diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/Manifest.gz | bin | 6220 -> 6218 bytes | |||
| -rw-r--r-- | sys-devel/gcc/Manifest | 3 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-15.0.1_pre20250330.ebuild | 52 | ||||
| -rw-r--r-- | sys-devel/patch/Manifest | 8 | ||||
| -rw-r--r-- | sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch | 51 | ||||
| -rw-r--r-- | sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch | 36 | ||||
| -rw-r--r-- | sys-devel/patch/patch-2.8.ebuild (renamed from sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild) | 10 |
7 files changed, 60 insertions, 100 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 8f27dd690454..d792216bac87 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 3489811e811f..c7c3052bbde1 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -33,8 +33,10 @@ DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8 DIST gcc-14.2.0-patches-7.tar.xz 14244 BLAKE2B 11236e91e1fe83fec8ffaa40ec0cdd4b52a00a951e9aa9a7a0a932b234b8f1a9603333a7ccf55859f4ef53dd4d8ad1fd5c1d2514b6e45fce5b86bb58622a0ecc SHA512 5a4d86d943e31fa068b5a784c0132bd83c23243dcb3cf972557a42e004469a415e1b3185f31b1bb36f916594d475f266a2fda031a414e4a15e0bbfe471269eee DIST gcc-14.2.0-patches-8.tar.xz 14540 BLAKE2B 09f66035343d4cab694b8ab382170f8e2d546ddffedf3477f26edbd6a798ddf94294f569c2661729d40088d590bc17a4eb651710d8d9f66f33703734a1a82b67 SHA512 7a9a2724ef8db3c57b033d90751192969c16e5eaa8f4777b7f16470222ff3a18771b461bd89feaad701e7f0d573b883b487981588129933c732fb76117728b86 DIST gcc-15-20250323.tar.xz 91685912 BLAKE2B cd56bfe95b80358cbc44ae27a15d297d60630495f452e5d8158f5dfb7be457cdbb144226ef3bc8bdac6eec7f9e20185240a7a4ddc229ab96b7a9ef5c502c308a SHA512 45e44a9136c466ef1ace86129cc5e4629f4cbeefd896967ef9701711a09f806ac0505232f5eb840823aeaca82c8e6107b6cbb3ea7b912264402b4faf5cd19788 +DIST gcc-15-20250330.tar.xz 91772420 BLAKE2B 164a4db7f83d40a010edbed11ecf949e459a5f0c866425812299d55ed96965fcc537bb40190dc78a16f66dfaa8da110b74fb612d8e76fe29ce4031d6196ef0b3 SHA512 719f5b1d79cd8ba4462d6916b1ddb401ca7ee9a9596610e6be00085fdf0d20c7ccbdc88983a22cfea73a0b21b28e1edb8dfd095ca95696362d1d9d62fe6551c2 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de DIST gcc-15.0.0-patches-48.tar.xz 18120 BLAKE2B bfb1e7330c1c0499d2d0a0046506961cccaac1df8e5779f9de599e8b6d89e9014b512072159ed18fb58243e95716b79aaa0d7665e7742ceda117d40a867cf34f SHA512 1cc61250e943e2cae543a5336fdc9ad04851186f8f45e4b82cb9be287a804374e84066cec0efd55662211107cecde92f78b6d3c745e421bc83b3d60101be9ebd +DIST gcc-15.0.0-patches-50.tar.xz 25208 BLAKE2B 09e98c3dcdd3c60ede26c6e322d513b3df09efddfa21ea95b2cb7c3ee57b4c054f41fc60668706e33e56f022ef4b7cb96f7cc01b4a25d62d9777ef8b3b0d1ade SHA512 3b69d97a08c894a387fbcc4934bf0c519af8f66aff394c2a2565ed545fcb93f0bd70526cc74f5d952047d8d6782847c6d8e4aa7a408f0f89b1666c747ada8b4d DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf @@ -60,6 +62,7 @@ EBUILD gcc-14.2.1_p20250322.ebuild 1440 BLAKE2B edf0c165e4041c43526cf6cb419c3526 EBUILD gcc-14.2.1_p20250329.ebuild 1440 BLAKE2B edf0c165e4041c43526cf6cb419c352600d5d7b9a64e245b4d846f8ee36d23ee452db98e7c49dd87c731df970724090c511a5ce8eb8daf9d0768b0a14c51bff4 SHA512 512f6f80292e13afb9ae2ad78563d0332e1f37f37d005d0f1797cc1efe0797412f48611ff757e6da6caa876c280595364bee8406996de225adf06fb4b91f4e00 EBUILD gcc-14.3.9999.ebuild 1410 BLAKE2B 0f8247346ce7d9f4cc4a77005a7144c96d06b4e1a02d98aec657df8d34a4be32ac08edaa7cf67807617890a6bc21817d5ba343c08162afa542d00b728d55b9e7 SHA512 51a642ab1483b5ddddb6cfb5c2427afe72a23f105b4551defd86951ebada785da719e00773247d14e60830c6b8cb9698edb1a6fc79a9a7e5c3a60b7eb00163d1 EBUILD gcc-15.0.1_pre20250323-r1.ebuild 1452 BLAKE2B 9db6c10e17c36b210b0a04e69ce196ff1ee6208299f33e0e9bb56a92ef808a03ce52f84cad272e2b729a240f32dc86f94a1fa5a96b003fa2e7fef6e29197e0f2 SHA512 fc2ddf64a2b58432a7873befe8602c5a31241f314a2860e0596325ac80255fa8ffcc8bf80559eda105819e61f40438d9a5ea3ff7dd777a864c7770429d16e89f +EBUILD gcc-15.0.1_pre20250330.ebuild 1359 BLAKE2B c482d43d51426d3f2781af8d456d1b6b4c6841ed830dec1914c8ca2add8621e6e923dbec276c1dd8e686995e4374915860ffb9956b54edacaeddd49c2088b332 SHA512 d44d1c4d871adc0489216c6a301dc2cd56c6e4ab45620255bb6a189de30d8022c5acf68f99530ed8baa57d60013c824fe29a4b4c3d0c68cb5af31c79291dbbfd EBUILD gcc-15.0.9999.ebuild 1332 BLAKE2B aef152456b51d76667a87bd1c46c9896507e80cddacad67bbb129169f5b26ab0dc11cdcc5618354999cfa1d1f24b54513cc4f6a96cf2b22f9b7bdd0fc3a5616d SHA512 47c7484c2fa9f45d312b5cfa0dcc823f63127e746a3a96005f505a8bb242302c6f3ee71f9da33bc4f5c31d7aff78fa380bbf0808f8f499609e81a74230b76c6f EBUILD gcc-8.5.0-r2.ebuild 549 BLAKE2B 27dc07ccb846dcd58ca7363a40f7be4b1bd1c42b449f17b6ca06ac4093592ab76407fb4fc8f9b8c98310502995835aec4607532fbb13f4fe5df0c93900561253 SHA512 c30a521dea3da44017eb21819a48dbd9e35b0db58c3195fa72e542c71d3bbaa6bc4e998488f54deedc98352ff651331c06e4cc2293d46652de1fa13614a147cb EBUILD gcc-9.5.0.ebuild 1257 BLAKE2B e1a12b3049bcd88e14b0feea9fa0f0cac43d307b45adb29b4760cb0d6c76bd1185c3daaeb52d14950b57e2891671877a0ee2ea9f974fb1b1d384a86f130f72f5 SHA512 50acfc29555351b120f721f104d28d5bdcbbb6807abbbbf8d6fd54282b9fea74f833b1d5f3eca2fcca14d09d30df9f3e0110dfd9827818a9295e201e7725c12e diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250330.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250330.ebuild new file mode 100644 index 000000000000..9b27f5b51d0a --- /dev/null +++ b/sys-devel/gcc/gcc-15.0.1_pre20250330.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_HAS_TESTS=1 +PATCH_GCC_VER="15.0.0" +PATCH_VER="50" +MUSL_VER="2" +MUSL_GCC_VER="15.0.0" +PYTHON_COMPAT=( python3_{10..13} ) + +if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=master +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; +fi + +if [[ ${CATEGORY} != cross-* ]] ; then + # Technically only if USE=hardened *too* right now, but no point in complicating it further. + # If GCC is enabling CET by default, we need glibc to be built with support for it. + # bug #830454 + RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" + DEPEND="${RDEPEND}" +fi + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + eapply_user +} diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index fab454563955..c4c0b06e1d1c 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -13,14 +13,12 @@ AUX patch-2.7.6-configure-mkdir.patch 478 BLAKE2B 95135becb2749c9c0217aa6185a384 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382 AUX patch-2.7.6-fix-test-suite.patch 3006 BLAKE2B 4b00c743f880f3cd672d6d37ff89d691d34d38b9652a9434544db10c3e28adf412071a14b5f6e4fcb1cead5e6ec0c20f786b061c96eb3fed4d9e8744a18bb02a SHA512 626256394ca2df1fadfb6cfaaa4458b86912ba70debac88d959ce3c34d2f5791284fb2b9b38b88b3e38a50a1e0f6585f0c860a9866f27c40be4884e95d7d83f2 AUX patch-2.7.6-ndebug-assert-hash-table.patch 1563 BLAKE2B 283a1d0cf5228965809223fd977d9793313b8b031e8666813b0fc68da9b841ff9d46d840261fb8ef7e3b45957151f351d832d9c860df8e37ad9490a895f5edaa SHA512 5847dc8288ddd5149902bd0b2e4fb33d37eaf5d6ee253ccbba25378bec2261640b0ce557a89aff7e48d306ef825f7a8db9bb87707f42615bea103784e0cfc7d4 -AUX patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch 1834 BLAKE2B 50ec6e266baa882e6fa847b2a97567cd3eca6a9ac6e8ca7e445892647aa484bdd4a8612c2c898137e871b8c356e902d9e9d877508f96ab05edafcbb0f8e3a915 SHA512 715df5b6ba77f06bccb10740c4866fecbe02d89896086625408e7a53d953de2097f2333d23a3df116705ca076cfa99753d8edac1430c30f0225067ab4942c875 -AUX patch-2.7.6_p20250206-traditional-diff-lines.patch 1157 BLAKE2B 2ad41206d544b19f2f5b2c6b44714e13dd5f96899ee4d732f4482f5b724d2c04169b6538c2a4589569b3888593651313e0d30999e7c871aa0669c2ce6a2d0ae6 SHA512 fb5c0b2148c00dbe5f33794f05aa353fad48952cf278148ff65d2f31ad2d939d646ab04d74a1a8e79cdfc1c136ea54291d3e3470fb44c5877bcb42e8ba9e2bff DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b -DIST patch-2.7.6_p20250206.tar.xz 906596 BLAKE2B f110bcf19b655c900327088ba023743fd845161dd00cab228675d3c0992fa397916adf153c35775fc5ff8e733b559ce8a05eac71eec7156403f4c9ab17ff2a3e SHA512 2dd05af5f9f0864b0cccc5c5194d0ba4ca427fc366b91210e2f539a50bd2006d7142606f8f223b45c5d426eafef7e6b17c6b67c2ef9b7ec75589bb3d9fce68d3 -DIST patch-2.7.6_p20250206.tar.xz.sig 833 BLAKE2B 8363136c58bbde5c349a4c96cd277588f3b679a98ea1c21da39bcf375c2b85c0d36165f1dceab453a09bcc2745d5ab6959d5ba28020e138591e7530dbf72f180 SHA512 a114f836502bb02910c8f88d7e667ce92ef6b0b9a26eb466ee9bd1ad8956036867801b19ea3ee27418fe0fb6e673e3d5d2aad2b9c05f7e99fd8bb1a9d604ea6f +DIST patch-2.8.tar.xz 907208 BLAKE2B 687f566201adb2e32c3832b911adaddd9994aacb25b66886d6315bfe2752e09fd551b3856a39024b8472b2d95efebf412d4a7c085812a13620de811073a397ad SHA512 d689d696660a662753e8660792733c3be0a94c76abfe7a28b0f9f70300c3a42d6437d081553a59bfde6e1b0d5ee13ed89be48d0b00b6da2cadbfc14a15ada603 +DIST patch-2.8.tar.xz.sig 833 BLAKE2B 6890bd25e2b4b5633b58073949f28f7c71c57667af9e4d92acc8f1736740c6433adf7078bf9ed3199158bd9734d080dba5b7eb46577d5714aa487d79fd938603 SHA512 8050bc11cd52ee930025e40550afe6c1a866a4a74fdc99332087c2d0fe8358b83d031322bf64480333fe682a7f52127fba7aceffa0cf6747e1ee3f239539f5f7 EBUILD patch-2.7.6-r6.ebuild 2393 BLAKE2B bee456b5704807b931046f85172a93aa3ed564979a02ff307943b7c4d585d21bdcebc1d637f5914925d0eb9d088f5d2413ab9903ec8daf442a316455c9a2954a SHA512 706529f59336e2d746b88c68acfea63d299372505e021b38fd301f25ae09c3afc2fea9daab73526399dc1fa0898914a1937f9a18d1bce1c0cade10354ec484c6 EBUILD patch-2.7.6-r7.ebuild 2463 BLAKE2B f7ac6ef1bf4a98c8e8bc1257a1fd1732325888ea96e10c3ad1e130262b3e53ef73c82b82042fce0a990dba79e9be5a09c2bb1a51b730b6283ae67ed725323244 SHA512 36e5e6b27932bb904953d139f42bba3a6ce1d0e321b67298c54a422204bb124ed4206a3ccc4e3ce8ed2610c2265b26ef049a4bfdc3a4695055893e3010a57b93 -EBUILD patch-2.7.6_p20250206-r1.ebuild 2292 BLAKE2B c0387d6fb199ccd2adca5363de1b7696bf1063a9c0c46c1fbd5d8258f78e491adeb0b73ee87cdb798161b63c387804975de7ee6adfc2e8fec556a0d980ba94aa SHA512 43863983607271f157d9c03e36ab824603dc86b1b30e8a5841c4b5fb64944b6ce9c171dfc8e0a59205353b843af8bbbac97d93c384a8699b295d57ac3d4e69b1 +EBUILD patch-2.8.ebuild 2043 BLAKE2B 1656b1095752f92ae19eba238049d203590bea056d784f1011f8fdf48ab95a16bb4a91b51674cf7ce1e8e01889abfbb45d8a19a371da37ce3f64889d2ca2fea1 SHA512 d15f55a85a5674d05805931b75369c13ae072582ed370d590a85831e1591304cff232ab69752795303555b64a7b090894d99061a51db0024c887ce170682f6af EBUILD patch-9999.ebuild 2043 BLAKE2B 1656b1095752f92ae19eba238049d203590bea056d784f1011f8fdf48ab95a16bb4a91b51674cf7ce1e8e01889abfbb45d8a19a371da37ce3f64889d2ca2fea1 SHA512 d15f55a85a5674d05805931b75369c13ae072582ed370d590a85831e1591304cff232ab69752795303555b64a7b090894d99061a51db0024c887ce170682f6af MISC metadata.xml 329 BLAKE2B ac0ac5e4a422955e2e1cc040d03ab9df083c70d0275145366ffe47c04fb08ac5e9c1cf776ab9c96e023910a0f66a7ff3cfd8377574d8e282cd78c435a6d8bdd2 SHA512 a0c5d5bc2d111a6d22afa4bae0e56ac7f927798122fed5373dd64a214d7b51dc436482bf21eb2ef32073c2f4004cb6dd6449afd58b7ab6936ed3c2e3a4c39872 diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch deleted file mode 100644 index 0891b855d998..000000000000 --- a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b5d2124e2e6019ee5d329b49ef6904a0daec74a1 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Mon, 24 Feb 2025 22:59:51 -0800 -Subject: [PATCH] patch: fix --no-backup-if-mismatch regression - -Problem reported by Sam James in: -https://lists.gnu.org/archive/html/bug-patch/2025-02/msg00014.html -https://bugs.gentoo.org/show_bug.cgi?id=949834 -* src/patch.c (backup_if_mismatch_specified): New static var. -(get_some_switches): Set it. -(main): Default backup_if_mismatch only if not set on command line. -* tests/no-backup: New file. -* tests/Makefile.am (TESTS): Add it. ---- - src/patch.c | 6 ++++- - 3 files changed, 62 insertions(+), 1 deletion(-) - -diff --git a/src/patch.c b/src/patch.c -index 6c460f7..e4d0524 100644 ---- a/src/patch.c -+++ b/src/patch.c -@@ -118,6 +118,7 @@ static bool merge; - static enum diff reject_format = NO_DIFF; /* automatic */ - static bool make_backups; - static bool backup_if_mismatch; -+static bool backup_if_mismatch_specified; - static char const *version_control; - static char const *version_control_context; - static bool remove_empty_files; -@@ -196,7 +197,8 @@ main (int argc, char **argv) - if (set_utc && setenv ("TZ", "UTC0", 1) < 0) - pfatal ("setenv"); - -- backup_if_mismatch = ! posixly_correct; -+ if (!backup_if_mismatch_specified) -+ backup_if_mismatch = !posixly_correct; - if (make_backups | backup_if_mismatch) - backup_type = get_version (version_control_context, version_control); - -@@ -1050,9 +1052,11 @@ get_some_switches (int argc, char **argv) - usage (stdout, EXIT_SUCCESS); - case CHAR_MAX + 5: - backup_if_mismatch = true; -+ backup_if_mismatch_specified = true; - break; - case CHAR_MAX + 6: - backup_if_mismatch = false; -+ backup_if_mismatch_specified = true; - break; - case CHAR_MAX + 7: - posixly_correct = true; diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch deleted file mode 100644 index f33a79980f3e..000000000000 --- a/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 29fced6251928e6334fa15fd28bf2c198acd4cd4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Wed, 26 Feb 2025 16:44:48 -0800 -Subject: [PATCH 1/2] Count traditional diff pattern lines correctly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a bug I introduced on Thu Sep 5 16:37:50 2024 -0700. -Problem reported by Petr Vaněk in: -https://lists.gnu.org/archive/html/bug-patch/2025-02/msg00017.html -* src/pch.c (another_hunk): Fix method for counting number -of lines in a traditional diff hunk. ---- - src/pch.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/pch.c b/src/pch.c -index 63c9a0c..d9f5c61 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -1765,9 +1765,10 @@ another_hunk (enum diff difftype, bool rev) - if (*s == ',') { - idx_t last; - s = scan_linenum (s + 1, &last); -- if (p_first >= IDX_MAX - p_ptrn_lines) -+ ptrdiff_t diff = last - p_first; -+ if (! (-1 <= diff && diff < IDX_MAX)) - malformed (); -- p_ptrn_lines += 1 - p_first; -+ p_ptrn_lines = diff + 1; - } - else - p_ptrn_lines = (*s != 'a'); --- -2.45.3 diff --git a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild b/sys-devel/patch/patch-2.8.ebuild index fbaa5fd97f05..c410f22ffd4f 100644 --- a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild +++ b/sys-devel/patch/patch-2.8.ebuild @@ -21,8 +21,9 @@ elif [[ ${PV} = *_p* ]] ; then else SRC_URI="mirror://gnu/patch/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" LICENSE="GPL-3+" SLOT="0" @@ -36,13 +37,6 @@ BDEPEND=" verify-sig? ( >=sec-keys/openpgp-keys-patch-20250206 ) " -PATCHES=( - # backport fix for https://bugs.gentoo.org/949834 - "${FILESDIR}"/${P}-no-backup-if-mismatch-regression.patch - # backport https://lists.gnu.org/archive/html/bug-patch/2025-02/msg00017.html - "${FILESDIR}"/${P}-traditional-diff-lines.patch -) - src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack |