Update the bash RPM (description from the INDEX file provided by Novell):

         Using any locale with UTF-8 encoding leads to an endless loop
         if after a quote a tabluator completion is tried.

Update the bzip2 RPM (description from the INDEX file provided by Novell):

         bzip2 could crash or run into an enless loop when decompressing
         certain specially crafted archives. This problem has been fixed.
         (CAN-2005-1260)

An advisory is at
<url:http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-1260>.

Update the coreutils RPM (description from the INDEX file provided by Novell):

         Fix a bug in the cp and mv utilities that cause them to terminate
         with a segmentation fault when copying extended attributes fails.

Update the libacl RPM (description from the INDEX file provided by Novell):

         When specifying multiple files, the X pseudo permission was handled
         wrong. (X evaluates to x if any acl entry contains x, and - otherwise.)

Update the ncurses RPM (description from the INDEX file provided by Novell):

         Make resizing of the terminal work even with threaded curses programs

Update the zlib RPM:

         The previous zlib update for CAN-2005-2096 fixed a flaw in zlib that
         could allow a carefully crafted compressed stream to crash an
         application. While the original patch corrected the reported
         overflow, Markus Oberhumer discovered additional ways a stream could
         trigger an overflow. This update fixes those problems as well.

         This issue is tracked by the Mitre CVE ID CAN-2005-1849.

         Since only zlib 1.2.x is affected, older SUSE products are not
         affected by this problem.

--<url:http://www.novell.com/linux/security/advisories/2005_43_zlib.html>

Add linux_base-8, linux_base-suse-9.2 and linux_base-suse-9.3 to CONFLICTS.

Remove quotes from RESTRICTED line (portlint).

Remove deprecation.

Increment PORTREVISION to 2.

PR:  102707

2 files changed, 32 insertions, 35 deletions

diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 1635237d5334..873b29362ea8 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -8,10 +8,10 @@
 
 PORTNAME=		linux_base-suse
 PORTVERSION=		9.1
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		emulators linux
-MASTER_SITES=		${MASTER_SITE_SUSE}
-MASTER_SITE_SUBDIR=	i386/9.1/suse/i586
+MASTER_SITES=		${MASTER_SITE_SUSE} ${MASTER_SITE_SUSE:S/$/:update/}
+MASTER_SITE_SUBDIR=	i386/9.1/suse/i586 i386/update/9.1/rpm/i586/:update
 DISTFILES=	suse-release-9.1-0.i586.rpm \
 		glibc-locale-2.3.3-98.i586.rpm \
 		glibc-2.3.3-98.i586.rpm \
@@ -20,21 +20,21 @@ DISTFILES=	suse-release-9.1-0.i586.rpm \
 		db-4.2.52-85.i586.rpm \
 		gdbm-1.8.3-225.i586.rpm \
 		glib-1.2.10-586.i586.rpm \
-		bash-2.05b-305.i586.rpm \
-		ncurses-5.4-59.i586.rpm \
+		bash-2.05b-305.1.i586.rpm:update \
+		ncurses-5.4-61.3.i586.rpm:update \
 		readline-4.3-306.i586.rpm \
-		zlib-1.2.1-70.i586.rpm \
+		zlib-1.2.1-70.12.i586.rpm:update \
 		info-4.6-61.i586.rpm \
 		grep-2.5.1-416.i586.rpm \
 		desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm \
-		coreutils-5.2.1-23.i586.rpm \
+		coreutils-5.2.1-23.8.i586.rpm:update \
 		popt-1.7-176.i586.rpm \
 		insserv-1.00.2-85.i586.rpm \
 		setserial-2.17-577.i586.rpm \
 		libstdc++-3.3.3-41.i586.rpm \
 		slang-1.4.9-121.i586.rpm \
-		bzip2-1.0.2-344.i586.rpm \
-		libacl-2.2.21-54.i586.rpm \
+		bzip2-1.0.2-346.6.i586.rpm:update \
+		libacl-2.2.21-54.4.i586.rpm:update \
 		libselinux-1.8-16.i586.rpm \
 		rpm-4.1.1-177.i586.rpm \
 		libgcc-3.3.3-41.i586.rpm \
@@ -46,15 +46,12 @@ COMMENT=	Basic packages for Linux mode from SUSE 9.1/i386
 
 EXTRACT_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
-CONFLICTS=	linux_base-7* linux_base-debian* \
-		linux_base-gentoo* linux_base-rh-9* linux_base-fc*
-
-DEPRECATED=     unmaintained and does not comply to the linux_base invariants
-EXPIRATION_DATE=2006-09-01
-IGNORE=         ${DEPRECATED}
+CONFLICTS=	linux_base-7* linux_base-8* linux_base-debian* \
+		linux_base-fc* linux_base-gentoo* linux_base-rh-9* \
+		linux_base-suse-9.2* linux_base-suse-9.3*
 
 NO_LATEST_LINK=		yes
