gentoo resync : 23.06.2018

3 files changed, 97 insertions, 4 deletions

diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 661e3a222218..cff22462bdcf 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,10 +2,11 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 AUX tar-1.29-add-files.patch 6602 BLAKE2B ac4687bccd88e1fb3b2c565901815988b0ff0d9d42b46f71878c0293db0e0ce453d3b2fd3ead26d136997bd6f87b1400eb2310fd4d40c07a56b63a5528e5a7fa SHA512 5c87dd4a8e6d86c8e2311ac8487958abbda846484aec664ab82b7502ac1bb6a6cd43d3869fc64e06f792915b6a0659c41b9481357e5da19fbe43f9c913a10f3e
 AUX tar-1.29-extract-pathname-bypass-upstream.patch 1604 BLAKE2B 83364c5dee8d12b7cb67d8497666ec3082e0e209aeb4c84cc26292d43da0820bd14188f3003244a379cf5b6bdb5d3d7d566b42ec2c35d62f1d5713be7395e001 SHA512 c13046f8b0bcc435197c859006b1cfd12b79377f3b90edfd4b77f86ec6d3ca431c716d731be84884f0ec6d6129765cbfbccb5971d0b909c3f45aff8f0b9b45cb
 AUX tar-1.29-extract-pathname-bypass.patch 723 BLAKE2B c63c23dd1f256263cb4d1371e7a3eeccfe1da4aa74c13fd23f9bc1721b06e06d388eb99e1d9d17fb3344875be8b80e2a433f78360c89f6b2b7408302f346d0cc SHA512 ba06ae53b4effcdd0996be07ae03fae7237c579a82d2606fe25100bed447287a68e37282ba2b017eed0c26cb0f4bf77dcdb4fca2f5175e1bbaed91408b0bd54a
+AUX tar-1.30-fix-test-117-and-118.patch 3109 BLAKE2B d547dfb115d6cdbdf565c93dcdc70c9d2d0cde70228f58763e74d4cf5df7d621a5fccea375c3e103f8dcc04a19b3318b227384db2dc983cec5876eed8861cece SHA512 d104bbd88dafc0c3bb0308fbfb1dfb39b6c26fed14a316c30c2355d57ebe16172c0dde8ed6c91696b90f37622a43b5b1d70f397f7de521b9bd1552a5af78bb14
 AUX tar-1.30-fix-test-92.patch 257 BLAKE2B ee4fe8420f56191a8e4d9edefd109c948eb693532e2c3bb2073a8d55631aed142ab9c3adfa64d6461eb1aa9221a1aca6ec5086f15b3b9154effdb8e7128a8601 SHA512 aa1c80edbf1c846e23aa34ed343ffebad969b26fed9d4ccdc779f3df5bc384bb44d6c78044c385dbb7c01e68462568b941e8ec1060eb97bf36606d7beb790c1c
 DIST tar-1.29.tar.bz2 2715993 BLAKE2B 656b77a49c463ec7ade87a97b71469dadbf01551131bdf0cfa895b7b2a7d073a4cd51e9bec4169b134d83155aca18af1a89ddb5d14cb1dc0d9968184870d69f3 SHA512 d2cea9892892dfa0c8efd390303b75dccc085c4895e07ced684074592d69729916d6ea12475aa6aff873d076a729bb7dc2499c233edcfb9c7e8e8995481eef3b
 DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
 EBUILD tar-1.29-r1.ebuild 2157 BLAKE2B 4a1e4e3cbbc34cf71f41b5ce9e1f7b8b65a9413fdc3e08bb97f09eb64a4f72b8952461fef59d7b6beca00350ea0b7718d2a4d99d3f9a8a830479d1e194f44641 SHA512 9445561ce892822feb1365f6a227143a3bea6767a19bacea08345057ac2fab80cd5035c81281b27161a443c5103e5432288e9b69ec0fe33218c587ccb9d20a4b
 EBUILD tar-1.29-r3.ebuild 2227 BLAKE2B 50afab4df588f55fdab5d3cfd4258d3c65192ee0cc7079527a05fcbee0a2ec50e3875302a241faa351edc41e5f77351382ecd3e291037eec11115d4c729aebde SHA512 270db39d7490c4829fb11cb680b39e75963bb065fe3ebdf78ab024300dae27f78e18453dc76c029a6cdfc4af9511074322aaafc3e89910e63e976065d92867a3
