From cfa1cd7dfeedef96b63b68e65518b04b3c050efe Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sun, 22 Sep 2013 21:09:29 +0000
Subject: [PATCH] upgrading package: infozip 2.32.5.52 -> 3.00.6.00

---
 infozip/infozip.patch | 24 +++++-------------------
 infozip/infozip.spec  | 36 ++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/infozip/infozip.patch b/infozip/infozip.patch
index b41900feac..e8accf3aa8 100644
--- a/infozip/infozip.patch
+++ b/infozip/infozip.patch
@@ -1,7 +1,8 @@
---- zip-2.32/unix/configure	2006-02-18 06:58:56 +0100
-+++ zip-2.32/unix/configure	2006-07-02 15:31:34 +0200
-@@ -50,15 +50,9 @@
- fi
+Index: zip30/unix/configure
+--- zip30/unix/configure.orig	2008-06-20 05:32:20.000000000 +0200
++++ zip30/unix/configure	2013-09-22 23:08:14.897808180 +0200
+@@ -218,15 +218,9 @@
+ 
  
  echo Check for the C preprocessor
 -# on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
@@ -19,18 +20,3 @@
  
  echo "#include <stdio.h>" > conftest.c
  $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
-@@ -74,7 +68,7 @@
-     echo "int foo() { return 0;}" > conftest.c
-     $CC -c conftest.c >/dev/null 2>/dev/null
-     echo Check if compiler generates underlines
--    nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
-+    nm conftest.o | grep "[^_]foo" >/dev/null 2>/dev/null
-     [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
-     if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
-       if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
-
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0282
-    Directory traversal vulnerability in UnZip 5.50 allows attackers to
-    overwrite arbitrary files via invalid characters between two . (dot)
-    characters, which are filtered and result in a ".." sequence.
-
diff --git a/infozip/infozip.spec b/infozip/infozip.spec
index fc970f800f..4f6eb5d275 100644
--- a/infozip/infozip.spec
+++ b/infozip/infozip.spec
@@ -22,10 +22,10 @@
 ##
 
 #   package versions
-%define       V_zip_here   2.32
-%define       V_zip_real   232
-%define       V_unzip_here 5.52
-%define       V_unzip_real 552
+%define       V_zip_here   3.00
+%define       V_zip_real   30
+%define       V_unzip_here 6.00
+%define       V_unzip_real 60
 
 #   package information
 Name:         infozip
@@ -38,11 +38,11 @@ Class:        BASE
 Group:        Archiver
 License:      BSD
 Version:      %{V_zip_here}.%{V_unzip_here}
-Release:      20080101
+Release:      20130922
 
 #   list of sources
-Source0:      ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/zip%{V_zip_real}.tar.gz
-Source1:      ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/unzip%{V_unzip_real}.tar.gz
+Source0:      ftp://ftp.info-zip.org/pub/infozip/src/zip%{V_zip_real}.tgz
+Source1:      ftp://ftp.info-zip.org/pub/infozip/src/unzip%{V_unzip_real}.tgz
 Patch0:       infozip.patch
 
 #   build information
@@ -57,28 +57,28 @@ PreReq:       OpenPKG, openpkg >= 20100101
 %track
     prog infozip:unzip = {
         version   = %{V_unzip_real}
-        url       = ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/
-        regex     = unzip(__VER__)\.tar\.gz
+        url       = ftp://ftp.info-zip.org/pub/infozip/src/
+        regex     = unzip(__VER__)\.tgz
     }
     prog infozip:zip = {
         version   = %{V_zip_real}
-        url       = ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/
-        regex     = [^n]zip(__VER__)\.tar\.gz
+        url       = ftp://ftp.info-zip.org/pub/infozip/src/
+        regex     = [^n]zip(__VER__)\.tgz
     }
 
 %prep
     %setup -q -c
     %setup -q -T -D -a 1
     %patch -p0
-    %{l_shtool} subst \
-        -e 's;@l_cpp@;%{l_cc} -E;' \
-        zip-%{V_zip_here}/unix/configure
 
 %build
-    ( cd zip-%{V_zip_here}
+    ( cd zip%{V_zip_real}
+      %{l_shtool} subst \
+          -e 's;@l_cpp@;%{l_cc} -E;' \
+          unix/configure
       %{l_make} %{l_mflags} -f unix/Makefile generic
     ) || exit $?
-    ( cd unzip-%{V_unzip_here}
+    ( cd unzip%{V_unzip_real}
       os=generic
       case "%{l_platform -t}" in
           *-linux*      ) os=linux_noasm ;;
@@ -91,13 +91,13 @@ PreReq:       OpenPKG, openpkg >= 20100101
 
 %install
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}
-    ( cd zip-%{V_zip_here}
+    ( cd zip%{V_zip_real}
       %{l_make} %{l_mflags} -f unix/Makefile install \
           prefix=$RPM_BUILD_ROOT%{l_prefix} \
           INSTALL="%{l_shtool} install -c" \
           INSTALL_D="%{l_shtool} mkdir -f -p -m 755"
     ) || exit $?
-    ( cd unzip-%{V_unzip_here}
+    ( cd unzip%{V_unzip_real}
       %{l_make} %{l_mflags} -f unix/Makefile install \
           prefix=$RPM_BUILD_ROOT%{l_prefix} \
           INSTALL_D="%{l_shtool} mkdir -f -p -m 755"