[packages/unzip] remove nostrip,cve-2005-4667,method99_hint patches dropped from spec in b47192c
atler
atler at pld-linux.org
Sat May 21 21:02:25 CEST 2022
commit f31014087fd7576b4ccef3b2d4cb1652b2255e23
Author: Jan Palus <atler at pld-linux.org>
Date: Sat May 21 21:00:09 2022 +0200
remove nostrip,cve-2005-4667,method99_hint patches dropped from spec in b47192c
unzip-6.0-nostrip.patch | 12 ------------
unzip-cve-2005-4667.patch | 24 ------------------------
unzip-method99_hint.patch | 25 -------------------------
3 files changed, 61 deletions(-)
---
diff --git a/unzip-6.0-nostrip.patch b/unzip-6.0-nostrip.patch
deleted file mode 100644
index 71c263f..0000000
--- a/unzip-6.0-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up unzip60/unix/configure.nostrip unzip60/unix/configure
---- unzip60/unix/configure.nostrip 2009-11-30 10:18:09.000000000 +0100
-+++ unzip60/unix/configure 2009-11-30 10:21:08.354264213 +0100
-@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
- IZ_BZIP2=${3}
- CFLAGS="${CFLAGS} -I. -DUNIX"
- LFLAGS1=""
--LFLAGS2="-s"
-+LFLAGS2=""
- LN="ln -s"
-
- CFLAGS_OPT=''
diff --git a/unzip-cve-2005-4667.patch b/unzip-cve-2005-4667.patch
deleted file mode 100644
index 0753e33..0000000
--- a/unzip-cve-2005-4667.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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) \
-- 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 */
- # define Info(buf,flag,sprf_arg) \
-- (*G.message)((zvoid *)&G, (uch *)(buf), (ulg)sprintf sprf_arg, (flag))
-+ (*G.message)((zvoid *)&G, (uch *)(buf), (ulg)wsizesnprintf sprf_arg, (flag))
- # else /* generic version, does not use sprintf() return value */
- # define Info(buf,flag,sprf_arg) \
- (*G.message)((zvoid *)&G, (uch *)(buf), \
-- (ulg)(sprintf sprf_arg, strlen((char *)(buf))), (flag))
-+ (ulg)(wsizesnprintf sprf_arg, strlen((char *)(buf))), (flag))
- # endif
- # endif
- #endif /* !Info */
diff --git a/unzip-method99_hint.patch b/unzip-method99_hint.patch
deleted file mode 100644
index 819a002..0000000
--- a/unzip-method99_hint.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- unzip-5.52/extract.c.orig 2005-02-26 05:47:30.000000000 +0100
-+++ unzip-5.52/extract.c 2008-05-29 18:33:08.000000000 +0200
-@@ -120,6 +120,8 @@
- " skipping: %-22s need %s compat. v%u.%u (can do v%u.%u)\n";
- static ZCONST char Far ComprMsgNum[] =
- " skipping: %-22s unsupported compression method %u\n";
-+static ZCONST char Far SevenZipHint[] =
-+ " hint: compression method 99 means 'WinZip 9+ AES encryption'. try to use 7-zip instead of unzip.\n";
- #ifndef SFX
- static ZCONST char Far ComprMsgName[] =
- " skipping: %-22s `%s' method not supported\n";
-@@ -847,9 +849,13 @@
- LoadFarStringSmall(ComprNames[G.crec.compression_method])));
- else
- #endif
-+ {
- Info(slide, 0x401, ((char *)slide, LoadFarString(ComprMsgNum),
- FnFilter1(G.filename),
- G.crec.compression_method));
-+ if (G.crec.compression_method == 99 )
-+ Info(slide, 0x401, ((char *)slide, LoadFarString(SevenZipHint)));
-+ }
- }
- return 0;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/unzip.git/commitdiff/f31014087fd7576b4ccef3b2d4cb1652b2255e23
More information about the pld-cvs-commit
mailing list