-EBUILD tar-1.30.ebuild 2163 BLAKE2B c07de44b4f9c90532a5516e60091980ec53650c09e2d6aa04902b8a2045a7bbf0822d6ea4ea771ebd433e1861ecb0f2de3a521176b41e86df167750c8b035e60 SHA512 7accbccbbc5e107d6d86f3e9f5ba6d706d4f10046154587e7e45de52e68af9da7e1bf44c481c58b9b30103f0a3fae3d403c62edce6f5e380e672a7ffbc153985
+EBUILD tar-1.30.ebuild 2207 BLAKE2B 98c6fa3728d922c5e97767728dd76ef5875f7af9577aee9bfa700a25db2ace1e521defb996d79f5edfea16e3a0c796b3d9971b58f637b248d7c2698d8b0ea8f8 SHA512 51be80e8662cfcb429c9c24335058cc9adc4b73b78c745d2785a996630635f526081e7ba642532d496842abf29d91b19d85da083edb500f9d26bedd1725d546b
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch b/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch
new file mode 100644
index 000000000000..2f75da6cd247
--- /dev/null
+++ b/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch
@@ -0,0 +1,89 @@
+tests: fix race in dirrem01 and dirrem02
+
+Previously the '--checkpoint-action=echo' was triggered after
+'--checkpoint-action=sleep=1' - so the order of events *usually*
+was (for --format='gnu'):
+
+  ...
+  1. checkpoint handler before write of 'dir/sub' member
+  2. one-second delay
+  3. stderr write: 'tar: Write checkpoint 3'
+  4. write the member 'dir/sub' into the archive
+  5. check that the member's ctime has not been changed
+  6. genfile's detecting 'Write checkpoint', doing unlink
+  ...
+
+But sometimes, the genfile was fast enough to win the race and
+unlinked the directory before the member was written into the
+archive (IOW, the order was 1-2-3-6-4-5).  This led to the
+occasional warning 'tar: dir/sub: file changed as we read it'.
+
+Swap the order of 'sleep=1' and 'echo' actions so the genfile
+utility has (hopefully) enough time to do the unlink before
+writing the file into the archive (enforce 1-2-3-6-4-5 order).
+
+* tests/dirrem01.at: Swap 'sleep=1' and 'echo' actions.
+* tests/dirrem02.at: Likewise.
+
+Origin: https://lists.gnu.org/archive/html/bug-tar/2018-01/msg00000.html
+---
+ tests/dirrem01.at | 5 +++--
+ tests/dirrem02.at | 7 ++++---
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/tests/dirrem01.at b/tests/dirrem01.at
+index 40344dc..dabc206 100644
+--- a/tests/dirrem01.at
++++ b/tests/dirrem01.at
+@@ -47,14 +47,15 @@ gnu)   CPT=3;;
+ esac
+ 
+ genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
+-       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
+-       --checkpoint-action='echo' -c -f archive.tar \
++       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \
++       --checkpoint-action='sleep=1' -c -f archive.tar \
+        --listed-incremental db -v dir >/dev/null
+ ],
+ [1],
+ [ignore],
+ [tar: dir: Directory is new
+ tar: dir/sub: Directory is new
++tar: dir/sub: file changed as we read it
+ tar: dir/sub: File removed before we read it
+ ],[],[],[gnu,posix])
+ 
+diff --git a/tests/dirrem02.at b/tests/dirrem02.at
+index e1cf9ef..924454f 100644
+--- a/tests/dirrem02.at
++++ b/tests/dirrem02.at
+@@ -20,7 +20,7 @@
+ 
+ # Description:
+ #
+-# When an explicitley named directory disappears during creation
++# When an explicitly named directory disappears during creation
+ # of incremental dump, tar should still exit with TAREXIT_FAILURE (2).
+ #
+ # For further details see dirrem01.at
+@@ -44,14 +44,15 @@ gnu)   CPT=3;;
+ esac
+ 
+ genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
+-       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
+-       --checkpoint-action='echo' -c -f archive.tar \
++       tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \
++       --checkpoint-action='sleep=1' -c -f archive.tar \
+        --listed-incremental db -v dir dir/sub >/dev/null
+ ],
+ [2],
+ [ignore],
+ [tar: dir: Directory is new
+ tar: dir/sub: Directory is new
++tar: dir/sub: file changed as we read it
+ tar: dir/sub: Cannot open: No such file or directory
+ tar: Exiting with failure status due to previous errors
+ ],[],[],[gnu,posix])
+-- 
+cgit v1.0-41-gc330
+
diff --git a/app-arch/tar/tar-1.30.ebuild b/app-arch/tar/tar-1.30.ebuild
index a06f678cc894..a2e73cd2c85e 100644
--- a/app-arch/tar/tar-1.30.ebuild
+++ b/app-arch/tar/tar-1.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 RDEPEND="acl? ( virtual/acl )
@@ -21,7 +21,10 @@ DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.35 )
 	xattr? ( elibc_glibc? ( sys-apps/attr ) )"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-test-92.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-test-92.patch
+	"${FILESDIR}"/${P}-fix-test-117-and-118.patch
+)
 
 src_prepare() {
 	default