gzip: Upgrade to 1.3.13 to address multiple issues

CVE-2006-4334, CVE-2006-4335, CVE-2006-4336,
CVE-2006-4337, CVE-2006-4338

4 files changed, 18 insertions, 47 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index f1c94f6462..63cf4156f0 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11830,22 +11830,6 @@ sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421
 md5=4a04df0d971a8952fb395b6eb0bc8dab
 sha256=48d93ef10f17cffe1ecbfec3078932ae48e08e3c172437e4bdfb22ae87d25421
 
-[ftp://ftp.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
-[ftp://ftp.nl.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
-[ftp://ftp.pl.debian.org/pub/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
-[ftp://ftp.us.debian.org/debian/pool/main/g/gzip/gzip_1.3.5.orig.tar.gz]
-md5=3d6c191dfd2bf307014b421c12dc8469
-sha256=631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07
-
 [http://rtpnet.nerim.net/ipaq/patches/2.6.17-1/WIP/h1940_batt.patch]
 md5=2810d6a0aa41a349faf711bfc9facf14
 sha256=0d68bfb125997599470dbc4822d43e777a831da2f1cfa5356b5dc791cdd8b27f
diff --git a/recipes/gzip/gzip-1.3.13/configure.patch b/recipes/gzip/gzip-1.3.13/configure.patch
new file mode 100644
index 0000000000..55e8c77345
--- /dev/null
+++ b/recipes/gzip/gzip-1.3.13/configure.patch
@@ -0,0 +1,15 @@
+Index: gzip-1.3.13/configure.ac
+===================================================================
+--- gzip-1.3.13.orig/configure.ac	2010-03-15 13:15:37.457912205 +0800
++++ gzip-1.3.13/configure.ac	2010-03-15 13:17:46.497912101 +0800
+@@ -27,8 +27,8 @@
+ AC_CONFIG_SRCDIR(gzip.c)
+ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
+-AM_INIT_AUTOMAKE([1.11 dist-xz])
+-AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
++AM_INIT_AUTOMAKE([1.10])
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+ AC_PROG_CC_STDC
+ AM_PROG_CC_C_O
diff --git a/recipes/gzip/gzip-1.3.5/configure.patch b/recipes/gzip/gzip-1.3.5/configure.patch
deleted file mode 100644
index 64e901a9a4..0000000000
--- a/recipes/gzip/gzip-1.3.5/configure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- gzip-1.3.5/./configure.in~configure
-+++ gzip-1.3.5/./configure.in
-@@ -18,8 +18,8 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- 
--AC_PREREQ(2.54)
--AC_INIT(gzip, 1.3.5, bug-gzip@gnu.org)
-+AC_PREREQ(2.57)
-+AC_INIT([gzip],[1.3.5],[bug-gzip@gnu.org])
- AC_CONFIG_SRCDIR(gzip.c)
- AM_INIT_AUTOMAKE
- 
-@@ -39,9 +39,8 @@
- 
- AC_CACHE_CHECK([for underline in external names], [gzip_cv_underline],
-   [gzip_cv_underline=yes
--   AC_TRY_COMPILE([int foo() {return 0;}], [],
--     [nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 ||
--	gzip_cv_underline=no])])
-+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int foo() {return 0;}]], [[]])],[nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 ||
-+	gzip_cv_underline=no],[])])
- if test $gzip_cv_underline = no; then
-   ASCPP="${ASCPP} -DNO_UNDERLINE"
- fi
diff --git a/recipes/gzip/gzip_1.3.5.bb b/recipes/gzip/gzip_1.3.13.bb
index a0c49864b4..86c1abede6 100644
--- a/recipes/gzip/gzip_1.3.5.bb
+++ b/recipes/gzip/gzip_1.3.13.bb
@@ -6,8 +6,10 @@ to be a replacement for 'compress'. The GNU Project uses it as \
 the standard compression program for its system."
 PR = "r1"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \
+SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz;name=src \
 	   file://configure.patch;patch=1"
+SRC_URI[src.md5sum] = "c54a31b93e865f6a4410b2dc64662706"
+SRC_URI[src.sha256sum] = "1d06ff9f5c523651bed3dcde6e6aa8118eee48b22534a157a2588705fa517ca3"
 
 S = "${WORKDIR}/gzip-${PV}"