Hello community,
here is the log from the commit of package zip for openSUSE:Factory
checked in at Fri Jul 30 13:00:49 CEST 2010.
--------
--- zip/zip.changes 2010-03-06 04:07:47.000000000 +0100
+++ zip/zip.changes 2010-05-21 19:01:21.000000000 +0200
@@ -1,0 +2,19 @@
+Fri May 21 18:52:08 CEST 2010 - pth@suse.de
+
+- Update to Zip 3.0:
+ * large-file support (i.e., > 2GB)
+ * support for more than 65536 files per archive
+ * multi-part archive support
+ * bzip2 compression support
+ * Unicode (UTF-8) filename and (partial) comment support
+ * difference mode (for incremental backups)
+ * filesystem-synch mode
+ * cross-archive copy mode
+ * extended progress info and logging
+ * improved archive-fixing support
+ * improved streaming and piping
+ * improved command-line parser
+ * improved Unix FIFO support
+ * Unix 32-bit UIDs/GIDs (requires UnZip 6.0 to restore)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
zip-2.3-iso8859_2.patch
zip-2.3-nonexec-stack.patch
zip-2.3-optflags.patch
zip-2.3-tempfile.patch
zip-2.32.tar.bz2
New:
----
zip-3.0-add_options_to_help.patch
zip-3.0-iso8859_2.patch
zip-3.0-nonexec-stack.patch
zip-3.0-optflags.patch
zip-3.0-tempfile.patch
zip-3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zip.spec ++++++
--- /var/tmp/diff_new_pack.owRzCz/_old 2010-07-30 12:58:51.000000000 +0200
+++ /var/tmp/diff_new_pack.owRzCz/_new 2010-07-30 12:58:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package zip (Version 2.32)
+# spec file for package zip (Version 3.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,16 +24,18 @@
Provides: crzip
Obsoletes: crzip
AutoReqProv: on
-Version: 2.32
-Release: 78
+Version: 3.0
+Release: 1
+%define file_version 30
Summary: File compression program
Url: http://www.info-zip.org/
Source: %name-%version.tar.bz2
-Patch1: zip-2.3-tempfile.patch
-Patch2: zip-2.3-iso8859_2.patch
-Patch3: zip-2.3-nonexec-stack.patch
-Patch4: zip-2.3-optflags.patch
-Patch5: zip-notimestamp.patch
+Patch2: zip-3.0-iso8859_2.patch
+Patch3: zip-3.0-add_options_to_help.patch
+Patch4: zip-3.0-nonexec-stack.patch
+Patch5: zip-3.0-optflags.patch
+Patch6: zip-3.0-tempfile.patch
+Patch7: zip-notimestamp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,12 +49,13 @@
Info-ZIP
%prep
-%setup -q
-%patch1
+%setup -q -n zip%{file_version}
%patch2
%patch3
%patch4
%patch5
+%patch6
+%patch7
%build
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
@@ -67,11 +70,14 @@
%files
%defattr(-,root,root)
-%doc BUGS CHANGES INSTALL LICENSE MANUAL README TODO WHATSNEW WHERE
+%doc BUGS CHANGES INSTALL LICENSE README TODO WHATSNEW WHERE
%doc %{_mandir}/man1/zip.1.gz
-/usr/bin/zip
-/usr/bin/zipcloak
-/usr/bin/zipnote
-/usr/bin/zipsplit
+%doc %{_mandir}/man1/zipcloak.1.gz
+%doc %{_mandir}/man1/zipnote.1.gz
+%doc %{_mandir}/man1/zipsplit.1.gz
+%{_bindir}/zip
+%{_bindir}/zipcloak
+%{_bindir}/zipnote
+%{_bindir}/zipsplit
%changelog
++++++ zip-3.0-add_options_to_help.patch ++++++
--- zip.c
+++ zip.c
@@ -730,6 +730,7 @@
" -r recurse into directories (see Recursion below)",
" -m after archive created, delete original files (move into archive)",
" -j junk directory names (store just file names)",
+" -k Attempt to convert the names and paths to conform to MSDOS",
" -q quiet operation",
" -v verbose operation (just \"zip -v\" shows version information)",
" -c prompt for one-line comment for each entry",
++++++ zip-2.3-iso8859_2.patch -> zip-3.0-iso8859_2.patch ++++++
--- zip/zip-2.3-iso8859_2.patch 2009-11-24 18:21:16.000000000 +0100
+++ zip/zip-3.0-iso8859_2.patch 2010-05-21 19:01:19.000000000 +0200
@@ -1,12 +1,11 @@
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 */
+--- ebcdic.h.orig 2005-04-09 23:10:02.000000000 +0200
++++ ebcdic.h 2010-05-21 18:47:36.891591234 +0200
+@@ -277,6 +277,24 @@ ZCONST uch Far iso2oem[] = {
0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98 /* F8 - FF */
};
-+
+ #endif /* OEM_RUS */
+ZCONST uch Far iso2oem_2[] = {
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
@@ -28,10 +27,10 @@
#endif /* IZ_ISO2OEM_ARRAY */
#ifdef IZ_OEM2ISO_ARRAY
-@@ -275,6 +294,25 @@ ZCONST uch Far oem2iso[] = {
- 0xAD, 0xB1, 0x3D, 0xBE, 0xB6, 0xA7, 0xF7, 0xB8, /* F0 - F7 */
+@@ -319,6 +337,25 @@ ZCONST uch Far oem2iso[] = {
0xB0, 0xA8, 0xB7, 0xB9, 0xB3, 0xB2, 0xA6, 0xA0 /* F8 - FF */
};
+ #endif /* OEM_RUS */
+
+ZCONST uch Far oem2iso_2[] = {
+ 0xC7, 0xFC, 0xE9, 0xE2, 0xE4, 0xF9, 0xE6, 0xE7,
@@ -56,9 +55,9 @@
#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
+--- globals.c.orig 2008-05-25 19:26:38.000000000 +0200
++++ globals.c 2010-05-21 18:47:36.895590875 +0200
+@@ -32,6 +32,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) */
@@ -66,54 +65,55 @@
+int iso8859_2 = 0; /* 1=ISO8859-2 will be used instead of ISO8859-1 */
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 */
+ int fix = 0; /* 1=fix the zip file, 2=FF, 3=ZipNote */
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
+--- man/zip.1.orig 2008-06-17 02:39:40.000000000 +0200
++++ man/zip.1 2010-05-21 18:47:36.895590875 +0200
+@@ -18,7 +18,7 @@
+ zip \- package and compress (archive) files
.SH SYNOPSIS
.B zip
--.RB [ \-aABcdDeEfFghjklLmoqrRSTuvVwXyz!@$ ]
-+.RB [ \-aABcdDeEfFghjkKlLmoOqrRSTuvVwXyz!@$ ]
- .RB [ \-b\ path ]
- .RB [ \-n\ suffixes ]
- .RB [ \-t\ mmddyyyy ]
-@@ -543,7 +543,15 @@ Attempt to convert the names and paths t
- store only the MSDOS attribute (just the user write attribute from UNIX),
+-.RB [\- aABcdDeEfFghjklLmoqrRSTuvVwXyz!@$ ]
++.RB [\- aABcdDeEfFghjklLmoOqrRSTuvVwXyz!@$ ]
+ [\-\-longoption ...]
+ .RB [\- b " path]"
+ .RB [\- n " suffixes]"
+@@ -1322,7 +1322,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
-names such as those with two dots.
+names such as those with two dots. Conversion from ISO8859-1 to
-+IBM PC CP 852 is used. See also
-+.B \-O
++IBM PC CP 852 is used. See also
++.B \-OO
+.TP
+.B \-K
+Attempt to convert the names and paths to conform to MS Windows. Behaviour
-+similar to
++similar to
+.B \-k
+but long names are used.
.TP
+ .PD 0
.B \-l
- Translate the Unix end-of-line character LF into the
-@@ -706,6 +714,11 @@ will change the last modified time of
- to the latest time of the entries in
- .IR foo.zip .
+@@ -1578,6 +1586,12 @@ with encrypted entries, \fIzipcloak\fP w
+ them to normal entries.
.TP
-+.B \-O
-+File names will be converted from ISO8859-2 instead of from ISO8859-1. See
+ .PD 0
++.B \-OO
++File names will be converted from ISO8859-2 instead of from ISO8859-1. See
+.B \-k
+for details.
+.TP
- \fB\-P\fP\ \fIpassword\fP
- use \fIpassword\fP to encrypt zipfile entries (if any). \fBTHIS IS
- INSECURE!\fP Many multi-user operating systems provide ways for any user to
++.PD 0
+ .B \-p
+ .TP
+ .PD
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
+--- unix/unix.c.orig 2008-06-19 06:26:18.000000000 +0200
++++ unix/unix.c 2010-05-21 18:47:36.975590824 +0200
+@@ -267,9 +267,14 @@ int *pdosflag; /* output: force
return NULL;
strcpy(n, t);
@@ -131,21 +131,21 @@
#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)
+--- util.c.orig 2008-03-29 13:19:08.000000000 +0100
++++ util.c 2010-05-21 18:47:37.287590701 +0200
+@@ -725,7 +725,10 @@ char *str_iso_to_oem(dst, src)
char *dst;
{
char *dest_start = dst;
- while (*dst++ = (char)iso2oem[(uch)(*src++)]);
+ if (!iso8859_2)
+ while (*src) { *dst++ = (*src & 0x80) ? iso2oem[*src++ & 0x7f] : *src++; }
-+ else
++ else
+ while (*src) { *dst++ = (*src & 0x80) ? iso2oem_2[*src++ & 0x7f] : *src++; }
return dest_start;
}
#endif
-@@ -481,7 +484,10 @@ char *str_oem_to_iso(dst, src)
+@@ -736,7 +739,10 @@ char *str_oem_to_iso(dst, src)
char *dst;
{
char *dest_start = dst;
@@ -159,9 +159,34 @@
#endif
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
+--- zip.c.orig 2008-07-05 18:34:06.000000000 +0200
++++ zip.c 2010-05-21 18:48:04.779644629 +0200
+@@ -1942,7 +1942,7 @@ int set_filetype(out_path)
+ #ifdef UNICODE_TEST
+ #define o_sC 0x146
+ #endif
+-
++#define o_OO 0x147
+
+ /* the below is mainly from the old main command line
+ switch with a few changes */
+@@ -2025,6 +2025,7 @@ struct option_struct far options[] = {
+ #endif /* ?MACOS */
+ {"J", "junk-sfx", o_NO_VALUE, o_NOT_NEGATABLE, 'J', "strip self extractor from archive"},
+ {"k", "DOS-names", o_NO_VALUE, o_NOT_NEGATABLE, 'k', "force use of 8.3 DOS names"},
++ {"K", "latin1-entries", o_NO_VALUE, o_NOT_NEGATABLE, 'K', "convert file names from CP850 to ISO8859-1"},
+ {"l", "to-crlf", o_NO_VALUE, o_NOT_NEGATABLE, 'l', "convert text file line ends - LF->CRLF"},
+ {"ll", "from-crlf", o_NO_VALUE, o_NOT_NEGATABLE, o_ll, "convert text file line ends - CRLF->LF"},
+ {"lf", "logfile-path",o_REQUIRED_VALUE, o_NOT_NEGATABLE, o_lf, "log to log file at path (default overwrite)"},
+@@ -2043,6 +2044,7 @@ struct option_struct far options[] = {
+ #endif
+ {"o", "latest-time", o_NO_VALUE, o_NOT_NEGATABLE, 'o', "use latest entry time as archive time"},
+ {"O", "output-file", o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'O', "set out zipfile different than in zipfile"},
++ {"OO", "iso8859-2", o_NO_VALUE, o_NOT_NEGATABLE, o_OO, "Use ISO8859-2 instead of ISO8859-1"},
+ {"p", "paths", o_NO_VALUE, o_NOT_NEGATABLE, 'p', "store paths"},
+ {"P", "password", o_REQUIRED_VALUE, o_NOT_NEGATABLE, 'P', "encrypt entries, option value is password"},
+ #if defined(QDOS) || defined(QLZIP)
+@@ -2289,6 +2291,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) */
@@ -170,30 +195,30 @@
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 */
-@@ -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;
-+ case 'K': /* file names will be converted from IBM PC CP 850 to ISO8859-1 */
-+ winify = dosify = 1; break;
- case 'l': /* Translate end-of-line */
- translate_eol++; break;
- #ifndef WINDLL
-@@ -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;
-+ case 'O': /* ISO8859-2 will be used instead of ISO8859-1 */
-+ iso8859_2 = 1; break;
- case 'p': /* Store path with name */
- break; /* (do nothing as annoyance avoidance) */
- case 'P': /* password for encryption */
+@@ -2859,6 +2863,8 @@ char **argv; /* command line
+ junk_sfx = 1; break;
+ case 'k': /* Make entries using DOS names (k for Katz) */
+ dosify = 1; break;
++ case 'K': /* file names will be converted from IBM PC CP 850 to ISO8859-1 */
++ winify = dosify = 1; break;
+ case 'l': /* Translate end-of-line */
+ translate_eol = 1; break;
+ case o_ll:
+@@ -2915,6 +2921,8 @@ char **argv; /* command line
+ free(value);
+ have_out = 1;
+ break;
++ case o_OO: /* ISO8859-2 will be used instead of ISO8859-1 */
++ iso8859_2 = 1; break;
+ case 'p': /* Store path with name */
+ break; /* (do nothing as annoyance avoidance) */
+ case 'P': /* password for encryption */
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 */
+--- zip.h.orig 2008-05-25 19:23:22.000000000 +0200
++++ zip.h 2010-05-21 18:47:37.339590945 +0200
+@@ -311,9 +311,11 @@ extern ZCONST uch ebcdic[256];
+ /* Are these ever used? 6/12/05 EG */
#ifdef IZ_ISO2OEM_ARRAY /* ISO 8859-1 (Win CP 1252) --> OEM CP 850 */
extern ZCONST uch Far iso2oem[128];
+extern ZCONST uch Far iso2oem_2[128];
@@ -202,22 +227,22 @@
extern ZCONST uch Far oem2iso[128];
+extern ZCONST uch Far oem2iso_2[128];
#endif
- extern char errbuf[FNMAX+81]; /* Handy place to build error messages */
- extern int recurse; /* Recurse into directories encountered */
-@@ -263,6 +265,8 @@ extern int scanimage; /* Scan
- #define DEFLATE 8 /* Deflation method*/
- extern int method; /* Restriction on compression method */
+ extern char errbuf[FNMAX+4081]; /* Handy place to build error messages */
+@@ -342,6 +344,8 @@ extern int des_good; /* Good
+ extern ulg des_crc; /* Data descriptor CRC */
+ extern uzoff_t des_csize; /* Data descriptor csize */
+ extern uzoff_t des_usize; /* Data descriptor usize */
+extern int winify; /* file names will be converted from IBM PC CP 850 to ISO8859-1 */
-+extern int iso8859_2; /* ISO8859-2 will be used instead of ISO8859-1 */
++extern int iso8859_2; /* ISO8859-2 will be used instead of ISO8859-1 */
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 */
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
+--- unix/Makefile.orig 2008-05-07 08:33:56.000000000 +0200
++++ unix/Makefile 2010-05-21 18:47:37.363590733 +0200
+@@ -57,7 +57,7 @@ IZ_OUR_BZIP2_DIR = bzip2
# CFLAGS flags for C compile
# LFLAGS1 flags after output file spec, before obj file list
# LFLAGS2 flags after obj file list (libraries, etc)
++++++ zip-2.3-nonexec-stack.patch -> zip-3.0-nonexec-stack.patch ++++++
--- zip/zip-2.3-nonexec-stack.patch 2009-11-24 18:21:17.000000000 +0100
+++ zip/zip-3.0-nonexec-stack.patch 2010-05-21 19:01:19.000000000 +0200
@@ -1,19 +1,15 @@
-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
+--- crc_i386.S
++++ crc_i386.S
+@@ -302,3 +302,6 @@
#endif /* i386 || _i386 || _I386 || __i386 */
- #endif /* !USE_ZLIB */
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
+
+.section .note.GNU-stack, "", @progbits
+.previous
-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:
+--- match.S
++++ match.S
+@@ -405,3 +405,5 @@
#endif /* i386 || _I386 || _i386 || __i386 */
#endif /* !USE_ZLIB */
++++++ zip-2.3-optflags.patch -> zip-3.0-optflags.patch ++++++
--- zip/zip-2.3-optflags.patch 2009-11-24 18:21:18.000000000 +0100
+++ zip/zip-3.0-optflags.patch 2010-05-21 19:01:19.000000000 +0200
@@ -1,13 +1,11 @@
-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`
+--- unix/Makefile
++++ unix/Makefile
+@@ -202,7 +202,7 @@
+ eval $(MAKE) $(MAKEF) zips `cat flags`
generic_gcc:
-- $(MAKE) generic CC=gcc CPP="gcc -E"
-+ $(MAKE) generic CPP="gcc -E"
+- $(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
++ $(MAKE) $(MAKEF) generic CPP="gcc -E"
# AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
att6300nodir:
++++++ zip-2.3-tempfile.patch -> zip-3.0-tempfile.patch ++++++
--- zip/zip-2.3-tempfile.patch 2009-11-24 18:21:18.000000000 +0100
+++ zip/zip-3.0-tempfile.patch 2010-05-21 19:01:20.000000000 +0200
@@ -1,14 +1,9 @@
-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
+--- fileio.c
++++ fileio.c
+@@ -1490,6 +1490,13 @@
strcat(t, "ziXXXXXX"); /* must use lowercase for Linux dos file system */
-+#ifdef NO_MKSTEMP
- return mktemp(t);
-+#else
+ # if defined(UNIX) && !defined(NO_MKSTEMP)
+ /* tempname should not be called */
+ {
+ int fd;
+
@@ -16,8 +11,6 @@
+ return NULL;
+ close(fd);
+ }
-+ return t;
-+#endif
- #endif /* NO_MKTEMP */
- #endif /* TANDEM */
- #endif /* CMS_MVS */
+ return t;
+ # else
+ return mktemp(t);
++++++ zip-2.32.tar.bz2 -> zip-3.0.tar.bz2 ++++++
++++ 79071 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org