From ebc282ef4dfa408accac685565b8ee5f6faec119 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Feb 2023 09:56:54 +0000 Subject: gentoo auto-resync : 12:02:2023 - 09:56:54 --- sys-apps/diffutils/Manifest | 2 + sys-apps/diffutils/diffutils-3.9-r1.ebuild | 58 ++++++++++++++++++++++ .../diffutils-3.9-diff-D-option-regression.patch | 27 ++++++++++ 3 files changed, 87 insertions(+) create mode 100644 sys-apps/diffutils/diffutils-3.9-r1.ebuild create mode 100644 sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch (limited to 'sys-apps/diffutils') diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest index 8432aa2e43b2..80c3606c8b98 100644 --- a/sys-apps/diffutils/Manifest +++ b/sys-apps/diffutils/Manifest @@ -1,3 +1,4 @@ +AUX diffutils-3.9-diff-D-option-regression.patch 1002 BLAKE2B 58b474797f039f033a9e543961d35dd47e1bbc994e44341ad2519c3163b6b6fdd160ddf9b9da7434b11fc6397c5ab8b6dca94923ce26f865df1da3917a40b013 SHA512 a34f8438d8bf274d29adefb7f90b2512a063bba4c3d80b9f8066f41bf5ee5fe14bca9fd239b9551b1881408740560cbce62b4eaf42e664deff7cf975575dc74a AUX diffutils-3.9-make-4.4-test-color.patch 1021 BLAKE2B 54ab07967f48c230292590cfd668ea4f6e6ea0a53850705e6dd9c62da626d5a905946314dfcbbd18c6a34b16b564113cd0c2cd0a3e84e652d8cf1037030df2f3 SHA512 9d6e3463dd29684b58bdd8e2585c0ea597a66cb60f8068f1c06ca7c676b12a51a4d691aa7d31afcedeb9612038560eca40cdf6bd6715e7789e5efd9e72b0c5f3 AUX loong-fix-build.patch 859 BLAKE2B 11e48762d8112d3c56947d0f9db196d84c142775d5abab0dc1a6593a4f0eeecbf7cbf72d589a0db1623d3a4f85559bc95f17260b94041d6eb625401e784852c3 SHA512 1d87a407196ebbfd22b1b14504a5ec61eff9cc8a4d11a4f7d15c1a7aea1ff338c9bc18e6298ea6e29898a0753201cda6bb90023a5dda817e78a0980e846a68d3 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e @@ -6,5 +7,6 @@ DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c1 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed EBUILD diffutils-3.8.ebuild 1673 BLAKE2B e1af83d87e166a3d60f87ed13870240f9216ff72ffb99508780c7020fa466da05b2e3b8eeaaf8dbf244ee873059a004273bfb2e2ab6ddb4cf4f0e16542497f3b SHA512 17925dde918dc25fde6a42891b45c7a8f242aa5a81bf67974b01d03785f16251496912fb5ccfe0927cde4908432cf36532341d7b11f16b2ae5033169f466018f +EBUILD diffutils-3.9-r1.ebuild 1789 BLAKE2B f5ee04bf9a53311a51bc4597a11ac1240054c34bae2a8a33d8d056f40815b27bcfd6c0da226eb6ce4606be46ddfd22ab73b75b0b6794dd7df27137a67c12e321 SHA512 9b1071439ddfdf5232de72f85dafe6243097fa972d4ee7e3cd90504a8128090ccca80030f106e88590efd7ce1e9f3438bb4ddf7dbe6e538ca233b919ef006335 EBUILD diffutils-3.9.ebuild 1738 BLAKE2B e77e1914a52c8ea0ba462abd13483525008028f8db677d0fa054c563e115900f7fcd6b4736927aa9d8192b15ed65e43bcd183651e373cbc469afa327d8bccaa9 SHA512 62ed34d6e9c18ba2e0831ad05cc48df9f0c787cf7e111a61b6ef5b781faa776645f53356d0b8c89a10df7a6c91e0fb95b467b8a5fc09d890080e8f7dc7ada194 MISC metadata.xml 403 BLAKE2B 009b73d59702ec89a6dc4e9ff8886ee77f0390961ea51aa5248d6f2fa3c9de0dd7fc8ba6844b0e38b7bae348dbb3b38cc8447f27371127976a5e5ae37aebbb34 SHA512 c0450fc2991ef0b1b56076a82fe88a8c860ac2a11aa78ac86cbaa29b049fdc6c69e11f9da3e9f90501f0a9567884e0bc47cf2b3b0a486cd173d1060b19f04a25 diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sys-apps/diffutils/diffutils-3.9-r1.ebuild new file mode 100644 index 000000000000..b33f99dcdb75 --- /dev/null +++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc +inherit flag-o-matic verify-sig + +DESCRIPTION="Tools to make diffs and compare files" +HOMEPAGE="https://www.gnu.org/software/diffutils/" + +if [[ ${PV} == *_p* ]] ; then + # Subscribe to the 'platform-testers' ML to find these. + # Useful to test on our especially more niche arches and report issues upstream. + MY_COMMIT="43-2d50" + MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT} + SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )" + S="${WORKDIR}"/${MY_P} +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls static" + +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-diffutils ) +" + +PATCHES=( + "${FILESDIR}"/${P}-make-4.4-test-color.patch + "${FILESDIR}"/${P}-diff-D-option-regression.patch +) + +src_configure() { + use static && append-ldflags -static + + # Disable automagic dependency over libsigsegv; see bug #312351. + export ac_cv_libsigsegv=no + + # required for >=glibc-2.26, bug #653914 + use elibc_glibc && export gl_cv_func_getopt_gnu=yes + + local myeconfargs=( + # Interferes with F_S (sets F_S=2) + --disable-gcc-warnings + --with-packager="Gentoo" + --with-packager-version="${PVR}" + --with-packager-bug-reports="https://bugs.gentoo.org/" + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} diff --git a/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch b/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch new file mode 100644 index 000000000000..a12e1bc673a0 --- /dev/null +++ b/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch @@ -0,0 +1,27 @@ +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61193 +https://git.savannah.gnu.org/cgit/groff.git/commit/?id=10274fb69e517b2c4b10fcd0ba3347e5bd0eefd7 +https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=ba08fbbb0ca5da455bf695236c57bc50e7faed50 + +From ba08fbbb0ca5da455bf695236c57bc50e7faed50 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 10 Feb 2023 15:33:40 -0800 +Subject: diff: fix bug where -D does not work +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Robert Webb (bug#61193). +* src/diff.c (main): Omit stray ‘sizeof’. +* tests/ifdef: New test. +* tests/Makefile.am (TESTS): Add it. +--- a/src/diff.c ++++ b/src/diff.c +@@ -416,7 +416,7 @@ main (int argc, char **argv) + char *base = b; + int changes = 0; + +- for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++) ++ for (i = 0; i < sizeof C_ifdef_group_formats; i++) + { + char ch = C_ifdef_group_formats[i]; + switch (ch) -- cgit v1.2.3