3 files changed, 21 insertions, 17 deletions

diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index 73a42493e5ba..70f3446a0cad 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		f8
 PORTVERSION=		8
-PORTREVISION=		8
+PORTREVISION=		9
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
 MASTER_SITE_SUBDIR=	../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Packages \
@@ -26,12 +26,12 @@ BIN_DISTFILES=	basesystem-8.1-1.noarch.rpm \
 		compat-db-4.5.20-3.fc8.${LINUX_RPM_ARCH}.rpm \
 		compat-libstdc++-296-2.96-139.${LINUX_RPM_ARCH}.rpm \
 		compat-libstdc++-33-3.2.3-62.${LINUX_RPM_ARCH}.rpm \
-		coreutils-6.9-18.fc8.${LINUX_RPM_ARCH}.rpm \
+		coreutils-6.9-19.fc8.${LINUX_RPM_ARCH}.rpm \
 		db4-4.6.21-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		e2fsprogs-1.40.4-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		e2fsprogs-libs-1.40.4-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		elfutils-0.135-1.fc8.${LINUX_RPM_ARCH}.rpm \
-		fedora-release-8-5.noarch.rpm \
+		fedora-release-8-6.transition.noarch.rpm \
 		filesystem-2.4.11-1.fc8.${LINUX_RPM_ARCH}.rpm \
 		freetype-2.3.5-4.fc8.${LINUX_RPM_ARCH}.rpm \
 		gdbm-1.8.0-27.fc7.${LINUX_RPM_ARCH}.rpm \
@@ -71,11 +71,11 @@ SRC_DISTFILES+=	acl-2.2.39-14.fc8.src.rpm \
 		bash-3.2-20.fc8.src.rpm \
 		bzip2-1.0.4-12.fc8.src.rpm \
 		compat-db-4.5.20-3.fc8.src.rpm \
-		coreutils-6.9-18.fc8.src.rpm \
+		coreutils-6.9-19.fc8.src.rpm \
 		db4-4.6.21-2.fc8.src.rpm \
 		e2fsprogs-1.40.4-2.fc8.src.rpm \
 		elfutils-0.135-1.fc8.src.rpm \
-		fedora-release-8-5.src.rpm \
+		fedora-release-8-6.transition.src.rpm \
 		filesystem-2.4.11-1.fc8.src.rpm \
 		freetype-2.3.5-4.fc8.src.rpm \
 		gcc-4.1.2-33.src.rpm \
diff --git a/emulators/linux_base-f10/distinfo.i386 b/emulators/linux_base-f10/distinfo.i386
index a445b4198808..32adc72e29fa 100644
--- a/emulators/linux_base-f10/distinfo.i386
+++ b/emulators/linux_base-f10/distinfo.i386
@@ -19,9 +19,9 @@ SIZE (rpm/i386/fedora/8.newkey/compat-libstdc++-296-2.96-139.i386.rpm) = 93214
 MD5 (rpm/i386/fedora/8.newkey/compat-libstdc++-33-3.2.3-62.i386.rpm) = 2b0c6485391d2b0e7f2b1285a5af1ba7
 SHA256 (rpm/i386/fedora/8.newkey/compat-libstdc++-33-3.2.3-62.i386.rpm) = ca1a8390b7b9596ff1f91381be8853080dc74beeab7e639cb9439b44e13e0620
 SIZE (rpm/i386/fedora/8.newkey/compat-libstdc++-33-3.2.3-62.i386.rpm) = 235768
-MD5 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.i386.rpm) = 99ff5a7b3da08f290cb5b6d79f321fa8
-SHA256 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.i386.rpm) = e7eede346d911c57487591f268308756ab57a41242257fcbd6df6944e4ba8b29
-SIZE (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.i386.rpm) = 3489403
+MD5 (rpm/i386/fedora/8.newkey/coreutils-6.9-19.fc8.i386.rpm) = 01fbaaecc6b8e2e6b40d5fcf20897eb6
+SHA256 (rpm/i386/fedora/8.newkey/coreutils-6.9-19.fc8.i386.rpm) = d9a37999b944c259664cf673e0d754571c95e8a4c65f1b6add24abaf2a0e350c
+SIZE (rpm/i386/fedora/8.newkey/coreutils-6.9-19.fc8.i386.rpm) = 3489858
 MD5 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.i386.rpm) = 668c3732accf196f5c19f0e247572451
 SHA256 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.i386.rpm) = 6a0b232d6dec37c0177865f608d76e33b96334ff245d4fa5a905e0ccec7b93e4
 SIZE (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.i386.rpm) = 600400
@@ -34,9 +34,9 @@ SIZE (rpm/i386/fedora/8.newkey/e2fsprogs-libs-1.40.4-2.fc8.i386.rpm) = 141435
 MD5 (rpm/i386/fedora/8.newkey/elfutils-0.135-1.fc8.i386.rpm) = a6f4868b35b920680c35a2367a47c8b0
 SHA256 (rpm/i386/fedora/8.newkey/elfutils-0.135-1.fc8.i386.rpm) = b864b9577eee91c944c130a1b5383559efbb3e3da300ac1550984cfc24fc2da3
 SIZE (rpm/i386/fedora/8.newkey/elfutils-0.135-1.fc8.i386.rpm) = 228796