-RESTRICTED=		"binaries under GNU GPL without accompanying source"
+RESTRICTED=		binaries under GNU GPL without accompanying source
 ONLY_FOR_ARCHS=		i386
 DIST_SUBDIR=		rpm/${ARCH}/suse
 PREFIX=			${LINUXBASE}
@@ -104,7 +101,7 @@ do-extract:
 # 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 ${DISTFILES:S/:new//}; do \
+	@for R in ${DISTFILES:S/:update//}; do \
 		${ECHO} $$R; \
 		${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \
 	done
diff --git a/emulators/linux_base-suse-9.1/distinfo b/emulators/linux_base-suse-9.1/distinfo
index 408817cfbaaa..122dbb67d050 100644
--- a/emulators/linux_base-suse-9.1/distinfo
+++ b/emulators/linux_base-suse-9.1/distinfo
@@ -22,18 +22,18 @@ SIZE (rpm/i386/suse/gdbm-1.8.3-225.i586.rpm) = 27027
 MD5 (rpm/i386/suse/glib-1.2.10-586.i586.rpm) = f8545f68e60d7bf27f0f3b988b27f276
 SHA256 (rpm/i386/suse/glib-1.2.10-586.i586.rpm) = 5bc0f72017e2dfe095a2bbc63700fdec2b25ffc234dc7862c2b1796c868523fd
 SIZE (rpm/i386/suse/glib-1.2.10-586.i586.rpm) = 124852
-MD5 (rpm/i386/suse/bash-2.05b-305.i586.rpm) = 21c636daa38c1406d7add2a69416578a
-SHA256 (rpm/i386/suse/bash-2.05b-305.i586.rpm) = 3a311b3a0418c33736119f0342310476f4dd0a3742b626ddd9952dd583ad06e8
-SIZE (rpm/i386/suse/bash-2.05b-305.i586.rpm) = 636675
-MD5 (rpm/i386/suse/ncurses-5.4-59.i586.rpm) = 5d3b5ddb2508853af9f738968696b257
-SHA256 (rpm/i386/suse/ncurses-5.4-59.i586.rpm) = bca4256429387840a76c9c43f0832684026a4a1e7a04eb76ea5b881cff6e1fff
-SIZE (rpm/i386/suse/ncurses-5.4-59.i586.rpm) = 790419
+MD5 (rpm/i386/suse/bash-2.05b-305.1.i586.rpm) = d50cccee356b3a4abf589ece733facb2
+SHA256 (rpm/i386/suse/bash-2.05b-305.1.i586.rpm) = 0f4ee7dbfbf8c9e8714c309892ffae393927c4cad7516652cfcfade8376699e1
+SIZE (rpm/i386/suse/bash-2.05b-305.1.i586.rpm) = 637832
+MD5 (rpm/i386/suse/ncurses-5.4-61.3.i586.rpm) = 36db6a2b140fe4b0299ca1db9d57aca8
+SHA256 (rpm/i386/suse/ncurses-5.4-61.3.i586.rpm) = d036e32bf6591b85486ffef6936dd3bf8b37947f76777c8836ccf1efe9167db9
+SIZE (rpm/i386/suse/ncurses-5.4-61.3.i586.rpm) = 790958
 MD5 (rpm/i386/suse/readline-4.3-306.i586.rpm) = 26c47a9f0472d0d946cd5c495c790dc5
 SHA256 (rpm/i386/suse/readline-4.3-306.i586.rpm) = ccb7719b595880f4c7a2b1511385a957232176ea93c09e2867df130f0b320ede
 SIZE (rpm/i386/suse/readline-4.3-306.i586.rpm) = 151357
-MD5 (rpm/i386/suse/zlib-1.2.1-70.i586.rpm) = 021fa0b41c54e916cd1d1d4f96d37c2c
-SHA256 (rpm/i386/suse/zlib-1.2.1-70.i586.rpm) = f0e2fe55d4a7fbf371efe2400d668835b054fdbd1f76e8be03e78025cad9d8a3
-SIZE (rpm/i386/suse/zlib-1.2.1-70.i586.rpm) = 63453
+MD5 (rpm/i386/suse/zlib-1.2.1-70.12.i586.rpm) = 2e1b7e050b6ab5fbc30899b7fc30a7ce
+SHA256 (rpm/i386/suse/zlib-1.2.1-70.12.i586.rpm) = c6b602d82e6ac39ee40503213cbcc7898634bf8f955e2525aeb8fed1aecd35f4
+SIZE (rpm/i386/suse/zlib-1.2.1-70.12.i586.rpm) = 63887
 MD5 (rpm/i386/suse/info-4.6-61.i586.rpm) = f205c1491ce440410aa47048a608c0bb
 SHA256 (rpm/i386/suse/info-4.6-61.i586.rpm) = fc607e1ad9c1f387f878b3d4fccf39101e73957ccf61b048efc99fa513310cb1
 SIZE (rpm/i386/suse/info-4.6-61.i586.rpm) = 144064
@@ -43,9 +43,9 @@ SIZE (rpm/i386/suse/grep-2.5.1-416.i586.rpm) = 169601
 MD5 (rpm/i386/suse/desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm) = 85360525dfad7c3e806dda689dbe3709
 SHA256 (rpm/i386/suse/desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm) = 5f2e4670d99f047c65a157423e438e0027d27de714b8a1047ca2e7f74e1bc714
 SIZE (rpm/i386/suse/desktop-file-utils-0.3.0.cvs20030807-221.i586.rpm) = 148110
-MD5 (rpm/i386/suse/coreutils-5.2.1-23.i586.rpm) = 2408d42377ed371ac7d322d37994e155
-SHA256 (rpm/i386/suse/coreutils-5.2.1-23.i586.rpm) = ada257e8500e0591ab4b02360240659bda5362d5b288f7617c9d89e3a7d3f004
-SIZE (rpm/i386/suse/coreutils-5.2.1-23.i586.rpm) = 1982252
+MD5 (rpm/i386/suse/coreutils-5.2.1-23.8.i586.rpm) = 5873e03520e53bf097c322a6d2a2a397
+SHA256 (rpm/i386/suse/coreutils-5.2.1-23.8.i586.rpm) = 15c9caf6cf6fff01424aec5fd855634acfa7c792be3417c8d7ef7972ad3a2e7b
+SIZE (rpm/i386/suse/coreutils-5.2.1-23.8.i586.rpm) = 1984282
 MD5 (rpm/i386/suse/popt-1.7-176.i586.rpm) = 7f675630429ba0c800569ac99e3a9ca4
 SHA256 (rpm/i386/suse/popt-1.7-176.i586.rpm) = e0f303d02768181b448859af05402d9f079527b69c812e66fb4d20c2b0097341
 SIZE (rpm/i386/suse/popt-1.7-176.i586.rpm) = 52024
@@ -61,12 +61,12 @@ SIZE (rpm/i386/suse/libstdc++-3.3.3-41.i586.rpm) = 301785
 MD5 (rpm/i386/suse/slang-1.4.9-121.i586.rpm) = 99279709a3dedfbc38859878f18cb97e
 SHA256 (rpm/i386/suse/slang-1.4.9-121.i586.rpm) = 6221f44226004338f4625fafa254da935904c1bfeeceff03a1cbb3d1542d7a1d
 SIZE (rpm/i386/suse/slang-1.4.9-121.i586.rpm) = 233659
-MD5 (rpm/i386/suse/bzip2-1.0.2-344.i586.rpm) = 5a1b566f07e9cc9e3f43647f446a57d5
-SHA256 (rpm/i386/suse/bzip2-1.0.2-344.i586.rpm) = 58953ade38164f2621a3e694dbe000c312ec15aff350b7030c492743be1095ec
-SIZE (rpm/i386/suse/bzip2-1.0.2-344.i586.rpm) = 221961
-MD5 (rpm/i386/suse/libacl-2.2.21-54.i586.rpm) = e07c7272a1b7fd2db1ec87f82c6dc4d3
-SHA256 (rpm/i386/suse/libacl-2.2.21-54.i586.rpm) = 54bd410cc7e74beeb6043b7eac8b88bb075cf4850965cf8317f9fe47c4ca8741
-SIZE (rpm/i386/suse/libacl-2.2.21-54.i586.rpm) = 18239
+MD5 (rpm/i386/suse/bzip2-1.0.2-346.6.i586.rpm) = 5517e3d56d43b263309a098d204ef201
+SHA256 (rpm/i386/suse/bzip2-1.0.2-346.6.i586.rpm) = 907ae63ee5b9b447a6d4df0633056f6e4873f5dace579c6d66cb2513a31b1054
+SIZE (rpm/i386/suse/bzip2-1.0.2-346.6.i586.rpm) = 222199
+MD5 (rpm/i386/suse/libacl-2.2.21-54.4.i586.rpm) = cfa327301a3e22517684adcbc7490b6e
+SHA256 (rpm/i386/suse/libacl-2.2.21-54.4.i586.rpm) = c14a24ab7c9edf3f223e708be9a0c020ec3e8060a4438e861ceabd3dc29b5d22
+SIZE (rpm/i386/suse/libacl-2.2.21-54.4.i586.rpm) = 18916
 MD5 (rpm/i386/suse/libselinux-1.8-16.i586.rpm) = 89e848b1c6db7aa7801469131e6446a4
 SHA256 (rpm/i386/suse/libselinux-1.8-16.i586.rpm) = 8031a35443884795a38d6703ce05b19b0cee22414114d41b53c59a10b2116e22
 SIZE (rpm/i386/suse/libselinux-1.8-16.i586.rpm) = 47298