From 71dd9d29cdaf7cc0ecdb9ea37d128726a941c630 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Nov 2024 03:02:57 +0000 Subject: gentoo auto-resync : 23:11:2024 - 03:02:56 --- dev-vcs/Manifest.gz | Bin 11841 -> 11843 bytes dev-vcs/cvs/Manifest | 1 - .../cvs/files/cvs-1.12.12-mktime-configure.patch | 201 --------------------- dev-vcs/git-extras/Manifest | 2 +- dev-vcs/git-extras/git-extras-7.2.0.ebuild | 4 +- 5 files changed, 3 insertions(+), 205 deletions(-) delete mode 100644 dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 8a59284d21e0..2c431a005845 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest index 345e8f50d7ac..055cecd56ecf 100644 --- a/dev-vcs/cvs/Manifest +++ b/dev-vcs/cvs/Manifest @@ -14,7 +14,6 @@ AUX cvs-1.12.12-getdelim.patch 564 BLAKE2B 10d8e2b991f812cfbabb4b9b11d43c6d2d317 AUX cvs-1.12.12-hash-nameclash.patch 1019 BLAKE2B a48dbec6e85c66c4369239785d70c595ec6241bc66bb62f2c3b5ad01a35b0599b7b1a03e1e3fc8b012a1d16d202e1439d9349ef914e1e5663b61463863e53c04 SHA512 dcd612dcc4b008c0fbabd74bcc179e69ebaed31a9f6622127061194a8ed99549502fbc0bffc75cc87aed26f7fe46215da81438c3a797e2179ed3da8e0b5ebdbb AUX cvs-1.12.12-install-sh.patch 495 BLAKE2B f18331b296c55aba72da32e5ee7e52c467f37b5e218555144d78f2dd63d2cd1fbb8d76030fd9c2a1f0d8992e3764fef0909a6afdf7c1947092dc5787863dea71 SHA512 7e468d41c1eb23c0a62b605e6e48cffc004e8f386a87a9696dd73b36702c74aad529f5cba7280dee1100027b6e1e907adad257cc446ca3ad734fa40d47e4ff72 AUX cvs-1.12.12-mktime-configure-m4.patch 10106 BLAKE2B ff50889cd569a890b5e81d0302c498ea61a2ef379328294baa906030c0bd5cf63953c1d0bf7bc5615d212ee97789ce791430f86b4eb0edd7844a06d0044b754b SHA512 860c6395ad9dada1de24b0845b4d64ebc1777a50f92ac20cc0bfbb3211898db3a31ed9206ebcdd47cf01efcf07420749366700d6e5110bd177d57e7229a1d781 -AUX cvs-1.12.12-mktime-configure.patch 4791 BLAKE2B 68587d6604f32064aeca0b5043fdf6fbd3e06cb8eeccdd806463b7035d3598e7354e07e28ae233ab0a4889956d7ebb52bcdf968aaf4bb7aea738ee408bb7e2d2 SHA512 10b29450d5d0a6a02d92812b919edbba2b86f2217aa54896b44358edb2eb8d8d6111b5c5db39faa50ef1f9a86ed1ee190332629f33402ad8cd8082b77547f486 AUX cvs-1.12.12-mktime-x32.patch 916 BLAKE2B cab0794b1feeb0a8a841732a25d5ba7a9b12721b286860229c8351714c34f01c2dceedc03fc0f16cde9a573027a7ecc56860eb53621c0bf7cbc7b4bec0fa0a99 SHA512 4a58c0f94de8e19c2de1930b7e5e04816e79a86885c89b792616a4c43f6e12aef271005ae59ae0d5788a910ba97735ccdf35f0ef5faafc2e3c50a9858b8f6216 AUX cvs-1.12.12-musl.patch 421 BLAKE2B c8949755aa511dc21deb7dc3bab1d3641915d794b8d935961b7b7b8d38ee40cdcc2c154f45e057635e9c9af41c4906a046acb2affaf093e4d35d4234a34c845f SHA512 1c14b89dccee3130cc4ff881b7204f01dd8e14d1767e21d30b879df17a368a0f6bc7d3945872f8a6adcf47e34c3e48b9f2c0c0c90cccbf10fa935690a57f5e20 AUX cvs-1.12.12-openat.patch 761 BLAKE2B ea0ea24adb27599ccd2f375ebeb008c3c2cbc246ad0dfd8fa88cf7b56c9313e97d3ad0a71e45dad1fa79dd1a3b50271def194aa9cea7eddb9748a6076f4e0ebc SHA512 b0a7abc785169705d2f0668a8af706f93ee3eba3d050d555689577962283e54f6bd186e662b64c65f926cf72dff76a37259181338707d641ee0f20591ba62805 diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch deleted file mode 100644 index 03d7f35601e2..000000000000 --- a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch +++ /dev/null @@ -1,201 +0,0 @@ -https://bugs.gentoo.org/220040 -https://bugs.gentoo.org/570208 - -update mktime check to latest autoconf version which is less buggy - ---- a/configure -+++ b/configure -@@ -5299,26 +6059,25 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - /* Test program from Paul Eggert and Tony Leneis. */ --#if TIME_WITH_SYS_TIME -+#ifdef TIME_WITH_SYS_TIME - # include - # include - #else --# if HAVE_SYS_TIME_H -+# ifdef HAVE_SYS_TIME_H - # include - # else - # include - # endif - #endif - --#if HAVE_STDLIB_H --# include --#endif -+#include -+#include - --#if HAVE_UNISTD_H -+#ifdef HAVE_UNISTD_H - # include - #endif - --#if !HAVE_ALARM -+#ifndef HAVE_ALARM - # define alarm(X) /* empty */ - #endif - -@@ -5335,9 +6094,9 @@ - }; - #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - --/* Fail if mktime fails to convert a date in the spring-forward gap. -+/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ --static void -+static int - spring_forward_gap () - { - /* glibc (up to about 1998-10-07) failed this test. */ -@@ -5356,29 +6115,27 @@ - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; -- if (mktime (&tm) == (time_t)-1) -- exit (1); -+ return mktime (&tm) != (time_t) -1; - } - --static void -+static int - mktime_test1 (now) - time_t now; - { - struct tm *lt; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -+ return ! (lt = localtime (&now)) || mktime (lt) == now; - } - --static void -+static int - mktime_test (now) - time_t now; - { -- mktime_test1 (now); -- mktime_test1 ((time_t) (time_t_max - now)); -- mktime_test1 ((time_t) (time_t_min + now)); -+ return (mktime_test1 (now) -+ && mktime_test1 ((time_t) (time_t_max - now)) -+ && mktime_test1 ((time_t) (time_t_min + now))); - } - --static void -+static int - irix_6_4_bug () - { - /* Based on code from Ariel Faigon. */ -@@ -5391,11 +6148,10 @@ - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); -- if (tm.tm_mon != 2 || tm.tm_mday != 31) -- exit (1); -+ return tm.tm_mon == 2 && tm.tm_mday == 31; - } - --static void -+static int - bigtime_test (j) - int j; - { -@@ -5417,8 +6173,39 @@ - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) -- exit (1); -+ return 0; - } -+ return 1; -+} -+ -+static int -+year_2050_test () -+{ -+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, -+ ignoring leap seconds. */ -+ unsigned long int answer = 2527315200UL; -+ -+ struct tm tm; -+ time_t t; -+ tm.tm_year = 2050 - 1900; -+ tm.tm_mon = 2 - 1; -+ tm.tm_mday = 1; -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ -+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" -+ instead of "TZ=America/Vancouver" in order to detect the bug even -+ on systems that don't support the Olson extension, or don't have the -+ full zoneinfo tables installed. */ -+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); -+ -+ t = mktime (&tm); -+ -+ /* Check that the result is either a failure, or close enough -+ to the correct answer that we can assume the discrepancy is -+ due to leap seconds. */ -+ return (t == (time_t) -1 -+ || (0 < t && answer - 120 <= t && t <= answer + 120)); - } - - int -@@ -5432,12 +6219,15 @@ - isn't worth using anyway. */ - alarm (60); - -- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) -- continue; -- time_t_max--; -- if ((time_t) -1 < 0) -- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) -- continue; -+ for (;;) -+ { -+ t = (time_t_max << 1) + 1; -+ if (t <= time_t_max) -+ break; -+ time_t_max = t; -+ } -+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -+ - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { -@@ -5445,18 +6235,22 @@ - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) -- mktime_test (t); -- mktime_test ((time_t) 1); -- mktime_test ((time_t) (60 * 60)); -- mktime_test ((time_t) (60 * 60 * 24)); -- -- for (j = 1; 0 < j; j *= 2) -- bigtime_test (j); -- bigtime_test (j - 1); -+ if (! mktime_test (t)) -+ return 1; -+ if (! (mktime_test ((time_t) 1) -+ && mktime_test ((time_t) (60 * 60)) -+ && mktime_test ((time_t) (60 * 60 * 24)))) -+ return 1; -+ -+ for (j = 1; ; j <<= 1) -+ if (! bigtime_test (j)) -+ return 1; -+ else if (INT_MAX / 2 < j) -+ break; -+ if (! bigtime_test (INT_MAX)) -+ return 1; - } -- irix_6_4_bug (); -- spring_forward_gap (); -- exit (0); -+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest index 9f31e494d7e8..740659a7d961 100644 --- a/dev-vcs/git-extras/Manifest +++ b/dev-vcs/git-extras/Manifest @@ -1,5 +1,5 @@ DIST git-extras-7.1.0.tar.gz 176733 BLAKE2B 697f09c2993e85595620e272465ad2f4afa3bbd456a1041b92b01a98f962f3aa1fb5f22f1c9ef7e484b87734e8c9e8d15da15f71fb345b9049dd5bb1b98093c9 SHA512 955161b40c48ab92578efe487db78ea8d0fff499aaf8d4da2b13e8194a7f9297a84542c8642dd3a7c61c9a4d1e92342b5c586d341e4a003c9838d5e9731127b9 DIST git-extras-7.2.0.tar.gz 183043 BLAKE2B 242adf211a39666b97996f0a45073171034930fe29ee3ebbfa07068886367832e17cc76398145d8802d32201c2563c8f2ba4171ed206344fbefbb10c4fadd6f3 SHA512 c97c00bab24415574c8b38f259a0becd5da2edafe8cb5ff373de50917bc2854e39b1c396c42b603d4f203af2853d0ebaefe074bfe353f7692af7b1a13e744586 EBUILD git-extras-7.1.0.ebuild 1107 BLAKE2B 28fa8fbbe22d6364d62a2044cb33a0674c77200caf56bb1a1bbf79d6459cea814d70930bfde79cca51ade2b800a00cb28f81d5cbc2849cac45fb9d26103cef2d SHA512 9da846bf1166b5a9a617c29b8220ec16f3980d01326466454df053cda4a7482e080e954269a076a4ad4d13019e2ff9e97eddb36177207eac181c5a6116b79648 -EBUILD git-extras-7.2.0.ebuild 1692 BLAKE2B f30e3090e9f0b910f71f9694c3c1830d930b42a5b360e1841ec4511bd005732533cbfa31e4f6b7be2e20dc50b6bb613470476476018d98cf58d236207e51586c SHA512 eeaaae28018d1967199cd3b923066b53e4cfe119d0b672c1d93d61fc94bb9c2eafaa817bfea7513ed3eb6714898d50afc15654adafcb2d22fd37969a8ba76f84 +EBUILD git-extras-7.2.0.ebuild 1692 BLAKE2B 18164d502e943a08001899469538c09d3092619ddec1aec2bf51b05e76fc38779be86cfc17b17c8c39852f4658749d18052dd3565a0ed544d79d4250b4079ae1 SHA512 8edef51aed2ecaebfdc707106cd8aa0b5bd0ab23a79cebed86434599c1c6e861058e66179207cb849c7e88753ad6fd4188b15c9915103b15088241f919ca52f2 MISC metadata.xml 318 BLAKE2B d62d3d04e485a54a0790bbe4390525d6f3ee34ce8ce0c863de54f80c54bfd78f60a32222c0ad101343c3ee7040d5894671a7669c8fc89082bef827cb4edff7ef SHA512 608c0ded622cf20a6d23659fd42295b4c3d70127896b35be659c6d200d649cf496eda5a217deb356754919e0e9d0b635ad38d9b23ae4badd9fdfcf9887f20258 diff --git a/dev-vcs/git-extras/git-extras-7.2.0.ebuild b/dev-vcs/git-extras/git-extras-7.2.0.ebuild index 514d3fd4d220..45de416dfecf 100644 --- a/dev-vcs/git-extras/git-extras-7.2.0.ebuild +++ b/dev-vcs/git-extras/git-extras-7.2.0.ebuild @@ -23,7 +23,7 @@ RDEPEND=" BDEPEND=" test? ( $(python_gen_any_dep ' - >=dev-python/GitPython-3.1.40[${PYTHON_USEDEP}] + >=dev-python/gitpython-3.1.40[${PYTHON_USEDEP}] >=dev-python/pytest-7.2[${PYTHON_USEDEP}] dev-python/testpath[${PYTHON_USEDEP}] ') @@ -31,7 +31,7 @@ BDEPEND=" " python_check_deps() { - python_has_version ">=dev-python/GitPython-3.1.40[${PYTHON_USEDEP}]" && + python_has_version ">=dev-python/gitpython-3.1.40[${PYTHON_USEDEP}]" && python_has_version ">=dev-python/pytest-7.2[${PYTHON_USEDEP}]" && python_has_version "dev-python/testpath[${PYTHON_USEDEP}]" } -- cgit v1.2.3