diff -crB orig/crc_i386.S src/crc_i386.S *** orig/crc_i386.S 2013-12-28 19:18:09.149077946 +0100 --- src/crc_i386.S 2014-10-30 02:13:29.803018816 +0100 *************** *** 302,304 **** --- 302,306 ---- #endif /* i386 || _i386 || _I386 || __i386 */ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */ + .section .note.GNU-stack, "", @progbits + .previous diff -crB orig/man/zip.1 src/man/zip.1 *** orig/man/zip.1 2013-12-28 19:18:09.156077946 +0100 --- src/man/zip.1 2014-10-30 02:13:06.161018860 +0100 *************** *** 13,19 **** .\" 30 August 2007, 27 April 2008, 25 May 2008, 27 May 2008 by EG, .\" 7 June 2008 by SMS and EG; 12 June 2008 by EG) .\" ! .TH ZIP 1L "16 June 2008 (v3.0)" Info-ZIP .SH NAME zip \- package and compress (archive) files .SH SYNOPSIS --- 13,19 ---- .\" 30 August 2007, 27 April 2008, 25 May 2008, 27 May 2008 by EG, .\" 7 June 2008 by SMS and EG; 12 June 2008 by EG) .\" ! .TH ZIP 1 "16 June 2008 (v3.0)" Info-ZIP .SH NAME zip \- package and compress (archive) files .SH SYNOPSIS *************** *** 53,66 **** and is compatible with PKZIP (Phil Katz's ZIP for MSDOS systems). .LP A companion program ! .RI ( unzip (1L)) unpacks .I zip archives. The .I zip and ! .IR unzip (1L) programs can work with archives produced by PKZIP (supporting most PKZIP features up to PKZIP version 4.6), and PKZIP and PKUNZIP can work with archives produced by --- 53,66 ---- and is compatible with PKZIP (Phil Katz's ZIP for MSDOS systems). .LP A companion program ! .RI ( unzip (1)) unpacks .I zip archives. The .I zip and ! .IR unzip (1) programs can work with archives produced by PKZIP (supporting most PKZIP features up to PKZIP version 4.6), and PKZIP and PKUNZIP can work with archives produced by *************** *** 502,508 **** where the option starts with --, has a multicharacter name, can include a trailing dash to negate the option (if the option supports it), and can have a value (option argument) specified by ! preceeding it with = (no spaces). Values can also follow the argument. So .IP \fC--before-date=mmddyyyy\fP --- 502,508 ---- where the option starts with --, has a multicharacter name, can include a trailing dash to negate the option (if the option supports it), and can have a value (option argument) specified by ! preceding it with = (no spaces). Values can also follow the argument. So .IP \fC--before-date=mmddyyyy\fP *************** *** 2403,2409 **** .TP .PD .B \-\-use\-privileges ! [WIN32] Use priviliges (if granted) to obtain all aspects of WinNT security. .TP .PD 0 .B \-@ --- 2403,2409 ---- .TP .PD .B \-\-use\-privileges ! [WIN32] Use privileges (if granted) to obtain all aspects of WinNT security. .TP .PD 0 .B \-@ *************** *** 2661,2670 **** [VMS] see ZIPOPT .SH "SEE ALSO" compress(1), ! shar(1L), tar(1), ! unzip(1L), ! gzip(1L) .SH DIAGNOSTICS The exit status (or error level) approximates the exit codes defined by PKWARE and takes on the following values, except under VMS: --- 2661,2670 ---- [VMS] see ZIPOPT .SH "SEE ALSO" compress(1), ! shar(1), tar(1), ! unzip(1), ! gzip(1) .SH DIAGNOSTICS The exit status (or error level) approximates the exit codes defined by PKWARE and takes on the following values, except under VMS: *************** *** 2756,2762 **** .I zip handles some of the conversion internally. When using Kermit to transfer zip files from VMS to MSDOS, type "set ! file type block" on VMS. When transfering from MSDOS to VMS, type "set file type fixed" on VMS. In both cases, type "set file type binary" on MSDOS. .LP --- 2756,2762 ---- .I zip handles some of the conversion internally. When using Kermit to transfer zip files from VMS to MSDOS, type "set ! file type block" on VMS. When transferring from MSDOS to VMS, type "set file type fixed" on VMS. In both cases, type "set file type binary" on MSDOS. .LP diff -crB orig/match.S src/match.S *** orig/match.S 2013-12-28 19:18:09.156077946 +0100 --- src/match.S 2014-10-30 02:13:29.803018816 +0100 *************** *** 405,407 **** --- 405,409 ---- #endif /* i386 || _I386 || _i386 || __i386 */ #endif /* !USE_ZLIB */ + .section .note.GNU-stack, "", @progbits + .previous diff -crB orig/revision.h src/revision.h *** orig/revision.h 2013-12-28 19:18:09.161077946 +0100 --- src/revision.h 2013-12-28 19:18:09.202077946 +0100 *************** *** 79,84 **** --- 79,85 ---- }; ZCONST char * far swlicense[] = { + #ifndef __BIONIC__ "Copyright (c) 1990-2008 Info-ZIP. All rights reserved.", "", "For the purposes of this copyright and license, \"Info-ZIP\" is defined as", *************** *** 133,138 **** --- 134,144 ---- " 4. Info-ZIP retains the right to use the names \"Info-ZIP,\" \"Zip,\" \"UnZip,\"", " \"UnZipSFX,\" \"WiZ,\" \"Pocket UnZip,\" \"Pocket Zip,\" and \"MacZip\" for its", " own source and binary releases." + #else + "Copyright (c) 1990-2008 Info-ZIP. All rights reserved.", + "", + "Check license at ftp://ftp.info-zip.org/pub/infozip/license.html", + #endif }; #endif /* DEFCPYRT */ #endif /* !WINDLL && !IZ_VERSION_SYMBOLS_ONLY */ diff -crB orig/unix/unix.c src/unix/unix.c *** orig/unix/unix.c 2013-12-28 19:18:09.165077946 +0100 --- src/unix/unix.c 2013-12-28 19:18:09.207077946 +0100 *************** *** 8,14 **** --- 8,18 ---- If, for some reason, all these files are missing, the Info-ZIP license also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html */ + #ifndef __BIONIC__ #include "zip.h" + #else + #include "../zip.h" + #endif #ifndef UTIL /* the companion #endif is a bit of ways down ... */ diff -crB orig/zip.c src/zip.c *** orig/zip.c 2013-12-28 19:18:09.178077946 +0100 --- src/zip.c 2013-12-28 19:18:09.219077946 +0100 *************** *** 588,594 **** --- 588,596 ---- # else " -h show this help -n don't compress these suffixes" # endif + #ifndef __BIONIC__ ," -h2 show more help", + #endif " Macintosh specific:", " -jj record Fullpath (+ Volname) -N store finder-comments as comments", " -df zip only datafork of a file -S include finder invisible/system files" *************** *** 667,674 **** --- 669,678 ---- #ifdef RISCOS ," -h2 show more help -I don't scan thru Image files" #else + #ifndef __BIONIC__ ," -h2 show more help" #endif + #endif #endif /* ?MACOS */ #ifdef VMS ," (Must quote upper-case options, like \"-V\", unless SET PROC/PARSE=EXTEND)" *************** *** 1028,1034 **** for (i = 0; i < sizeof(text)/sizeof(char *); i++) { ! printf(text[i]); putchar('\n'); } #ifdef DOS --- 1032,1038 ---- for (i = 0; i < sizeof(text)/sizeof(char *); i++) { ! printf("%s", text[i]); putchar('\n'); } #ifdef DOS *************** *** 1225,1231 **** CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE); for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++) { ! printf(cryptnote[i]); putchar('\n'); } ++i; /* crypt support means there IS at least one compilation option */ --- 1229,1235 ---- CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE); for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++) { ! printf("%s", cryptnote[i]); putchar('\n'); } ++i; /* crypt support means there IS at least one compilation option */ *************** *** 2010,2016 **** --- 2014,2022 ---- {"h", "help", o_NO_VALUE, o_NOT_NEGATABLE, 'h', "help"}, {"H", "", o_NO_VALUE, o_NOT_NEGATABLE, 'h', "help"}, {"?", "", o_NO_VALUE, o_NOT_NEGATABLE, 'h', "help"}, + #ifndef __BIONIC__ {"h2", "more-help", o_NO_VALUE, o_NOT_NEGATABLE, o_h2, "extended help"}, + #endif #endif /* !WINDLL */ {"i", "include", o_VALUE_LIST, o_NOT_NEGATABLE, 'i', "include only files matching patterns"}, #if defined(VMS) || defined(WIN32) *************** *** 2829,2837 **** --- 2835,2845 ---- #endif /* !WINDLL */ #ifndef WINDLL + #ifndef __BIONIC__ case o_h2: /* Extended Help */ help_extended(); RETURN(finish(ZE_OK)); + #endif #endif /* !WINDLL */ /* -i is with -x */ diff -crB orig/zipnote.c src/zipnote.c *** orig/zipnote.c 2013-12-28 19:18:09.180077946 +0100 --- src/zipnote.c 2014-10-30 02:13:49.321018726 +0100 *************** *** 661,667 **** if ((r = zipcopy(z)) != ZE_OK) ziperr(r, "was copying an entry"); } ! fclose(x); /* Write central directory and end of central directory with new comments */ if ((c = zftello(y)) == (zoff_t)-1) /* get start of central */ --- 661,667 ---- if ((r = zipcopy(z)) != ZE_OK) ziperr(r, "was copying an entry"); } ! 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 */ diff -crB orig/zip.txt src/zip.txt *** orig/zip.txt 2013-12-28 19:18:09.178077946 +0100 --- src/zip.txt 2014-10-30 02:13:06.162018860 +0100 *************** *** 376,382 **** where the option starts with --, has a multicharacter name, can include a trailing dash to negate the option (if the option supports it), and ! can have a value (option argument) specified by preceeding it with = (no spaces). Values can also follow the argument. So --before-date=mmddyyyy --- 376,382 ---- where the option starts with --, has a multicharacter name, can include a trailing dash to negate the option (if the option supports it), and ! can have a value (option argument) specified by preceding it with = (no spaces). Values can also follow the argument. So --before-date=mmddyyyy *************** *** 1696,1702 **** -! --use-privileges ! [WIN32] Use priviliges (if granted) to obtain all aspects of WinNT security. -@ --- 1696,1702 ---- -! --use-privileges ! [WIN32] Use privileges (if granted) to obtain all aspects of WinNT security. -@ *************** *** 1957,1963 **** be converted using Rahul Dhesi's BILF program. This version of zip handles some of the conversion internally. When using Kermit to trans- fer zip files from VMS to MSDOS, type "set file type block" on VMS. ! When transfering from MSDOS to VMS, type "set file type fixed" on VMS. In both cases, type "set file type binary" on MSDOS. Under some older VMS versions, zip may hang for file specifications --- 1957,1963 ---- be converted using Rahul Dhesi's BILF program. This version of zip handles some of the conversion internally. When using Kermit to trans- fer zip files from VMS to MSDOS, type "set file type block" on VMS. ! When transferring from MSDOS to VMS, type "set file type fixed" on VMS. In both cases, type "set file type binary" on MSDOS. Under some older VMS versions, zip may hang for file specifications