diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-24 00:08:50 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-24 00:08:50 +0100 |
| commit | b2523734e380d060074602eb5ce53daf7d98803b (patch) | |
| tree | 0f6e9c0a8339a7e6bb0b44089507392951245899 /app-arch/tar | |
| parent | 622b78d0d832282505f685f2f442c34ea0e8a7b1 (diff) | |
gentoo auto-resync : 24:04:2023 - 00:08:50
Diffstat (limited to 'app-arch/tar')
| -rw-r--r-- | app-arch/tar/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.34-r2.ebuild | 7 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.34-r3.ebuild | 7 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest index 60a47e680095..28e14e8f1353 100644 --- a/app-arch/tar/Manifest +++ b/app-arch/tar/Manifest @@ -2,6 +2,6 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9 AUX tar-1.34-fix-cve-2022-48303.patch 1123 BLAKE2B fd1fd30443372eb29ba6168ec421be849682587c40ecefe5a96050566ec198e680dd9e9baeacecb9ed01376672d826a65573f10e7dd443b7a79dcd66caf33060 SHA512 c9e21ac3bcb592262da9db07d0772d0c14b6e1d0c59542ef984b37e36987d6292343f228622433aed1bd776ca1f5fd049fe00661ec8661c608aad21637f13477 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7 -EBUILD tar-1.34-r2.ebuild 2509 BLAKE2B e4867e9669e4528e654c484d36a26eb16114e61725f1d6730bc0f61beb19c453821a319657337bdcef816216a785f27594e7ad6bcf313266339563981b1d969e SHA512 fef232a1bb0331994b3e46152111143759a4a5f263db30dae0e51272863c5a92b6f1d0da8a61f66c0c09211ebfbc2b91347feb9aea161d19fdcb22971c8e479b -EBUILD tar-1.34-r3.ebuild 2575 BLAKE2B 3aa6dce66fb212c2c993f4fee3ee2d71f2c3e2799eeba004eb24d1328a711bb6819ea7d9f63193e5de001def2054bcf76747cf8fea8d3abec74e8bffb9dfe9b6 SHA512 6101788d14d1c981d0c9f45ac9436c2a78f9dfbcb861284c36e27e41370370d51e942d824491682b6164120eaf4ae6e253bfcbb9cd31f2b139588169903ded19 +EBUILD tar-1.34-r2.ebuild 2835 BLAKE2B 055771c521466673b972532b36c8150ea6dfed14db5e9a70cb7b1dc7a6a23fcca0e141837a45fc5dc5807242d4ee473eabc95f1cf3ae55a9f756c92b64dca16d SHA512 168e92f580e1d21e92b424482dd540b79f9e9dfa0c07e2204f34f043a601c24e291c9158833f84e48a5ef13de28c5e7ef07ecda7bc22d7a4c6085ea54dd553b9 +EBUILD tar-1.34-r3.ebuild 2901 BLAKE2B 6d24402431972089e79f0756ceef13349d1a3a8b2a199c2c0a86679d57bd168294b9dbd7841fe62d62b85632e78135bae52fe6eb0f054b97c81c158a5ebba0ae SHA512 ef6969aa4c1c3dc5b864eed95949ac48767203d82e17642e23003d038f51182bb559c8cc3b5bfdd9d6ff4a9c7823a2cdfc4cb75ca247155c821ced3f251e985e MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64 diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild index 86fdc8e05e20..805941b1f61c 100644 --- a/app-arch/tar/tar-1.34-r2.ebuild +++ b/app-arch/tar/tar-1.34-r2.ebuild @@ -90,6 +90,13 @@ pkg_postinst() { # ensure to preserve the symlink before app-alternatives/tar # is installed if [[ ! -h ${EROOT}/bin/tar ]]; then + if [[ -e ${EROOT}/usr/bin/tar ]] ; then + # bug #904887 + ewarn "${EROOT}/usr/bin/tar exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unsual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak." + mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die + fi ln -s gtar "${EROOT}/bin/tar" || die fi } diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild index f92891dceff1..da958a84470e 100644 --- a/app-arch/tar/tar-1.34-r3.ebuild +++ b/app-arch/tar/tar-1.34-r3.ebuild @@ -94,6 +94,13 @@ pkg_postinst() { # ensure to preserve the symlink before app-alternatives/tar # is installed if [[ ! -h ${EROOT}/bin/tar ]]; then + if [[ -e ${EROOT}/usr/bin/tar ]] ; then + # bug #904887 + ewarn "${EROOT}/usr/bin/tar exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unsual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak." + mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die + fi ln -s gtar "${EROOT}/bin/tar" || die fi } |