From 727f084d29cc4e018061fdfb730caa262810a9f3 Mon Sep 17 00:00:00 2001 From: hubertf Date: Fri, 12 Nov 1999 05:17:20 +0000 Subject: Fix patch fuzz insanity --- archivers/zoo/files/patch-sum | 13 ++- archivers/zoo/patches/patch-aa | 248 +++-------------------------------------- archivers/zoo/patches/patch-ab | 81 +++++++------- archivers/zoo/patches/patch-ac | 43 +++++++ archivers/zoo/patches/patch-ad | 19 ++++ archivers/zoo/patches/patch-ae | 14 +++ archivers/zoo/patches/patch-af | 20 ++++ archivers/zoo/patches/patch-ag | 21 ++++ archivers/zoo/patches/patch-ah | 16 +++ archivers/zoo/patches/patch-ai | 19 ++++ 10 files changed, 220 insertions(+), 274 deletions(-) create mode 100644 archivers/zoo/patches/patch-ac create mode 100644 archivers/zoo/patches/patch-ad create mode 100644 archivers/zoo/patches/patch-ae create mode 100644 archivers/zoo/patches/patch-af create mode 100644 archivers/zoo/patches/patch-ag create mode 100644 archivers/zoo/patches/patch-ah create mode 100644 archivers/zoo/patches/patch-ai (limited to 'archivers') diff --git a/archivers/zoo/files/patch-sum b/archivers/zoo/files/patch-sum index bbac910f00a..2cb55299934 100644 --- a/archivers/zoo/files/patch-sum +++ b/archivers/zoo/files/patch-sum @@ -1,4 +1,11 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:10 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/12 05:17:20 hubertf Exp $ -MD5 (patch-aa) = 5e962a7f57e28633acb98c6b30b3d610 -MD5 (patch-ab) = 0ccb862859da88e861d4a13656caeaf4 +MD5 (patch-aa) = ab1c5e90e327403e71d79f6135ce4577 +MD5 (patch-ab) = 415493548ca6cc2473399935e6057a3a +MD5 (patch-ac) = 859a96fc00703a078b3d4bdca7e34282 +MD5 (patch-ad) = f59fb2e9701963544b835e87d040b340 +MD5 (patch-ae) = 34d4f6b31e98d15b04db1d4e8b17a5ec +MD5 (patch-af) = f735e102d471604ee6816f6767e850c5 +MD5 (patch-ag) = 0065439af898aaebe927a17b0bc547c1 +MD5 (patch-ah) = 713e2171b21921d91811a0645f5e1476 +MD5 (patch-ai) = a704e845454d764dbd8094773797f3ae diff --git a/archivers/zoo/patches/patch-aa b/archivers/zoo/patches/patch-aa index 054f8b183ca..e5c8a4efac3 100644 --- a/archivers/zoo/patches/patch-aa +++ b/archivers/zoo/patches/patch-aa @@ -1,234 +1,16 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:53 agc Exp $ +$NetBSD: patch-aa,v 1.3 1999/11/12 05:17:20 hubertf Exp $ -*** bsd.c.old Thu Aug 8 09:34:07 1991 ---- bsd.c Thu Jan 5 05:20:03 1995 -*************** -*** 69,76 **** - } - - /* Function gettz() returns the offset from GMT in seconds */ -! long gettz() - { - #define SEC_IN_DAY (24L * 60L * 60L) - #define INV_VALUE (SEC_IN_DAY + 1L) - static long retval = INV_VALUE; /* cache, init to impossible value */ ---- 69,80 ---- - } - - /* Function gettz() returns the offset from GMT in seconds */ -! long gettz(t) -! long t; - { -+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) -+ return -localtime(&t)->tm_gmtoff; -+ #else - #define SEC_IN_DAY (24L * 60L * 60L) - #define INV_VALUE (SEC_IN_DAY + 1L) - static long retval = INV_VALUE; /* cache, init to impossible value */ -*************** -*** 83,88 **** ---- 87,93 ---- - /* Timezone fix thanks to Bill Davidsen */ - retval = tzp.tz_minuteswest * 60 - tzp.tz_dsttime * 3600L; - return retval; -+ #endif - } - - /* Standard UNIX-compatible time routines */ -*************** -*** 91,105 **** - /* Standard UNIX-specific file attribute routines */ - #include "nixmode.i" - - #ifndef SEEK_CUR - # define SEEK_CUR 1 - #endif - - /* Truncate a file. */ - int zootrunc(f) FILE *f; - { -! extern long lseek(); -! long seekpos; - int fd = fileno(f); - seekpos = lseek(fd, 0L, SEEK_CUR); - if (seekpos >= 0) ---- 96,114 ---- - /* Standard UNIX-specific file attribute routines */ - #include "nixmode.i" - -+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) -+ #include -+ #else - #ifndef SEEK_CUR - # define SEEK_CUR 1 - #endif -+ #endif - - /* Truncate a file. */ - int zootrunc(f) FILE *f; - { -! extern off_t lseek(); -! off_t seekpos; - int fd = fileno(f); - seekpos = lseek(fd, 0L, SEEK_CUR); - if (seekpos >= 0) -*** misc2.c.old Thu Aug 8 09:34:48 1991 ---- misc2.c Thu Jan 5 05:37:06 1995 -*************** -*** 314,323 **** - { - long diff_tz; - long longtime; - if (direntry->tz == NO_TZ) /* none stored */ - return; -! diff_tz = (long) direntry->tz * (3600/4) - gettz(); /* diff. in seconds */ -! longtime = mstonix (direntry->date, direntry->time) + diff_tz; /* adj tz */ - mstime (longtime, &direntry->date, &direntry->time); - } - #endif /* GETTZ */ ---- 314,325 ---- - { - long diff_tz; - long longtime; -+ long t; - if (direntry->tz == NO_TZ) /* none stored */ - return; -! t = mstonix (direntry->date, direntry->time); -! diff_tz = (long) direntry->tz * (3600/4) - gettz(t); /* diff. in seconds */ -! longtime = t + diff_tz; /* adj tz */ - mstime (longtime, &direntry->date, &direntry->time); - } - #endif /* GETTZ */ -*** nixtime.i.old Thu Aug 8 09:34:57 1991 ---- nixtime.i Thu Jan 5 05:16:28 1995 -*************** -*** 52,58 **** - long mstonix(); - long gettz(); - long utimbuf[2]; -! utimbuf[0] = utimbuf[1] = gettz() + mstonix (date, time); - return (utime (path, utimbuf)); - } - ---- 52,59 ---- - long mstonix(); - long gettz(); - long utimbuf[2]; -! long t = mstonix (date, time); -! utimbuf[0] = utimbuf[1] = t + gettz(t); - return (utime (path, utimbuf)); - } - -*** zoolist.c.old Thu Aug 8 09:36:09 1991 ---- zoolist.c Thu Jan 5 05:41:47 1995 -*************** -*** 539,548 **** - { - long gettz(); - int diff_tz; /* timezone difference */ - if (file_tz == NO_TZ) /* if no timezone stored ..*/ - printf (" "); /* .. just pad with blanks */ - else { -! diff_tz = (file_tz / 4) - (int) (gettz() / 3600); - if (diff_tz == 0) - printf (" "); /* print nothing if same */ - else if (diff_tz > 0) /* else print signed difference */ ---- 539,550 ---- - { - long gettz(); - int diff_tz; /* timezone difference */ -+ long t; - if (file_tz == NO_TZ) /* if no timezone stored ..*/ - printf (" "); /* .. just pad with blanks */ - else { -! time(&t); -! diff_tz = (file_tz / 4) - (int) (gettz(t) / 3600); - if (diff_tz == 0) - printf (" "); /* print nothing if same */ - else if (diff_tz > 0) /* else print signed difference */ -*** zoofns.h.bak Thu Aug 8 09:36:02 1991 ---- zoofns.h Thu Jan 5 06:03:04 1995 -*************** -*** 94,100 **** ---- 94,104 ---- - void fixslash PARMS ((char *)); - void makelist PARMS ((int, char *[], char *[], int, char *, char *, char *, int *)); - void memerr PARMS ((unsigned int)); -+ #ifdef STDARG -+ void prterror(int level, char *format, ...); -+ #else - void prterror PARMS ((int, char *, ...)); -+ #endif - void rootname PARMS ((char *, char *)); - void skip_files PARMS ((ZOOFILE, unsigned int *, unsigned int *, int *, - char [], long *)); -*** options.h.orig Sat May 1 08:27:59 1993 ---- options.h Thu Jan 5 06:51:56 1995 -*************** -*** 96,102 **** - #define NIXTIME - #define NIXFNAME - #define NEEDCTYP -- #define NOENUM - #define REN_STDC - #define SETBUF - #define GETTZ ---- 96,101 ---- -*************** -*** 110,115 **** ---- 109,115 ---- - #define ANSI_PROTO - #define VOIDPTR void * - #else -+ #define NOENUM - #define NOSTRCHR /* not really needed for 4.3BSD */ - #define T_SIGNAL int - #define VARARGS -*** zooadd2.c.orig Sat Jul 20 02:38:10 1991 ---- zooadd2.c Thu Jan 5 06:55:40 1995 -*************** -*** 258,269 **** - register struct direntry *direntry; - { - #ifdef GETTZ - long gettz(); - #endif - direntry->zoo_tag = ZOO_TAG; - direntry->type = 2; /* type is now 2 */ - #ifdef GETTZ -! direntry->tz = gettz() / (15 * 60); /* seconds => 15-min units */ - #else - direntry->tz = NO_TZ; /* timezone unknown */ - #endif ---- 258,272 ---- - register struct direntry *direntry; - { - #ifdef GETTZ -+ long mstonix(); - long gettz(); -+ long t; - #endif - direntry->zoo_tag = ZOO_TAG; - direntry->type = 2; /* type is now 2 */ - #ifdef GETTZ -! t = mstonix (direntry->date, direntry->time); -! direntry->tz = gettz(t) / (15 * 60); /* seconds => 15-min units */ - #else - direntry->tz = NO_TZ; /* timezone unknown */ - #endif -*** ar.h.orig Sat May 1 08:04:22 1993 ---- ar.h Thu Jan 5 07:05:36 1995 -*************** -*** 15,23 **** ---- 15,25 ---- - /* uchar should be 8 bits or more */ - /* typedef unsigned char uchar; -- already in zoo.h */ - -+ #if !(defined(__FreeBSD__) && __FreeBSD__ < 3) && !defined(__OpenBSD__) && !defined(__NetBSD__) - typedef unsigned int uint; /* 16 bits or more */ - #if !defined(__386BSD__) || !defined(_TYPES_H_) - typedef unsigned short ushort; /* 16 bits or more */ -+ #endif - #endif - typedef unsigned long ulong; /* 32 bits or more */ - +--- ./ar.h Sat May 1 06:04:22 1993 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/ar.h Fri Nov 12 06:19:39 1999 +@@ -15,9 +15,11 @@ + /* uchar should be 8 bits or more */ + /* typedef unsigned char uchar; -- already in zoo.h */ + ++#if !(defined(__FreeBSD__) && __FreeBSD__ < 3) && !defined(__OpenBSD__) && !defined(__NetBSD__) + typedef unsigned int uint; /* 16 bits or more */ + #if !defined(__386BSD__) || !defined(_TYPES_H_) + typedef unsigned short ushort; /* 16 bits or more */ ++#endif + #endif + typedef unsigned long ulong; /* 32 bits or more */ + diff --git a/archivers/zoo/patches/patch-ab b/archivers/zoo/patches/patch-ab index 325f3f61b0b..c1b6ce527dd 100644 --- a/archivers/zoo/patches/patch-ab +++ b/archivers/zoo/patches/patch-ab @@ -1,43 +1,48 @@ -$NetBSD: patch-ab,v 1.3 1998/08/07 10:35:53 agc Exp $ +$NetBSD: patch-ab,v 1.4 1999/11/12 05:17:20 hubertf Exp $ ---- makefile.orig Tue Jul 16 17:52:08 1991 -+++ makefile Sat Feb 7 18:20:15 1998 -@@ -18,13 +18,13 @@ +--- ./bsd.c Sat May 1 06:21:53 1993 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/bsd.c Fri Nov 12 06:19:38 1999 +@@ -69,8 +69,12 @@ + } - MAKE = make # needed for some systems e.g. older BSD + /* Function gettz() returns the offset from GMT in seconds */ +-long gettz() ++long gettz(t) ++long t; + { ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ return -localtime(&t)->tm_gmtoff; ++#else + #define SEC_IN_DAY (24L * 60L * 60L) + #define INV_VALUE (SEC_IN_DAY + 1L) + static long retval = INV_VALUE; /* cache, init to impossible value */ +@@ -95,6 +99,7 @@ + retval = -tm->tm_gmtoff; + #endif + return retval; ++#endif + } --CC = cc --CFLAGS = -+#CC = cc -+#CFLAGS = - MODEL = - EXTRA = -DBIG_MEM -DNDEBUG - LINTFLAGS = -DLINT --OPTIM = -O --DESTDIR = /usr/local/bin -+OPTIM = $(CFLAGS) -+DESTDIR = $(PREFIX)/bin + /* Standard UNIX-compatible time routines */ +@@ -103,15 +108,19 @@ + /* Standard UNIX-specific file attribute routines */ + #include "nixmode.i" - #List of all object files created for Zoo - ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ -@@ -67,7 +67,7 @@ - @echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#include ++#else + #ifndef SEEK_CUR + # define SEEK_CUR 1 + #endif ++#endif - # install alpha zoo as "tzoo" --install: -+inst_test: - mv zoo $(DESTDIR)/tzoo - - # install beta zoo as "bzoo" -@@ -75,8 +75,9 @@ - mv zoo $(DESTDIR)/bzoo - - # install production zoo as "zoo" --inst_prod: -- mv zoo $(DESTDIR)/zoo -+install: -+ $(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR) -+ $(INSTALL_DATA) zoo.1 fiz.1 $(PREFIX)/man/man1 - - # executable targets - TARGETS = zoo fiz + /* Truncate a file. */ + int zootrunc(f) FILE *f; + { +- extern long lseek(); +- long seekpos; ++ extern off_t lseek(); ++ off_t seekpos; + int fd = fileno(f); + seekpos = lseek(fd, 0L, SEEK_CUR); + if (seekpos >= 0) diff --git a/archivers/zoo/patches/patch-ac b/archivers/zoo/patches/patch-ac new file mode 100644 index 00000000000..c4432f03eeb --- /dev/null +++ b/archivers/zoo/patches/patch-ac @@ -0,0 +1,43 @@ +$NetBSD: patch-ac,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./makefile Tue Jul 16 17:52:08 1991 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/makefile Fri Nov 12 06:19:40 1999 +@@ -18,13 +18,13 @@ + + MAKE = make # needed for some systems e.g. older BSD + +-CC = cc +-CFLAGS = ++#CC = cc ++#CFLAGS = + MODEL = + EXTRA = -DBIG_MEM -DNDEBUG + LINTFLAGS = -DLINT +-OPTIM = -O +-DESTDIR = /usr/local/bin ++OPTIM = $(CFLAGS) ++DESTDIR = $(PREFIX)/bin + + #List of all object files created for Zoo + ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ +@@ -67,7 +67,7 @@ + @echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" + + # install alpha zoo as "tzoo" +-install: ++inst_test: + mv zoo $(DESTDIR)/tzoo + + # install beta zoo as "bzoo" +@@ -75,8 +75,9 @@ + mv zoo $(DESTDIR)/bzoo + + # install production zoo as "zoo" +-inst_prod: +- mv zoo $(DESTDIR)/zoo ++install: ++ $(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR) ++ $(INSTALL_DATA) zoo.1 fiz.1 $(PREFIX)/man/man1 + + # executable targets + TARGETS = zoo fiz diff --git a/archivers/zoo/patches/patch-ad b/archivers/zoo/patches/patch-ad new file mode 100644 index 00000000000..1220a4e7824 --- /dev/null +++ b/archivers/zoo/patches/patch-ad @@ -0,0 +1,19 @@ +$NetBSD: patch-ad,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./misc2.c Tue Jul 16 17:53:02 1991 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/misc2.c Fri Nov 12 06:19:38 1999 +@@ -314,10 +314,12 @@ + { + long diff_tz; + long longtime; ++ long t; + if (direntry->tz == NO_TZ) /* none stored */ + return; +- diff_tz = (long) direntry->tz * (3600/4) - gettz(); /* diff. in seconds */ +- longtime = mstonix (direntry->date, direntry->time) + diff_tz; /* adj tz */ ++ t = mstonix (direntry->date, direntry->time); ++ diff_tz = (long) direntry->tz * (3600/4) - gettz(t); /* diff. in seconds */ ++ longtime = t + diff_tz; /* adj tz */ + mstime (longtime, &direntry->date, &direntry->time); + } + #endif /* GETTZ */ diff --git a/archivers/zoo/patches/patch-ae b/archivers/zoo/patches/patch-ae new file mode 100644 index 00000000000..1e5760fad59 --- /dev/null +++ b/archivers/zoo/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./nixtime.i Tue Jul 16 17:53:46 1991 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/nixtime.i Fri Nov 12 06:19:38 1999 +@@ -52,7 +52,8 @@ + long mstonix(); + long gettz(); + long utimbuf[2]; +- utimbuf[0] = utimbuf[1] = gettz() + mstonix (date, time); ++ long t = mstonix (date, time); ++ utimbuf[0] = utimbuf[1] = t + gettz(t); + return (utime (path, utimbuf)); + } + diff --git a/archivers/zoo/patches/patch-af b/archivers/zoo/patches/patch-af new file mode 100644 index 00000000000..9e68cdd2ce8 --- /dev/null +++ b/archivers/zoo/patches/patch-af @@ -0,0 +1,20 @@ +$NetBSD: patch-af,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./options.h Sat May 1 06:27:59 1993 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/options.h Fri Nov 12 06:19:39 1999 +@@ -96,7 +96,6 @@ + #define NIXTIME + #define NIXFNAME + #define NEEDCTYP +-#define NOENUM + #define REN_STDC + #define SETBUF + #define GETTZ +@@ -110,6 +109,7 @@ + #define ANSI_PROTO + #define VOIDPTR void * + #else ++#define NOENUM + #define NOSTRCHR /* not really needed for 4.3BSD */ + #define T_SIGNAL int + #define VARARGS diff --git a/archivers/zoo/patches/patch-ag b/archivers/zoo/patches/patch-ag new file mode 100644 index 00000000000..23ec0e6f2b3 --- /dev/null +++ b/archivers/zoo/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./zooadd2.c Sat Jul 20 01:38:10 1991 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/zooadd2.c Fri Nov 12 06:19:39 1999 +@@ -258,12 +258,15 @@ + register struct direntry *direntry; + { + #ifdef GETTZ ++ long mstonix(); + long gettz(); ++ long t; + #endif + direntry->zoo_tag = ZOO_TAG; + direntry->type = 2; /* type is now 2 */ + #ifdef GETTZ +- direntry->tz = gettz() / (15 * 60); /* seconds => 15-min units */ ++ t = mstonix (direntry->date, direntry->time); ++ direntry->tz = gettz(t) / (15 * 60); /* seconds => 15-min units */ + #else + direntry->tz = NO_TZ; /* timezone unknown */ + #endif diff --git a/archivers/zoo/patches/patch-ah b/archivers/zoo/patches/patch-ah new file mode 100644 index 00000000000..909a2fed42a --- /dev/null +++ b/archivers/zoo/patches/patch-ah @@ -0,0 +1,16 @@ +$NetBSD: patch-ah,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./zoofns.h Sat May 1 05:57:35 1993 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/zoofns.h Fri Nov 12 06:19:39 1999 +@@ -94,7 +94,11 @@ + void fixslash PARMS ((char *)); + void makelist PARMS ((int, char *[], char *[], int, char *, char *, char *, int *)); + void memerr PARMS ((unsigned int)); ++#ifdef STDARG ++void prterror(int level, char *format, ...); ++#else + void prterror PARMS ((int, char *, ...)); ++#endif + void rootname PARMS ((char *, char *)); + void skip_files PARMS ((ZOOFILE, unsigned int *, unsigned int *, int *, + char [], long *)); diff --git a/archivers/zoo/patches/patch-ai b/archivers/zoo/patches/patch-ai new file mode 100644 index 00000000000..a70f04f1c00 --- /dev/null +++ b/archivers/zoo/patches/patch-ai @@ -0,0 +1,19 @@ +$NetBSD: patch-ai,v 1.1 1999/11/12 05:17:21 hubertf Exp $ + +--- ./zoolist.c Sat Jul 20 00:57:27 1991 ++++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/zoolist.c Fri Nov 12 06:19:38 1999 +@@ -539,10 +539,12 @@ + { + long gettz(); + int diff_tz; /* timezone difference */ ++ long t; + if (file_tz == NO_TZ) /* if no timezone stored ..*/ + printf (" "); /* .. just pad with blanks */ + else { +- diff_tz = (file_tz / 4) - (int) (gettz() / 3600); ++ time(&t); ++ diff_tz = (file_tz / 4) - (int) (gettz(t) / 3600); + if (diff_tz == 0) + printf (" "); /* print nothing if same */ + else if (diff_tz > 0) /* else print signed difference */ + -- cgit v1.2.3