Update to bash 4.1.2-41.el6_8 and db4 4.7.25-20.el6_8.1.

Fix check-plist errors.

PR:		216219
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>

5 files changed, 27 insertions, 30 deletions

diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 42785a1b19b3..5f8623e6d239 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	c6
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators linux
 PKGNAMEPREFIX=	linux_base-
 
@@ -11,7 +11,7 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Base set of packages needed in Linux mode for i386/amd64 (Linux CentOS 6)
 
 BIN_DISTFILES=	basesystem-10.0-4.el6.noarch.rpm \
-		bash-4.1.2-40.el6${EXTRACT_SUFX} \
+		bash-4.1.2-41.el6_8${EXTRACT_SUFX} \
 		bzip2-1.0.5-7.el6_0${EXTRACT_SUFX} \
 		centos-release-6-8.el6.centos.12.3${EXTRACT_SUFX} \
 		compat-libstdc++-296-2.96-144.el6.i686.rpm \
@@ -33,7 +33,7 @@ BIN_DISTFILES=	basesystem-10.0-4.el6.noarch.rpm \
 LIB_DISTFILES=	bzip2-libs-1.0.5-7.el6_0${EXTRACT_SUFX} \
 		compat-db43-4.3.29-15.el6${EXTRACT_SUFX} \
 		compat-libstdc++-33-3.2.3-69.el6${EXTRACT_SUFX} \
-		db4-4.7.25-20.el6_7${EXTRACT_SUFX} \
+		db4-4.7.25-20.el6_8.1${EXTRACT_SUFX} \
 		e2fsprogs-libs-1.41.12-22.el6${EXTRACT_SUFX} \
 		freetype-2.3.11-17.el6${EXTRACT_SUFX} \
 		gamin-0.1.10-9.el6${EXTRACT_SUFX} \
@@ -65,14 +65,14 @@ LIB_DISTFILES=	bzip2-libs-1.0.5-7.el6_0${EXTRACT_SUFX} \
 SRC_DISTFILES=	acl-2.2.49-6.el6${SRC_SUFX}:SOURCE \
 		attr-2.4.44-7.el6${SRC_SUFX}:SOURCE \
 		basesystem-10.0-4.el6${SRC_SUFX}:SOURCE \
-		bash-4.1.2-40.el6${SRC_SUFX}:SOURCE \
+		bash-4.1.2-41.el6_8${SRC_SUFX}:SOURCE \
 		bzip2-1.0.5-7.el6_0${SRC_SUFX}:SOURCE \
 		centos-release-6-8.el6.centos.12.3${SRC_SUFX}:SOURCE \
 		compat-db-4.6.21-15.el6${SRC_SUFX}:SOURCE \
 		compat-gcc-296-2.96-144.el6${SRC_SUFX}:SOURCE \
 		compat-gcc-32-3.2.3-69.el6${SRC_SUFX}:SOURCE \
 		coreutils-8.4-43.el6${SRC_SUFX}:SOURCE \
-		db4-4.7.25-20.el6_7${SRC_SUFX}:SOURCE \
+		db4-4.7.25-20.el6_8.1${SRC_SUFX}:SOURCE \
 		e2fsprogs-1.41.12-22.el6${SRC_SUFX}:SOURCE \
 		elfutils-0.164-2.el6${SRC_SUFX}:SOURCE \
 		filesystem-2.4.30-3.el6${SRC_SUFX}:SOURCE \
@@ -112,8 +112,8 @@ USES=		linux:c6
 USE_LINUX=	# empty
 USE_LINUX_RPM=	yes
 
-REMOVE_DIRS=	boot home media root tmp usr/lib/pm-utils usr/lib64/pm-utils \
-		usr/local var/log var/run var/tmp
+REMOVE_DIRS=	boot home media mnt proc root sys tmp usr/lib/pm-utils \
+		usr/lib64/pm-utils usr/local var/log var/run var/tmp
 REMOVE_FILES=	bin/df bin/su etc/exports etc/group etc/gshadow etc/motd \
 		etc/passwd etc/printcap etc/protocols etc/services etc/shadow \
 		usr/tmp
