Update XFree86 libraries to 3.3.6-29, to avoid multiple security

bugs.

4 files changed, 5 insertions, 11 deletions

diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index ffcac69c7463..9f886e604f1e 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		linux_base
 PORTVERSION=		6.1
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_REDHAT_LINUX}
 MASTER_SITE_SUBDIR=	${PORTVERSION}/en/os/${MACHINE_ARCH}/RedHat/RPMS
@@ -20,8 +20,6 @@ PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
 
-FORBIDDEN=		"multiple security bugs--see <URL:http://rhn.redhat.com/errata/RHSA-2001-071.html>"
-
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
 ONLY_FOR_ARCHS=		alpha i386
@@ -38,14 +36,14 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_GLIBC=		glibc-2.1.3-26.${MACHINE_ARCH}.rpm
 UPDATES=		${RPM_GLIBC} \
-			zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm
+			zlib-1.1.3-25.6.${MACHINE_ARCH}.rpm \
+			XFree86-libs-3.3.6-29.${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
 RPM_GLIB=
 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
 .else
 LIBC5_COMPAT=
@@ -53,7 +51,6 @@ RPM_BINUTILS=		binutils-2.9.1.0.23-7.alpha.rpm
 RPM_GLIB=		glib-1.2.6-2.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+=
 .endif
 
@@ -84,7 +81,6 @@ RPM_SET3=		setserial-2.15-2.${MACHINE_ARCH}.rpm \
 			slang-1.2.2-4.${MACHINE_ARCH}.rpm \
 			stat-1.5-11.${MACHINE_ARCH}.rpm \
 			tcsh-6.08.00-6.${MACHINE_ARCH}.rpm \
-			${RPM_X_LIBS} \
 			xpm-3.4k-1.${MACHINE_ARCH}.rpm
 
 DBPATH=			/var/lib/rpm
diff --git a/emulators/linux_base-6/distinfo b/emulators/linux_base-6/distinfo
index c22905b755c7..c325d0fd8146 100644
--- a/emulators/linux_base-6/distinfo
+++ b/emulators/linux_base-6/distinfo
@@ -1,5 +1,3 @@
-MD5 (rpm/XFree86-libs-3.3.5-17.alpha.rpm) = 8eff75ce1fff3885631584cf1a3b3f66
-MD5 (rpm/XFree86-libs-3.3.5-3.i386.rpm) = d8b820090eda9d4ef5429726a8c26e48
 MD5 (rpm/basesystem-6.0-4.noarch.rpm) = 9fa4ff5adc067837cfd56ff139c3e09f
 MD5 (rpm/bash-1.14.7-16.alpha.rpm) = 4f7068b533dec68fb6faacae22c95ba2
 MD5 (rpm/bash-1.14.7-16.i386.rpm) = dab7c815dfc829552995b103675238cd
diff --git a/emulators/linux_base-6/distinfo.alpha b/emulators/linux_base-6/distinfo.alpha
index 14414e92d3d7..a1a373505f96 100644
--- a/emulators/linux_base-6/distinfo.alpha
+++ b/emulators/linux_base-6/distinfo.alpha
@@ -24,5 +24,5 @@ MD5 (rpm/setserial-2.15-2.alpha.rpm) = 8c83c88f71d5a977b71c7192827609a0
 MD5 (rpm/slang-1.2.2-4.alpha.rpm) = 32ef66f3664549478cf0ed6a0c664640
 MD5 (rpm/stat-1.5-11.alpha.rpm) = 2c2bdfc91afc259bd2cb5a8e17d6a99a
 MD5 (rpm/tcsh-6.08.00-6.alpha.rpm) = 1aa899b05416a0678b6089bbde3b4994
-MD5 (rpm/XFree86-libs-3.3.5-17.alpha.rpm) = 8eff75ce1fff3885631584cf1a3b3f66
+MD5 (rpm/XFree86-libs-3.3.6-29.alpha.rpm) = 9cda3f7867f3ab4d52091bfce0aa0d15
 MD5 (rpm/xpm-3.4k-1.alpha.rpm) = abd5ebf6986557673398ae21a341bade
diff --git a/emulators/linux_base-6/distinfo.i386 b/emulators/linux_base-6/distinfo.i386
index 34f1d17c739d..f5cea6a3e968 100644
--- a/emulators/linux_base-6/distinfo.i386
+++ b/emulators/linux_base-6/distinfo.i386
@@ -26,6 +26,6 @@ MD5 (rpm/setserial-2.15-2.i386.rpm) = c40ebf65fcf59aad8204614c9e64f053
 MD5 (rpm/slang-1.2.2-4.i386.rpm) = d261dc5de4ad2a5469bdba9ca26fcdf7
 MD5 (rpm/stat-1.5-11.i386.rpm) = 644b03fae49b335e15af437a0700cc88
 MD5 (rpm/tcsh-6.08.00-6.i386.rpm) = bd560fe49394b1b2d99a910f0067f3db
-MD5 (rpm/XFree86-libs-3.3.5-3.i386.rpm) = d8b820090eda9d4ef5429726a8c26e48
+MD5 (rpm/XFree86-libs-3.3.6-29.i386.rpm) = 6987a9f54aac77e70d5ad79e4985b21f
 MD5 (rpm/xpm-3.4k-1.i386.rpm) = 693c16f82d9529fe8f9a0f286e4a00aa
 MD5 (rpm/glib-1.2.6-2.i386.rpm) = 1f40a4f4dff84d98591e7d3db3f819fb