diff options
Diffstat (limited to 'dev-vcs/git')
| -rw-r--r-- | dev-vcs/git/Manifest | 9 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-2.47.0-maintenance.patch | 85 | ||||
| -rw-r--r-- | dev-vcs/git/git-2.48.0.ebuild (renamed from dev-vcs/git/git-2.48.0_rc2.ebuild) | 4 |
3 files changed, 4 insertions, 94 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 0b7d4438970b..0c93e45f8167 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -2,7 +2,6 @@ AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7a48986c4ebba95f3e7ab033bc1b9c29eee9ded0b47a2c6d6831d4ece0662dd244f41a670d0805e1a5c8bd8c25531fcfb3493 SHA512 3c076c2865e930cfe2f0c9d01fb8e272037aeed99b46063e88942b89b1191e8149fd87ecbcbdb2d23ea37d556a971434938d7f4e4e2eef0e26e1b250534cc0e2 AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7 AUX git-2.46.2-unsafe-directory.patch 429 BLAKE2B 5e6be22e89250d434e0b62b27d90619a2d3379c2829dee9390d5e3413eb803a0547164e4e12c7f144812b394ee5238f9f1ee087f8c8f553766e473689ad2abda SHA512 8ad143cb0221c83d0c13606354e4c46f7169877a7d901cd1cd3f25e41efbc9ba57feaab626c6e1a19e9f52a084af629f9a2686eaaa76ec9e03569a1013087878 -AUX git-2.47.0-maintenance.patch 3704 BLAKE2B 446917defc5e45ac5c19df3643416435f25048551a03c2e7505aef57a7915bc4ffcd81f30839c1603db16660f0f5ae70a68a3a3d62b3b1205622993cf103121d SHA512 bd175f0e0004102d2f7c22c080bb0ea920fc4d54c709cdef64a9217f83c2ebd381f799e7775b500849080f967e8e8ac871774c363a446fd292f7034263dfe235 AUX git-2.48.0_rc2-meson-deps.patch 2866 BLAKE2B d08429ad04c2a96e2d20443548185a0331777eedf05a06d9cd591a6870612d396a871da39cff3ef8c7b6681fbc75df1fa4591c3bff51e795b2a30bc32da168ed SHA512 7b874520fe7937e34f4f74d2ecda98cc42c985f10c8542ed7f90fad0aad46b56bc294206adaffa3fac9bc07411f839bfd938c72cf485d7a53bd475491943582b AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec @@ -13,22 +12,22 @@ DIST git-2.44.2.tar.xz 7435020 BLAKE2B 625071528e6575af86aa51d7d5baeaa9b1b8be0e9 DIST git-2.45.2.tar.xz 7487680 BLAKE2B 477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c SHA512 dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73 DIST git-2.46.2.tar.xz 7581344 BLAKE2B 1ea2a166bd2717d581020a9921cf7e82dc2c77e2a9bd6bc70f4b6396c214c74b30e8ae6815eba33bd2995f7a6e2570b96c51acbfce25ab85e05d5fdbd09d870c SHA512 d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00 DIST git-2.47.1.tar.xz 7654244 BLAKE2B 5dd5d1bde226469d8de0952456dbaa408739f8613cfefdd76715e6a2bc1fdf8695740f005cc3b2caab876fccfbff0609201a827e0bd9837ec68056ba2a41da34 SHA512 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea -DIST git-2.48.0.rc2.tar.xz 7715400 BLAKE2B bb66c9063611b597e93c97725cb7e6b1fd2d6096f5940fba5d2cbdc0780352c2bcc51e82535a09e690c7b35b9460bae87e286b8241cde299bc38898fb73ab5d1 SHA512 6f1dfe20a2ea45962668ce8935f233eb579498f5ba8502449b337545c3b809b82168b58790f6dc0b43c841c9039038838fedce3be80cd04d855d985d7ba4ef60 +DIST git-2.48.0.tar.xz 7723336 BLAKE2B 63d0ac06aef75120ff2aab34b76039cc9e2606a4e69ee36fed868df7243318abac6550e03054bebc9b65a086c54a4f00d95affcc121fa690a3a580cb352ecbb3 SHA512 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e DIST git-htmldocs-2.44.2.tar.xz 1559412 BLAKE2B 9a62ab1d70b009a9bc29250c49ca835a46928703a73ec004ea57e7dc74212c5a29d7e0784cd752c8d2c1e23b70702e2c2f280904dfedefb3d4a687002a950596 SHA512 2a82e3c37aaca91643976d21fac3bd82b23fe2374856d73b0ba726339450ea6f8a5e8e38326546292f83923e28da280ca3bed549afff1aad684ebfb3926e4992 DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440 DIST git-htmldocs-2.46.2.tar.xz 1553104 BLAKE2B 9a7b784c1a01153dc660b4fe6eaa3ceac2d30eeb96015ab4ec73296811d27cc84715abd19f723ad16c64028114c2aceee2727380e7c9f8ff220ae4538dcc9c62 SHA512 51c5363ac48f04118071218ea095dae97676ac299a482511ef55e9267724f08e7c021ffa15418d9e32e676333ba31643c9049860f154f58a67d9604e141376c3 DIST git-htmldocs-2.47.1.tar.xz 1564776 BLAKE2B ff8c313e00867423ddb122572e730868541ab22c76cb73aad54ee5dab298c4a8fdc29d50ebdceb658d7799132258dad9ffcaa582439a74463a8c212c3d82005c SHA512 7df2c572413d42f954c0ca01577f9324a60810dd712a8a36b0b503708d9795a90ffa95ee96b13c082796e276bcbc65094de32ade0f71ff744f6e45869cbbb4d7 -DIST git-htmldocs-2.48.0.rc2.tar.xz 1579656 BLAKE2B 9cf24ca45cdbaaf7d1348aabf00f9b4ff87b3028290322e98c59bff5dae758ed01b1c315d5e66cd9ffe1e8250dbe3c2ad94aa8c6cdf4b46b34d4966c1918cd0d SHA512 2bfe7a9c7d6c9f3885dd59408d205e147aae4df3963b7df9b8d637fec7fc0ba6abad0367d51eb5c1e005abcdb94dd6ffd7a109556901b139cec323d0f926e54d +DIST git-htmldocs-2.48.0.tar.xz 1579956 BLAKE2B 012afa8f22ef59e0e96a2c72d04f634d5ac4266e5d0b7eb5e3b51815bbdc30299606eee2a57066b54025a2622ca6ac4e4945348aab10ba0967e52a8f84225ba6 SHA512 3d02d6d64ae174103d266f67e1e0b5251b4427e13ea0b802f1a29211d6134e2adea6aa211d8bf22180ccf29ff2c13e19309021d01acd1954a84bff622d343a27 DIST git-manpages-2.44.2.tar.xz 574316 BLAKE2B ecfca8e05ca682097376ce6a1e8b9de8fcc36472860321987be12291a53d1a92befb950fd856775df65f28300b267b80975775cba046cfb89159887e8cba5516 SHA512 2ad6d922acf46028b3b7dd5a686c0396e5452e4d50b32ba9af0cc51cc3431003524b91279e2a795065a179af3d760ce72530580295ed09a53673274cf9567cc6 DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b DIST git-manpages-2.46.2.tar.xz 584812 BLAKE2B dd5592a1fd61b6eda0afa4f9292ce86dd14bca6a88016f96c53617f6505f27cc9a2ba9437c6330bb8003b3f57cd1e75bf441bf2a2168554bbda9c26db37db4cb SHA512 ce7a2a1fbb9376182b8ce3ed772fbeeef2cf338bc06bf9bcf3c07a65419e41b3754d6851a44886d0b07dfd82f8eefe7b8b1d9f5c28ed6b6a0ea4168ed457e121 DIST git-manpages-2.47.1.tar.xz 586432 BLAKE2B df4eafa03ba235202c361d16fd6db1c6b2a4fea5501f62dcd7b53e3764542a2b70ab44e1525d5f4437dad9505c507ba88aa14b1e8e828713b81cb66b6d9a73c2 SHA512 9acd5207e6c2751ec87708eedc4f060ee6bed0841564f787cd3fd5dbce712c4c2afbb9ce4e85a466fb52a8f399420ca24c7cd4eb8e14edb7ea7a5c06e3c82a5e -DIST git-manpages-2.48.0.rc2.tar.xz 590744 BLAKE2B faca2ccbcf62d68735e33db02fa84ad71fa565e5b5ebcae54ccbf65e5763e55bef84aaa3b5cd6701c8650580bb2ce0dfd657708752e350b1d167ce3ee2879ee0 SHA512 a94af649554a1530b7184ebe68f60653fe3aaeb8254fb1e0b94bde5ff2a4f709db3180d58111414b9185cedd5537c65bedf50b4a31af78299540edc7c572befd +DIST git-manpages-2.48.0.tar.xz 590480 BLAKE2B 73e61821d48b524331d8b2bc56047065307cab7b2831cc869cc76d9e3b1da6bdbda8184e14f17cb7bf1efdb26f6dd87682e259b69b597c12fff00ee6a98377c9 SHA512 f9f5844b39361d379e66f68e327bd99693ae4c3f0bb3a85de4c1a36e665771f69afced98fb454d2f6574284c08e1043a75b0af7a774912a2b2ec958994fcc17d EBUILD git-2.44.2.ebuild 16300 BLAKE2B 39fc9cdc25a8e9ff53081c6992c53889d9023ba83759c4765547ef3e60302eedc4737b72850fc671a1de10275a6863ec695c194710c5306623d1cc19018e8f92 SHA512 7d1bcbe7f005296e8ef09ba34e8ada5aa6e1c1b6857ddcb75905a17514e43d9110f44569f06be38fae129e2c6dccbdcf7a2c715a14be2f7066be03ddf504e426 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179 EBUILD git-2.46.2.ebuild 16800 BLAKE2B 6c37df1d123aae231ecbcf4c5bb93364c78f89c1a10d81a5954da536c8148c28696ad1d43d5cce04743eadc9cd1045e3acfccc11bd4f7acb97289395199c9dee SHA512 89d20136a0f0d4d10b5a2a8eef067d631b708a7abdd887992d7553a2a5296abfa666c5be5499d19b02c94412a40aaa671b8c4bfc7b63b178a5e85867867877be EBUILD git-2.47.1.ebuild 16915 BLAKE2B 730dda1235d73fe06861ac16587ee72669b620888ecc52e32ef5f1a77fde5af852f6f8a38374cdd4283e8fe3d1223bae1eae58f16c1e7117832c58c8589702a6 SHA512 09576e9f95be72705005762dcd41091d030acaadd2b56cc814b45fd471202790eaaeae05893b1d2eeb8d2362fdb24847764c2e8e5d8353b28b63a9442934e274 -EBUILD git-2.48.0_rc2.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97 +EBUILD git-2.48.0.ebuild 11173 BLAKE2B c35d659168fa0fdf254fa0deefb2eb62351e64b93c5810cd26eb78ac039bc716cb631dadf5590518929716f1b37d840ad8929928773a27f94fb23deec26c0dda SHA512 3c2b1d67542f20967b1693d56a00fe4cb5062c2a6025d64fc2f16b6c340bf0035b1e3189067af809f2eaeaac7efc2dd3ded818c1f8f881615fd887fa7a1a4c1b EBUILD git-9999-r1.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97 EBUILD git-9999-r2.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97 EBUILD git-9999-r3.ebuild 11235 BLAKE2B c4c5d987fece04d851c584d82e77bab4c1c6bea84fa3d1bdae83eec31dad5c63f642f70f1101ef9eaef7fa95983824f712cc56b0da2857686709f7d69d91e12a SHA512 75525ddf4baaeb74e5e227740634f710b7ac6235b20c42d91a77267687ba6ad7215f1e27569c569399787bab9bffa75c229b724dfeb52b0fb85aba1468bb9c97 diff --git a/dev-vcs/git/files/git-2.47.0-maintenance.patch b/dev-vcs/git/files/git-2.47.0-maintenance.patch deleted file mode 100644 index 085d4adac33f..000000000000 --- a/dev-vcs/git/files/git-2.47.0-maintenance.patch +++ /dev/null @@ -1,85 +0,0 @@ -https://lore.kernel.org/git/CAG=Um+0mJW-oAH+YLC3dWEU64JwS-zMkkTiFWYBe4g6HMbe-iA@mail.gmail.com/ -https://github.com/git/git/commit/c95547a394a35dc26afa686454086d2db6e51ea4 - -From c95547a394a35dc26afa686454086d2db6e51ea4 Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt <ps@pks.im> -Date: Thu, 10 Oct 2024 07:33:01 +0200 -Subject: [PATCH] builtin/gc: fix crash when running `git maintenance start` - -It was reported on the mailing list that running `git maintenance start` -immediately segfaults starting with b6c3f8e12c (builtin/maintenance: fix -leak in `get_schedule_cmd()`, 2024-09-26). And indeed, this segfault is -trivial to reproduce up to a point where one is scratching their head -why we didn't catch this regression in our test suite. - -The root cause of this error is `get_schedule_cmd()`, which does not -populate the `out` parameter in all cases anymore starting with the -mentioned commit. Callers do assume it to always be populated though and -will e.g. call `strvec_split()` on the returned value, which will of -course segfault when the variable is uninitialized. - -So why didn't we catch this trivial regression? The reason is that our -tests always set up the "GIT_TEST_MAINT_SCHEDULER" environment variable -via "t/test-lib.sh", which allows us to override the scheduler command -with a custom one so that we don't accidentally modify the developer's -system. But the faulty code where we don't set the `out` parameter will -only get hit in case that environment variable is _not_ set, which is -never the case when executing our tests. - -Fix the regression by again unconditionally allocating the value in the -`out` parameter, if provided. Add a test that unsets the environment -variable to catch future regressions in this area. - -Reported-by: Shubham Kanodia <shubham.kanodia10@gmail.com> -Signed-off-by: Patrick Steinhardt <ps@pks.im> -Signed-off-by: Junio C Hamano <gitster@pobox.com> ---- a/builtin/gc.c -+++ b/builtin/gc.c -@@ -1794,7 +1794,7 @@ static const char *get_frequency(enum schedule_priority schedule) - * | Input | Output | - * | *cmd | return code | *out | *is_available | - * +-------+-------------+-------------------+---------------+ -- * | "foo" | false | NULL | (unchanged) | -+ * | "foo" | false | "foo" (allocated) | (unchanged) | - * +-------+-------------+-------------------+---------------+ - * - * GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh” -@@ -1812,8 +1812,11 @@ static int get_schedule_cmd(const char *cmd, int *is_available, char **out) - struct string_list_item *item; - struct string_list list = STRING_LIST_INIT_NODUP; - -- if (!testing) -+ if (!testing) { -+ if (out) -+ *out = xstrdup(cmd); - return 0; -+ } - - if (is_available) - *is_available = 0; ---- a/t/t7900-maintenance.sh -+++ b/t/t7900-maintenance.sh -@@ -646,6 +646,22 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' ' - maintenance.repo "$(pwd)/$META" - ' - -+test_expect_success 'start without GIT_TEST_MAINT_SCHEDULER' ' -+ test_when_finished "rm -rf systemctl.log script repo" && -+ mkdir script && -+ write_script script/systemctl <<-\EOF && -+ echo "$*" >>../systemctl.log -+ EOF -+ git init repo && -+ ( -+ cd repo && -+ sane_unset GIT_TEST_MAINT_SCHEDULER && -+ PATH="$PWD/../script:$PATH" git maintenance start --scheduler=systemd -+ ) && -+ test_grep -- "--user list-timers" systemctl.log && -+ test_grep -- "enable --now git-maintenance@" systemctl.log -+' -+ - test_expect_success 'start --scheduler=<scheduler>' ' - test_expect_code 129 git maintenance start --scheduler=foo 2>err && - test_grep "unrecognized --scheduler argument" err && - diff --git a/dev-vcs/git/git-2.48.0_rc2.ebuild b/dev-vcs/git/git-2.48.0.ebuild index 41c0ed848010..c90d0aa8bf6a 100644 --- a/dev-vcs/git/git-2.48.0_rc2.ebuild +++ b/dev-vcs/git/git-2.48.0.ebuild @@ -148,10 +148,6 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-2.48.0_rc2-meson-deps.patch -) - pkg_setup() { if use subversion && has_version "dev-vcs/subversion[dso]" ; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" |