@@ -136,7 +136,6 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/dev/shm
 	${TOUCH} ${STAGEDIR}${PREFIX}/etc/mtab
 	${MV} ${STAGEDIR}${PREFIX}/etc/krb5.conf \
 		${STAGEDIR}${PREFIX}/etc/krb5.conf.sample
diff --git a/emulators/linux_base-c6/distinfo.i386 b/emulators/linux_base-c6/distinfo.i386
index 35baf64cc985..6dd7373047e8 100644
--- a/emulators/linux_base-c6/distinfo.i386
+++ b/emulators/linux_base-c6/distinfo.i386
@@ -1,12 +1,12 @@
-TIMESTAMP = 1479848488
+TIMESTAMP = 1484729690
 SHA256 (rpm/i686/centos/6.8/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = d3424f4610860e7f8f444cc3cddf51cd75f5e58ca0ecffc8bdbbcb5f8fe1b0d1
 SIZE (rpm/i686/centos/6.8/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = 37204
 SHA256 (rpm/i686/centos/6.8/compat-db43-4.3.29-15.el6.i686.rpm) = 202767fa03ff58947d6a2ec2437e52fc9179f3995fa77264753fde03f2737d0a
 SIZE (rpm/i686/centos/6.8/compat-db43-4.3.29-15.el6.i686.rpm) = 914280
 SHA256 (rpm/i686/centos/6.8/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 894abcc5f0b28e39c71d4b0ca27d19540e7eb9d3c32664d5621324c9efbfe11e
 SIZE (rpm/i686/centos/6.8/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 193328
-SHA256 (rpm/i686/centos/6.8/db4-4.7.25-20.el6_7.i686.rpm) = 1bbe6a2090411a8ecec459f1bc94ebfa586f40a3a4f0c4e440e0e3bb06eb7ba5
-SIZE (rpm/i686/centos/6.8/db4-4.7.25-20.el6_7.i686.rpm) = 594068
+SHA256 (rpm/i686/centos/6.8/db4-4.7.25-20.el6_8.1.i686.rpm) = 0e38b3d3bfd03d4d4fcd6068b70793f15e383aa63002f293bf361301db018949
+SIZE (rpm/i686/centos/6.8/db4-4.7.25-20.el6_8.1.i686.rpm) = 594872
 SHA256 (rpm/i686/centos/6.8/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 4bc8b22538b56dda34db646ec87218b333499d00e90a9bc5852cbef178b357f1
 SIZE (rpm/i686/centos/6.8/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 130892
 SHA256 (rpm/i686/centos/6.8/freetype-2.3.11-17.el6.i686.rpm) = ec0490d369ebf2de04a58437aba31af3e4bcf5a339867e7096b2a1a173d2802b
@@ -65,8 +65,8 @@ SHA256 (rpm/i686/centos/6.8/zlib-1.2.3-29.el6.i686.rpm) = 1e40dce8a497f740b22d20
 SIZE (rpm/i686/centos/6.8/zlib-1.2.3-29.el6.i686.rpm) = 74284
 SHA256 (rpm/i686/centos/6.8/basesystem-10.0-4.el6.noarch.rpm) = 18860007697438e375733bb4a36a599daac2e2ae95d98a74c436a10d0974710e
 SIZE (rpm/i686/centos/6.8/basesystem-10.0-4.el6.noarch.rpm) = 4784
-SHA256 (rpm/i686/centos/6.8/bash-4.1.2-40.el6.i686.rpm) = 2b6d593582015dc7df2b58a4719ac372bc8ae1731e741250447d6e5a375cbc0a
-SIZE (rpm/i686/centos/6.8/bash-4.1.2-40.el6.i686.rpm) = 911904
+SHA256 (rpm/i686/centos/6.8/bash-4.1.2-41.el6_8.i686.rpm) = 6689941bca2a3f39c3aff416204ddbb3ac1bde73017fee0648a26340d8115dbf
+SIZE (rpm/i686/centos/6.8/bash-4.1.2-41.el6_8.i686.rpm) = 911956
 SHA256 (rpm/i686/centos/6.8/bzip2-1.0.5-7.el6_0.i686.rpm) = 37883219612b1ffa199f5a7227fcd165687a24e5c7c291c579647d1563777e47
 SIZE (rpm/i686/centos/6.8/bzip2-1.0.5-7.el6_0.i686.rpm) = 49428
 SHA256 (rpm/i686/centos/6.8/centos-release-6-8.el6.centos.12.3.i686.rpm) = c265b4a617313a4ec790d2e5836713f7d684243fa02296247beae88d3aee12cb
@@ -109,8 +109,8 @@ SHA256 (rpm/i686/centos/6.8/attr-2.4.44-7.el6.src.rpm) = 5f5440619e0109d9f8d913d
 SIZE (rpm/i686/centos/6.8/attr-2.4.44-7.el6.src.rpm) = 335725
 SHA256 (rpm/i686/centos/6.8/basesystem-10.0-4.el6.src.rpm) = 18d3bd0580f40bdc208773f26b424fa1975fad70fae9f179c52337a8f80ade76
 SIZE (rpm/i686/centos/6.8/basesystem-10.0-4.el6.src.rpm) = 5949
-SHA256 (rpm/i686/centos/6.8/bash-4.1.2-40.el6.src.rpm) = bc4e15073b61079e05e5fb4069df779d8b2f6dd1ae9c13fe8230ef006b90c721
-SIZE (rpm/i686/centos/6.8/bash-4.1.2-40.el6.src.rpm) = 6686039
+SHA256 (rpm/i686/centos/6.8/bash-4.1.2-41.el6_8.src.rpm) = 51f44455653b116a613fdafd1ebdc8819deab2c39fddb5a5a388e3ca1f9276ea
+SIZE (rpm/i686/centos/6.8/bash-4.1.2-41.el6_8.src.rpm) = 6687192
 SHA256 (rpm/i686/centos/6.8/bzip2-1.0.5-7.el6_0.src.rpm) = 99a3d6a620f9f427aaeba974ae06234d0a771231730de7e203b97dce1dbf1931
 SIZE (rpm/i686/centos/6.8/bzip2-1.0.5-7.el6_0.src.rpm) = 855419
 SHA256 (rpm/i686/centos/6.8/centos-release-6-8.el6.centos.12.3.src.rpm) = 30648911e7df859182044b1135a9adc62064e5a3b974091b642da1f950702fe1
@@ -123,8 +123,8 @@ SHA256 (rpm/i686/centos/6.8/compat-gcc-32-3.2.3-69.el6.src.rpm) = 7ff0c6e00ad068
 SIZE (rpm/i686/centos/6.8/compat-gcc-32-3.2.3-69.el6.src.rpm) = 21622433
 SHA256 (rpm/i686/centos/6.8/coreutils-8.4-43.el6.src.rpm) = 120438c0ff4d87cb917fb5aecedca88003c7e4a6fb3965ee6423af20333548a6
 SIZE (rpm/i686/centos/6.8/coreutils-8.4-43.el6.src.rpm) = 4656860
-SHA256 (rpm/i686/centos/6.8/db4-4.7.25-20.el6_7.src.rpm) = 656c2bc7a94c9cae8768588123dfd837f0e7d6f4d24a5640759ea24b198653ad
-SIZE (rpm/i686/centos/6.8/db4-4.7.25-20.el6_7.src.rpm) = 13414534
+SHA256 (rpm/i686/centos/6.8/db4-4.7.25-20.el6_8.1.src.rpm) = 61468eb1e729957b2ae26b2e9222da0c7c156f91eb8b192eda392ded078b010b
+SIZE (rpm/i686/centos/6.8/db4-4.7.25-20.el6_8.1.src.rpm) = 13422611
 SHA256 (rpm/i686/centos/6.8/e2fsprogs-1.41.12-22.el6.src.rpm) = eb4509ce21bb38c8734b0b352e940617a675e84cd22841907070487a21b0f6f7
 SIZE (rpm/i686/centos/6.8/e2fsprogs-1.41.12-22.el6.src.rpm) = 5553847
 SHA256 (rpm/i686/centos/6.8/elfutils-0.164-2.el6.src.rpm) = 9bb190818fd55b4edbc52f561a0aa48cc4d7b85aef49cec18ead53d8a14f704d
diff --git a/emulators/linux_base-c6/distinfo.x86_64 b/emulators/linux_base-c6/distinfo.x86_64
index fa4a99c0718c..36f46495da56 100644
--- a/emulators/linux_base-c6/distinfo.x86_64
+++ b/emulators/linux_base-c6/distinfo.x86_64
@@ -1,12 +1,12 @@
-TIMESTAMP = 1479889504
+TIMESTAMP = 1484729875
 SHA256 (rpm/x86_64/centos/6.8/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = d3424f4610860e7f8f444cc3cddf51cd75f5e58ca0ecffc8bdbbcb5f8fe1b0d1
 SIZE (rpm/x86_64/centos/6.8/bzip2-libs-1.0.5-7.el6_0.i686.rpm) = 37204
 SHA256 (rpm/x86_64/centos/6.8/compat-db43-4.3.29-15.el6.i686.rpm) = 202767fa03ff58947d6a2ec2437e52fc9179f3995fa77264753fde03f2737d0a
 SIZE (rpm/x86_64/centos/6.8/compat-db43-4.3.29-15.el6.i686.rpm) = 914280
 SHA256 (rpm/x86_64/centos/6.8/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 894abcc5f0b28e39c71d4b0ca27d19540e7eb9d3c32664d5621324c9efbfe11e
 SIZE (rpm/x86_64/centos/6.8/compat-libstdc++-33-3.2.3-69.el6.i686.rpm) = 193328
-SHA256 (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_7.i686.rpm) = 1bbe6a2090411a8ecec459f1bc94ebfa586f40a3a4f0c4e440e0e3bb06eb7ba5
-SIZE (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_7.i686.rpm) = 594068
+SHA256 (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_8.1.i686.rpm) = 0e38b3d3bfd03d4d4fcd6068b70793f15e383aa63002f293bf361301db018949
+SIZE (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_8.1.i686.rpm) = 594872
 SHA256 (rpm/x86_64/centos/6.8/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 4bc8b22538b56dda34db646ec87218b333499d00e90a9bc5852cbef178b357f1
 SIZE (rpm/x86_64/centos/6.8/e2fsprogs-libs-1.41.12-22.el6.i686.rpm) = 130892
 SHA256 (rpm/x86_64/centos/6.8/freetype-2.3.11-17.el6.i686.rpm) = ec0490d369ebf2de04a58437aba31af3e4bcf5a339867e7096b2a1a173d2802b
@@ -69,8 +69,8 @@ SHA256 (rpm/x86_64/centos/6.8/compat-db43-4.3.29-15.el6.x86_64.rpm) = c852d0b0bb
 SIZE (rpm/x86_64/centos/6.8/compat-db43-4.3.29-15.el6.x86_64.rpm) = 894824
 SHA256 (rpm/x86_64/centos/6.8/compat-libstdc++-33-3.2.3-69.el6.x86_64.rpm) = 41ea0fec16c0ca62722a32b7ffd70bb716beec8b6dd32b57f076be02a5aee00c
 SIZE (rpm/x86_64/centos/6.8/compat-libstdc++-33-3.2.3-69.el6.x86_64.rpm) = 187476
-SHA256 (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_7.x86_64.rpm) = 7410c7cd0242c8cd55abeee10e67826a866e3be53b7d0e4f44c9437861097d19
-SIZE (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_7.x86_64.rpm) = 576640
+SHA256 (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_8.1.x86_64.rpm) = 0faa6bed44dd2a76ff040b31de24ef8a143229791176bfaae1dab1b471b21565
+SIZE (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_8.1.x86_64.rpm) = 577440
 SHA256 (rpm/x86_64/centos/6.8/e2fsprogs-libs-1.41.12-22.el6.x86_64.rpm) = cddd17f8fe98eb2e501ebf0d0d72d754fe22a509953bcb8f10b1963fbe646909
 SIZE (rpm/x86_64/centos/6.8/e2fsprogs-libs-1.41.12-22.el6.x86_64.rpm) = 123932
 SHA256 (rpm/x86_64/centos/6.8/freetype-2.3.11-17.el6.x86_64.rpm) = a4f680e25073d307608ab245d87eb982646957892d68628736e5f1a00c2ee8c3
@@ -129,8 +129,8 @@ SHA256 (rpm/x86_64/centos/6.8/zlib-1.2.3-29.el6.x86_64.rpm) = c5b040d38b550da4c7
 SIZE (rpm/x86_64/centos/6.8/zlib-1.2.3-29.el6.x86_64.rpm) = 74568
 SHA256 (rpm/x86_64/centos/6.8/basesystem-10.0-4.el6.noarch.rpm) = 18860007697438e375733bb4a36a599daac2e2ae95d98a74c436a10d0974710e
 SIZE (rpm/x86_64/centos/6.8/basesystem-10.0-4.el6.noarch.rpm) = 4784
-SHA256 (rpm/x86_64/centos/6.8/bash-4.1.2-40.el6.x86_64.rpm) = 124d9a256115353d93fbab96cf0cbbd16606af407fa17469f6b9fd784182a7b9
-SIZE (rpm/x86_64/centos/6.8/bash-4.1.2-40.el6.x86_64.rpm) = 930724
+SHA256 (rpm/x86_64/centos/6.8/bash-4.1.2-41.el6_8.x86_64.rpm) = 30209c04edfa8e59b0788739c383f3ae60e75d6df59b7a6d5df901010c68e014
+SIZE (rpm/x86_64/centos/6.8/bash-4.1.2-41.el6_8.x86_64.rpm) = 930864
 SHA256 (rpm/x86_64/centos/6.8/bzip2-1.0.5-7.el6_0.x86_64.rpm) = e179e17b35407c2e6725a6ee230bbf51531f6ed788e1b8c4ac1e9ee859463648
 SIZE (rpm/x86_64/centos/6.8/bzip2-1.0.5-7.el6_0.x86_64.rpm) = 49724
 SHA256 (rpm/x86_64/centos/6.8/centos-release-6-8.el6.centos.12.3.x86_64.rpm) = e7ef25f95c7778f8e779e2a426b8afe2bc5a17ed1381fcd1d8ca677c54dc3edd
@@ -173,8 +173,8 @@ SHA256 (rpm/x86_64/centos/6.8/attr-2.4.44-7.el6.src.rpm) = 5f5440619e0109d9f8d91
 SIZE (rpm/x86_64/centos/6.8/attr-2.4.44-7.el6.src.rpm) = 335725
 SHA256 (rpm/x86_64/centos/6.8/basesystem-10.0-4.el6.src.rpm) = 18d3bd0580f40bdc208773f26b424fa1975fad70fae9f179c52337a8f80ade76
 SIZE (rpm/x86_64/centos/6.8/basesystem-10.0-4.el6.src.rpm) = 5949
-SHA256 (rpm/x86_64/centos/6.8/bash-4.1.2-40.el6.src.rpm) = bc4e15073b61079e05e5fb4069df779d8b2f6dd1ae9c13fe8230ef006b90c721
-SIZE (rpm/x86_64/centos/6.8/bash-4.1.2-40.el6.src.rpm) = 6686039
+SHA256 (rpm/x86_64/centos/6.8/bash-4.1.2-41.el6_8.src.rpm) = 51f44455653b116a613fdafd1ebdc8819deab2c39fddb5a5a388e3ca1f9276ea
+SIZE (rpm/x86_64/centos/6.8/bash-4.1.2-41.el6_8.src.rpm) = 6687192
 SHA256 (rpm/x86_64/centos/6.8/bzip2-1.0.5-7.el6_0.src.rpm) = 99a3d6a620f9f427aaeba974ae06234d0a771231730de7e203b97dce1dbf1931
 SIZE (rpm/x86_64/centos/6.8/bzip2-1.0.5-7.el6_0.src.rpm) = 855419
 SHA256 (rpm/x86_64/centos/6.8/centos-release-6-8.el6.centos.12.3.src.rpm) = 30648911e7df859182044b1135a9adc62064e5a3b974091b642da1f950702fe1
@@ -187,8 +187,8 @@ SHA256 (rpm/x86_64/centos/6.8/compat-gcc-32-3.2.3-69.el6.src.rpm) = 7ff0c6e00ad0
 SIZE (rpm/x86_64/centos/6.8/compat-gcc-32-3.2.3-69.el6.src.rpm) = 21622433
 SHA256 (rpm/x86_64/centos/6.8/coreutils-8.4-43.el6.src.rpm) = 120438c0ff4d87cb917fb5aecedca88003c7e4a6fb3965ee6423af20333548a6
 SIZE (rpm/x86_64/centos/6.8/coreutils-8.4-43.el6.src.rpm) = 4656860
-SHA256 (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_7.src.rpm) = 656c2bc7a94c9cae8768588123dfd837f0e7d6f4d24a5640759ea24b198653ad
-SIZE (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_7.src.rpm) = 13414534
+SHA256 (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_8.1.src.rpm) = 61468eb1e729957b2ae26b2e9222da0c7c156f91eb8b192eda392ded078b010b
+SIZE (rpm/x86_64/centos/6.8/db4-4.7.25-20.el6_8.1.src.rpm) = 13422611
 SHA256 (rpm/x86_64/centos/6.8/e2fsprogs-1.41.12-22.el6.src.rpm) = eb4509ce21bb38c8734b0b352e940617a675e84cd22841907070487a21b0f6f7
 SIZE (rpm/x86_64/centos/6.8/e2fsprogs-1.41.12-22.el6.src.rpm) = 5553847
 SHA256 (rpm/x86_64/centos/6.8/elfutils-0.164-2.el6.src.rpm) = 9bb190818fd55b4edbc52f561a0aa48cc4d7b85aef49cec18ead53d8a14f704d
diff --git a/emulators/linux_base-c6/pkg-plist.i386 b/emulators/linux_base-c6/pkg-plist.i386
index 67e6c99dfb3e..1eb2221b400e 100644
--- a/emulators/linux_base-c6/pkg-plist.i386
+++ b/emulators/linux_base-c6/pkg-plist.i386
@@ -2361,7 +2361,6 @@ var/mail
 @dir etc/xinetd.d
 @dir lib/modules
 @dir lib/tls
-@dir mnt
 @dir opt
 @dir selinux
 @dir srv
diff --git a/emulators/linux_base-c6/pkg-plist.x86_64 b/emulators/linux_base-c6/pkg-plist.x86_64
index 3a431df55dd3..478c7517e166 100644
--- a/emulators/linux_base-c6/pkg-plist.x86_64
+++ b/emulators/linux_base-c6/pkg-plist.x86_64
@@ -2790,7 +2790,6 @@ var/mail
 @dir lib64/rtkaio
 @dir lib64/security
 @dir lib64/tls
-@dir mnt
 @dir opt
 @dir selinux
 @dir srv