diff options
Diffstat (limited to 'source/a/infozip/zip-patches')
-rw-r--r-- | source/a/infozip/zip-patches/man.patch | 40 | ||||
-rw-r--r-- | source/a/infozip/zip-patches/zip-3.0-currdir.patch | 12 | ||||
-rw-r--r-- | source/a/infozip/zip-patches/zip-3.0-exec-shield.patch | 20 | ||||
-rw-r--r-- | source/a/infozip/zip-patches/zip-3.0-format-security.patch | 20 | ||||
-rw-r--r-- | source/a/infozip/zip-patches/zip-3.0-time.patch | 11 | ||||
-rw-r--r-- | source/a/infozip/zip-patches/zipnote.patch | 13 |
6 files changed, 116 insertions, 0 deletions
diff --git a/source/a/infozip/zip-patches/man.patch b/source/a/infozip/zip-patches/man.patch new file mode 100644 index 000000000..9ba44c85e --- /dev/null +++ b/source/a/infozip/zip-patches/man.patch @@ -0,0 +1,40 @@ +--- ./man/zipsplit.1 2008-05-08 10:17:48.000000000 +0200 ++++ ./man/zipsplit.1 2013-04-26 18:33:12.492008280 +0200 +@@ -12,6 +12,7 @@ + .RB [ \-r\ room ] + .RB [ \-b\ path ] + .RB [ \-h ] ++.RB [ \-q ] + .RB [ \-v ] + .RB [ \-L ] + zipfile +@@ -47,6 +48,9 @@ + .BI \-h + Show a short help. + .TP ++.BI \-q ++Suppress some informational messages. ++.TP + .BI \-v + Show version information. + .TP +--- ./man/zipnote.1 2013-04-26 18:40:32.145018756 +0200 ++++ ./man/zipnote.1 2013-04-26 18:40:18.943018442 +0200 +@@ -7,6 +7,7 @@ + .RB [ \-w ] + .RB [ \-b\ path ] + .RB [ \-h ] ++.RB [ \-q ] + .RB [ \-v ] + .RB [ \-L ] + zipfile +@@ -27,6 +28,9 @@ + .BI \-h + Show a short help. + .TP ++.BI \-q ++Suppress some informational messages. ++.TP + .BI \-v + Show version information. + .TP diff --git a/source/a/infozip/zip-patches/zip-3.0-currdir.patch b/source/a/infozip/zip-patches/zip-3.0-currdir.patch new file mode 100644 index 000000000..40da32e7a --- /dev/null +++ b/source/a/infozip/zip-patches/zip-3.0-currdir.patch @@ -0,0 +1,12 @@ +diff -up zip30/util.c.currdir zip30/util.c +--- zip30/util.c.currdir 2009-11-16 12:42:17.783961701 +0100 ++++ zip30/util.c 2009-11-16 12:42:58.185960707 +0100 +@@ -493,6 +493,8 @@ int cs; /* force case-se + /* Compare the sh pattern p with the string s and return true if they match, + false if they don't or if there is a syntax error in the pattern. */ + { ++ while (s[0] == '.' && s[1] == '/') ++ s += 2; /* strip redundant leading "./" sections */ + return recmatch(p, s, cs) == 1; + } + diff --git a/source/a/infozip/zip-patches/zip-3.0-exec-shield.patch b/source/a/infozip/zip-patches/zip-3.0-exec-shield.patch new file mode 100644 index 000000000..05c1a6c49 --- /dev/null +++ b/source/a/infozip/zip-patches/zip-3.0-exec-shield.patch @@ -0,0 +1,20 @@ +diff -up zip30/crc_i386.S.exec_shield zip30/crc_i386.S +--- zip30/crc_i386.S.exec_shield 2009-11-13 18:37:45.000000000 +0100 ++++ zip30/crc_i386.S 2009-11-13 18:39:54.435390166 +0100 +@@ -302,3 +302,6 @@ _crc32: /* ulg c + #endif /* i386 || _i386 || _I386 || __i386 */ + + #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */ ++ ++.section .note.GNU-stack, "", @progbits ++.previous +diff -up zip30/match.S.exec_shield zip30/match.S +--- zip30/match.S.exec_shield 2005-01-28 10:40:14.000000000 +0100 ++++ zip30/match.S 2009-11-13 18:39:48.570389058 +0100 +@@ -405,3 +405,6 @@ L__return: + #endif /* i386 || _I386 || _i386 || __i386 */ + + #endif /* !USE_ZLIB */ ++ ++.section .note.GNU-stack, "", @progbits ++.previous diff --git a/source/a/infozip/zip-patches/zip-3.0-format-security.patch b/source/a/infozip/zip-patches/zip-3.0-format-security.patch new file mode 100644 index 000000000..54ce2e662 --- /dev/null +++ b/source/a/infozip/zip-patches/zip-3.0-format-security.patch @@ -0,0 +1,20 @@ +--- a/zip.c ++++ a/zip.c +@@ -1028,7 +1028,7 @@ local void help_extended() + + for (i = 0; i < sizeof(text)/sizeof(char *); i++) + { +- printf(text[i]); ++ printf("%s", text[i]); + putchar('\n'); + } + #ifdef DOS +@@ -1225,7 +1225,7 @@ local void version_info() + CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE); + for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++) + { +- printf(cryptnote[i]); ++ printf("%s", cryptnote[i]); + putchar('\n'); + } + ++i; /* crypt support means there IS at least one compilation option */ diff --git a/source/a/infozip/zip-patches/zip-3.0-time.patch b/source/a/infozip/zip-patches/zip-3.0-time.patch new file mode 100644 index 000000000..f72fd16c2 --- /dev/null +++ b/source/a/infozip/zip-patches/zip-3.0-time.patch @@ -0,0 +1,11 @@ +--- zip-2.31/unix/Makefile.time 2007-02-07 09:36:30.000000000 +0100 ++++ zip-2.31/unix/Makefile 2007-02-07 09:38:42.000000000 +0100 +@@ -24,7 +24,7 @@ + E = + + # probably can change this to 'install' if you have it +-INSTALL_PROGRAM = cp ++INSTALL_PROGRAM = cp -p + # probably can change this to 'install -d' if you have it + # XXX NextStep 3.3 and Openstep 4.x don't know about -p ! + INSTALL_D = mkdir -p diff --git a/source/a/infozip/zip-patches/zipnote.patch b/source/a/infozip/zip-patches/zipnote.patch new file mode 100644 index 000000000..4177a7df8 --- /dev/null +++ b/source/a/infozip/zip-patches/zipnote.patch @@ -0,0 +1,13 @@ +diff --git a/zipnote.c b/zipnote.c +index 5e02cb6..996f012 100644 +--- a/zipnote.c ++++ b/zipnote.c +@@ -661,7 +661,7 @@ char **argv; /* command line tokens */ + if ((r = zipcopy(z)) != ZE_OK) + ziperr(r, "was copying an entry"); + } +- fclose(x); ++ fclose(in_file); + + /* Write central directory and end of central directory with new comments */ + if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */ |