Accepting request 25076 from Archiving

Copy from Archiving/zip based on submit request 25076 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/25076 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zip?expand=0&rev=6
2009-11-27 11:59:29 +00:00 · 2009-11-27 11:59:29 +00:00 · 8954461ee8
commit 8954461ee8
parent 2b884936e9
6 changed files with 88 additions and 121 deletions
--- a/zip-2.3-iso8859_2.patch
+++ b/zip-2.3-iso8859_2.patch
@ -1,6 +1,8 @@
--- ebcdic.h
-+++ ebcdic.h
-@@ -254,6 +254,25 @@
+Index: ebcdic.h
+===================================================================
+--- ebcdic.h.orig	2005-01-29 05:25:54.000000000 +0100
+++ ebcdic.h	2009-11-24 18:19:52.726932000 +0100
+@@ -254,6 +254,25 @@ ZCONST uch Far iso2oem[] = {
     0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6,  /* F0 - F7 */
     0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98   /* F8 - FF */
 };
@ -26,11 +28,10 @@
 #endif /* IZ_ISO2OEM_ARRAY */
 
 #ifdef IZ_OEM2ISO_ARRAY
-@@ -274,6 +293,25 @@
-     0xDE, 0xDA, 0xDB, 0xD9, 0xFD, 0xDD, 0xAF, 0xB4,  /* E8 - EF */
+@@ -275,6 +294,25 @@ ZCONST uch Far oem2iso[] = {
     0xAD, 0xB1, 0x3D, 0xBE, 0xB6, 0xA7, 0xF7, 0xB8,  /* F0 - F7 */
     0xB0, 0xA8, 0xB7, 0xB9, 0xB3, 0xB2, 0xA6, 0xA0   /* F8 - FF */
-+};
+ };
 +
 +ZCONST uch Far oem2iso_2[] = {
 +    0xC7, 0xFC, 0xE9, 0xE2, 0xE4, 0xF9, 0xE6, 0xE7,
@ -49,12 +50,15 @@
 +    0xC0, 0xDA, 0xE0, 0xDB, 0xFD, 0xDD, 0xFE, 0xB4,
 +    0xF0, 0xBD, 0xB2, 0xB7, 0xA2, 0xA7, 0xF7, 0xB8,
 +    0xF8, 0xA8, 0xFF, 0xFB, 0xD8, 0xF8, 0xFE, 0xFF
- };
+};
 #endif /* IZ_OEM2ISO_ARRAY */
 
--- globals.c
-+++ globals.c
-@@ -30,6 +30,8 @@
+ #if defined(THEOS) || defined(THEOS_SUPPORT)
+Index: globals.c
+===================================================================
+--- globals.c.orig	2005-03-20 21:32:02.000000000 +0100
+++ globals.c	2009-11-24 18:19:52.730930000 +0100
+@@ -30,6 +30,8 @@ int pathput = 1;        /* 1=store path
 int scanimage = 1;      /* 1=scan through image files */
 #endif
 int method = BEST;      /* one of BEST, DEFLATE (only), or STORE (only) */
@ -63,8 +67,10 @@
 int dosify = 0;         /* 1=make new entries look like MSDOS */
 int verbose = 0;        /* 1=report oddities in zip file structure */
 int fix = 0;            /* 1=fix the zip file */
--- man/zip.1
-+++ man/zip.1
+Index: man/zip.1
+===================================================================
+--- man/zip.1.orig	2006-06-20 04:25:00.000000000 +0200
+++ man/zip.1	2009-11-24 18:19:52.747932000 +0100
@@ -14,7 +14,7 @@
 zip, zipcloak, zipnote, zipsplit \- package and compress (archive) files
 .SH SYNOPSIS
@ -74,7 +80,7 @@
 .RB [ \-b\ path ]
 .RB [ \-n\ suffixes ]
 .RB [ \-t\ mmddyyyy ]
-@@ -514,7 +514,15 @@
+@@ -543,7 +543,15 @@ Attempt to convert the names and paths t
 store only the MSDOS attribute (just the user write attribute from UNIX),
 and mark the entry as made under MSDOS (even though it was not);
 for compatibility with PKUNZIP under MSDOS which cannot handle certain
@ -91,38 +97,43 @@
 .TP
 .B \-l
 Translate the Unix end-of-line character LF into the
-@@ -628,6 +636,11 @@
- .I foo.zip
+@@ -706,6 +714,11 @@ will change the last modified time of
 to the latest time of the entries in
 .IR foo.zip .
-+.TP
+ .TP
 +.B \-O
 +File names will be converted from ISO8859-2 instead of from ISO8859-1. See 
 +.B \-k
 +for details.
- .TP
- .IP \fB\-P\fP\ \fIpassword\fP
+.TP
+ \fB\-P\fP\ \fIpassword\fP
 use \fIpassword\fP to encrypt zipfile entries (if any).  \fBTHIS IS
--- unix/unix.c
-+++ unix/unix.c
-@@ -246,8 +246,13 @@
- 
-   if (isdir == 42) return n;    /* avoid warning on unused variable */
+ INSECURE!\fP  Many multi-user operating systems provide ways for any user to
+Index: unix/unix.c
+===================================================================
+--- unix/unix.c.orig	2006-05-30 00:35:00.000000000 +0200
+++ unix/unix.c	2009-11-24 18:19:52.754931000 +0100
+@@ -261,9 +261,14 @@ int *pdosflag;          /* output: force
+     return NULL;
+   strcpy(n, t);
 
 -  if (dosify)
 +  if ((dosify) && (!winify))
     msname(n);
-+
+ 
 +#ifdef IZ_ISO2OEM_ARRAY
 +  if (dosify)
 +    str_iso_to_oem(n, n);
 +#endif
- 
+
 #ifdef EBCDIC
-   strtoasc(n, n);               /* here because msname() needs native coding */
--- util.c
-+++ util.c
-@@ -383,7 +383,10 @@
+   strtoasc(n, n);       /* here because msname() needs native coding */
+ #endif
+Index: util.c
+===================================================================
+--- util.c.orig	2006-03-06 07:13:30.000000000 +0100
+++ util.c	2009-11-24 18:19:52.759937000 +0100
+@@ -470,7 +470,10 @@ char *str_iso_to_oem(dst, src)
   char *dst;
 {
   char *dest_start = dst;
@ -134,7 +145,7 @@
   return dest_start;
 }
 #endif
-@@ -394,7 +397,10 @@
+@@ -481,7 +484,10 @@ char *str_oem_to_iso(dst, src)
   char *dst;
 {
   char *dest_start = dst;
@ -146,9 +157,11 @@
   return dest_start;
 }
 #endif
--- zip.c
-+++ zip.c
-@@ -933,6 +933,8 @@
+Index: zip.c
+===================================================================
+--- zip.c.orig	2006-06-19 02:16:24.000000000 +0200
+++ zip.c	2009-11-24 18:19:52.766924000 +0100
+@@ -979,6 +979,8 @@ char **argv;            /* command line
   dispose = 0;         /* 1=remove files after put in zip file */
   pathput = 1;         /* 1=store path with name */
   method = BEST;       /* one of BEST, DEFLATE (only), or STORE (only) */
@ -157,7 +170,7 @@
   dosify = 0;          /* 1=make new entries look like MSDOS */
   verbose = 0;         /* 1=report oddities in zip file structure */
   fix = 0;             /* 1=fix the zip file */
-@@ -1190,6 +1192,8 @@
+@@ -1263,6 +1265,8 @@ char **argv;            /* command line
               junk_sfx = 1;  break;
             case 'k':   /* Make entries using DOS names (k for Katz) */
               dosify = 1;  break;
@ -166,7 +179,7 @@
             case 'l':   /* Translate end-of-line */
               translate_eol++; break;
 #ifndef WINDLL
-@@ -1208,6 +1212,8 @@
+@@ -1287,6 +1291,8 @@ char **argv;            /* command line
 #endif
             case 'o':   /* Set zip file time to time of latest file in it */
               latest = 1;  break;
@ -175,9 +188,11 @@
             case 'p':   /* Store path with name */
               break;            /* (do nothing as annoyance avoidance) */
             case 'P':   /* password for encryption */
--- zip.h
-+++ zip.h
-@@ -236,9 +236,11 @@
+Index: zip.h
+===================================================================
+--- zip.h.orig	2005-06-16 05:55:28.000000000 +0200
+++ zip.h	2009-11-24 18:19:52.770930000 +0100
+@@ -245,9 +245,11 @@ extern ZCONST uch ebcdic[256];
 #endif /* EBCDIC */
 #ifdef IZ_ISO2OEM_ARRAY         /* ISO 8859-1 (Win CP 1252) --> OEM CP 850 */
 extern ZCONST uch Far iso2oem[128];
@ -189,7 +204,7 @@
 #endif
 extern char errbuf[FNMAX+81];   /* Handy place to build error messages */
 extern int recurse;             /* Recurse into directories encountered */
-@@ -254,6 +256,8 @@
+@@ -263,6 +265,8 @@ extern int scanimage;           /* Scan
 #define DEFLATE 8               /* Deflation method*/
 extern int method;              /* Restriction on compression method */
 
@ -198,8 +213,10 @@
 extern int dosify;              /* Make new entries look like MSDOS */
 extern char *special;           /* Don't compress special suffixes */
 extern int verbose;             /* Report oddities in zip file structure */
--- unix/Makefile
-+++ unix/Makefile
+Index: unix/Makefile
+===================================================================
+--- unix/Makefile.orig	2006-04-23 01:52:18.000000000 +0200
+++ unix/Makefile	2009-11-24 18:19:52.774937000 +0100
@@ -46,7 +46,7 @@ VERSION = Version 2.32
 #   CFLAGS    flags for C compile
 #   LFLAGS1   flags after output file spec, before obj file list
--- a/zip-2.3-nonexec-stack.patch
+++ b/zip-2.3-nonexec-stack.patch
@ -1,15 +1,19 @@
--- crc_i386.S	1999-10-09 16:10:26.000000000 -0400
-+++ crc_i386.S	2003-10-24 16:15:52.000000000 -0400
-@@ -230,3 +230,6 @@
+Index: crc_i386.S
+===================================================================
+--- crc_i386.S.orig	2005-01-29 05:23:28.000000000 +0100
+++ crc_i386.S	2009-11-24 18:19:53.095928000 +0100
+@@ -238,3 +238,6 @@ _crc32:                         /* ulg c
 #endif /* i386 || _i386 || _I386 || __i386 */
 
 #endif /* !USE_ZLIB */
 +
 +.section .note.GNU-stack, "", @progbits
 +.previous
--- match.S	1999-07-27 17:18:14.000000000 -0400
-+++ match.S	2003-10-24 16:15:38.000000000 -0400
-@@ -405,3 +405,5 @@
+Index: match.S
+===================================================================
+--- match.S.orig	2005-01-29 06:40:14.000000000 +0100
+++ match.S	2009-11-24 18:19:53.100930000 +0100
+@@ -405,3 +405,5 @@ L__return:
 #endif /* i386 || _I386 || _i386 || __i386  */
 
 #endif /* !USE_ZLIB */
--- a/zip-2.3-optflags.patch
+++ b/zip-2.3-optflags.patch
@ -1,6 +1,8 @@
--- zip-2.3/unix/Makefile.xx	2005-04-25 16:35:51.708054850 +0200
-+++ zip-2.3/unix/Makefile	2005-04-25 16:36:07.535061437 +0200
-@@ -157,7 +157,7 @@
+Index: unix/Makefile
+===================================================================
+--- unix/Makefile.orig	2009-11-24 18:19:52.774937000 +0100
+++ unix/Makefile	2009-11-24 18:19:53.326841000 +0100
+@@ -160,7 +160,7 @@ generic: flags
 	eval $(MAKE) zips `cat flags`
 
 generic_gcc:
--- a/zip-2.3-tempfile.patch
+++ b/zip-2.3-tempfile.patch
@ -1,6 +1,8 @@
--- zip-2.31/fileio.c
-+++ zip-2.31/fileio.c
-@@ -860,7 +860,18 @@
+Index: fileio.c
+===================================================================
+--- fileio.c.orig	2005-06-16 05:31:52.000000000 +0200
+++ fileio.c	2009-11-24 18:19:52.483933000 +0100
+@@ -919,7 +919,18 @@ char *zip;              /* path name of
   }
 #else
   strcat(t, "ziXXXXXX"); /* must use lowercase for Linux dos file system */
--- a/zip.changes
+++ b/zip.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 24 17:20:58 UTC 2009 - crrodriguez@opensuse.org
+
+- refresh patches 
+
 -------------------------------------------------------------------
 Fri Aug  3 02:59:50 CEST 2007 - dmueller@suse.de

--- a/zip.spec
+++ b/zip.spec
@ -1,7 +1,7 @@
 #
 # spec file for package zip (Version 2.32)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -19,13 +19,13 @@


 Name:           zip
-License:        BSD 3-Clause
+License:        BSD3c
 Group:          Productivity/Archiving/Compression
 Provides:       crzip
 Obsoletes:      crzip
 AutoReqProv:    on
 Version:        2.32
-Release:        75
+Release:        76
 Summary:        File compression program
 Url:            http://www.info-zip.org/
 Source:         %name-%version.tar.bz2
@ -47,10 +47,10 @@ Authors:

 %prep
 %setup -q
-%patch1 -p1
+%patch1
 %patch2
 %patch3
-%patch4 -p1
+%patch4

 %build
 make -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
@ -73,66 +73,3 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/zipsplit

 %changelog
-* Fri Aug 03 2007 dmueller@suse.de
- update to 2.32:
-  * fixed -R operation to match the supplied file patterns
-  * handle cases where -x, -R, and -i patterns are mixed
-  * added some directory-search speedups
-  * fixed bug when encrypting large uncompressible files
-  * fixed selection of files to delete by date
-  * added -MM option where each input file pattern must
-  match at least one file and all input files must be readable
-  * added check for when Zip tries to exceed seek limit in output file
-  * minor changes to compile with Visual C++ 2005
-  * added support for Unix FIFOs (named pipes)
-  * other minor fixes
-* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Thu Dec 15 2005 pth@suse.de
- Compile with (limited) large file support. This will support
-  single files exceeding 2 GB as long as the archive stays below
-  that theshold.
-* Mon Oct 31 2005 dmueller@suse.de
- build with non-executable stack
-* Mon Jul 18 2005 rommel@suse.de
- update to version 2.31 (has the crypto stuff previously in zip-2.3.patch,
-  obsoletes zip-longpath.patch, a few more fixes)
-* Mon Apr 25 2005 meissner@suse.de
- correctly use RPM_OPT_FLAGS.
-* Thu Dec 02 2004 rommel@suse.de
- reworked zip-longpath.patch, missing free's after malloc
-* Thu Nov 11 2004 rommel@suse.de
- added zip-longpath.patch (Bugzilla #47932)
-* Fri Jan 09 2004 adrian@suse.de
- build as user
-* Wed Sep 18 2002 ro@suse.de
- removed bogus self-provides
-* Thu Jan 24 2002 grimmer@suse.de
- added zip-2.3-iso8859_2.patch to fix coding conversion
-  between Microsoft and Linux file names
-  (originally from http://www.axis.cz/linux/zip_unzip.php3,
-  enhanced to support both ISO8859-1 and ISO8859-2 by Petr Mladek
-  <pmladek@suse.cz>)
-* Wed Jan 23 2002 okir@suse.de
- Fixed tempfile race
-* Mon Jun 18 2001 schwab@suse.de
- Fix cpp directives inside macro call.
-* Thu Dec 14 2000 grimmer@suse.de
- added encryption patch
- bzipped sources
- now Provides and Obsoletes crzip
-* Wed Mar 01 2000 schwab@suse.de
- /usr/man -> /usr/share/man
-* Fri Dec 17 1999 grimmer@suse.de
- Update to 2.3
- Spec file cleanups
-* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Mon Feb 22 1999 grimmer@suse.de
- New version (2.2)
- specfile updates
- added french PAC-info
-* Thu Feb 06 1997 rj@suse.de
- Version 2.01:
- ownerships changed
- some cosmetic changes