From a6b7dfd2bbff6a5bd7fef9d4dcaf2371f69c2e12 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 3 Aug 2005 18:54:31 +0000 Subject: Update to 2.31: New things in Zip 2.31 - Crypt now part of source distribution (see Readme.cr) - Bug fixes: - Debian patch 001 - Converted quoted strings - Debian patch 002 - Makefile changes - Debian patch 003 - Build changes - Debian patch 004 - Changes to unix/configure - Debian patch 005 - Fix for FNMAX path bug - Split VMS -V into -V and -VV (see Manual) - New VC6 project files thanks to Cosmin - AtheOS port (thanks to Ruslan Nickolaev) - Add api.c kluge for zip32.dll to support Visual Basic - Binary detection changed from 20% binary to new algorithm that should better detect word processing files as binary and should accept UTF-8 files as text. This flags the file in the archive as TEXT or BINARY for use by UnZip for line end conversion (see proginfo/txtvsbin.txt) - License update - DJGPP fixes - Many Makefile updates - Fixes to ZipSplit, ZipNotes, and ZipCloak --- archivers/zip/patches/patch-aa | 13 ------------- archivers/zip/patches/patch-ab | 39 --------------------------------------- archivers/zip/patches/patch-ac | 13 ------------- archivers/zip/patches/patch-ad | 13 ------------- archivers/zip/patches/patch-ae | 20 -------------------- archivers/zip/patches/patch-af | 13 ------------- archivers/zip/patches/patch-ag | 13 ------------- archivers/zip/patches/patch-ah | 6 +++--- 8 files changed, 3 insertions(+), 127 deletions(-) delete mode 100644 archivers/zip/patches/patch-aa delete mode 100644 archivers/zip/patches/patch-ab delete mode 100644 archivers/zip/patches/patch-ac delete mode 100644 archivers/zip/patches/patch-ad delete mode 100644 archivers/zip/patches/patch-ae delete mode 100644 archivers/zip/patches/patch-af delete mode 100644 archivers/zip/patches/patch-ag (limited to 'archivers/zip/patches') diff --git a/archivers/zip/patches/patch-aa b/archivers/zip/patches/patch-aa deleted file mode 100644 index 515710c4000..00000000000 --- a/archivers/zip/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2002/04/18 16:42:31 yyamano Exp $ - ---- unix/configure.orig Sat Mar 2 19:33:13 2002 -+++ unix/configure -@@ -13,7 +13,7 @@ - - CC=${1-cc} - CFLAGS=${2-"-O2 -I. -DUNIX"} --LFLAGS1="-s" -+LFLAGS1="" - LN="ln -s" - - echo Check for the C preprocessor diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab deleted file mode 100644 index 2adc8e0e178..00000000000 --- a/archivers/zip/patches/patch-ab +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2004/12/17 22:41:15 wiz Exp $ - ---- unix/unix.c.orig 1999-11-07 15:08:21.000000000 +0100 -+++ unix/unix.c -@@ -319,8 +319,8 @@ iztimes *t; /* return value: - a file size of -1 */ - { - struct stat s; /* results of stat() */ -- char name[FNMAX]; -- int len = strlen(f); -+ char *name; -+ size_t len = strlen(f); - - if (f == label) { - if (a != NULL) -@@ -331,6 +331,11 @@ iztimes *t; /* return value: - t->atime = t->mtime = t->ctime = label_utim; - return label_time; - } -+ -+ name = malloc(len+1); -+ if (!name) -+ return 0; -+ - strcpy(name, f); - if (name[len - 1] == '/') - name[len - 1] = '\0'; -@@ -698,7 +703,11 @@ void version_local() - #ifdef __QNXNTO__ - " (QNX Neutrino)", - #else -+#ifdef __APPLE__ -+ " (Mac OS X)", -+#else - "", -+#endif /* Mac OS X */ - #endif /* QNX Neutrino */ - #endif /* QNX 4 */ - #endif /* Convex */ diff --git a/archivers/zip/patches/patch-ac b/archivers/zip/patches/patch-ac deleted file mode 100644 index 41731ba8e13..00000000000 --- a/archivers/zip/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/04/18 16:42:31 yyamano Exp $ - ---- zip.c.orig Sat Mar 2 19:38:04 2002 -+++ zip.c -@@ -248,7 +248,7 @@ - if (PERR(c)) - perror("zip I/O error"); - fflush(mesg); -- fprintf(stderr, "\nzip error: %s (%s)\n", errors[c-1], h); -+ fprintf(stderr, "\nzip error: %s (%s)\n", ziperrors[c-1], h); - } - if (tempzip != NULL) - { diff --git a/archivers/zip/patches/patch-ad b/archivers/zip/patches/patch-ad deleted file mode 100644 index 1dde9a14791..00000000000 --- a/archivers/zip/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2002/04/18 16:42:31 yyamano Exp $ - ---- zipcloak.c.orig Sat Mar 2 19:39:05 2002 -+++ zipcloak.c -@@ -55,7 +55,7 @@ - char *msg; /* message about how it happened */ - { - if (PERR(code)) perror("zipcloak error"); -- fprintf(stderr, "zipcloak error: %s (%s)\n", errors[code-1], msg); -+ fprintf(stderr, "zipcloak error: %s (%s)\n", ziperrors[code-1], msg); - if (tempzf != NULL) fclose(tempzf); - if (tempzip != NULL) { - destroy(tempzip); diff --git a/archivers/zip/patches/patch-ae b/archivers/zip/patches/patch-ae deleted file mode 100644 index d01f269f494..00000000000 --- a/archivers/zip/patches/patch-ae +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/04/18 16:42:31 yyamano Exp $ - ---- ziperr.h.orig Sat Mar 2 19:39:27 2002 -+++ ziperr.h -@@ -39,7 +39,7 @@ - - #ifdef GLOBALS - /* Error messages for the ziperr() function in the zip programs */ --char *errors[ZE_MAXERR] = { -+char *ziperrors[ZE_MAXERR] = { - /* 1 */ "", - /* 2 */ "Unexpected end of zip file", - /* 3 */ "Zip file structure invalid", -@@ -63,5 +63,5 @@ - # endif - }; - #else /* !GLOBALS */ --extern char *errors[ZE_MAXERR]; /* Error messages for ziperr() */ -+extern char *ziperrors[ZE_MAXERR]; /* Error messages for ziperr() */ - #endif /* ?GLOBALS */ diff --git a/archivers/zip/patches/patch-af b/archivers/zip/patches/patch-af deleted file mode 100644 index f9d3cb8b64b..00000000000 --- a/archivers/zip/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2002/04/18 16:42:31 yyamano Exp $ - ---- zipnote.c.orig Sat Mar 2 19:44:04 2002 -+++ zipnote.c -@@ -59,7 +59,7 @@ - { - if (PERR(c)) - perror("zipnote error"); -- fprintf(stderr, "zipnote error: %s (%s)\n", errors[c-1], h); -+ fprintf(stderr, "zipnote error: %s (%s)\n", ziperrors[c-1], h); - if (tempzf != NULL) - fclose(tempzf); - if (tempzip != NULL) diff --git a/archivers/zip/patches/patch-ag b/archivers/zip/patches/patch-ag deleted file mode 100644 index 23ef6a5e5fe..00000000000 --- a/archivers/zip/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2002/04/18 16:42:31 yyamano Exp $ - ---- zipsplit.c.orig Sat Mar 2 19:45:34 2002 -+++ zipsplit.c -@@ -139,7 +139,7 @@ - { - if (PERR(c)) - perror("zipsplit error"); -- fprintf(stderr, "zipsplit error: %s (%s)\n", errors[c-1], h); -+ fprintf(stderr, "zipsplit error: %s (%s)\n", ziperrors[c-1], h); - if (indexmade) - { - strcpy(name, INDEX); diff --git a/archivers/zip/patches/patch-ah b/archivers/zip/patches/patch-ah index bcf62dfa438..dd598f5352f 100644 --- a/archivers/zip/patches/patch-ah +++ b/archivers/zip/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.1 2005/03/28 18:08:12 wiz Exp $ +$NetBSD: patch-ah,v 1.2 2005/08/03 18:54:31 wiz Exp $ ---- unix/Makefile.orig 1999-11-29 06:22:42.000000000 +0100 +--- unix/Makefile.orig 2005-02-28 08:33:50.000000000 +0100 +++ unix/Makefile @@ -12,7 +12,6 @@ all: @@ -10,7 +10,7 @@ $NetBSD: patch-ah,v 1.1 2005/03/28 18:08:12 wiz Exp $ SHELL = /bin/sh LN = ln -s -@@ -154,10 +153,10 @@ flags: unix/configure +@@ -155,10 +154,10 @@ flags: unix/configure # Generic targets: generic: flags -- cgit v1.2.3