Apply debian patches

Change-Id: I83a384020e3622a81f9d51b07e94996e6f1cce9c
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

5 files changed, 17 insertions, 13 deletions

diff --git a/src/crc_i386.S b/src/crc_i386.S
index 38dbc86..6b9e34a 100644
--- a/src/crc_i386.S
+++ b/src/crc_i386.S
@@ -302,3 +302,5 @@ _crc32:                         /* ulg crc32(ulg crc, uch *buf, extent len) */
 #endif /* i386 || _i386 || _I386 || __i386 */
 
 #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
+.section .note.GNU-stack, "", @progbits
+.previous
diff --git a/src/man/zip.1 b/src/man/zip.1
index 0c2fce0..ea8f863 100644
--- a/src/man/zip.1
+++ b/src/man/zip.1
@@ -13,7 +13,7 @@
 .\" 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
+.TH ZIP 1 "16 June 2008 (v3.0)" Info-ZIP
 .SH NAME
 zip \- package and compress (archive) files
 .SH SYNOPSIS
@@ -53,14 +53,14 @@ and
 and is compatible with PKZIP (Phil Katz's ZIP for MSDOS systems).
 .LP
 A companion program
-.RI ( unzip (1L))
+.RI ( unzip (1))
 unpacks
 .I zip
 archives.
 The
 .I zip
 and
-.IR unzip (1L)
+.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,7 +502,7 @@ Long options take the form
 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
+preceding it with = (no spaces).  Values can also follow the
 argument.  So
 .IP
 \fC--before-date=mmddyyyy\fP
@@ -2403,7 +2403,7 @@ deflation is controlled.
 .TP
 .PD
 .B \-\-use\-privileges
-[WIN32] Use priviliges (if granted) to obtain all aspects of WinNT security.
+[WIN32] Use privileges (if granted) to obtain all aspects of WinNT security.
 .TP
 .PD 0
 .B \-@
@@ -2661,10 +2661,10 @@ be added to the zip file with basename and extension swapped.
 [VMS] see ZIPOPT
 .SH "SEE ALSO"
 compress(1),
-shar(1L),
+shar(1),
 tar(1),
-unzip(1L),
-gzip(1L)
+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,7 +2756,7 @@ This version of
 .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
+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 --git a/src/match.S b/src/match.S
index eb8f735..46319a3 100644
--- a/src/match.S
+++ b/src/match.S
@@ -405,3 +405,5 @@ L__return:
 #endif /* i386 || _I386 || _i386 || __i386  */
 
 #endif /* !USE_ZLIB */
+.section .note.GNU-stack, "", @progbits
+.previous
diff --git a/src/zip.txt b/src/zip.txt
index 85f89b5..b82f6d2 100644
--- a/src/zip.txt
+++ b/src/zip.txt
@@ -376,7 +376,7 @@ USE
 
        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  =
+       can have a value (option argument) specified by preceding  it  with  =
        (no spaces).  Values can also follow the argument.  So
 
               --before-date=mmddyyyy
@@ -1696,7 +1696,7 @@ OPTIONS
 
        -!
        --use-privileges
-              [WIN32]  Use  priviliges  (if  granted) to obtain all aspects of
+              [WIN32]  Use  privileges  (if  granted) to obtain all aspects of
               WinNT security.
 
        -@
@@ -1957,7 +1957,7 @@ BUGS
        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.
+       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
diff --git a/src/zipnote.c b/src/zipnote.c
index 5e02cb6..996f012 100644
--- a/src/zipnote.c
+++ b/src/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 */