-MD5 (rpm/i386/fedora/8.newkey/fedora-release-8-5.noarch.rpm) = 5533140b89d8eb7e84d8a3aa45656688
-SHA256 (rpm/i386/fedora/8.newkey/fedora-release-8-5.noarch.rpm) = 5798dfc58b45feb99b82d65643d4ea3e9751cd0b2ce3744cd14377d7c6fe8120
-SIZE (rpm/i386/fedora/8.newkey/fedora-release-8-5.noarch.rpm) = 27713
+MD5 (rpm/i386/fedora/8.newkey/fedora-release-8-6.transition.noarch.rpm) = 4a24f97ce3df6510b731bbdbd0e8554b
+SHA256 (rpm/i386/fedora/8.newkey/fedora-release-8-6.transition.noarch.rpm) = b5171619fb1379007c1ee551af3c3a61be522c3b9f873073777c50de800ffc86
+SIZE (rpm/i386/fedora/8.newkey/fedora-release-8-6.transition.noarch.rpm) = 32087
 MD5 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.i386.rpm) = e37e038cbf7895f6b269eb8350fc0243
 SHA256 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.i386.rpm) = f74bf41bfc757d08f0169b53c24e8fc575b4df006f66fd23d5e6b9e49d51b738
 SIZE (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.i386.rpm) = 121014
@@ -136,9 +136,9 @@ SIZE (rpm/i386/fedora/8.newkey/bzip2-1.0.4-12.fc8.src.rpm) = 854245
 MD5 (rpm/i386/fedora/8.newkey/compat-db-4.5.20-3.fc8.src.rpm) = b4bb198943499381a5b74fdb77418603
 SHA256 (rpm/i386/fedora/8.newkey/compat-db-4.5.20-3.fc8.src.rpm) = 0ab5e7c71a805cdc02b62cb1c57b5e42f0d6b78b19720127750332c16da8e655
 SIZE (rpm/i386/fedora/8.newkey/compat-db-4.5.20-3.fc8.src.rpm) = 19442774
-MD5 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.src.rpm) = 12986d32dc59d07e9b1b0f66acc7509e
-SHA256 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.src.rpm) = 588eece56d02901f7e3fee0ea60cfa5614456282eb19532d65d87edfed1bf6b4
-SIZE (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.src.rpm) = 5495705
+MD5 (rpm/i386/fedora/8.newkey/coreutils-6.9-19.fc8.src.rpm) = 086f894333ac1ab560356b5a1248fc7a
+SHA256 (rpm/i386/fedora/8.newkey/coreutils-6.9-19.fc8.src.rpm) = 138614d6aa9582937890a4d42a3c477b1af2d453e36dd8199136cc4fe0030813
+SIZE (rpm/i386/fedora/8.newkey/coreutils-6.9-19.fc8.src.rpm) = 5500618
 MD5 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.src.rpm) = 5044230fa36968f097d807e2a3d83ba9
 SHA256 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.src.rpm) = e8c0951e8e8bf8ae39b5422e52f0cb5d193bc0dd2fe677e304634d41eecc3839
 SIZE (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.src.rpm) = 12167754
@@ -148,9 +148,9 @@ SIZE (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.src.rpm) = 4075714
 MD5 (rpm/i386/fedora/8.newkey/elfutils-0.135-1.fc8.src.rpm) = c2a03a45e8525f8ad7a995fa4d7cb3b1
 SHA256 (rpm/i386/fedora/8.newkey/elfutils-0.135-1.fc8.src.rpm) = f2d8d84aa7eefe81246d7969f1e3476fa490f9bd564789ca2955f7b781a8c4ae
 SIZE (rpm/i386/fedora/8.newkey/elfutils-0.135-1.fc8.src.rpm) = 1704896
-MD5 (rpm/i386/fedora/8.newkey/fedora-release-8-5.src.rpm) = 0c5195d063efecea1ced085a02808dde
-SHA256 (rpm/i386/fedora/8.newkey/fedora-release-8-5.src.rpm) = f9d1e02926fd8878994d62e805ff141fe809ba8cf190fd834912dc87c4d43521
-SIZE (rpm/i386/fedora/8.newkey/fedora-release-8-5.src.rpm) = 30645
+MD5 (rpm/i386/fedora/8.newkey/fedora-release-8-6.transition.src.rpm) = f6e7f209d2b23de4b895ba0e0c08efc2
+SHA256 (rpm/i386/fedora/8.newkey/fedora-release-8-6.transition.src.rpm) = e800624d623a37bd608e8640fb1900188c617e7d01497947635301fe71e05680
+SIZE (rpm/i386/fedora/8.newkey/fedora-release-8-6.transition.src.rpm) = 34995
 MD5 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.src.rpm) = 880ea74c64035c8fc6eda6451bc371ca
 SHA256 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.src.rpm) = fde05b4a1b8306f6e723f203163f258d94308c903e055bb2a69be052e4d5f16a
 SIZE (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.src.rpm) = 13891
diff --git a/emulators/linux_base-f10/pkg-plist b/emulators/linux_base-f10/pkg-plist
index 43d3de5454d3..680109eeab92 100644
--- a/emulators/linux_base-f10/pkg-plist
+++ b/emulators/linux_base-f10/pkg-plist
@@ -65,8 +65,10 @@ etc/pam.d/su-l
 etc/pki/rpm-gpg/RPM-GPG-KEY
 etc/pki/rpm-gpg/RPM-GPG-KEY-beta
 etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-8-and-9
 etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide
 etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-8-and-9
 etc/pki/rpm-gpg/RPM-GPG-KEY-rawhide
 etc/profile
 etc/profile.d/colorls.csh
@@ -86,7 +88,9 @@ etc/termcap
 @unexec if cmp -s %D/etc/yp.conf.sample %D/etc/yp.conf; then rm -f %D/etc/yp.conf; fi
 etc/yp.conf.sample
 etc/yum.repos.d/fedora-development.repo
+etc/yum.repos.d/fedora-updates-newkey.repo
 etc/yum.repos.d/fedora-updates-testing.repo
+etc/yum.repos.d/fedora-updates-testing-newkey.repo
 etc/yum.repos.d/fedora-updates.repo
 etc/yum.repos.d/fedora.repo
 lib/ld-2.7.so