diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /app-arch/tar | |
parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) |
gentoo resync : 19.03.2019
Diffstat (limited to 'app-arch/tar')
-rw-r--r-- | app-arch/tar/Manifest | 6 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch | 89 | ||||
-rw-r--r-- | app-arch/tar/files/tar-1.30-fix-test-92.patch | 13 | ||||
-rw-r--r-- | app-arch/tar/tar-1.30.ebuild | 81 | ||||
-rw-r--r-- | app-arch/tar/tar-1.31-r1.ebuild | 2 |
5 files changed, 2 insertions, 189 deletions
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 1a53b330e867..61e18be07d0d 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -1,11 +1,7 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152 -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 AUX tar-1.31-remove-erroneous-abort-call.patch 989 BLAKE2B 67646a590097860d692e158b41c960c6bf4372c2018d47b9f71da7972bd25afb631cd851178d0bd8eb19c26d54bfaa8f1ed42da97033d262ccfa0c0099a03daa SHA512 c4d317b9968c0638287e6dff77a7660d36e8ad4af56039146992d519d05a0f73b6a459cc88de7a4afd9909efd1bdbd3567d8b3aa67b48d89867600c1023400aa -DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8 DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6 -EBUILD tar-1.30.ebuild 2187 BLAKE2B cb952591e27678df72ad53da254bb901d355bf9af7dbe0e22b59a92d3b49fc90c20a9f170154a3ff77bc5aa3cbb2962930cf9258feb5f0f11de3b4dbe2d76f7c SHA512 89fa12ce7849917a85402d98e6532205b294a1793f8f563af952736f282a13ac52f982c0ed87d55a65c7e04f2d150ce5a348bd178ff10512eab822401cee81b2 -EBUILD tar-1.31-r1.ebuild 2266 BLAKE2B 9f281e2266b2773b14d633a8b88d1fb4a076f701a6453ecaa5383ba767ebb16440874c03ff2d1512e25e98f8e1ccc7f806002b19f897ea18a095d59468b4bd66 SHA512 edb72f897b41f164c8142c3b44765797e5e0c11bfd6ba07cf69a7e84a520058024b047f31e9b340d788df972bf98ea5d0675f36b88a9e74de005948ad1f750b0 +EBUILD tar-1.31-r1.ebuild 2265 BLAKE2B e2ace5e40af0143b82bb4d1fae2d20a2af9189cdb5e4973688012b9dfc7dcccc4c4c1f8643cf92c502f068be342fa2cf3c614e29c71beded3dbb51ad921c4c2d SHA512 2490769e0aa6f874024cbe35a9ed1c73872b15b296b2f5cbc0a52c953a7f71e9552a8544fd63b2ca209d34f09d6f1614e262fa05b6e55fcc50c3f8e785054da0 EBUILD tar-1.32.ebuild 2212 BLAKE2B 0ba0d330cf681db8740dc0d6ff04049311cf014a48445e1042374c8a916f0dbe8851aadd2306bbe73caf7ee1f47ae3fee15c1f65b7ca9e10c95cd899cafe1dbe SHA512 caf7cef12cf4d6e4ef9ec9ae38aeeb5bcf2da279e2aacf37d04d7c29935a617f2a43f8adf0b33dee892103921f6d26626bc84530739c5f21273cf320a1c2ff29 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 deleted file mode 100644 index 2f75da6cd247..000000000000 --- a/app-arch/tar/files/tar-1.30-fix-test-117-and-118.patch +++ /dev/null @@ -1,89 +0,0 @@ -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/files/tar-1.30-fix-test-92.patch b/app-arch/tar/files/tar-1.30-fix-test-92.patch deleted file mode 100644 index d5a63e4ab355..000000000000 --- a/app-arch/tar/files/tar-1.30-fix-test-92.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://lists.gnu.org/archive/html/bug-tar/2017-12/msg00027.html - ---- a/tests/difflink.at -+++ b/tests/difflink.at -@@ -21,7 +21,7 @@ mkdir a - genfile -f a/x - ln -s x a/y - ln a/y a/z --tar cf a.tar a -+tar cf a.tar a/x a/y a/z - rm a/z - ln -s x a/z - tar df a.tar diff --git a/app-arch/tar/tar-1.30.ebuild b/app-arch/tar/tar-1.30.ebuild deleted file mode 100644 index 613884f9f5da..000000000000 --- a/app-arch/tar/tar-1.30.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="Use this to make tarballs :)" -HOMEPAGE="https://www.gnu.org/software/tar/" -SRC_URI="mirror://gnu/tar/${P}.tar.bz2 - mirror://gnu-alpha/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 ~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 ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - nls? ( >=sys-devel/gettext-0.10.35 ) - xattr? ( elibc_glibc? ( sys-apps/attr ) )" - -PATCHES=( - "${FILESDIR}"/${P}-fix-test-92.patch - "${FILESDIR}"/${P}-fix-test-117-and-118.patch -) - -src_prepare() { - default - - if ! use userland_GNU ; then - sed -i \ - -e 's:/backup\.sh:/gbackup.sh:' \ - scripts/{backup,dump-remind,restore}.in \ - || die "sed non-GNU" - fi -} - -src_configure() { - use static && append-ldflags -static - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --enable-backup-scripts - --libexecdir="${EPREFIX}"/usr/sbin - $(usex userland_GNU "" "--program-prefix=g") - $(use_with acl posix-acls) - $(use_enable nls) - $(use_with selinux) - $(use_with xattr xattrs) - ) - FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}" -} - -src_install() { - default - - local p=$(usex userland_GNU "" "g") - if [[ -z ${p} ]] ; then - # a nasty yet required piece of baggage - exeinto /etc - doexe "${FILESDIR}"/rmt - fi - - # autoconf looks for gtar before tar (in configure scripts), hence - # in Prefix it is important that it is there, otherwise, a gtar from - # the host system (FreeBSD, Solaris, Darwin) will be found instead - # of the Prefix provided (GNU) tar - if use prefix ; then - dosym tar /bin/gtar - fi - - mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die - mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die - - if use minimal ; then - find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \ - -type f -a '!' '(' -name tar -o -name ${p}tar ')' \ - -delete || die - fi -} diff --git a/app-arch/tar/tar-1.31-r1.ebuild b/app-arch/tar/tar-1.31-r1.ebuild index e1e080951528..72de0a507c72 100644 --- a/app-arch/tar/tar-1.31-r1.ebuild +++ b/app-arch/tar/tar-1.31-r1.ebuild @@ -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 ~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 ~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" LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )" |