Fix both alpha and i386. The major change is that glibc has been

updated.

Reviewed by: kris

4 files changed, 13 insertions, 18 deletions

diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 9a81e19b44ce..77523a1158b7 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -59,9 +59,10 @@ MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 # Let's avoid hardcoding 'en' as the language.
 LANG=			en
 
-UPDATES=		glibc-common-2.2.4-29.${MACHINE_ARCH}.rpm \
-				glibc-2.2.4-29.${MACHINE_ARCH}.rpm \
-				zlib-1.1.3-25.7.${MACHINE_ARCH}.rpm
+UPD_SET1=		glibc-common-2.2.4-31.${MACHINE_ARCH}.rpm \
+			glibc-2.2.4-31.${MACHINE_ARCH}.rpm
+UPD_SET2=		zlib-1.1.3-25.7.${MACHINE_ARCH}.rpm
+UPDATES=		${UPD_SET1} ${UPD_SET2}
 
 .ifdef USE_LINUX
 .error You have `USE_LINUX' variable defined either in environment or in make(1) arguments. Please undefine and try again.
@@ -73,12 +74,12 @@ UPDATES=		glibc-common-2.2.4-29.${MACHINE_ARCH}.rpm \
 RPM_BZIP2=		bzip2-1.0.1-3.i386.rpm
 RPM_FREETYPE=		freetype-2.0.1-4.i386.rpm
 RPM_GDBM=		gdbm-1.8.0-5.i386.rpm
-RPM_LIBSTDCXX=		libstdc++-2.96-85.i386.rpm
+RPM_LIBSTDCXX=
 RPM_COMPAT_LIBSTDCXX=	compat-libstdc++-6.2-2.9.0.14.i386.rpm
 RPM_SETSERIAL=		setserial-2.17-2.i386.rpm
 RPM_SETUP=		setup-2.4.7-1.noarch.rpm
 RPM_XFREE86_LIBS=	XFree86-libs-4.0.3-5.i386.rpm
-UPDATES+=		${RPM_LIBSTDCXX}
+UPDATES+=		libstdc++-2.96-112.7.1.i386.rpm
 .else
 RPM_BZIP2=		bzip2-1.0.1-4.alpha.rpm
 RPM_FREETYPE=		freetype-2.0.1-5.alpha.rpm
@@ -131,9 +132,7 @@ do-install:
 # Also, set the ELF fallback brand to Linux, so that we don't have to do
 # anything special to run staticly linked binaries.
 	@/sbin/sysctl -w ${FALLBACK_ELF_MIB}=${LINUX_ELF}
-	@for R in glibc-common-2.2.4-29.${MACHINE_ARCH}.rpm \
-		glibc-2.2.4-29.${MACHINE_ARCH}.rpm \
-		${DISTFILES} zlib-1.1.3-25.7.${MACHINE_ARCH}.rpm; do \
+	@for R in ${UPD_SET1} ${DISTFILES} ${UPD_SET2}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
diff --git a/emulators/linux_base-rh-9/distinfo.alpha b/emulators/linux_base-rh-9/distinfo.alpha
index 134a152dbb24..ecdb3c5e21e3 100644
--- a/emulators/linux_base-rh-9/distinfo.alpha
+++ b/emulators/linux_base-rh-9/distinfo.alpha
@@ -1,10 +1,7 @@
-MD5 (rpm/glibc-common-2.2.4-29.alpha.rpm) = 157ff2a64d725590bb0f489227cb59e0
 MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = db4e20d62c96ae3cd7fb3d9da89f0ec0
-MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = 50c7e24be0727971a1253bb75d30a1ed
 MD5 (rpm/setup-2.4.7-2.noarch.rpm) = ce6ded4c40f0475353291c0207db96d4
 MD5 (rpm/filesystem-2.0.7-1.noarch.rpm) = c82cd42bdf4e8becfef3701f0f246270
 MD5 (rpm/basesystem-7.0-2.noarch.rpm) = 9d4e753ef487d62e1672f52ef190447a
-MD5 (rpm/glibc-2.2.4-29.alpha.rpm) = 78f97e6419fa24beeecd0d035c951c8c
 MD5 (rpm/termcap-11.0.1-8.noarch.rpm) = ee5eb175910c60f95119e8af912e4846
 MD5 (rpm/db1-1.85-5.alpha.rpm) = 3d81e088f11af780cb951be465a0a94f
 MD5 (rpm/db3-3.1.17-7.alpha.rpm) = 0f7ac3c351be032ec99679c715cca722
@@ -26,4 +23,6 @@ MD5 (rpm/sh-utils-2.0-13.alpha.rpm) = d8206bfdeb0e723555a167ba363d4368
 MD5 (rpm/rpm-4.0.2-8.alpha.rpm) = de97b0fda240f422fa2a67dd0729d775
 MD5 (rpm/freetype-2.0.1-5.alpha.rpm) = 3dfb1fad9d16c1e9114f474ebb8fa849
 MD5 (rpm/XFree86-libs-4.0.3-21.alpha.rpm) = 7e0f11ac8258f550959df98f81146d9e
+MD5 (rpm/glibc-common-2.2.4-31.alpha.rpm) = c8c0cd28dd1dbfb96f3e720116e1f9c5
+MD5 (rpm/glibc-2.2.4-31.alpha.rpm) = 7e914fcb9302c7e0cc0586e2ef9d96f3
 MD5 (rpm/zlib-1.1.3-25.7.alpha.rpm) = 73352503d0864dbfa6db5369002fb0a1
diff --git a/emulators/linux_base-rh-9/distinfo.i386 b/emulators/linux_base-rh-9/distinfo.i386
index 0b16214b61cc..a4400dfa7baa 100644
--- a/emulators/linux_base-rh-9/distinfo.i386
+++ b/emulators/linux_base-rh-9/distinfo.i386
@@ -1,10 +1,7 @@
-MD5 (rpm/glibc-common-2.2.4-29.i386.rpm) = 76d59b340658260e4e1a8d1ce057b8b7
-MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = db4e20d62c96ae3cd7fb3d9da89f0ec0
 MD5 (rpm/redhat-release-7.1-1.noarch.rpm) = 50c7e24be0727971a1253bb75d30a1ed
 MD5 (rpm/setup-2.4.7-1.noarch.rpm) = 4a4819c1e86d61a9ca67a5b4feb375b7
 MD5 (rpm/filesystem-2.0.7-1.noarch.rpm) = c82cd42bdf4e8becfef3701f0f246270
 MD5 (rpm/basesystem-7.0-2.noarch.rpm) = 9d4e753ef487d62e1672f52ef190447a
-MD5 (rpm/glibc-2.2.4-29.i386.rpm) = f3d389a4ca38cb96d4a3f7e37c405741
 MD5 (rpm/termcap-11.0.1-8.noarch.rpm) = ee5eb175910c60f95119e8af912e4846
 MD5 (rpm/db1-1.85-5.i386.rpm) = 648f8ceec0ae49723beef68546e0c900
 MD5 (rpm/db3-3.1.17-7.i386.rpm) = 61cd34ed0205dc63cdb6faf7ada0c7eb
@@ -23,8 +20,10 @@ MD5 (rpm/readline-4.1-9.i386.rpm) = 35b6eae1b87503a686af6a577f1d86d3
 MD5 (rpm/setserial-2.17-2.i386.rpm) = 283ecf92b4bb47bd8b3a0bf436797b45
 MD5 (rpm/slang-1.4.2-2.i386.rpm) = 08f61ae541a0c802b5f0de2ec72e6b84
 MD5 (rpm/sh-utils-2.0-13.i386.rpm) = c0cb76287553e7f43234af45994d7d41
-MD5 (rpm/zlib-1.1.3-25.7.i386.rpm) = 1c2a98b53ec5bd716b48d71643705055
 MD5 (rpm/rpm-4.0.2-8.i386.rpm) = 7c19ebfcbb9079ce77b9aa2d33c26ff2
 MD5 (rpm/freetype-2.0.1-4.i386.rpm) = d0343a9d5f1d91ec254903ed164251cd
 MD5 (rpm/XFree86-libs-4.0.3-5.i386.rpm) = 227caaee9e10162b6500e6e9544726b3
-MD5 (rpm/libstdc++-2.96-85.i386.rpm) = c55761de27efcd655352d983b63b71a4
+MD5 (rpm/glibc-common-2.2.4-31.i386.rpm) = 7e45b087c1772f1dd45fc42b20b62309
+MD5 (rpm/glibc-2.2.4-31.i386.rpm) = ed5a12d2eba916b92a58d8538216d2fe
+MD5 (rpm/zlib-1.1.3-25.7.i386.rpm) = 1c2a98b53ec5bd716b48d71643705055
+MD5 (rpm/libstdc++-2.96-112.7.1.i386.rpm) = 31777243b5a7ede605bbe516aecc1528
diff --git a/emulators/linux_base-rh-9/pkg-plist.i386 b/emulators/linux_base-rh-9/pkg-plist.i386
index 9a10c95ff314..3939f6c3558b 100644
--- a/emulators/linux_base-rh-9/pkg-plist.i386
+++ b/emulators/linux_base-rh-9/pkg-plist.i386
@@ -467,9 +467,7 @@ usr/lib/librpmio.so.0.0.0
 usr/lib/libslang.so.1
 usr/lib/libslang.so.1.4.2
 usr/lib/libstdc++-2-libc6.1-1-2.9.0.so
-usr/lib/libstdc++-3-libc6.2-2-2.10.0.so
 usr/lib/libstdc++-libc6.1-1.so.2
-usr/lib/libstdc++-libc6.2-2.so.3
 usr/lib/libstdc++.so.2.7.2
 usr/lib/libstdc++.so.2.7.2.8
 usr/lib/libstdc++.so.2.8