packages: unzip/unzip-cve-2005-4667.patch, unzip/unzip-opt.patch, unzip/unz...
gotar
gotar at pld-linux.org
Sat Oct 31 19:11:24 CET 2009
Author: gotar Date: Sat Oct 31 18:11:24 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 6.00
---- Files affected:
packages/unzip:
unzip-cve-2005-4667.patch (1.1 -> 1.2) , unzip-opt.patch (1.3 -> 1.4) , unzip.spec (1.56 -> 1.57) , unzip-CAN-2005-2475.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/unzip/unzip-cve-2005-4667.patch
diff -u packages/unzip/unzip-cve-2005-4667.patch:1.1 packages/unzip/unzip-cve-2005-4667.patch:1.2
--- packages/unzip/unzip-cve-2005-4667.patch:1.1 Sat Feb 18 00:33:49 2006
+++ packages/unzip/unzip-cve-2005-4667.patch Sat Oct 31 19:11:19 2009
@@ -1,13 +1,13 @@
---- unzip-5.52.orig/unzpriv.h 2006-02-18 00:17:52.000000000 +0100
-+++ unzip-5.52/unzpriv.h 2006-02-18 00:01:42.000000000 +0100
-@@ -2274,17 +2274,18 @@
- * (char *)(sprintf sprf_arg, (buf))) == EOF)
+--- unzip60/unzpriv.h.orig 2009-04-20 01:59:26.000000000 +0200
++++ unzip60/unzpriv.h 2009-10-31 18:31:01.000000000 +0100
+@@ -2699,17 +2699,18 @@ char *GetLoadPath OF((__GPRO));
+ * (flag)&1? stderr : stdout) < 0)
*/
#ifndef Info /* may already have been defined for redirection */
+# define wsizesnprintf(buf, ...) snprintf (buf, WSIZE-1, __VA_ARGS__)
# ifdef FUNZIP
# define Info(buf,flag,sprf_arg) \
-- fprintf((flag)&1? stderr : stdout, (char *)(sprintf sprf_arg, (buf)))
+- fputs((char *)(sprintf sprf_arg, (buf)), (flag)&1? stderr : stdout)
+ fputs((char *)(wsizesnprintf sprf_arg, (buf)), (flag)&1? stderr : stdout)
# else
# ifdef INT_SPRINTF /* optimized version for "int sprintf()" flavour */
================================================================
Index: packages/unzip/unzip-opt.patch
diff -u packages/unzip/unzip-opt.patch:1.3 packages/unzip/unzip-opt.patch:1.4
--- packages/unzip/unzip-opt.patch:1.3 Tue Jun 8 10:01:12 2004
+++ packages/unzip/unzip-opt.patch Sat Oct 31 19:11:19 2009
@@ -1,97 +1,116 @@
---- unzip-5.51/unix/Makefile.orig 2004-03-01 18:37:24.000000000 +0100
-+++ unzip-5.51/unix/Makefile 2004-06-08 09:51:27.353336136 +0200
-@@ -566,7 +566,7 @@
+--- unzip60/unix/Makefile.orig 2009-01-18 23:41:18.000000000 +0100
++++ unzip60/unix/Makefile 2009-10-31 18:36:25.000000000 +0100
+@@ -594,7 +594,7 @@
@echo\
'which is UnZip linked with the DLL). This target is an example only.'
@echo ""
-- $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUNIX $(LOC)"
-+ $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL -DUNIX $(LOC)"
+- $(MAKE) objsdll CC=gcc CFLAGS="-O3 -Wall -fPIC -DDLL"
++ $(MAKE) objsdll CC=gcc CFLAGS="-Wall -fPIC -DDLL"
gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
$(RM) libunzip.so.0 libunzip.so
$(LN) -s libunzip.so.0.4 libunzip.so.0
-@@ -681,13 +681,13 @@
+@@ -717,13 +717,13 @@
bsdi: unix_make
@echo 'NOTE: use bsdi_noasm target for non-Intel BSD/OS compiles.'
$(MAKE) unzips CC=gcc2 LD=shlicc2 AS=gcc2\
-- CF="-O3 -Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)" CRC32=crc_gcc
-+ CF="-Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)" CRC32=crc_gcc
+- CFLAGS="-O3 -Wall -DASM_CRC -DBSD" CRCA_O=crc_gcc$O
++ CFLAGS="-Wall -DASM_CRC -DBSD" CRCA_O=crc_gcc$O
# BSDI BSD/OS
bsdi_noasm: unix_make
# @echo 'NOTE: use bsd target for non-Intel BSD/OS compiles.'
$(MAKE) unzips CC=gcc2 LD=shlicc2 AS=gcc2\
-- CF="-O3 -Wall -I. -DUNIX -DBSD $(LOC)"
-+ CF="-Wall -I. -DUNIX -DBSD $(LOC)"
+- CFLAGS="-O3 -Wall -DBSD"
++ CFLAGS="-Wall -DBSD"
# Coherent 3.x/4.x, Mark Williams C. ``For Coherent's CC, it needs either
# -T0 or -T150000 (or bigger) added to the CFLAGS, otherwise the compiler
-@@ -728,7 +728,7 @@
+@@ -747,7 +747,7 @@
+ # Info-ZIP recommends using "win32/Makefile.gcc" instead.
+ cygwin: unix_make
+ $(MAKE) unzips CC=gcc LD=gcc AS=gcc\
+- CFLAGS="-O3 -DASM_CRC -DNO_LCHOWN -DNO_LCHMOD"\
++ CFLAGS="-DASM_CRC -DNO_LCHOWN -DNO_LCHMOD"\
+ AF="-Di386 $(AF)" CRCA_O=crc_gcc$O\
+ E=".exe" CP="cp" LN="ln -s"
+
+@@ -764,7 +764,7 @@
freebsd: unix_make
@echo 'NOTE: use bsd target for non-Intel FreeBSD compiles (if any).'
$(MAKE) unzips CC=gcc LD=gcc AS=gcc\
-- CF="-O3 -Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)"\
-+ CF="-Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)"\
- AF="-Di386 $(AF)" CRC32=crc_gcc
+- CFLAGS="-O3 -Wall -DASM_CRC -DBSD"\
++ CFLAGS="-Wall -DASM_CRC -DBSD"\
+ AF="-Di386 $(AF)" CRCA_O=crc_gcc$O
# Generic BSDish Unix gcc. ``The -O3 only works with later versions of gcc;
-@@ -739,7 +739,7 @@
+@@ -775,7 +775,7 @@
# with "echo" instead).
#
gcc: unix_make
-- $(MAKE) unzips CC=gcc LD=gcc CF="-O3 -I. $(LOC)" LF2=""
-+ $(MAKE) unzips CC=gcc LD=gcc CF="-I. $(LOC)" LF2=""
+- $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O3" LF2=""
++ $(MAKE) unzips CC=gcc LD=gcc CFLAGS="" LF2=""
$(STRIP) $(UNZIPS)
# Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000
-@@ -757,7 +757,7 @@
+@@ -793,7 +793,7 @@
isc_gcc: unix_make
- $(MAKE) unzips AS=gcc CC=gcc LD=gcc CRC32=crc_gcc LF="-shlib $(LF)" \
- SL="-shlib $(SL)" FL="-shlib $(FL)" \
-- LF2="" CF="-O3 -I. -DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM $(LOC)" \
-+ LF2="" CF="-I. -DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM $(LOC)" \
+ $(MAKE) unzips AS=gcc CC=gcc LD=gcc CRCA_O=crc_gcc$O \
+ LF="-shlib $(LF)" SL="-shlib $(SL)" FL="-shlib $(FL)" LF2="" \
+- CFLAGS="-O3" LOC="-DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM -DNO_LCHOWN -DNO_LCHMOD $(LOC)" \
++ CFLAGS="" LOC="-DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM -DNO_LCHOWN -DNO_LCHMOD $(LOC)" \
AF="-DNO_UNDERLINE -Djecxz=jcxz -DALIGNMENT='.align 16' $(AF)"
$(STRIP) $(UNZIPS)
-@@ -773,8 +773,8 @@
+@@ -809,8 +809,8 @@
linux: unix_make
@echo 'NOTE: use linux_noasm target for non-Intel Linux compiles.'
$(MAKE) unzips CC=gcc LD=gcc AS=gcc\
-- CF="-O3 -Wall -I. -DASM_CRC $(LOC)"\
-- AF="-Di386 $(AF)" CRC32=crc_gcc
-+ CF="-Wall -I. -DASM_CRC $(LOC) $(CFLAGS)"\
-+ AF="-Di386 $(AF) $(LDFLAGS)" CRC32=crc_gcc
+- CFLAGS="-O3 -Wall -DASM_CRC"\
+- AF="-Di386 $(AF)" CRCA_O=crc_gcc$O
++ CFLAGS="-Wall -DASM_CRC"\
++ AF="-Di386 $(AF) $(LDFLAGS)" CRCA_O=crc_gcc$O
# GRR: this echo is pointless; if user gets this far, no difference to install
# @echo 'Be sure to use the install_asm target rather than the install target'
-@@ -790,7 +790,7 @@
+@@ -826,7 +826,7 @@
# (or -O2 or -O) is ignored. [GRR 960828: test target only]
#
linux_lcc: unix_make
-- $(MAKE) unzips CC=lcc LD=lcc CF="-O3 -Wall -I. -D__inline__= $(LOC)"
-+ $(MAKE) unzips CC=lcc LD=lcc CF="-Wall -I. -D__inline__= $(LOC)"
+- $(MAKE) unzips CC=lcc LD=lcc CFLAGS="-O3 -Wall -D__inline__= "
++ $(MAKE) unzips CC=lcc LD=lcc CFLAGS="-Wall -D__inline__= "
# Linux host with go32 (djgpp) cross-compiler (go32crs.tgz) for 32-bit DOS.
linux_dos: unix_make
-@@ -808,8 +808,8 @@
+@@ -845,7 +845,7 @@
# library).
#
linux_shlib: unix_make
--# $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL $(LOC)"
-- $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DASM_CRC $(LOC)"\
-+# $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL $(LOC)"
-+ $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL -DASM_CRC $(LOC)"\
- AS=gcc AF="-fPIC -Di386 $(AF)" CRC32=crc_gcc
- ln -sf crc_gcc.pic.o crc32.pic.o
- gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
-@@ -821,9 +821,9 @@
- # Linux ELF shared library, as above, but using inflate() from zlib (libz.so)
+- $(MAKE) objsdll CC=gcc CFLAGS="-O3 -Wall -fPIC"\
++ $(MAKE) objsdll CC=gcc CFLAGS="-Wall -fPIC"\
+ LOC="-DDLL -DASM_CRC $(LOC)"\
+ AS=gcc AF="-fPIC -Di386 $(AF)" CRCA_O=crc_gcc$O
+ gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)\
+@@ -859,7 +859,7 @@
# instead of the original UnZip version. (libz was libgz prior to 0.94)
linux_shlibz: unix_make
--# $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUSE_ZLIB $(LOC)"
-+# $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL -DUSE_ZLIB $(LOC)"
- $(MAKE) objsdll CC=gcc AS=gcc AF="-fPIC -Di386 $(AF)" CRC32=crc_gcc\
-- CF="-O3 -Wall -I. -fPIC -DDLL -DUSE_ZLIB -DASM_CRC $(LOC)"
-+ CF="-Wall -I. -fPIC -DDLL -DUSE_ZLIB -DASM_CRC $(LOC)"
- ln -sf crc_gcc.pic.o crc32.pic.o
- gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
+ $(MAKE) objsdll CC=gcc AS=gcc AF="-fPIC -Di386 $(AF)" CRCA_O=crc_gcc$O\
+- CFLAGS="-O3 -Wall -fPIC" LOC="-DDLL -DUSE_ZLIB -DASM_CRC $(LOC)"
++ CFLAGS="-Wall -fPIC" LOC="-DDLL -DUSE_ZLIB -DASM_CRC $(LOC)"
+ gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)\
+ crc_gcc.pic.o
ln -sf libunzip.so.0.4 libunzip.so.0
+@@ -872,12 +872,12 @@
+
+ # Macintosh MacOS X (Unix-compatible enviroment), using standard compiler
+ macosx: unix_make
+- $(MAKE) unzips CFLAGS="-O3 -Wall -DBSD" LF2=""
++ $(MAKE) unzips CFLAGS="-Wall -DBSD" LF2=""
+ $(STRIP) $(UNZIPS)
+
+ # Macintosh MacOS X (Unix-compatible enviroment), using gcc
+ macosx_gcc: unix_make
+- $(MAKE) unzips CC=gcc CFLAGS="-O3 -Wall -DBSD" LF2=""
++ $(MAKE) unzips CC=gcc CFLAGS="-Wall -DBSD" LF2=""
+ $(STRIP) $(UNZIPS)
+
+ # Minix 1.5 PC for the 386. Invoke as is to use default cc, or as "make
================================================================
Index: packages/unzip/unzip.spec
diff -u packages/unzip/unzip.spec:1.56 packages/unzip/unzip.spec:1.57
--- packages/unzip/unzip.spec:1.56 Thu May 29 19:40:45 2008
+++ packages/unzip/unzip.spec Sat Oct 31 19:11:19 2009
@@ -1,4 +1,7 @@
# $Revision$, $Date$
+#
+# TODO: bzip2 support
+#
Summary: Unpacks .zip files such as those made by pkzip under DOS
Summary(de.UTF-8): entpackt .zip-Dateien (etwa mit pkzip unter DOS erstellte)
Summary(es.UTF-8): Descompacta archivos con extensión .zip, como los que crea pkzip en DOS
@@ -10,17 +13,16 @@
Summary(tr.UTF-8): pkzip ve benzeri programların ürettiği zip arşivlerini açar
Summary(uk.UTF-8): Розпаковувач файлів .zip
Name: unzip
-Version: 5.52
-Release: 6
+Version: 6.00
+Release: 1
License: distributable
Group: Applications/Archiving
-Source0: ftp://ftp.info-zip.org/pub/infozip/src/%{name}552.tar.gz
-# Source0-md5: 9d23919999d6eac9217d1f41472034a9
+Source0: ftp://ftp.info-zip.org/pub/infozip/src/%{name}60.tgz
+# Source0-md5: 62b490407489521db863b523a7f86375
#Source0: ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/%{name}552.tar.gz
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: d7f8b0b09f6e8d89591b4dc25e335764
Patch0: %{name}-opt.patch
-Patch1: %{name}-CAN-2005-2475.patch
Patch2: %{name}-cve-2005-4667.patch
Patch3: %{name}-method99_hint.patch
URL: http://www.info-zip.org/
@@ -93,27 +95,26 @@
або умовчання відрізняються.
%prep
-%setup -q
+%setup -q -n %{name}60
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
-rm -f Makefile
ln -sf unix/Makefile Makefile
%build
+# NOTE: unix/configure creates flags file with guessed values
%{__make} unzips \
CC="%{__cc}" \
AS="%{__cc}" \
%ifarch %{ix86}
- CF="%{rpmcflags} -I. -Wall -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+ CF="%{rpmcflags} -I. -Wall -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS" \
AF="-Di386 %{rpmldflags}" \
- CRC32="crc_gcc" \
- LD="%{__cc} %{rpmcflags} -I. -Wall -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ CRCA_O="crc_gcc.o" \
+ LD="%{__cc} %{rpmcflags} -I. -Wall -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS"
%else
CF="%{rpmcflags} -I. -Wall" \
- LD="%{__cc} %{rpmcflags} -I. -Wall"
+ LD="%{__cc} %{rpmcflags} -I. -Wall"
%endif
%install
@@ -131,7 +132,7 @@
%files
%defattr(644,root,root,755)
-%doc README BUGS
+%doc BUGS COPYING.OLD History.600 LICENSE README ToDo WHERE file_id.diz *.txt proginfo
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man*/*
%lang(fi) %{_mandir}/fi/man*/*
@@ -143,6 +144,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.57 2009/10/31 18:11:19 gotar
+- upgraded to 6.00
+
Revision 1.56 2008/05/29 17:40:45 pluto
- useful hint for users about magic method 99, release 6.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unzip/unzip-cve-2005-4667.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unzip/unzip-opt.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unzip/unzip.spec?r1=1.56&r2=1.57&f=u
More information about the pld-cvs-commit
mailing list