Date: Wed, 1 Jul 2020 10:27:06 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540948 - in head/archivers/zoo: . files Message-ID: <202007011027.061AR67w004585@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jul 1 10:27:06 2020 New Revision: 540948 URL: https://svnweb.freebsd.org/changeset/ports/540948 Log: Really fix `archivers/zoo' on 64-bit machines. When PR 162804 had been committed by gabor@ back in 2011, only two of the proposed four patches supplied were actually included; the patches for zoodel.c and zoopack.c were somehow missed. PR: 162804, 240982 Added: head/archivers/zoo/files/patch-zoodel.c (contents, props changed) head/archivers/zoo/files/patch-zoopack.c (contents, props changed) Modified: head/archivers/zoo/Makefile Modified: head/archivers/zoo/Makefile ============================================================================== --- head/archivers/zoo/Makefile Wed Jul 1 10:10:21 2020 (r540947) +++ head/archivers/zoo/Makefile Wed Jul 1 10:27:06 2020 (r540948) @@ -3,7 +3,7 @@ PORTNAME= zoo PORTVERSION= 2.10.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= archivers MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/ \ LOCAL/ehaupt Added: head/archivers/zoo/files/patch-zoodel.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/zoo/files/patch-zoodel.c Wed Jul 1 10:27:06 2020 (r540948) @@ -0,0 +1,14 @@ +--- zoodel.c.orig 1991-07-16 15:58:46 UTC ++++ zoodel.c +@@ -138,7 +138,11 @@ if (*option == 'g') { + + /* read archive header */ + frd_zooh (&zoo_header, zoo_file); ++#ifdef __LP64__ ++ if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0) ++#else + if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L) ++#endif + prterror ('f', failed_consistency); + if (ver_too_high (&zoo_header)) + prterror ('f', wrong_version, zoo_header.major_ver, zoo_header.minor_ver); Added: head/archivers/zoo/files/patch-zoopack.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/zoo/files/patch-zoopack.c Wed Jul 1 10:27:06 2020 (r540948) @@ -0,0 +1,14 @@ +--- zoopack.c.orig 1993-05-01 03:59:21 UTC ++++ zoopack.c +@@ -139,7 +139,11 @@ if (zoo_file == NOFILE) + /* Read the header of the old archive. */ + frd_zooh(&old_zoo_header, zoo_file); + ++#ifdef __LP64__ ++if ((int)(old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0) { ++#else + if ((old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0L) { ++#endif + prterror ('w', failed_consistency); + ++bad_header; /* remember for future error message */ + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007011027.061AR67w004585>