diff options
Diffstat (limited to 'app-arch/sharutils')
| -rw-r--r-- | app-arch/sharutils/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/sharutils/files/sharutils-4.15.2-C23.patch | 50 | ||||
| -rw-r--r-- | app-arch/sharutils/files/sharutils-4.15.2-dewhich.patch | 32 | ||||
| -rw-r--r-- | app-arch/sharutils/sharutils-4.15.2-r3.ebuild (renamed from app-arch/sharutils/sharutils-4.15.2-r2.ebuild) | 22 |
4 files changed, 101 insertions, 7 deletions
diff --git a/app-arch/sharutils/Manifest b/app-arch/sharutils/Manifest index 132f10d83bcd..c536294f85c1 100644 --- a/app-arch/sharutils/Manifest +++ b/app-arch/sharutils/Manifest @@ -1,6 +1,8 @@ +AUX sharutils-4.15.2-C23.patch 1094 BLAKE2B de6094d4f29fc6c2c12745e2024fabf6bd1ee3675c404c7829c02c5a0a9ab616245e126842be316ddf717c9664f8c1e4b1f9538afd15fc1298b0d47d14fd778e SHA512 cfe1acbe41dd7eff0571cf5cea480502fbe33333a7a005d9f82de40cc613489bf7290eb4f0aac06445e9b8b557590f6d7fd6e8d60eaf6a2dd9294c5ab9731417 AUX sharutils-4.15.2-CVE-2018-1000097.patch 500 BLAKE2B 581ee4fa93ac9b7f2eb0a5b605f0072a15af174f8462f1983833d1314eb3b7dc7763af60f32e6baa054ad00abf4ca4a10a7ae88b59415ab8ea9de3cb674ccf67 SHA512 6415da74c4f6f203bc4ad617bd05fa6ac86e1079538236148763e0b5e81ca8ea4004ea58e9e4755ba371246a7c469ef1e421576260494043d3ce3fc80e73cf69 +AUX sharutils-4.15.2-dewhich.patch 1234 BLAKE2B cae406d85108898f536e3cacd573bcd74492bad07953a0d6b625e2c0a1ff47d76effb1ff405d093c65c430c086fe8167bf791bebab980d0bfbe1bc8243f3c453 SHA512 094b70368170ec7be3b9e70518f3a3946019b9773f66a66ea3538b6505febce14b89cf22da2810923e5e73950a4e9a783d55f6d4d948987892e9570d53630932 AUX sharutils-4.15.2-gcc-10.patch 1048 BLAKE2B 4148ca1ffd1fd5469234a0af1efefa38f179a19527fc18b4df638d63a3d128f4f2f3934b94e3c862a515555199d16da4d59a508cc4aab1d097aa6e390967be2a SHA512 75fcd9ea81d1d8c63eee8525aac8eeeaa4c8caebf223670951489f0869dc50f0af84b647443df60927f184a89659c44c91c6f6a7ce12b874821037322ce079ae AUX sharutils-4.15.2-glibc228.patch 3807 BLAKE2B 644163c477f51b407211e8c9e6d3120ae38307753666fffb7aecbc758793b0b897920246b1f070e727e28728d76eb3283b80ababb881f39f909f9aa96b6e1ace SHA512 179272ae9b528719700bac5b06e4c70116d3d8a06973a69069617fc8dc0fa095227f7ab703b4c5b2beed649d5ffdc661d1d7ad7885185cb6ba6c62fce020e1cf DIST sharutils-4.15.2.tar.xz 1122476 BLAKE2B e2acae027679ebdf723ecae6f243608f501f5c24685a19223dd27580ccf76bc7d38905a9d202b30cf2633e5580d727821398f1162b170233f03c17f3da683917 SHA512 80d0b804a0617e11e5c23dc0d59b218bbf93e40aaf5e9a5401a18ef9cb700390aab711e2b2e2f26c8fd5b8ef99a91d3405e01d02cadabcba7639979314e59f8d -EBUILD sharutils-4.15.2-r2.ebuild 1093 BLAKE2B 8679051e2d8707b993ea6a3d485acf489ede5bf1af6fe7f657c5f1dc9a851968505433690bcb570e4c44d2b0592a0497b8ade7ca0e8e5f15fb9d9aacf33d6823 SHA512 8bfcbafad13d674a6092251a77e60421c9bee03ebc2d15802f2853fc6fde02310b181a823ebb0d53c5660afa823b97450d4fa818ce691503eadbc116abfd702b +EBUILD sharutils-4.15.2-r3.ebuild 1274 BLAKE2B c1ad69318ad75979a67eca46dd350661ad0a046a3d852ae3ab2c0a0902240263cc29f65675ab5bf8d082e78a6e3c761a1bde2aec356fa7090f85b074c3c55b4a SHA512 40c1d84af8dbf3979f98034e8f4a24c8d797430fab73b9b6ff76b41e875377fed7b2ef20fdee75b40aa8c01e3f1ca311c7782d323a29a4941564a953f38d0879 MISC metadata.xml 387 BLAKE2B 3677450dccbfa33050783a515707ac058cb052d6a4ffe2d075c80bf2f3f0c1939dad69810e87f07ba7b877029e8a18a69b0b692281e331445edf587147c74cfb SHA512 4fb79c41b65ebc8e01bfaa1e1ff75504b3e6cc607fc2c17f5a964252d24d699f3f6c50e8606452abfa2028c9400b83755827d77874fa0b2cc7e2375a6031710a diff --git a/app-arch/sharutils/files/sharutils-4.15.2-C23.patch b/app-arch/sharutils/files/sharutils-4.15.2-C23.patch new file mode 100644 index 000000000000..e27ce8ab9b8e --- /dev/null +++ b/app-arch/sharutils/files/sharutils-4.15.2-C23.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/900248 +https://bugs.gentoo.org/894322 +missing include for textdomain and bindtextdomain +This is only one place we can put include, else weird +macro dance messes with it or we use gettext before we +mark it for assembly operations. +--- a/src/shar-opts.h ++++ b/src/shar-opts.h +@@ -373,6 +373,8 @@ + # include <libintl.h> + # endif + ++#include "gettext.h" ++ + # ifndef ATTRIBUTE_FORMAT_ARG + # define ATTRIBUTE_FORMAT_ARG(_a) + # endif +--- a/src/unshar-opts.h ++++ b/src/unshar-opts.h +@@ -210,6 +210,8 @@ + # include <libintl.h> + # endif + ++#include "gettext.h" ++ + # ifndef ATTRIBUTE_FORMAT_ARG + # define ATTRIBUTE_FORMAT_ARG(_a) + # endif +--- a/src/uudecode-opts.h ++++ b/src/uudecode-opts.h +@@ -188,6 +188,8 @@ + # include <libintl.h> + # endif + ++#include "gettext.h" ++ + # ifndef ATTRIBUTE_FORMAT_ARG + # define ATTRIBUTE_FORMAT_ARG(_a) + # endif +--- a/src/uuencode-opts.h ++++ b/src/uuencode-opts.h +@@ -184,6 +184,8 @@ + # include <libintl.h> + # endif + ++#include "gettext.h" ++ + # ifndef ATTRIBUTE_FORMAT_ARG + # define ATTRIBUTE_FORMAT_ARG(_a) + # endif diff --git a/app-arch/sharutils/files/sharutils-4.15.2-dewhich.patch b/app-arch/sharutils/files/sharutils-4.15.2-dewhich.patch new file mode 100644 index 000000000000..a2531ad69128 --- /dev/null +++ b/app-arch/sharutils/files/sharutils-4.15.2-dewhich.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/941724 +which-hunt +diff '--color=auto' -ru sharutils-4.15.2.old/libopts/m4/libopts.m4 sharutils-4.15.2/libopts/m4/libopts.m4 +--- sharutils-4.15.2.old/libopts/m4/libopts.m4 2025-01-22 13:17:52.302369061 +0000 ++++ sharutils-4.15.2/libopts/m4/libopts.m4 2025-01-22 13:19:46.096362975 +0000 +@@ -114,9 +114,9 @@ + AC_PROG_SED + [while : + do +- POSIX_SHELL=`which bash` ++ POSIX_SHELL=`command -v bash` + test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`which dash` ++ POSIX_SHELL=`command -v dash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=/usr/xpg4/bin/sh + test -x "$POSIX_SHELL" && break +diff '--color=auto' -ru sharutils-4.15.2.old/m4/libopts.m4 sharutils-4.15.2/m4/libopts.m4 +--- sharutils-4.15.2.old/m4/libopts.m4 2025-01-22 13:17:52.365018511 +0000 ++++ sharutils-4.15.2/m4/libopts.m4 2025-01-22 13:19:17.856525747 +0000 +@@ -114,9 +114,9 @@ + AC_PROG_SED + [while : + do +- POSIX_SHELL=`which bash` ++ POSIX_SHELL=`command -v bash` + test -x "$POSIX_SHELL" && break +- POSIX_SHELL=`which dash` ++ POSIX_SHELL=`command -v dash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=/usr/xpg4/bin/sh + test -x "$POSIX_SHELL" && break diff --git a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/app-arch/sharutils/sharutils-4.15.2-r3.ebuild index c39766d65c95..5507562f71ff 100644 --- a/app-arch/sharutils/sharutils-4.15.2-r2.ebuild +++ b/app-arch/sharutils/sharutils-4.15.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -inherit flag-o-matic strip-linguas +inherit flag-o-matic strip-linguas autotools MY_P="${P/_/-}" DESCRIPTION="Tools to deal with shar archives" @@ -21,9 +21,15 @@ DEPEND="app-arch/xz-utils nls? ( >=sys-devel/gettext-0.10.35 )" PATCHES=( - "${FILESDIR}"/${PN}-4.15.2-glibc228.patch - "${FILESDIR}"/${PN}-4.15.2-CVE-2018-1000097.patch - "${FILESDIR}"/${PN}-4.15.2-gcc-10.patch + "${FILESDIR}"/${P}-glibc228.patch + "${FILESDIR}"/${P}-CVE-2018-1000097.patch + "${FILESDIR}"/${P}-gcc-10.patch + "${FILESDIR}"/${P}-dewhich.patch + "${FILESDIR}"/${P}-C23.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + pathfind ) src_prepare() { @@ -35,6 +41,10 @@ src_prepare() { # bug #943901 append-cflags -std=gnu17 + + # bug https://bugs.gentoo.org/941724 + # regenerate config after which removal + eautoreconf } src_configure() { |