CentOS ports: for c6_64, install 32bit libraries alongside

PR:		206943
Submitted by:	xmj

4 files changed, 648 insertions, 117 deletions

diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 3e473ae2a936..f34f55b26081 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	6.7
 PORTREVISION=	1
 CATEGORIES=	emulators linux
 MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
-MASTER_SITE_SUBDIR=	${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/\
-			${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/\
+			centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/
 
 PKGNAMEPREFIX=	linux_base-
 DISTFILES=	${PRE_BIN_DISTFILES} ${BIN_DISTFILES} ${SRC_DISTFILES}
@@ -28,30 +28,34 @@ PRE_BIN_DISTFILES=	filesystem-2.4.30-3.el6.${LINUX_RPM_ARCH}.rpm \
 BIN_DISTFILES=	basesystem-10.0-4.el6.noarch.rpm \
 		bash-4.1.2-33.el6_7.1.${LINUX_RPM_ARCH}.rpm \
 		bzip2-1.0.5-7.el6_0.${LINUX_RPM_ARCH}.rpm \
-		bzip2-libs-1.0.5-7.el6_0.${LINUX_RPM_ARCH}.rpm \
 		centos-release-6-7.el6.centos.12.3.${LINUX_RPM_ARCH}.rpm \
-		compat-db43-4.3.29-15.el6.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-33-3.2.3-69.el6.${LINUX_RPM_ARCH}.rpm \
-		compat-libstdc++-296-2.96-144.el6.i686.rpm \
 		coreutils-8.4-37.el6_7.3.${LINUX_RPM_ARCH}.rpm \
-		db4-4.7.25-20.el6_7.${LINUX_RPM_ARCH}.rpm \
 		e2fsprogs-1.41.12-22.el6.${LINUX_RPM_ARCH}.rpm \
-		e2fsprogs-libs-1.41.12-22.el6.${LINUX_RPM_ARCH}.rpm \
 		elfutils-0.161-3.el6.${LINUX_RPM_ARCH}.rpm \
 		findutils-4.4.2-6.el6.${LINUX_RPM_ARCH}.rpm \
+		glibc-common-2.12-1.166.el6_7.7.${LINUX_RPM_ARCH}.rpm \
+		grep-2.20-3.el6_7.1.${LINUX_RPM_ARCH}.rpm \
+		info-4.13a-8.el6.${LINUX_RPM_ARCH}.rpm \
+		keyutils-1.4-5.el6.${LINUX_RPM_ARCH}.rpm \
+		less-436-13.el6.${LINUX_RPM_ARCH}.rpm \
+		ncurses-5.7-4.20090207.el6.${LINUX_RPM_ARCH}.rpm \
+		sed-4.2.1-10.el6.${LINUX_RPM_ARCH}.rpm \
+		setserial-2.17-25.el6.${LINUX_RPM_ARCH}.rpm \
+		which-2.19-6.el6.${LINUX_RPM_ARCH}.rpm \
+		compat-libstdc++-296-2.96-144.el6.i686.rpm
+LIB_DISTFILES=	bzip2-libs-1.0.5-7.el6_0.${LINUX_RPM_ARCH}.rpm \
+		compat-db43-4.3.29-15.el6.${LINUX_RPM_ARCH}.rpm \
+		compat-libstdc++-33-3.2.3-69.el6.${LINUX_RPM_ARCH}.rpm \
+		db4-4.7.25-20.el6_7.${LINUX_RPM_ARCH}.rpm \
+		e2fsprogs-libs-1.41.12-22.el6.${LINUX_RPM_ARCH}.rpm \
 		freetype-2.3.11-15.el6_6.1.${LINUX_RPM_ARCH}.rpm \
 		gamin-0.1.10-9.el6.${LINUX_RPM_ARCH}.rpm \
 		gdbm-1.8.0-38.el6.${LINUX_RPM_ARCH}.rpm \
 		glib2-2.28.8-4.el6.${LINUX_RPM_ARCH}.rpm \
 		glibc-2.12-1.166.el6_7.7.${LINUX_RPM_ARCH}.rpm \
-		glibc-common-2.12-1.166.el6_7.7.${LINUX_RPM_ARCH}.rpm \
 		gmp-4.3.1-7.el6_2.2.${LINUX_RPM_ARCH}.rpm \
-		grep-2.20-3.el6_7.1.${LINUX_RPM_ARCH}.rpm \
-		info-4.13a-8.el6.${LINUX_RPM_ARCH}.rpm \
-		keyutils-1.4-5.el6.${LINUX_RPM_ARCH}.rpm \
 		keyutils-libs-1.4-5.el6.${LINUX_RPM_ARCH}.rpm \
 		krb5-libs-1.10.3-42.el6.${LINUX_RPM_ARCH}.rpm \
-		less-436-13.el6.${LINUX_RPM_ARCH}.rpm \
 		libacl-2.2.49-6.el6.${LINUX_RPM_ARCH}.rpm \
 		libattr-2.4.44-7.el6.${LINUX_RPM_ARCH}.rpm \
 		libblkid-2.17.2-12.18.el6.${LINUX_RPM_ARCH}.rpm \
@@ -63,19 +67,18 @@ BIN_DISTFILES=	basesystem-10.0-4.el6.noarch.rpm \
 		libsepol-2.0.41-4.el6.${LINUX_RPM_ARCH}.rpm \
 		libstdc++-4.4.7-16.el6.${LINUX_RPM_ARCH}.rpm \
 		libuuid-2.17.2-12.18.el6.${LINUX_RPM_ARCH}.rpm \
-		ncurses-5.7-4.20090207.el6.${LINUX_RPM_ARCH}.rpm \
 		ncurses-libs-5.7-4.20090207.el6.${LINUX_RPM_ARCH}.rpm \
 		pcre-7.8-7.el6.${LINUX_RPM_ARCH}.rpm \
 		popt-1.13-7.el6.${LINUX_RPM_ARCH}.rpm \
 		readline-6.0-4.el6.${LINUX_RPM_ARCH}.rpm \
 		redhat-lsb-core-4.0-7.el6.centos.${LINUX_RPM_ARCH}.rpm \
-		sed-4.2.1-10.el6.${LINUX_RPM_ARCH}.rpm \
-		setserial-2.17-25.el6.${LINUX_RPM_ARCH}.rpm \
 		slang-2.2.1-1.el6.${LINUX_RPM_ARCH}.rpm \
 		util-linux-ng-2.17.2-12.18.el6.${LINUX_RPM_ARCH}.rpm \
-		which-2.19-6.el6.${LINUX_RPM_ARCH}.rpm \
 		zlib-1.2.3-29.el6.${LINUX_RPM_ARCH}.rpm
 
+BIN_DISTFILES+=	${LIB_DISTFILES}
+
+
 .if defined(PACKAGE_BUILDING)
 SRC_DISTFILES=	basesystem-10.0-4.el6.src.rpm:SOURCE \
 		bash-4.1.2-33.el6_7.1.src.rpm:SOURCE \
@@ -131,10 +134,23 @@ ONLY_FOR_ARCHS=		i386 amd64
 PKGNAMESUFFIX=		_64
 LINUX_RPM_ARCH=	x86_64
 LINUX_REPO_ARCH=	x86_64
+
+# hack to add i686 distfiles
+
+_32BIT_LINUX_RPM_ARCH=  i686
+_32BIT_DISTFILES=   ${LIB_DISTFILES:S/${LINUX_RPM_ARCH}/${_32BIT_LINUX_RPM_ARCH}/g}
+.       if ${_32BIT_DISTFILES} != ${LIB_DISTFILES}
+# they could be the same if above regexp doesn't match
+BIN_DISTFILES+=         ${_32BIT_DISTFILES}
+.       endif
+
+
 .	else
 LINUX_RPM_ARCH=		i686
 LINUX_REPO_ARCH=	i386
 .	endif
+
+
 USE_LINUX_PREFIX=	yes
 NO_WRKSUBDIR=		yes
 DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
diff --git a/emulators/linux_base-c6/distinfo.i686 b/emulators/linux_base-c6/distinfo.i686
index 292edc229069..6849f5826e5c 100644
--- a/emulators/linux_base-c6/distinfo.i686
+++ b/emulators/linux_base-c6/distinfo.i686
@@ -8,28 +8,46 @@ SHA256 (rpm/i686/centos/6.7/bash-4.1.2-33.el6_7.1.i686.rpm) = a732121d4392632388
 SIZE (rpm/i686/centos/6.7/bash-4.1.2-33.el6_7.1.i686.rpm) = 910760
 SHA256 (rpm/i686/centos/6.7/bzip2-1.0.5-7.el6_0.i686.rpm) = 37883219612b1ffa199f5a7227fcd165687a24e5c7c291c579647d1563777e47
 SIZE (rpm/i686/centos/6.7/bzip2-1.0.5-7.el6_0.i686.rpm) = 49428
-SHA256 (rpm/i686/centos/6.7/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = d3424f4610860e7f8f444cc3cddf51cd75f5e58ca0ecffc8bdbbcb5f8fe1b0d1
-SIZE (rpm/i686/centos/6.7/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = 37204
 SHA256 (rpm/i686/centos/6.7/centos-release-6-7.el6.centos.12.3.i686.rpm) = 2a1f61f9462d7f9bd0717319ca432455dd7acfb6cfd0b1c9d8b3fbb6feb2a0b8
 SIZE (rpm/i686/centos/6.7/centos-release-6-7.el6.centos.12.3.i686.rpm) = 21932
-SHA256 (rpm/i686/centos/6.7/compat-db43-4.3.29-15.el6.i686.rpm) = 202767fa03ff58947d6a2ec2437e52fc9179f3995fa77264753fde03f2737d0a
-SIZE (rpm/i686/centos/6.7/compat-db43-4.3.29-15.el6.i686.rpm) = 914280
-SHA256 (rpm/i686/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 894abcc5f0b28e39c71d4b0ca27d19540e7eb9d3c32664d5621324c9efbfe11e
-SIZE (rpm/i686/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 193328
-SHA256 (rpm/i686/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = a0d7cba8cf0fcb625ce3181d64fa59ca018b562350c30b3a13fd8b858f21f134
-SIZE (rpm/i686/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = 78832
 SHA256 (rpm/i686/centos/6.7/coreutils-8.4-37.el6_7.3.i686.rpm) = b95b1e17710cbc00ffa843ab14131b27b3014b124170b04c913282d888cc4ea0
 SIZE (rpm/i686/centos/6.7/coreutils-8.4-37.el6_7.3.i686.rpm) = 3148620
-SHA256 (rpm/i686/centos/6.7/db4-4.7.25-20.el6_7.i686.rpm) = 1bbe6a2090411a8ecec459f1bc94ebfa586f40a3a4f0c4e440e0e3bb06eb7ba5
-SIZE (rpm/i686/centos/6.7/db4-4.7.25-20.el6_7.i686.rpm) = 594068
 SHA256 (rpm/i686/centos/6.7/e2fsprogs-1.41.12-22.el6.i686.rpm) = 3690f61f020923fe0b7e41bef986b395f6077325861154cedc0b347c593b5715
 SIZE (rpm/i686/centos/6.7/e2fsprogs-1.41.12-22.el6.i686.rpm) = 567828
-SHA256 (rpm/i686/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 4bc8b22538b56dda34db646ec87218b333499d00e90a9bc5852cbef178b357f1
-SIZE (rpm/i686/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 130892
 SHA256 (rpm/i686/centos/6.7/elfutils-0.161-3.el6.i686.rpm) = 90e68d92fc62facfc5f8974598edd5f1b8dea2294634f1418d752abaf9eb86d6
 SIZE (rpm/i686/centos/6.7/elfutils-0.161-3.el6.i686.rpm) = 257936
 SHA256 (rpm/i686/centos/6.7/findutils-4.4.2-6.el6.i686.rpm) = d4509950ef57b835b584fc7debdb8f0cf4550704df48cc829ba716ebfb7efcdc
 SIZE (rpm/i686/centos/6.7/findutils-4.4.2-6.el6.i686.rpm) = 421872
+SHA256 (rpm/i686/centos/6.7/glibc-common-2.12-1.166.el6_7.7.i686.rpm) = 05d0ad7fafb040ac70f955b46c82c2bcb35a11a867f4b024e6cdfc393cefa7e4
+SIZE (rpm/i686/centos/6.7/glibc-common-2.12-1.166.el6_7.7.i686.rpm) = 14875116
+SHA256 (rpm/i686/centos/6.7/grep-2.20-3.el6_7.1.i686.rpm) = 30ee73ceb1cfd42756d10c3965b273e7b54c700591334ce46d456cba3bc9f54a
+SIZE (rpm/i686/centos/6.7/grep-2.20-3.el6_7.1.i686.rpm) = 350704
+SHA256 (rpm/i686/centos/6.7/info-4.13a-8.el6.i686.rpm) = 544b65b829fd4f8195dc131e773296f922bc218c756ec6d8e143ae0715f830b1
+SIZE (rpm/i686/centos/6.7/info-4.13a-8.el6.i686.rpm) = 176524
+SHA256 (rpm/i686/centos/6.7/keyutils-1.4-5.el6.i686.rpm) = 49fd3f0f5dbdf9ada34151f129e36e3e9ef7cd048711b85a918dce6e217b31a0
+SIZE (rpm/i686/centos/6.7/keyutils-1.4-5.el6.i686.rpm) = 39356
+SHA256 (rpm/i686/centos/6.7/less-436-13.el6.i686.rpm) = ac7bc80bcad24e573be8441a3854b71caa93efcdcc5ba20e42348a636db9af57
+SIZE (rpm/i686/centos/6.7/less-436-13.el6.i686.rpm) = 110324
+SHA256 (rpm/i686/centos/6.7/ncurses-5.7-4.20090207.el6.i686.rpm) = 5d7449100c2c23593fbaf7bf5048b8e8d19295e4adb4ebc0c366b8e572cd1142
+SIZE (rpm/i686/centos/6.7/ncurses-5.7-4.20090207.el6.i686.rpm) = 274852
+SHA256 (rpm/i686/centos/6.7/sed-4.2.1-10.el6.i686.rpm) = 34b309a83fc5e61d299e42e5c076f736302be6c94acc3dd0554f05ee69494241
+SIZE (rpm/i686/centos/6.7/sed-4.2.1-10.el6.i686.rpm) = 219480
+SHA256 (rpm/i686/centos/6.7/setserial-2.17-25.el6.i686.rpm) = c3537e6d2122f43674413742fcba524beb4dc9778efc7d25515f120dde79ba70
+SIZE (rpm/i686/centos/6.7/setserial-2.17-25.el6.i686.rpm) = 23568
+SHA256 (rpm/i686/centos/6.7/which-2.19-6.el6.i686.rpm) = 3b7b2af92a3868f69b0d7e24db09ecbcf20d48b64d96778fedf3e0462982ad81
+SIZE (rpm/i686/centos/6.7/which-2.19-6.el6.i686.rpm) = 38852
+SHA256 (rpm/i686/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = a0d7cba8cf0fcb625ce3181d64fa59ca018b562350c30b3a13fd8b858f21f134
+SIZE (rpm/i686/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = 78832
+SHA256 (rpm/i686/centos/6.7/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = d3424f4610860e7f8f444cc3cddf51cd75f5e58ca0ecffc8bdbbcb5f8fe1b0d1
+SIZE (rpm/i686/centos/6.7/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = 37204
+SHA256 (rpm/i686/centos/6.7/compat-db43-4.3.29-15.el6.i686.rpm) = 202767fa03ff58947d6a2ec2437e52fc9179f3995fa77264753fde03f2737d0a
+SIZE (rpm/i686/centos/6.7/compat-db43-4.3.29-15.el6.i686.rpm) = 914280
+SHA256 (rpm/i686/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 894abcc5f0b28e39c71d4b0ca27d19540e7eb9d3c32664d5621324c9efbfe11e
+SIZE (rpm/i686/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 193328
+SHA256 (rpm/i686/centos/6.7/db4-4.7.25-20.el6_7.i686.rpm) = 1bbe6a2090411a8ecec459f1bc94ebfa586f40a3a4f0c4e440e0e3bb06eb7ba5
+SIZE (rpm/i686/centos/6.7/db4-4.7.25-20.el6_7.i686.rpm) = 594068
+SHA256 (rpm/i686/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 4bc8b22538b56dda34db646ec87218b333499d00e90a9bc5852cbef178b357f1
+SIZE (rpm/i686/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 130892
 SHA256 (rpm/i686/centos/6.7/freetype-2.3.11-15.el6_6.1.i686.rpm) = 45a77d6322ca6eba1839d5ae1a2d3600053b53442178c66b4a2922db7bf675e6
 SIZE (rpm/i686/centos/6.7/freetype-2.3.11-15.el6_6.1.i686.rpm) = 373620
 SHA256 (rpm/i686/centos/6.7/gamin-0.1.10-9.el6.i686.rpm) = 154c598675497b411f77e51b2e2a6b6b4282ecf8d368dc17585757dad113338a
@@ -40,22 +58,12 @@ SHA256 (rpm/i686/centos/6.7/glib2-2.28.8-4.el6.i686.rpm) = 778bcfc904fa6c697b0a1
 SIZE (rpm/i686/centos/6.7/glib2-2.28.8-4.el6.i686.rpm) = 1735384
 SHA256 (rpm/i686/centos/6.7/glibc-2.12-1.166.el6_7.7.i686.rpm) = b864b56998c7f54ad2ff8a88e6d2e2e9bbb7fed5b5cd1a5a37335df3db1009f5
 SIZE (rpm/i686/centos/6.7/glibc-2.12-1.166.el6_7.7.i686.rpm) = 4558520
-SHA256 (rpm/i686/centos/6.7/glibc-common-2.12-1.166.el6_7.7.i686.rpm) = 05d0ad7fafb040ac70f955b46c82c2bcb35a11a867f4b024e6cdfc393cefa7e4
-SIZE (rpm/i686/centos/6.7/glibc-common-2.12-1.166.el6_7.7.i686.rpm) = 14875116
 SHA256 (rpm/i686/centos/6.7/gmp-4.3.1-7.el6_2.2.i686.rpm) = f1855126a943ed4aac412006af98490248b739b4f9f78487f17c3275557948e2
 SIZE (rpm/i686/centos/6.7/gmp-4.3.1-7.el6_2.2.i686.rpm) = 331548
-SHA256 (rpm/i686/centos/6.7/grep-2.20-3.el6_7.1.i686.rpm) = 30ee73ceb1cfd42756d10c3965b273e7b54c700591334ce46d456cba3bc9f54a
-SIZE (rpm/i686/centos/6.7/grep-2.20-3.el6_7.1.i686.rpm) = 350704
-SHA256 (rpm/i686/centos/6.7/info-4.13a-8.el6.i686.rpm) = 544b65b829fd4f8195dc131e773296f922bc218c756ec6d8e143ae0715f830b1
-SIZE (rpm/i686/centos/6.7/info-4.13a-8.el6.i686.rpm) = 176524
-SHA256 (rpm/i686/centos/6.7/keyutils-1.4-5.el6.i686.rpm) = 49fd3f0f5dbdf9ada34151f129e36e3e9ef7cd048711b85a918dce6e217b31a0
-SIZE (rpm/i686/centos/6.7/keyutils-1.4-5.el6.i686.rpm) = 39356
 SHA256 (rpm/i686/centos/6.7/keyutils-libs-1.4-5.el6.i686.rpm) = 59ca71f1c6b4cd19b58a35afd065f745ccfda46f55b4bdad9dda93f5ca872e60
 SIZE (rpm/i686/centos/6.7/keyutils-libs-1.4-5.el6.i686.rpm) = 20780
 SHA256 (rpm/i686/centos/6.7/krb5-libs-1.10.3-42.el6.i686.rpm) = 9aa44ac813cdff74b263f2cef21f1a79c7d5b52eebe9649ea3e89811bf39a106
 SIZE (rpm/i686/centos/6.7/krb5-libs-1.10.3-42.el6.i686.rpm) = 795280
-SHA256 (rpm/i686/centos/6.7/less-436-13.el6.i686.rpm) = ac7bc80bcad24e573be8441a3854b71caa93efcdcc5ba20e42348a636db9af57
-SIZE (rpm/i686/centos/6.7/less-436-13.el6.i686.rpm) = 110324
 SHA256 (rpm/i686/centos/6.7/libacl-2.2.49-6.el6.i686.rpm) = 64c400f31986db7f085e85454a305344da141872b6f3ac7922caa2fa656d3c12
 SIZE (rpm/i686/centos/6.7/libacl-2.2.49-6.el6.i686.rpm) = 24480
 SHA256 (rpm/i686/centos/6.7/libattr-2.4.44-7.el6.i686.rpm) = 16f9cba06fcbdf5163c1ae48e3d8df5b2a26eec1c8bfa3f7907718931ff8b93b
@@ -78,8 +86,6 @@ SHA256 (rpm/i686/centos/6.7/libstdc++-4.4.7-16.el6.i686.rpm) = 5901e37db999276c3
 SIZE (rpm/i686/centos/6.7/libstdc++-4.4.7-16.el6.i686.rpm) = 309312
 SHA256 (rpm/i686/centos/6.7/libuuid-2.17.2-12.18.el6.i686.rpm) = adff95ffc188f93e59c3517939a75de56eccf886b867948f696753e787f3d22d
 SIZE (rpm/i686/centos/6.7/libuuid-2.17.2-12.18.el6.i686.rpm) = 71040
-SHA256 (rpm/i686/centos/6.7/ncurses-5.7-4.20090207.el6.i686.rpm) = 5d7449100c2c23593fbaf7bf5048b8e8d19295e4adb4ebc0c366b8e572cd1142
-SIZE (rpm/i686/centos/6.7/ncurses-5.7-4.20090207.el6.i686.rpm) = 274852
 SHA256 (rpm/i686/centos/6.7/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = fe1778ee05c4840cb27a6804e6af6d61ca6f48666560654e3cfd765fa20ff2bb
 SIZE (rpm/i686/centos/6.7/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = 255352
 SHA256 (rpm/i686/centos/6.7/pcre-7.8-7.el6.i686.rpm) = 62aff1a2975adc4a02293297d12b0202b5710155c00753bd4657d6896c3e7b8e
@@ -90,16 +96,10 @@ SHA256 (rpm/i686/centos/6.7/readline-6.0-4.el6.i686.rpm) = 29fae06e31b73f4e5e0cd
 SIZE (rpm/i686/centos/6.7/readline-6.0-4.el6.i686.rpm) = 180296
 SHA256 (rpm/i686/centos/6.7/redhat-lsb-core-4.0-7.el6.centos.i686.rpm) = c8a54450a1716a676b06db0a734c53c7057925359cb4e4bc36fa66f32cff5a0f
 SIZE (rpm/i686/centos/6.7/redhat-lsb-core-4.0-7.el6.centos.i686.rpm) = 26108
-SHA256 (rpm/i686/centos/6.7/sed-4.2.1-10.el6.i686.rpm) = 34b309a83fc5e61d299e42e5c076f736302be6c94acc3dd0554f05ee69494241
-SIZE (rpm/i686/centos/6.7/sed-4.2.1-10.el6.i686.rpm) = 219480
-SHA256 (rpm/i686/centos/6.7/setserial-2.17-25.el6.i686.rpm) = c3537e6d2122f43674413742fcba524beb4dc9778efc7d25515f120dde79ba70
-SIZE (rpm/i686/centos/6.7/setserial-2.17-25.el6.i686.rpm) = 23568
 SHA256 (rpm/i686/centos/6.7/slang-2.2.1-1.el6.i686.rpm) = c6886d071eb63651df939c19f12363a1a68d112cedaa02019c94f53d39dd2f1f
 SIZE (rpm/i686/centos/6.7/slang-2.2.1-1.el6.i686.rpm) = 483404
 SHA256 (rpm/i686/centos/6.7/util-linux-ng-2.17.2-12.18.el6.i686.rpm) = 42738e2ff5a1c936f972d1175def794d470511e1a72753005c6a6b80e50a2fd9
 SIZE (rpm/i686/centos/6.7/util-linux-ng-2.17.2-12.18.el6.i686.rpm) = 1644620
-SHA256 (rpm/i686/centos/6.7/which-2.19-6.el6.i686.rpm) = 3b7b2af92a3868f69b0d7e24db09ecbcf20d48b64d96778fedf3e0462982ad81
-SIZE (rpm/i686/centos/6.7/which-2.19-6.el6.i686.rpm) = 38852
 SHA256 (rpm/i686/centos/6.7/zlib-1.2.3-29.el6.i686.rpm) = 1e40dce8a497f740b22d2035a76a92a34885613652c4b33262f04e2d12a00caa
 SIZE (rpm/i686/centos/6.7/zlib-1.2.3-29.el6.i686.rpm) = 74284
 SHA256 (rpm/i686/centos/6.7/basesystem-10.0-4.el6.src.rpm) = 18d3bd0580f40bdc208773f26b424fa1975fad70fae9f179c52337a8f80ade76
diff --git a/emulators/linux_base-c6/distinfo.x86_64 b/emulators/linux_base-c6/distinfo.x86_64
index d2546f93ad86..0d78a6ebaa75 100644
--- a/emulators/linux_base-c6/distinfo.x86_64
+++ b/emulators/linux_base-c6/distinfo.x86_64
@@ -8,28 +8,46 @@ SHA256 (rpm/x86_64/centos/6.7/bash-4.1.2-33.el6_7.1.x86_64.rpm) = 826458427d489d
 SIZE (rpm/x86_64/centos/6.7/bash-4.1.2-33.el6_7.1.x86_64.rpm) = 929340
 SHA256 (rpm/x86_64/centos/6.7/bzip2-1.0.5-7.el6_0.x86_64.rpm) = e179e17b35407c2e6725a6ee230bbf51531f6ed788e1b8c4ac1e9ee859463648
 SIZE (rpm/x86_64/centos/6.7/bzip2-1.0.5-7.el6_0.x86_64.rpm) = 49724
-SHA256 (rpm/x86_64/centos/6.7/bzip2-libs-1.0.5-7.el6_0.x86_64.rpm) = b2695bdc5a3119873c2580ca96b972b932c96b553ae98778461ef82204233a4a
-SIZE (rpm/x86_64/centos/6.7/bzip2-libs-1.0.5-7.el6_0.x86_64.rpm) = 37368
 SHA256 (rpm/x86_64/centos/6.7/centos-release-6-7.el6.centos.12.3.x86_64.rpm) = 48bf14cd636b4b255c42f21b9b8ff24457104fbf6b9d5aa7b33bae0f6d38b9f3
 SIZE (rpm/x86_64/centos/6.7/centos-release-6-7.el6.centos.12.3.x86_64.rpm) = 21900
-SHA256 (rpm/x86_64/centos/6.7/compat-db43-4.3.29-15.el6.x86_64.rpm) = c852d0b0bb4769226fbb5f5295fd6bfd758bb30470c8621d6beb2624c5cffe8e
-SIZE (rpm/x86_64/centos/6.7/compat-db43-4.3.29-15.el6.x86_64.rpm) = 894824
-SHA256 (rpm/x86_64/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.x86_64.rpm) = 41ea0fec16c0ca62722a32b7ffd70bb716beec8b6dd32b57f076be02a5aee00c
-SIZE (rpm/x86_64/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.x86_64.rpm) = 187476
-SHA256 (rpm/x86_64/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = a0d7cba8cf0fcb625ce3181d64fa59ca018b562350c30b3a13fd8b858f21f134
-SIZE (rpm/x86_64/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = 78832
 SHA256 (rpm/x86_64/centos/6.7/coreutils-8.4-37.el6_7.3.x86_64.rpm) = 93c649895566aafba458dc64e9589fbd809ea3ef705c7dd5c5f6460b583a046f
 SIZE (rpm/x86_64/centos/6.7/coreutils-8.4-37.el6_7.3.x86_64.rpm) = 3186928
-SHA256 (rpm/x86_64/centos/6.7/db4-4.7.25-20.el6_7.x86_64.rpm) = 7410c7cd0242c8cd55abeee10e67826a866e3be53b7d0e4f44c9437861097d19
-SIZE (rpm/x86_64/centos/6.7/db4-4.7.25-20.el6_7.x86_64.rpm) = 576640
 SHA256 (rpm/x86_64/centos/6.7/e2fsprogs-1.41.12-22.el6.x86_64.rpm) = 7d0e9722e0aaa07d4771e681e5c12abab9235f99432dbfb790a057e9ae7692e5
 SIZE (rpm/x86_64/centos/6.7/e2fsprogs-1.41.12-22.el6.x86_64.rpm) = 566896
-SHA256 (rpm/x86_64/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.x86_64.rpm) = cddd17f8fe98eb2e501ebf0d0d72d754fe22a509953bcb8f10b1963fbe646909
-SIZE (rpm/x86_64/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.x86_64.rpm) = 123932
 SHA256 (rpm/x86_64/centos/6.7/elfutils-0.161-3.el6.x86_64.rpm) = ce7c3873940e10ba84334b56c2a663e1be93943d6a9b94323ee244c9472b220d
 SIZE (rpm/x86_64/centos/6.7/elfutils-0.161-3.el6.x86_64.rpm) = 243044
 SHA256 (rpm/x86_64/centos/6.7/findutils-4.4.2-6.el6.x86_64.rpm) = 6224143ce90ba9862d2572c2b1cc6655f87e02c0156566d7d721652db99f99be
 SIZE (rpm/x86_64/centos/6.7/findutils-4.4.2-6.el6.x86_64.rpm) = 458112
+SHA256 (rpm/x86_64/centos/6.7/glibc-common-2.12-1.166.el6_7.7.x86_64.rpm) = 9270e196264742aa6dad454f91edc72535a8fd5e55e0aa205008d3756eae990a
+SIZE (rpm/x86_64/centos/6.7/glibc-common-2.12-1.166.el6_7.7.x86_64.rpm) = 14887196
+SHA256 (rpm/x86_64/centos/6.7/grep-2.20-3.el6_7.1.x86_64.rpm) = 5d5dd440313f0b778c947bfc8febddfb36d72d94ca24b90af77775000e63e672
+SIZE (rpm/x86_64/centos/6.7/grep-2.20-3.el6_7.1.x86_64.rpm) = 352760
+SHA256 (rpm/x86_64/centos/6.7/info-4.13a-8.el6.x86_64.rpm) = 15f7b80e6a468a4d933fc607a6bf76485a9c249d3b2a252d027ce5c40e697eac
+SIZE (rpm/x86_64/centos/6.7/info-4.13a-8.el6.x86_64.rpm) = 181876
+SHA256 (rpm/x86_64/centos/6.7/keyutils-1.4-5.el6.x86_64.rpm) = aa8417be37fa6fd3f52cda08bd04376b5701d9837ef8a34b33a9f8ef79c0e243
+SIZE (rpm/x86_64/centos/6.7/keyutils-1.4-5.el6.x86_64.rpm) = 40152
+SHA256 (rpm/x86_64/centos/6.7/less-436-13.el6.x86_64.rpm) = 7bf9bb5d1143cadddd6390215d9aa9477d367f3e0c09ac3bd5da3af846215522
+SIZE (rpm/x86_64/centos/6.7/less-436-13.el6.x86_64.rpm) = 110220
+SHA256 (rpm/x86_64/centos/6.7/ncurses-5.7-4.20090207.el6.x86_64.rpm) = a4cd0365f3fe8240e5b081597458888ebe42fbe88d0c86e87f5b48b718ca402b
+SIZE (rpm/x86_64/centos/6.7/ncurses-5.7-4.20090207.el6.x86_64.rpm) = 273996
+SHA256 (rpm/x86_64/centos/6.7/sed-4.2.1-10.el6.x86_64.rpm) = 4ef0cd3b93d6cef57037aaf858f61810da69cc2f905a4da1cadc5e641a5c4b7f
+SIZE (rpm/x86_64/centos/6.7/sed-4.2.1-10.el6.x86_64.rpm) = 221004
+SHA256 (rpm/x86_64/centos/6.7/setserial-2.17-25.el6.x86_64.rpm) = f28996685437d9caa76c35b67da2e72d48f38326bac198f1211a328abf9d04b1
+SIZE (rpm/x86_64/centos/6.7/setserial-2.17-25.el6.x86_64.rpm) = 23868
+SHA256 (rpm/x86_64/centos/6.7/which-2.19-6.el6.x86_64.rpm) = 279da7e844149005d729b0a46b9be0b266777fb7c2bd72b815ac8f4d09b61878
+SIZE (rpm/x86_64/centos/6.7/which-2.19-6.el6.x86_64.rpm) = 39340
+SHA256 (rpm/x86_64/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = a0d7cba8cf0fcb625ce3181d64fa59ca018b562350c30b3a13fd8b858f21f134
+SIZE (rpm/x86_64/centos/6.7/compat-libstdc++-296-2.96-144.el6.i686.rpm) = 78832
+SHA256 (rpm/x86_64/centos/6.7/bzip2-libs-1.0.5-7.el6_0.x86_64.rpm) = b2695bdc5a3119873c2580ca96b972b932c96b553ae98778461ef82204233a4a
+SIZE (rpm/x86_64/centos/6.7/bzip2-libs-1.0.5-7.el6_0.x86_64.rpm) = 37368
+SHA256 (rpm/x86_64/centos/6.7/compat-db43-4.3.29-15.el6.x86_64.rpm) = c852d0b0bb4769226fbb5f5295fd6bfd758bb30470c8621d6beb2624c5cffe8e
+SIZE (rpm/x86_64/centos/6.7/compat-db43-4.3.29-15.el6.x86_64.rpm) = 894824
+SHA256 (rpm/x86_64/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.x86_64.rpm) = 41ea0fec16c0ca62722a32b7ffd70bb716beec8b6dd32b57f076be02a5aee00c
+SIZE (rpm/x86_64/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.x86_64.rpm) = 187476
+SHA256 (rpm/x86_64/centos/6.7/db4-4.7.25-20.el6_7.x86_64.rpm) = 7410c7cd0242c8cd55abeee10e67826a866e3be53b7d0e4f44c9437861097d19
+SIZE (rpm/x86_64/centos/6.7/db4-4.7.25-20.el6_7.x86_64.rpm) = 576640
+SHA256 (rpm/x86_64/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.x86_64.rpm) = cddd17f8fe98eb2e501ebf0d0d72d754fe22a509953bcb8f10b1963fbe646909
+SIZE (rpm/x86_64/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.x86_64.rpm) = 123932
 SHA256 (rpm/x86_64/centos/6.7/freetype-2.3.11-15.el6_6.1.x86_64.rpm) = db9f9418457ac284178ce414f70dcd6e1aa55b3a02b450e3ea6441776a7b4ed3
 SIZE (rpm/x86_64/centos/6.7/freetype-2.3.11-15.el6_6.1.x86_64.rpm) = 369532
 SHA256 (rpm/x86_64/centos/6.7/gamin-0.1.10-9.el6.x86_64.rpm) = 9632fe00e669183fa1b1dfc7ef9c0bcd792d53239cb05e9861b5a47951fe145a
@@ -40,22 +58,12 @@ SHA256 (rpm/x86_64/centos/6.7/glib2-2.28.8-4.el6.x86_64.rpm) = fd969e3425645dcf0
 SIZE (rpm/x86_64/centos/6.7/glib2-2.28.8-4.el6.x86_64.rpm) = 1753004
 SHA256 (rpm/x86_64/centos/6.7/glibc-2.12-1.166.el6_7.7.x86_64.rpm) = 2c8769972f74c508392cf3d26ccaf1e977e26c6de17607d0f0efcd94c893e497
 SIZE (rpm/x86_64/centos/6.7/glibc-2.12-1.166.el6_7.7.x86_64.rpm) = 3997460
-SHA256 (rpm/x86_64/centos/6.7/glibc-common-2.12-1.166.el6_7.7.x86_64.rpm) = 9270e196264742aa6dad454f91edc72535a8fd5e55e0aa205008d3756eae990a
-SIZE (rpm/x86_64/centos/6.7/glibc-common-2.12-1.166.el6_7.7.x86_64.rpm) = 14887196
 SHA256 (rpm/x86_64/centos/6.7/gmp-4.3.1-7.el6_2.2.x86_64.rpm) = ec257a3a9b58ac802f344623cf4bb8a507c75583c18c0a3d798dafd69059b7fe
 SIZE (rpm/x86_64/centos/6.7/gmp-4.3.1-7.el6_2.2.x86_64.rpm) = 211528
-SHA256 (rpm/x86_64/centos/6.7/grep-2.20-3.el6_7.1.x86_64.rpm) = 5d5dd440313f0b778c947bfc8febddfb36d72d94ca24b90af77775000e63e672
-SIZE (rpm/x86_64/centos/6.7/grep-2.20-3.el6_7.1.x86_64.rpm) = 352760
-SHA256 (rpm/x86_64/centos/6.7/info-4.13a-8.el6.x86_64.rpm) = 15f7b80e6a468a4d933fc607a6bf76485a9c249d3b2a252d027ce5c40e697eac
-SIZE (rpm/x86_64/centos/6.7/info-4.13a-8.el6.x86_64.rpm) = 181876
-SHA256 (rpm/x86_64/centos/6.7/keyutils-1.4-5.el6.x86_64.rpm) = aa8417be37fa6fd3f52cda08bd04376b5701d9837ef8a34b33a9f8ef79c0e243
-SIZE (rpm/x86_64/centos/6.7/keyutils-1.4-5.el6.x86_64.rpm) = 40152
 SHA256 (rpm/x86_64/centos/6.7/keyutils-libs-1.4-5.el6.x86_64.rpm) = d2baa3ca6959fd7000da0c06266daf01665ab661f263101d2ed4f5903c8e8a86
 SIZE (rpm/x86_64/centos/6.7/keyutils-libs-1.4-5.el6.x86_64.rpm) = 20684
 SHA256 (rpm/x86_64/centos/6.7/krb5-libs-1.10.3-42.el6.x86_64.rpm) = 36d91861da361acaf2ef92aeeb64e2abb310a5591dd71e7bc1484226476de371
 SIZE (rpm/x86_64/centos/6.7/krb5-libs-1.10.3-42.el6.x86_64.rpm) = 786932
-SHA256 (rpm/x86_64/centos/6.7/less-436-13.el6.x86_64.rpm) = 7bf9bb5d1143cadddd6390215d9aa9477d367f3e0c09ac3bd5da3af846215522
-SIZE (rpm/x86_64/centos/6.7/less-436-13.el6.x86_64.rpm) = 110220
 SHA256 (rpm/x86_64/centos/6.7/libacl-2.2.49-6.el6.x86_64.rpm) = 2323e63de3fdeb2297c7473eb6a7d9afcb9de96b49d619939b5522d34ae07888
 SIZE (rpm/x86_64/centos/6.7/libacl-2.2.49-6.el6.x86_64.rpm) = 24008
 SHA256 (rpm/x86_64/centos/6.7/libattr-2.4.44-7.el6.x86_64.rpm) = 030c511f3aafa5096775faf6f5dc0dd836eee0addde3e48d985bb4f3e69a72df
@@ -78,8 +86,6 @@ SHA256 (rpm/x86_64/centos/6.7/libstdc++-4.4.7-16.el6.x86_64.rpm) = 6ca96e6623eec
 SIZE (rpm/x86_64/centos/6.7/libstdc++-4.4.7-16.el6.x86_64.rpm) = 301980
 SHA256 (rpm/x86_64/centos/6.7/libuuid-2.17.2-12.18.el6.x86_64.rpm) = cf31ed2f1d39f522366142a7c849f59bf285358ebccdc2e89745f1fef2d69048
 SIZE (rpm/x86_64/centos/6.7/libuuid-2.17.2-12.18.el6.x86_64.rpm) = 70508
-SHA256 (rpm/x86_64/centos/6.7/ncurses-5.7-4.20090207.el6.x86_64.rpm) = a4cd0365f3fe8240e5b081597458888ebe42fbe88d0c86e87f5b48b718ca402b
-SIZE (rpm/x86_64/centos/6.7/ncurses-5.7-4.20090207.el6.x86_64.rpm) = 273996
 SHA256 (rpm/x86_64/centos/6.7/ncurses-libs-5.7-4.20090207.el6.x86_64.rpm) = 88b5174e139c595569787ebe4750fefdfc5e047657f13df0c87b8316ff6cf956
 SIZE (rpm/x86_64/centos/6.7/ncurses-libs-5.7-4.20090207.el6.x86_64.rpm) = 250916
 SHA256 (rpm/x86_64/centos/6.7/pcre-7.8-7.el6.x86_64.rpm) = 6e099492eb691f0e869c02a7352530ec6a8d0056c1aadcde3613cc1f8e24e52c
@@ -90,18 +96,76 @@ SHA256 (rpm/x86_64/centos/6.7/readline-6.0-4.el6.x86_64.rpm) = d777c89f34b0cba68
 SIZE (rpm/x86_64/centos/6.7/readline-6.0-4.el6.x86_64.rpm) = 182628
 SHA256 (rpm/x86_64/centos/6.7/redhat-lsb-core-4.0-7.el6.centos.x86_64.rpm) = 697c45997daaeace47528a010c8071027e27c2820104ea6f2805ef84325c6077
 SIZE (rpm/x86_64/centos/6.7/redhat-lsb-core-4.0-7.el6.centos.x86_64.rpm) = 26016
-SHA256 (rpm/x86_64/centos/6.7/sed-4.2.1-10.el6.x86_64.rpm) = 4ef0cd3b93d6cef57037aaf858f61810da69cc2f905a4da1cadc5e641a5c4b7f
-SIZE (rpm/x86_64/centos/6.7/sed-4.2.1-10.el6.x86_64.rpm) = 221004
-SHA256 (rpm/x86_64/centos/6.7/setserial-2.17-25.el6.x86_64.rpm) = f28996685437d9caa76c35b67da2e72d48f38326bac198f1211a328abf9d04b1
-SIZE (rpm/x86_64/centos/6.7/setserial-2.17-25.el6.x86_64.rpm) = 23868
 SHA256 (rpm/x86_64/centos/6.7/slang-2.2.1-1.el6.x86_64.rpm) = 32188b2dbe1f7d1e460f85416c067a53a816757df2c84d39abc07936ce6c5376
 SIZE (rpm/x86_64/centos/6.7/slang-2.2.1-1.el6.x86_64.rpm) = 484172
 SHA256 (rpm/x86_64/centos/6.7/util-linux-ng-2.17.2-12.18.el6.x86_64.rpm) = 475876e8bc4f098aa80b3d869a2a7a5ef560a67a846a289ed39a00dcc83d3f99
 SIZE (rpm/x86_64/centos/6.7/util-linux-ng-2.17.2-12.18.el6.x86_64.rpm) = 1641624
-SHA256 (rpm/x86_64/centos/6.7/which-2.19-6.el6.x86_64.rpm) = 279da7e844149005d729b0a46b9be0b266777fb7c2bd72b815ac8f4d09b61878
-SIZE (rpm/x86_64/centos/6.7/which-2.19-6.el6.x86_64.rpm) = 39340
 SHA256 (rpm/x86_64/centos/6.7/zlib-1.2.3-29.el6.x86_64.rpm) = c5b040d38b550da4c75aba719c0b9d6c6936158b2d58ac10a99adc76a68a6302
 SIZE (rpm/x86_64/centos/6.7/zlib-1.2.3-29.el6.x86_64.rpm) = 74568
+SHA256 (rpm/x86_64/centos/6.7/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = d3424f4610860e7f8f444cc3cddf51cd75f5e58ca0ecffc8bdbbcb5f8fe1b0d1
+SIZE (rpm/x86_64/centos/6.7/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = 37204
+SHA256 (rpm/x86_64/centos/6.7/compat-db43-4.3.29-15.el6.i686.rpm) = 202767fa03ff58947d6a2ec2437e52fc9179f3995fa77264753fde03f2737d0a
+SIZE (rpm/x86_64/centos/6.7/compat-db43-4.3.29-15.el6.i686.rpm) = 914280
+SHA256 (rpm/x86_64/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 894abcc5f0b28e39c71d4b0ca27d19540e7eb9d3c32664d5621324c9efbfe11e
+SIZE (rpm/x86_64/centos/6.7/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 193328
+SHA256 (rpm/x86_64/centos/6.7/db4-4.7.25-20.el6_7.i686.rpm) = 1bbe6a2090411a8ecec459f1bc94ebfa586f40a3a4f0c4e440e0e3bb06eb7ba5
+SIZE (rpm/x86_64/centos/6.7/db4-4.7.25-20.el6_7.i686.rpm) = 594068
+SHA256 (rpm/x86_64/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 4bc8b22538b56dda34db646ec87218b333499d00e90a9bc5852cbef178b357f1
+SIZE (rpm/x86_64/centos/6.7/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 130892
+SHA256 (rpm/x86_64/centos/6.7/freetype-2.3.11-15.el6_6.1.i686.rpm) = 45a77d6322ca6eba1839d5ae1a2d3600053b53442178c66b4a2922db7bf675e6
+SIZE (rpm/x86_64/centos/6.7/freetype-2.3.11-15.el6_6.1.i686.rpm) = 373620
+SHA256 (rpm/x86_64/centos/6.7/gamin-0.1.10-9.el6.i686.rpm) = 154c598675497b411f77e51b2e2a6b6b4282ecf8d368dc17585757dad113338a
+SIZE (rpm/x86_64/centos/6.7/gamin-0.1.10-9.el6.i686.rpm) = 122940
+SHA256 (rpm/x86_64/centos/6.7/gdbm-1.8.0-38.el6.i686.rpm) = ff6addf9697a57eca18c2424bc6791648caa99c105f2b8c1c9d6c136b6afd7d3
+SIZE (rpm/x86_64/centos/6.7/gdbm-1.8.0-38.el6.i686.rpm) = 29672
+SHA256 (rpm/x86_64/centos/6.7/glib2-2.28.8-4.el6.i686.rpm) = 778bcfc904fa6c697b0a11399e5310e1684f58c81ae46f6962efcd8d663bc154
+SIZE (rpm/x86_64/centos/6.7/glib2-2.28.8-4.el6.i686.rpm) = 1735384
+SHA256 (rpm/x86_64/centos/6.7/glibc-2.12-1.166.el6_7.7.i686.rpm) = b864b56998c7f54ad2ff8a88e6d2e2e9bbb7fed5b5cd1a5a37335df3db1009f5
+SIZE (rpm/x86_64/centos/6.7/glibc-2.12-1.166.el6_7.7.i686.rpm) = 4558520
+SHA256 (rpm/x86_64/centos/6.7/gmp-4.3.1-7.el6_2.2.i686.rpm) = f1855126a943ed4aac412006af98490248b739b4f9f78487f17c3275557948e2
+SIZE (rpm/x86_64/centos/6.7/gmp-4.3.1-7.el6_2.2.i686.rpm) = 331548
+SHA256 (rpm/x86_64/centos/6.7/keyutils-libs-1.4-5.el6.i686.rpm) = 59ca71f1c6b4cd19b58a35afd065f745ccfda46f55b4bdad9dda93f5ca872e60
+SIZE (rpm/x86_64/centos/6.7/keyutils-libs-1.4-5.el6.i686.rpm) = 20780
+SHA256 (rpm/x86_64/centos/6.7/krb5-libs-1.10.3-42.el6.i686.rpm) = 9aa44ac813cdff74b263f2cef21f1a79c7d5b52eebe9649ea3e89811bf39a106
+SIZE (rpm/x86_64/centos/6.7/krb5-libs-1.10.3-42.el6.i686.rpm) = 795280
+SHA256 (rpm/x86_64/centos/6.7/libacl-2.2.49-6.el6.i686.rpm) = 64c400f31986db7f085e85454a305344da141872b6f3ac7922caa2fa656d3c12
+SIZE (rpm/x86_64/centos/6.7/libacl-2.2.49-6.el6.i686.rpm) = 24480
+SHA256 (rpm/x86_64/centos/6.7/libattr-2.4.44-7.el6.i686.rpm) = 16f9cba06fcbdf5163c1ae48e3d8df5b2a26eec1c8bfa3f7907718931ff8b93b
+SIZE (rpm/x86_64/centos/6.7/libattr-2.4.44-7.el6.i686.rpm) = 15640
+SHA256 (rpm/x86_64/centos/6.7/libblkid-2.17.2-12.18.el6.i686.rpm) = 93e668e95e20e1adf85bdcf68163108350b6ab58701dd08494bf372edb996282
+SIZE (rpm/x86_64/centos/6.7/libblkid-2.17.2-12.18.el6.i686.rpm) = 123288
+SHA256 (rpm/x86_64/centos/6.7/libcap-2.16-5.5.el6.i686.rpm) = 8d972a4332b8f942258e489574929de3ee660315dc6ca945939d54a99ec4398c
+SIZE (rpm/x86_64/centos/6.7/libcap-2.16-5.5.el6.i686.rpm) = 31516
+SHA256 (rpm/x86_64/centos/6.7/libcom_err-1.41.12-22.el6.i686.rpm) = a17fab636dcd0725ff95176ac060517430a719846695afdb487dea213d1e920d
+SIZE (rpm/x86_64/centos/6.7/libcom_err-1.41.12-22.el6.i686.rpm) = 38212
+SHA256 (rpm/x86_64/centos/6.7/libgcc-4.4.7-16.el6.i686.rpm) = 23bace51bc52442273828b872f7c8d2b07f49ee4f8da928dcc35c6962c37debc
+SIZE (rpm/x86_64/centos/6.7/libgcc-4.4.7-16.el6.i686.rpm) = 116816
+SHA256 (rpm/x86_64/centos/6.7/libidn-1.18-2.el6.i686.rpm) = a72cdffdb6aeeb5f94eeaeb6db3b4ac88eb0688760b2b75d2c5086d987d78e27
+SIZE (rpm/x86_64/centos/6.7/libidn-1.18-2.el6.i686.rpm) = 210260
+SHA256 (rpm/x86_64/centos/6.7/libselinux-2.0.94-5.8.el6.i686.rpm) = 24129f23d6438e04a1274f6070a67266dae162f40f9a5ba7232cd8b056907228
+SIZE (rpm/x86_64/centos/6.7/libselinux-2.0.94-5.8.el6.i686.rpm) = 111268
+SHA256 (rpm/x86_64/centos/6.7/libsepol-2.0.41-4.el6.i686.rpm) = 0f7b3c09a89b4f943faefc73bc5664f075146f6b96c8d1d38da06ed02cc2f21b
+SIZE (rpm/x86_64/centos/6.7/libsepol-2.0.41-4.el6.i686.rpm) = 128032
+SHA256 (rpm/x86_64/centos/6.7/libstdc++-4.4.7-16.el6.i686.rpm) = 5901e37db999276c3f517879e88c05bf5349736fd0599b207c2750ff222286e2
+SIZE (rpm/x86_64/centos/6.7/libstdc++-4.4.7-16.el6.i686.rpm) = 309312
+SHA256 (rpm/x86_64/centos/6.7/libuuid-2.17.2-12.18.el6.i686.rpm) = adff95ffc188f93e59c3517939a75de56eccf886b867948f696753e787f3d22d
+SIZE (rpm/x86_64/centos/6.7/libuuid-2.17.2-12.18.el6.i686.rpm) = 71040
+SHA256 (rpm/x86_64/centos/6.7/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = fe1778ee05c4840cb27a6804e6af6d61ca6f48666560654e3cfd765fa20ff2bb
+SIZE (rpm/x86_64/centos/6.7/ncurses-libs-5.7-4.20090207.el6.i686.rpm) = 255352
+SHA256 (rpm/x86_64/centos/6.7/pcre-7.8-7.el6.i686.rpm) = 62aff1a2975adc4a02293297d12b0202b5710155c00753bd4657d6896c3e7b8e
+SIZE (rpm/x86_64/centos/6.7/pcre-7.8-7.el6.i686.rpm) = 201096
+SHA256 (rpm/x86_64/centos/6.7/popt-1.13-7.el6.i686.rpm) = 617f8ee4d7776bb46a3a489ea10ac45831fd44947a30ef8d2126490ca2aa7a90
+SIZE (rpm/x86_64/centos/6.7/popt-1.13-7.el6.i686.rpm) = 39636
+SHA256 (rpm/x86_64/centos/6.7/readline-6.0-4.el6.i686.rpm) = 29fae06e31b73f4e5e0cd5f4431a3927c0e80b204e3fbcf0a6ccfc30720e8452
+SIZE (rpm/x86_64/centos/6.7/readline-6.0-4.el6.i686.rpm) = 180296
+SHA256 (rpm/x86_64/centos/6.7/redhat-lsb-core-4.0-7.el6.centos.i686.rpm) = c8a54450a1716a676b06db0a734c53c7057925359cb4e4bc36fa66f32cff5a0f
+SIZE (rpm/x86_64/centos/6.7/redhat-lsb-core-4.0-7.el6.centos.i686.rpm) = 26108
+SHA256 (rpm/x86_64/centos/6.7/slang-2.2.1-1.el6.i686.rpm) = c6886d071eb63651df939c19f12363a1a68d112cedaa02019c94f53d39dd2f1f
+SIZE (rpm/x86_64/centos/6.7/slang-2.2.1-1.el6.i686.rpm) = 483404
+SHA256 (rpm/x86_64/centos/6.7/util-linux-ng-2.17.2-12.18.el6.i686.rpm) = 42738e2ff5a1c936f972d1175def794d470511e1a72753005c6a6b80e50a2fd9
+SIZE (rpm/x86_64/centos/6.7/util-linux-ng-2.17.2-12.18.el6.i686.rpm) = 1644620
+SHA256 (rpm/x86_64/centos/6.7/zlib-1.2.3-29.el6.i686.rpm) = 1e40dce8a497f740b22d2035a76a92a34885613652c4b33262f04e2d12a00caa
+SIZE (rpm/x86_64/centos/6.7/zlib-1.2.3-29.el6.i686.rpm) = 74284
 SHA256 (rpm/x86_64/centos/6.7/basesystem-10.0-4.el6.src.rpm) = 18d3bd0580f40bdc208773f26b424fa1975fad70fae9f179c52337a8f80ade76
 SIZE (rpm/x86_64/centos/6.7/basesystem-10.0-4.el6.src.rpm) = 5949
 SHA256 (rpm/x86_64/centos/6.7/bash-4.1.2-33.el6_7.1.src.rpm) = f917ba1d5b4ded250eda214d48d6d99e1f656791613c58668205bf99107c07d9
diff --git a/emulators/linux_base-c6/pkg-plist.x86_64 b/emulators/linux_base-c6/pkg-plist.x86_64
index 250662e4e331..d28385f5fe60 100644
--- a/emulators/linux_base-c6/pkg-plist.x86_64
+++ b/emulators/linux_base-c6/pkg-plist.x86_64
@@ -80,8 +80,10 @@ etc/issue.net
 etc/ld.so.cache
 etc/ld.so.conf
 etc/lsb-release.d/base-4.0-amd64
+etc/lsb-release.d/base-4.0-ia32
 etc/lsb-release.d/base-4.0-noarch
 etc/lsb-release.d/core-4.0-amd64
+etc/lsb-release.d/core-4.0-ia32
 etc/lsb-release.d/core-4.0-noarch
 etc/mke2fs.conf
 etc/mtab
@@ -129,16 +131,138 @@ etc/yum.repos.d/CentOS-Media.repo
 etc/yum.repos.d/CentOS-Vault.repo
 etc/yum.repos.d/CentOS-fasttrack.repo
 etc/yum/vars/infra
+lib/i686/nosegneg/libc-%%GLIBCVER%%.so
+lib/i686/nosegneg/libc.so.6
+lib/i686/nosegneg/libm-%%GLIBCVER%%.so
+lib/i686/nosegneg/libm.so.6
+lib/i686/nosegneg/libpthread-%%GLIBCVER%%.so
+lib/i686/nosegneg/libpthread.so.0
+lib/i686/nosegneg/librt-%%GLIBCVER%%.so
+lib/i686/nosegneg/librt.so.1
+lib/i686/nosegneg/libthread_db-1.0.so
+lib/i686/nosegneg/libthread_db.so.1
+lib/ld-%%GLIBCVER%%.so
+lib/ld-linux.so.2
+lib/ld-lsb.so.3
+lib/libBrokenLocale-%%GLIBCVER%%.so
+lib/libBrokenLocale.so.1
+lib/libSegFault.so
+lib/libacl.so.1
+lib/libacl.so.1.1.0
+lib/libanl-%%GLIBCVER%%.so
+lib/libanl.so.1
+lib/libattr.so.1
+lib/libattr.so.1.1.0
+lib/libblkid.so.1
+lib/libblkid.so.1.1.0
+lib/libbz2.so.1
+lib/libbz2.so.1.0.4
+lib/libc-%%GLIBCVER%%.so
+lib/libc.so.6
+lib/libcap.so.2
+lib/libcap.so.2.16
+lib/libcidn-%%GLIBCVER%%.so
+lib/libcidn.so.1
+lib/libcom_err.so.2
+lib/libcom_err.so.2.1
+lib/libcrypt-%%GLIBCVER%%.so
+lib/libcrypt.so.1
+lib/libdb-4.3.so
+lib/libdb-4.7.so
+lib/libdb_cxx-4.3.so
+lib/libdl-%%GLIBCVER%%.so
+lib/libdl.so.2
+lib/libe2p.so.2
+lib/libe2p.so.2.3
+lib/libext2fs.so.2
+lib/libext2fs.so.2.4
+lib/libgcc_s-4.4.7-20120601.so.1
+lib/libgcc_s.so.1
+lib/libgio-2.0.so.0
+lib/libgio-2.0.so.0.2800.8
+lib/libglib-2.0.so.0
+lib/libglib-2.0.so.0.2800.8
+lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so.0.2800.8
+lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so.0.2800.8
+lib/libgssapi_krb5.so.2
+lib/libgssapi_krb5.so.2.2
+lib/libgssrpc.so.4
+lib/libgssrpc.so.4.1
+lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so.0.2800.8
+lib/libidn.so.11
+lib/libidn.so.11.6.1
+lib/libk5crypto.so.3
+lib/libk5crypto.so.3.1
+lib/libkeyutils.so.1
+lib/libkeyutils.so.1.3
+lib/libkrb5.so.3
+lib/libkrb5.so.3.3
+lib/libkrb5support.so.0
+lib/libkrb5support.so.0.1
+lib/libm-%%GLIBCVER%%.so
+lib/libm.so.6
+lib/libmount.so.1
+lib/libmount.so.1.1.0
+lib/libncurses.so.5
+lib/libncurses.so.5.7
+lib/libncursesw.so.5
+lib/libncursesw.so.5.7
+lib/libnsl-%%GLIBCVER%%.so
+lib/libnsl.so.1
+lib/libnss_compat-%%GLIBCVER%%.so
+lib/libnss_compat.so.2
+lib/libnss_dns-%%GLIBCVER%%.so
+lib/libnss_dns.so.2
+lib/libnss_files-%%GLIBCVER%%.so
+lib/libnss_files.so.2
+lib/libnss_hesiod-%%GLIBCVER%%.so
+lib/libnss_hesiod.so.2
+lib/libnss_nis-%%GLIBCVER%%.so
+lib/libnss_nis.so.2
+lib/libnss_nisplus-%%GLIBCVER%%.so
+lib/libnss_nisplus.so.2
+lib/libpcre.so.0
+lib/libpcre.so.0.0.1
+lib/libpopt.so.0
+lib/libpopt.so.0.0.0
+lib/libpthread-%%GLIBCVER%%.so
+lib/libpthread.so.0
+lib/libreadline.so.6
+lib/libreadline.so.6.0
+lib/libresolv-%%GLIBCVER%%.so
+lib/libresolv.so.2
+lib/librt-%%GLIBCVER%%.so
+lib/librt.so.1
+lib/libselinux.so.1
+lib/libsepol.so.1
+lib/libthread_db-1.0.so
+lib/libthread_db.so.1
+lib/libtinfo.so.5
+lib/libtinfo.so.5.7
+lib/libutil-%%GLIBCVER%%.so
+lib/libutil.so.1
+lib/libuuid.so.1
+lib/libuuid.so.1.3.0
+lib/libz.so.1
+lib/libz.so.1.2.3
 lib/lsb/init-functions
-lib64/ld-2.12.so
+lib/rtkaio/i686/nosegneg/librt.so.1
+lib/rtkaio/i686/nosegneg/librtkaio-%%GLIBCVER%%.so
+lib/rtkaio/librt.so.1
+lib/rtkaio/librtkaio-%%GLIBCVER%%.so
+lib/security/pam_cap.so
+lib64/ld-%%GLIBCVER%%.so
 lib64/ld-linux-x86-64.so.2
 lib64/ld-lsb-x86-64.so.3
-lib64/libBrokenLocale-2.12.so
+lib64/libBrokenLocale-%%GLIBCVER%%.so
 lib64/libBrokenLocale.so.1
 lib64/libSegFault.so
 lib64/libacl.so.1
 lib64/libacl.so.1.1.0
-lib64/libanl-2.12.so
+lib64/libanl-%%GLIBCVER%%.so
 lib64/libanl.so.1
 lib64/libattr.so.1
 lib64/libattr.so.1.1.0
@@ -146,20 +270,20 @@ lib64/libblkid.so.1
 lib64/libblkid.so.1.1.0
 lib64/libbz2.so.1
 lib64/libbz2.so.1.0.4
-lib64/libc-2.12.so
+lib64/libc-%%GLIBCVER%%.so
 lib64/libc.so.6
 lib64/libcap.so.2
 lib64/libcap.so.2.16
-lib64/libcidn-2.12.so
+lib64/libcidn-%%GLIBCVER%%.so
 lib64/libcidn.so.1
 lib64/libcom_err.so.2
 lib64/libcom_err.so.2.1
-lib64/libcrypt-2.12.so
+lib64/libcrypt-%%GLIBCVER%%.so
 lib64/libcrypt.so.1
 lib64/libdb-4.3.so
 lib64/libdb-4.7.so
 lib64/libdb_cxx-4.3.so
-lib64/libdl-2.12.so
+lib64/libdl-%%GLIBCVER%%.so
 lib64/libdl.so.2
 lib64/libe2p.so.2
 lib64/libe2p.so.2.3
@@ -191,7 +315,7 @@ lib64/libkrb5.so.3
 lib64/libkrb5.so.3.3
 lib64/libkrb5support.so.0
 lib64/libkrb5support.so.0.1
-lib64/libm-2.12.so
+lib64/libm-%%GLIBCVER%%.so
 lib64/libm.so.6
 lib64/libmount.so.1
 lib64/libmount.so.1.1.0
@@ -199,31 +323,31 @@ lib64/libncurses.so.5
 lib64/libncurses.so.5.7
 lib64/libncursesw.so.5
 lib64/libncursesw.so.5.7
-lib64/libnsl-2.12.so
+lib64/libnsl-%%GLIBCVER%%.so
 lib64/libnsl.so.1
-lib64/libnss_compat-2.12.so
+lib64/libnss_compat-%%GLIBCVER%%.so
 lib64/libnss_compat.so.2
-lib64/libnss_dns-2.12.so
+lib64/libnss_dns-%%GLIBCVER%%.so
 lib64/libnss_dns.so.2
-lib64/libnss_files-2.12.so
+lib64/libnss_files-%%GLIBCVER%%.so
 lib64/libnss_files.so.2
-lib64/libnss_hesiod-2.12.so
+lib64/libnss_hesiod-%%GLIBCVER%%.so
 lib64/libnss_hesiod.so.2
-lib64/libnss_nis-2.12.so
+lib64/libnss_nis-%%GLIBCVER%%.so
 lib64/libnss_nis.so.2
-lib64/libnss_nisplus-2.12.so
+lib64/libnss_nisplus-%%GLIBCVER%%.so
 lib64/libnss_nisplus.so.2
 lib64/libpcre.so.0
 lib64/libpcre.so.0.0.1
 lib64/libpopt.so.0
 lib64/libpopt.so.0.0.0
-lib64/libpthread-2.12.so
+lib64/libpthread-%%GLIBCVER%%.so
 lib64/libpthread.so.0
 lib64/libreadline.so.6
 lib64/libreadline.so.6.0
-lib64/libresolv-2.12.so
+lib64/libresolv-%%GLIBCVER%%.so
 lib64/libresolv.so.2
-lib64/librt-2.12.so
+lib64/librt-%%GLIBCVER%%.so
 lib64/librt.so.1
 lib64/libselinux.so.1
 lib64/libsepol.so.1
@@ -231,14 +355,14 @@ lib64/libthread_db-1.0.so
 lib64/libthread_db.so.1
 lib64/libtinfo.so.5
 lib64/libtinfo.so.5.7
-lib64/libutil-2.12.so
+lib64/libutil-%%GLIBCVER%%.so
 lib64/libutil.so.1
 lib64/libuuid.so.1
 lib64/libuuid.so.1.3.0
 lib64/libz.so.1
 lib64/libz.so.1.2.3
 lib64/rtkaio/librt.so.1
-lib64/rtkaio/librtkaio-2.12.so
+lib64/rtkaio/librtkaio-%%GLIBCVER%%.so
 lib64/security/pam_cap.so
 sbin/addpart
 sbin/agetty
@@ -325,6 +449,7 @@ usr/bin/column
 usr/bin/comm
 usr/bin/csplit
 usr/bin/cut
+usr/bin/cytune
 usr/bin/db43_archive
 usr/bin/db43_checkpoint
 usr/bin/db43_deadlock
@@ -370,6 +495,7 @@ usr/bin/gencat
 usr/bin/getconf
 usr/bin/getent
 usr/bin/getopt
+usr/bin/gio-querymodules-32
 usr/bin/gio-querymodules-64
 usr/bin/glib-compile-schemas
 usr/bin/groups
@@ -489,12 +615,326 @@ usr/bin/yes
 usr/include/db4.3.29/db.h
 usr/include/db4.3.29/db_185.h
 usr/include/db4.3.29/db_cxx.h
+usr/lib/db4.3.29/libdb.so
+usr/lib/db4.3.29/libdb_cxx.so
+usr/lib/gconv/ANSI_X3.110.so
+usr/lib/gconv/ARMSCII-8.so
+usr/lib/gconv/ASMO_449.so
+usr/lib/gconv/BIG5.so
+usr/lib/gconv/BIG5HKSCS.so
+usr/lib/gconv/BRF.so
+usr/lib/gconv/CP10007.so
+usr/lib/gconv/CP1125.so
+usr/lib/gconv/CP1250.so
+usr/lib/gconv/CP1251.so
+usr/lib/gconv/CP1252.so
+usr/lib/gconv/CP1253.so
+usr/lib/gconv/CP1254.so
+usr/lib/gconv/CP1255.so
+usr/lib/gconv/CP1256.so
+usr/lib/gconv/CP1257.so
+usr/lib/gconv/CP1258.so
+usr/lib/gconv/CP737.so
+usr/lib/gconv/CP775.so
+usr/lib/gconv/CP932.so
+usr/lib/gconv/CSN_369103.so
+usr/lib/gconv/CWI.so
+usr/lib/gconv/DEC-MCS.so
+usr/lib/gconv/EBCDIC-AT-DE-A.so
+usr/lib/gconv/EBCDIC-AT-DE.so
+usr/lib/gconv/EBCDIC-CA-FR.so
+usr/lib/gconv/EBCDIC-DK-NO-A.so
+usr/lib/gconv/EBCDIC-DK-NO.so
+usr/lib/gconv/EBCDIC-ES-A.so
+usr/lib/gconv/EBCDIC-ES-S.so
+usr/lib/gconv/EBCDIC-ES.so
+usr/lib/gconv/EBCDIC-FI-SE-A.so
+usr/lib/gconv/EBCDIC-FI-SE.so
+usr/lib/gconv/EBCDIC-FR.so
+usr/lib/gconv/EBCDIC-IS-FRISS.so
+usr/lib/gconv/EBCDIC-IT.so
+usr/lib/gconv/EBCDIC-PT.so
+usr/lib/gconv/EBCDIC-UK.so
+usr/lib/gconv/EBCDIC-US.so
+usr/lib/gconv/ECMA-CYRILLIC.so
+usr/lib/gconv/EUC-CN.so
+usr/lib/gconv/EUC-JISX0213.so
+usr/lib/gconv/EUC-JP-MS.so
+usr/lib/gconv/EUC-JP.so
+usr/lib/gconv/EUC-KR.so
+usr/lib/gconv/EUC-TW.so
+usr/lib/gconv/GB18030.so
+usr/lib/gconv/GBBIG5.so
+usr/lib/gconv/GBGBK.so
+usr/lib/gconv/GBK.so
+usr/lib/gconv/GEORGIAN-ACADEMY.so
+usr/lib/gconv/GEORGIAN-PS.so
+usr/lib/gconv/GOST_19768-74.so
+usr/lib/gconv/GREEK-CCITT.so
+usr/lib/gconv/GREEK7-OLD.so
+usr/lib/gconv/GREEK7.so
+usr/lib/gconv/HP-GREEK8.so
+usr/lib/gconv/HP-ROMAN8.so
+usr/lib/gconv/HP-ROMAN9.so
+usr/lib/gconv/HP-THAI8.so
+usr/lib/gconv/HP-TURKISH8.so
+usr/lib/gconv/IBM037.so
+usr/lib/gconv/IBM038.so
+usr/lib/gconv/IBM1004.so
+usr/lib/gconv/IBM1008.so
+usr/lib/gconv/IBM1008_420.so
+usr/lib/gconv/IBM1025.so
+usr/lib/gconv/IBM1026.so
+usr/lib/gconv/IBM1046.so
+usr/lib/gconv/IBM1047.so
+usr/lib/gconv/IBM1097.so
+usr/lib/gconv/IBM1112.so
+usr/lib/gconv/IBM1122.so
+usr/lib/gconv/IBM1123.so
+usr/lib/gconv/IBM1124.so
+usr/lib/gconv/IBM1129.so
+usr/lib/gconv/IBM1130.so
+usr/lib/gconv/IBM1132.so
+usr/lib/gconv/IBM1133.so
+usr/lib/gconv/IBM1137.so
+usr/lib/gconv/IBM1140.so
+usr/lib/gconv/IBM1141.so
+usr/lib/gconv/IBM1142.so
+usr/lib/gconv/IBM1143.so
+usr/lib/gconv/IBM1144.so
+usr/lib/gconv/IBM1145.so
+usr/lib/gconv/IBM1146.so
+usr/lib/gconv/IBM1147.so
+usr/lib/gconv/IBM1148.so
+usr/lib/gconv/IBM1149.so
+usr/lib/gconv/IBM1153.so
+usr/lib/gconv/IBM1154.so
+usr/lib/gconv/IBM1155.so
+usr/lib/gconv/IBM1156.so
+usr/lib/gconv/IBM1157.so
+usr/lib/gconv/IBM1158.so
+usr/lib/gconv/IBM1160.so
+usr/lib/gconv/IBM1161.so
+usr/lib/gconv/IBM1162.so
+usr/lib/gconv/IBM1163.so
+usr/lib/gconv/IBM1164.so
+usr/lib/gconv/IBM1166.so
+usr/lib/gconv/IBM1167.so
+usr/lib/gconv/IBM12712.so
+usr/lib/gconv/IBM1364.so
+usr/lib/gconv/IBM1371.so
+usr/lib/gconv/IBM1388.so
+usr/lib/gconv/IBM1390.so
+usr/lib/gconv/IBM1399.so
+usr/lib/gconv/IBM16804.so
+usr/lib/gconv/IBM256.so
+usr/lib/gconv/IBM273.so
+usr/lib/gconv/IBM274.so
+usr/lib/gconv/IBM275.so
+usr/lib/gconv/IBM277.so
+usr/lib/gconv/IBM278.so
+usr/lib/gconv/IBM280.so
+usr/lib/gconv/IBM281.so
+usr/lib/gconv/IBM284.so
+usr/lib/gconv/IBM285.so
+usr/lib/gconv/IBM290.so
+usr/lib/gconv/IBM297.so
+usr/lib/gconv/IBM420.so
+usr/lib/gconv/IBM423.so
+usr/lib/gconv/IBM424.so
+usr/lib/gconv/IBM437.so
+usr/lib/gconv/IBM4517.so
+usr/lib/gconv/IBM4899.so
+usr/lib/gconv/IBM4909.so
+usr/lib/gconv/IBM4971.so
+usr/lib/gconv/IBM500.so
+usr/lib/gconv/IBM5347.so
+usr/lib/gconv/IBM803.so
+usr/lib/gconv/IBM850.so
+usr/lib/gconv/IBM851.so
+usr/lib/gconv/IBM852.so
+usr/lib/gconv/IBM855.so
+usr/lib/gconv/IBM856.so
+usr/lib/gconv/IBM857.so
+usr/lib/gconv/IBM860.so
+usr/lib/gconv/IBM861.so
+usr/lib/gconv/IBM862.so
+usr/lib/gconv/IBM863.so
+usr/lib/gconv/IBM864.so
+usr/lib/gconv/IBM865.so
+usr/lib/gconv/IBM866.so
+usr/lib/gconv/IBM866NAV.so
+usr/lib/gconv/IBM868.so
+usr/lib/gconv/IBM869.so
+usr/lib/gconv/IBM870.so
+usr/lib/gconv/IBM871.so
+usr/lib/gconv/IBM874.so
+usr/lib/gconv/IBM875.so
+usr/lib/gconv/IBM880.so
+usr/lib/gconv/IBM891.so
+usr/lib/gconv/IBM901.so
+usr/lib/gconv/IBM902.so
+usr/lib/gconv/IBM903.so
+usr/lib/gconv/IBM9030.so
+usr/lib/gconv/IBM904.so
+usr/lib/gconv/IBM905.so
+usr/lib/gconv/IBM9066.so
+usr/lib/gconv/IBM918.so
+usr/lib/gconv/IBM921.so
+usr/lib/gconv/IBM922.so
+usr/lib/gconv/IBM930.so
+usr/lib/gconv/IBM932.so
+usr/lib/gconv/IBM933.so
+usr/lib/gconv/IBM935.so
+usr/lib/gconv/IBM937.so
+usr/lib/gconv/IBM939.so
+usr/lib/gconv/IBM943.so
+usr/lib/gconv/IBM9448.so
+usr/lib/gconv/IEC_P27-1.so
+usr/lib/gconv/INIS-8.so
+usr/lib/gconv/INIS-CYRILLIC.so
+usr/lib/gconv/INIS.so
+usr/lib/gconv/ISIRI-3342.so
+usr/lib/gconv/ISO-2022-CN-EXT.so
+usr/lib/gconv/ISO-2022-CN.so
+usr/lib/gconv/ISO-2022-JP-3.so
+usr/lib/gconv/ISO-2022-JP.so
+usr/lib/gconv/ISO-2022-KR.so
+usr/lib/gconv/ISO-IR-197.so
+usr/lib/gconv/ISO-IR-209.so
+usr/lib/gconv/ISO646.so
+usr/lib/gconv/ISO8859-1.so
+usr/lib/gconv/ISO8859-10.so
+usr/lib/gconv/ISO8859-11.so
+usr/lib/gconv/ISO8859-13.so
+usr/lib/gconv/ISO8859-14.so
+usr/lib/gconv/ISO8859-15.so
+usr/lib/gconv/ISO8859-16.so
+usr/lib/gconv/ISO8859-2.so
+usr/lib/gconv/ISO8859-3.so
+usr/lib/gconv/ISO8859-4.so
+usr/lib/gconv/ISO8859-5.so
+usr/lib/gconv/ISO8859-6.so
+usr/lib/gconv/ISO8859-7.so
+usr/lib/gconv/ISO8859-8.so
+usr/lib/gconv/ISO8859-9.so
+usr/lib/gconv/ISO8859-9E.so
+usr/lib/gconv/ISO_10367-BOX.so
+usr/lib/gconv/ISO_11548-1.so
+usr/lib/gconv/ISO_2033.so
+usr/lib/gconv/ISO_5427-EXT.so
+usr/lib/gconv/ISO_5427.so
+usr/lib/gconv/ISO_5428.so
+usr/lib/gconv/ISO_6937-2.so
+usr/lib/gconv/ISO_6937.so
+usr/lib/gconv/JOHAB.so
+usr/lib/gconv/KOI-8.so
+usr/lib/gconv/KOI8-R.so
+usr/lib/gconv/KOI8-RU.so
+usr/lib/gconv/KOI8-T.so
+usr/lib/gconv/KOI8-U.so
+usr/lib/gconv/LATIN-GREEK-1.so
+usr/lib/gconv/LATIN-GREEK.so
+usr/lib/gconv/MAC-CENTRALEUROPE.so
+usr/lib/gconv/MAC-IS.so
+usr/lib/gconv/MAC-SAMI.so
+usr/lib/gconv/MAC-UK.so
+usr/lib/gconv/MACINTOSH.so
+usr/lib/gconv/MIK.so
+usr/lib/gconv/NATS-DANO.so
+usr/lib/gconv/NATS-SEFI.so
+usr/lib/gconv/PT154.so
+usr/lib/gconv/RK1048.so
+usr/lib/gconv/SAMI-WS2.so
+usr/lib/gconv/SHIFT_JISX0213.so
+usr/lib/gconv/SJIS.so
+usr/lib/gconv/T.61.so
+usr/lib/gconv/TCVN5712-1.so
+usr/lib/gconv/TIS-620.so
+usr/lib/gconv/TSCII.so
+usr/lib/gconv/UHC.so
+usr/lib/gconv/UNICODE.so
+usr/lib/gconv/UTF-16.so
+usr/lib/gconv/UTF-32.so
+usr/lib/gconv/UTF-7.so
+usr/lib/gconv/VISCII.so
+usr/lib/gconv/gconv-modules
+usr/lib/gconv/gconv-modules.cache
+usr/lib/gconv/libCNS.so
+usr/lib/gconv/libGB.so
+usr/lib/gconv/libISOIR165.so
+usr/lib/gconv/libJIS.so
+usr/lib/gconv/libJISX0213.so
+usr/lib/gconv/libKSC.so
+usr/lib/gio/modules/libgiofam.so
+usr/lib/krb5/plugins/kdb/db2.so
+usr/lib/libdb-4.7.so
+usr/lib/libfam.so.0
+usr/lib/libfam.so.0.0.0
+usr/lib/libform.so.5
+usr/lib/libform.so.5.7
+usr/lib/libformw.so.5
+usr/lib/libformw.so.5.7
+usr/lib/libfreetype.so.6
+usr/lib/libfreetype.so.6.3.22
+usr/lib/libgamin-1.so.0
+usr/lib/libgamin-1.so.0.1.10
+usr/lib/libgdbm.so.2
+usr/lib/libgdbm.so.2.0.0
+usr/lib/libgmp.so.3
+usr/lib/libgmp.so.3.5.0
+usr/lib/libgmpxx.so.4
+usr/lib/libgmpxx.so.4.1.0
+usr/lib/libhistory.so.6
+usr/lib/libhistory.so.6.0
+usr/lib/libkadm5clnt_mit.so.8
+usr/lib/libkadm5clnt_mit.so.8.0
+usr/lib/libkadm5srv_mit.so.8
+usr/lib/libkadm5srv_mit.so.8.0
+usr/lib/libkdb5.so.6
+usr/lib/libkdb5.so.6.0
+usr/lib/libmemusage.so
+usr/lib/libmenu.so.5
+usr/lib/libmenu.so.5.7
+usr/lib/libmenuw.so.5
+usr/lib/libmenuw.so.5.7
+usr/lib/libmp.so.3
+usr/lib/libmp.so.3.1.14
+usr/lib/libpanel.so.5
+usr/lib/libpanel.so.5.7
+usr/lib/libpanelw.so.5
+usr/lib/libpanelw.so.5.7
+usr/lib/libpcprofile.so
+usr/lib/libpcrecpp.so.0
+usr/lib/libpcrecpp.so.0.0.0
+usr/lib/libpcreposix.so.0
+usr/lib/libpcreposix.so.0.0.0
+usr/lib/librt.so.1
+usr/lib/libslang.so.2
+usr/lib/libslang.so.2.2.1
 usr/lib/libstdc++-3-libc6.2-2-2.10.0.so
 usr/lib/libstdc++-libc6.2-2.so.3
-usr/lib/librt.so.1
+usr/lib/libstdc++.so.5
+usr/lib/libstdc++.so.5.0.7
+usr/lib/libstdc++.so.6
+usr/lib/libstdc++.so.6.0.13
+usr/lib/libtic.so.5
+usr/lib/libtic.so.5.7
+usr/lib/libverto-k5ev.so
+usr/lib/libverto-k5ev.so.0
+usr/lib/libverto-k5ev.so.0.0
+usr/lib/libverto.so
+usr/lib/libverto.so.0
+usr/lib/libverto.so.0.0
 usr/lib/locale/locale-archive
 usr/lib/lsb/install_initd
 usr/lib/lsb/remove_initd
+usr/lib/sse2/libgmp.so.3
+usr/lib/sse2/libgmp.so.3.5.0
+usr/lib/sse2/libgmpxx.so.4
+usr/lib/sse2/libgmpxx.so.4.1.0
+usr/lib/sse2/libmp.so.3
+usr/lib/sse2/libmp.so.3.1.14
 usr/lib64/db4.3.29/libdb.so
 usr/lib64/db4.3.29/libdb_cxx.so
 usr/lib64/gconv/ANSI_X3.110.so
@@ -804,7 +1244,11 @@ usr/lib64/libverto.so
 usr/lib64/libverto.so.0
 usr/lib64/libverto.so.0.0
 usr/libexec/gam_server
+usr/libexec/getconf/POSIX_V6_ILP32_OFF32
+usr/libexec/getconf/POSIX_V6_ILP32_OFFBIG
 usr/libexec/getconf/POSIX_V6_LP64_OFF64
+usr/libexec/getconf/POSIX_V7_ILP32_OFF32
+usr/libexec/getconf/POSIX_V7_ILP32_OFFBIG
 usr/libexec/getconf/POSIX_V7_LP64_OFF64
 usr/libexec/pt_chown
 usr/sbin/build-locale-archive
@@ -815,13 +1259,16 @@ usr/sbin/fdformat
 usr/sbin/filefrag
 usr/sbin/getcap
 usr/sbin/getpcaps
+usr/sbin/glibc_post_upgrade.i686
 usr/sbin/glibc_post_upgrade.x86_64
 usr/sbin/hwclock
 usr/sbin/iconvconfig
+usr/sbin/iconvconfig.i686
 usr/sbin/iconvconfig.x86_64
 usr/sbin/ldattach
 usr/sbin/mklost+found
 usr/sbin/readprofile
+usr/sbin/redhat_lsb_trigger.i686
 usr/sbin/redhat_lsb_trigger.x86_64
 usr/sbin/rtcwake
 usr/sbin/setcap
@@ -912,25 +1359,25 @@ usr/share/doc/glib2-2.28.8/AUTHORS
 usr/share/doc/glib2-2.28.8/COPYING
 usr/share/doc/glib2-2.28.8/NEWS
 usr/share/doc/glib2-2.28.8/README
-usr/share/doc/glibc-2.12/BUGS
-usr/share/doc/glibc-2.12/CONFORMANCE
-usr/share/doc/glibc-2.12/COPYING
-usr/share/doc/glibc-2.12/COPYING.LIB
-usr/share/doc/glibc-2.12/FAQ
-usr/share/doc/glibc-2.12/INSTALL
-usr/share/doc/glibc-2.12/LICENSES
-usr/share/doc/glibc-2.12/NEWS
-usr/share/doc/glibc-2.12/NOTES
-usr/share/doc/glibc-2.12/PROJECTS
-usr/share/doc/glibc-2.12/README
-usr/share/doc/glibc-2.12/README.hesiod
-usr/share/doc/glibc-2.12/README.libm
-usr/share/doc/glibc-common-2.12/ChangeLog.15.bz2
-usr/share/doc/glibc-common-2.12/ChangeLog.16.bz2
-usr/share/doc/glibc-common-2.12/ChangeLog.bz2
-usr/share/doc/glibc-common-2.12/README.timezone
-usr/share/doc/glibc-common-2.12/README.ufc-crypt
-usr/share/doc/glibc-common-2.12/gai.conf
+usr/share/doc/glibc-%%GLIBCVER%%/BUGS
+usr/share/doc/glibc-%%GLIBCVER%%/CONFORMANCE
+usr/share/doc/glibc-%%GLIBCVER%%/COPYING
+usr/share/doc/glibc-%%GLIBCVER%%/COPYING.LIB
+usr/share/doc/glibc-%%GLIBCVER%%/FAQ
+usr/share/doc/glibc-%%GLIBCVER%%/INSTALL
+usr/share/doc/glibc-%%GLIBCVER%%/LICENSES
+usr/share/doc/glibc-%%GLIBCVER%%/NEWS
+usr/share/doc/glibc-%%GLIBCVER%%/NOTES
+usr/share/doc/glibc-%%GLIBCVER%%/PROJECTS
+usr/share/doc/glibc-%%GLIBCVER%%/README
+usr/share/doc/glibc-%%GLIBCVER%%/README.hesiod
+usr/share/doc/glibc-%%GLIBCVER%%/README.libm
+usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.15.bz2
+usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.16.bz2
+usr/share/doc/glibc-common-%%GLIBCVER%%/ChangeLog.bz2
+usr/share/doc/glibc-common-%%GLIBCVER%%/README.timezone
+usr/share/doc/glibc-common-%%GLIBCVER%%/README.ufc-crypt
+usr/share/doc/glibc-common-%%GLIBCVER%%/gai.conf
 usr/share/doc/gmp-4.3.1/COPYING
 usr/share/doc/gmp-4.3.1/COPYING.LIB
 usr/share/doc/gmp-4.3.1/NEWS
@@ -2262,6 +2709,7 @@ usr/share/man/man8/cfdisk.8.gz
 usr/share/man/man8/chcpu.8.gz
 usr/share/man/man8/clock.8.gz
 usr/share/man/man8/ctrlaltdel.8.gz
+usr/share/man/man8/cytune.8.gz
 usr/share/man/man8/debugfs.8.gz
 usr/share/man/man8/delpart.8.gz
 usr/share/man/man8/dumpe2fs.8.gz
@@ -2359,6 +2807,9 @@ var/mail
 @dir usr/etc
 @dir usr/games
 @dir usr/lib/games
+@dir usr/lib/krb5/plugins/authdata
+@dir usr/lib/krb5/plugins/libkrb5
+@dir usr/lib/krb5/plugins/preauth
 @dir usr/lib64/X11
 @dir usr/lib64/db4.3.29
 @dir usr/lib64/games