Update for zlib "double free" security bug

(http://www.redhat.com/support/errata/RHSA-2002-026.html).  I only
tested this on i386.

6 files changed, 10 insertions, 8 deletions

diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index e5ebc86ba893..c5a388b69e5b 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -40,10 +40,11 @@ RPM_MIRRORS=		\
 	ftp://mirror.aarnet.edu.au/pub/linux/redhat/__DIR__/
 
 STDDIR=			linux/6.1/en/os/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR=			linux/updates/6.1/en/os/${MACHINE_ARCH}
+UPDDIR=			linux/updates/6.2/en/os/${MACHINE_ARCH}
 
 .include <bsd.port.pre.mk>
 
+UPDATES=		zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm
 .if (${MACHINE_ARCH} == "i386")
 LIBC5_COMPAT=		ld.so-1.9.5-11.i386.rpm libc-5.3.12-31.i386.rpm
 RPM_BINUTILS=		binutils-2.9.1.0.23-6.i386.rpm
@@ -52,7 +53,7 @@ RPM_GLIBC=		glibc-2.1.2-11.i386.rpm
 RPM_LDCONFIG=		ldconfig-1.9.5-15.i386.rpm
 RPM_RPM=		rpm-3.0.3-2.i386.rpm
 RPM_X_LIBS=		XFree86-libs-3.3.5-3.i386.rpm
-UPDATES=		glib-1.2.6-2.i386.rpm
+UPDATES+=		glib-1.2.6-2.i386.rpm
 .else
 LIBC5_COMPAT=
 RPM_BINUTILS=		binutils-2.9.1.0.23-7.alpha.rpm
@@ -61,7 +62,7 @@ RPM_GLIBC=		glibc-2.1.2-17.alpha.rpm
 RPM_LDCONFIG=		ldconfig-1.9.5-16.alpha.rpm
 RPM_RPM=		rpm-3.0.3-6.alpha.rpm
 RPM_X_LIBS=		XFree86-libs-3.3.5-17.alpha.rpm
-UPDATES=
+UPDATES+=
 .endif
 
 #
@@ -76,7 +77,6 @@ RPM_SET2=		${RPM_GLIBC} \
 			libtermcap-2.0.8-18.${MACHINE_ARCH}.rpm \
 			bash-1.14.7-16.${MACHINE_ARCH}.rpm \
 			ncurses-4.2-25.${MACHINE_ARCH}.rpm \
-			zlib-1.1.3-5.${MACHINE_ARCH}.rpm \
 			info-3.12h-2.${MACHINE_ARCH}.rpm \
 			fileutils-4.0-8.${MACHINE_ARCH}.rpm \
 			grep-2.3-2.${MACHINE_ARCH}.rpm \
diff --git a/emulators/linux_base-rh-9/distinfo b/emulators/linux_base-rh-9/distinfo
index 6757a5652954..9f6127a3343e 100644
--- a/emulators/linux_base-rh-9/distinfo
+++ b/emulators/linux_base-rh-9/distinfo
@@ -51,5 +51,5 @@ MD5 (rpm/termcap-9.12.6-15.alpha.rpm) = ec5f89b7fc6f4072b5cc84e2a78b622a
 MD5 (rpm/termcap-9.12.6-15.i386.rpm) = b598df3e6c132ed497862e67c48bf1e5
 MD5 (rpm/xpm-3.4k-1.alpha.rpm) = abd5ebf6986557673398ae21a341bade
 MD5 (rpm/xpm-3.4k-1.i386.rpm) = 693c16f82d9529fe8f9a0f286e4a00aa
-MD5 (rpm/zlib-1.1.3-5.alpha.rpm) = e0aa650d7221468cdb3e6aa8cbf784b6
-MD5 (rpm/zlib-1.1.3-5.i386.rpm) = 6d79b550fe69d03f7438c7557a07fe92
+MD5 (rpm/zlib-1.1.3-25.6.alpha.rpm) = 8e1e3754359de96f9b719a3d6329fb44
+MD5 (rpm/zlib-1.1.3-25.6.i386.rpm) = 6d79b550fe69d03f7438c7557a07fe92
diff --git a/emulators/linux_base-rh-9/distinfo.alpha b/emulators/linux_base-rh-9/distinfo.alpha
index 96341e6607b6..1b7edc6af211 100644
--- a/emulators/linux_base-rh-9/distinfo.alpha
+++ b/emulators/linux_base-rh-9/distinfo.alpha
@@ -7,7 +7,7 @@ MD5 (rpm/termcap-9.12.6-15.alpha.rpm) = ec5f89b7fc6f4072b5cc84e2a78b622a
 MD5 (rpm/libtermcap-2.0.8-18.alpha.rpm) = 7dd3946c717c50abc0e039c6add5584e
 MD5 (rpm/bash-1.14.7-16.alpha.rpm) = 4f7068b533dec68fb6faacae22c95ba2
 MD5 (rpm/ncurses-4.2-25.alpha.rpm) = 69be854df9f2ba4d5362b8dbf6d32383
-MD5 (rpm/zlib-1.1.3-5.alpha.rpm) = e0aa650d7221468cdb3e6aa8cbf784b6
+MD5 (rpm/zlib-1.1.3-25.6.alpha.rpm) = 8e1e3754359de96f9b719a3d6329fb44
 MD5 (rpm/info-3.12h-2.alpha.rpm) = fa0c3d02d69b5f4b4cc059d00d5e022c
 MD5 (rpm/fileutils-4.0-8.alpha.rpm) = 5a42d08bc1aa99fdb21b818f4c370cd0
 MD5 (rpm/grep-2.3-2.alpha.rpm) = b9fbd92efb1e42de293630e96df79547
diff --git a/emulators/linux_base-rh-9/distinfo.i386 b/emulators/linux_base-rh-9/distinfo.i386
index c7857ffccb5f..909146a99f47 100644
--- a/emulators/linux_base-rh-9/distinfo.i386
+++ b/emulators/linux_base-rh-9/distinfo.i386
@@ -7,7 +7,7 @@ MD5 (rpm/termcap-9.12.6-15.i386.rpm) = b598df3e6c132ed497862e67c48bf1e5
 MD5 (rpm/libtermcap-2.0.8-18.i386.rpm) = 9482834e8f4edcb449c6ca934fc07c10
 MD5 (rpm/bash-1.14.7-16.i386.rpm) = dab7c815dfc829552995b103675238cd
 MD5 (rpm/ncurses-4.2-25.i386.rpm) = 2f55ea9170e88028ac53e2874916b6b2
-MD5 (rpm/zlib-1.1.3-5.i386.rpm) = 6d79b550fe69d03f7438c7557a07fe92
+MD5 (rpm/zlib-1.1.3-25.6.i386.rpm) = d3e7293df89d9e74cea78e2556cb6ea4
 MD5 (rpm/info-3.12h-2.i386.rpm) = 9d19530f14e7be12385e7ee1b779f23e
 MD5 (rpm/fileutils-4.0-8.i386.rpm) = 766fb24bb704e7172627715da13e548c
 MD5 (rpm/grep-2.3-2.i386.rpm) = 2e292873c50db72f48e57c72e0d53b6d
diff --git a/emulators/linux_base-rh-9/pkg-plist.alpha b/emulators/linux_base-rh-9/pkg-plist.alpha
index b5e86d3f41e0..ad1c58913509 100644
--- a/emulators/linux_base-rh-9/pkg-plist.alpha
+++ b/emulators/linux_base-rh-9/pkg-plist.alpha
@@ -309,6 +309,7 @@ usr/doc/tcsh-6.08.00/FAQ
 usr/doc/tcsh-6.08.00/NewThings
 usr/doc/tcsh-6.08.00/complete.tcsh
 usr/doc/tcsh-6.08.00/eight-bit.txt
+usr/doc/zlib-1.1.3/README
 usr/include/ansidecl.h
 usr/include/bfd.h
 usr/include/bfdlink.h
diff --git a/emulators/linux_base-rh-9/pkg-plist.i386 b/emulators/linux_base-rh-9/pkg-plist.i386
index d231c76e95b2..65f5c1d905de 100644
--- a/emulators/linux_base-rh-9/pkg-plist.i386
+++ b/emulators/linux_base-rh-9/pkg-plist.i386
@@ -315,6 +315,7 @@ usr/doc/tcsh-6.08.00/FAQ
 usr/doc/tcsh-6.08.00/NewThings
 usr/doc/tcsh-6.08.00/complete.tcsh
 usr/doc/tcsh-6.08.00/eight-bit.txt
+usr/doc/zlib-1.1.3/README
 usr/i486-linux-libc5/lib/libICE.so.6
 usr/i486-linux-libc5/lib/libICE.so.6.3
 usr/i486-linux-libc5/lib/libPEX5.so.6