<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c83bb86deeebbf432a904dfccc820ae24824dcf">https://github.com/macports/macports-ports/commit/1c83bb86deeebbf432a904dfccc820ae24824dcf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1c83bb86deeebbf432a904dfccc820ae24824dcf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jan 5 07:23:27 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> unzoo: Fix build failure and wrong code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix implicit function declarations due to missing headers.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix array access past end of array.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix wrong variable type passed to utime.
</span>---
archivers/unzoo/Portfile | 13 ++++++++++---
archivers/unzoo/files/array.patch | 13 +++++++++++++
archivers/unzoo/files/implicit.patch | 20 ++++++++++++++++++++
archivers/unzoo/files/utime.patch | 15 +++++++++++++++
4 files changed, 58 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unzoo/Portfile b/archivers/unzoo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c2bc4632b3..b6b8946b148 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unzoo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unzoo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name unzoo
version 4.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd8e0c97e22adfc8fefd6f8d1b70d8ca53b234f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ddbaf41e7edd833eed987892caeb6ac39f47b9dd8abb660f906933fd91fbbf55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 26842
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories archivers
license public-domain
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +24,9 @@ long_description \
</span> homepage http://freecode.com/projects/unzoo/
master_sites http://critical.ch/unzoo/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 2e73c26188688033b7c2b6c7da32ad39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 9f1d0193492276bd0f59a48d720ab6092c6d4a0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fd8e0c97e22adfc8fefd6f8d1b70d8ca53b234f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles array.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ utime.patch
</span>
use_configure no
universal_variant yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unzoo/files/array.patch b/archivers/unzoo/files/array.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7887586c89d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unzoo/files/array.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+warning: array index 20 is past the end of the array (which contains 20 elements) [-Warray-bounds]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzoo.c.orig 2002-05-06 10:34:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzoo.c 2022-01-05 07:21:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1461,7 +1466,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int DescReadArch ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* read the text at the beginning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BlckReadArch(Descript.text,20L); Descript.text[20] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BlckReadArch(Descript.text,20L); Descript.text[19] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* try to read the magic words */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( (Descript.magic = WordReadArch()) != (unsigned long)0xfdc4a7dcL )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unzoo/files/implicit.patch b/archivers/unzoo/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..de3de8d7f45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unzoo/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcpy' with type 'char *(char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'strcat' with type 'char *(char *, const char *)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'system' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'utime' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'chmod' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzoo.c.orig 2002-05-06 10:34:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzoo.c 2022-01-05 07:21:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -244,6 +244,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <utime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /****************************************************************************
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unzoo/files/utime.patch b/archivers/unzoo/files/utime.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c9ff492f28e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unzoo/files/utime.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+warning: incompatible pointer types passing 'unsigned int [2]' to parameter of type 'const struct utimbuf *' [-Wincompatible-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzoo.c.orig 2002-05-06 10:34:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzoo.c 2022-01-05 07:30:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -618,8 +618,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ** members with the correct time as stored in the archive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SYS_IS_UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned int Secs [2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define SETF_TIME(patl,secs) (Secs[0]=Secs[1]=(secs),!utime((patl),Secs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct utimbuf Secs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SETF_TIME(patl,secs) (Secs.actime=Secs.modtime=(secs),!utime((patl),&Secs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SYS_IS_DOS_DJGPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long Secs [2];
</span></pre><pre style='margin:0'>
</pre>