gentoo auto-resync : 30:06:2023 - 13:42:59

5 files changed, 77 insertions, 38 deletions

diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index b0f3a8f1bd10..3bf35c19b332 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,9 +1,10 @@
 AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
 AUX giac-1.9.0.21-pari-2.15.patch 298 BLAKE2B 99329cfd473ec3b580caf8f9700501e8b5dca9143cd04d883729880109d4e1962d19dce19aaf51e5d26ab09dc399a45a3a052847837f53a60c1b21087ebeabb8 SHA512 f9335dd47ee43ca10b784c8302422efcd5a835b1fe13fa134f5d36e453327e96624e77e086710f9d556352b1d62e6e693b3308fe8af329492e11d68cc9451b5b
-AUX giac-1.9.0.55-disable-failing-tests.patch 1215 BLAKE2B ae8b6edb298d2df598a368a673678ba1cf4b145c129acf02c134c34898ebb620c9f4e9d8c7a7a008400add517805d7ef4d6892a94be14158548ae0a3478fad78 SHA512 30238160cd1fa7c155c1b990b196de33dd88b3da42b5e86b66392e184f0476d806dd0606a2df0b92982cf80ae4b0b9001accaa6d7b2ab86adc7bb12d89f08cc8
+AUX giac-1.9.0.55-pari-2.15-test.patch 356 BLAKE2B 93863190cb64dbf0073f56e9657478b5e6d166da5ae36b81e55a45bbb75359cf63b23089b8191ae1e60958bf14652d5ac935b1aaf900b2bfb7d30b7ef3dc9504 SHA512 09155a08d8078d9bff610be15a2df0329ab9db53ca3873f01e61b02095361ab201ec93600cebc2ef42ccac67be40095a71bdaecaf54561e824fa267085245c7f
+AUX giac-1.9.0.55-undefined-behavior.patch 2081 BLAKE2B 68a3b7f2a56b6d425442f47fe6f069c1cce1bda38d85421519c68fdc9fd256ff7228886c74697151a80ec79016b436c82bc033be098b62e848e49ec499273d2d SHA512 ae531a42c9670d1ecb2cc6546ed256532705a99e13154fef6024f0ab69d5ff07b2872746b164b1cf234dce1ffe9c448a174a60dfb34eb914535ae92816007a2a
 DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
 DIST giac_1.9.0-55.tar.gz 113729553 BLAKE2B 8e95693623cfc8558e9a3b2dcc5e11cdbc4f2e25f0c2e88322dee986c5e010a63ced682bdbcb8b6dda61c8309477e8a106360a56f3a88d76043359bdb64f5d61 SHA512 c8043893fbe8951662c6c2fdd53adf6d2602ae7d3810254cd76d8478992005d9320de5e6be9453a03d5ed976900ec7721790ee61dace58e7121e0cfc330ecad9
 EBUILD giac-1.9.0.29-r1.ebuild 4542 BLAKE2B dce03818ac9af080b4416b6546563e4be99617b220c4661a540f77e0127760582cfe0a3df8c6a2f94da676b8a0e9fa967be59748184b86eb8934481c607d7500 SHA512 6915110b6964d2e79d7da01cee85ee3b51b944f9879e5659447f0cba5d74bda8c4113ee9290203510fdb57ad1ba60eae52639b134ed74eec01b04a97d75cf066
-EBUILD giac-1.9.0.55.ebuild 4835 BLAKE2B cefeb94495172407ea7e2651786a37006d95d21e0526939528a3604f0ac807234a1ff15430a9de5663c257e5cebb85449c5b81f4912a8eb474fcad5c3fd268b5 SHA512 d51145dbe2b6b0d562d84f48ef58d8ce9885810cf30b01a4d6f308ec27fe064c8e0e6607b02fc6e5cf98f8bae7dac9fa51d79a766619afc3dd05b5a4e63a8d6a
+EBUILD giac-1.9.0.55.ebuild 4883 BLAKE2B 13cb41649246526921d4b30291373361fa715849dba380b1bb62d6c644063c79322a45993c94239d4188bec22745f01157041e52c13dc432422c112214d7a63d SHA512 eb0d59090282d292b5b74400b45ccdae25ef06b303d55e81b3ffdf75510c39d30a43ec0e7fd88d6a175a4e7d561b8e426d43841bd42fb43b7644b10988bb9931
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-disable-failing-tests.patch b/sci-mathematics/giac/files/giac-1.9.0.55-disable-failing-tests.patch
deleted file mode 100644
index fdb0cf9f0396..000000000000
--- a/sci-mathematics/giac/files/giac-1.9.0.55-disable-failing-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e9ad950f7838921b1d0c85b503d7c9668be663b6 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 22 Jun 2023 16:57:55 -0400
-Subject: [PATCH 1/1] check/Makefile.am: disable two failing tests.
-
-Mentioned on Github at,
-
-  https://github.com/sagemath/sage/pull/35745#issuecomment-1603298668
-
-For the moment, and without more information, disabling them is the
-simplest thing to do.
----
- check/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/check/Makefile.am b/check/Makefile.am
-index ef0aa03..be1260c 100644
---- a/check/Makefile.am
-+++ b/check/Makefile.am
-@@ -1,10 +1,10 @@
- TESTS = 	chk_integrate  \
- 		chk_factor chk_normalize chk_partfrac chk_limit \
- 		chk_cas chk_geo chk_morley_demo chk_xavier \
--		chk_fhan1 chk_fhan2 chk_fhan3 chk_fhan4 chk_fhan5 \
-+		chk_fhan1 chk_fhan2 chk_fhan3 chk_fhan5 \
- 		chk_fhan6 chk_fhan8 chk_fhan0 \
- 		chk_fhan11 chk_fhan12 chk_fhan13 chk_fhan14 chk_fhan15 \
--		chk_fhan16 chk_fhan17 chk_fhan19 chk_fhan20 \
-+		chk_fhan16 chk_fhan19 chk_fhan20 \
- 		chk_fhan21 chk_fhan9 chk_fhan18 chk_fhan7
- EXTRA_DIST = 	chk_integrate chk_intinda chk_intindbo chk_intindbr \
- 		chk_intindc chk_intindj chk_intindm \
--- 
-2.39.3
-
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-pari-2.15-test.patch b/sci-mathematics/giac/files/giac-1.9.0.55-pari-2.15-test.patch
new file mode 100644
index 000000000000..956ade485edd
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.55-pari-2.15-test.patch
@@ -0,0 +1,10 @@
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/giac/patches/giac-pari-2.15-test.patch
+
+--- a/check/chk_fhan4	2018-03-13 15:27:11.000000000 -0300
++++ b/check/chk_fhan4	2022-10-14 18:51:12.604731890 -0300
+@@ -1,4 +1,5 @@
+ #! /bin/sh
+ unset LANG
++export PARI_SIZE=2048000
+ ../src/icas TP04-sol.cas > TP04.tst
+ diff TP04.tst TP04-sol.cas.out1
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-undefined-behavior.patch b/sci-mathematics/giac/files/giac-1.9.0.55-undefined-behavior.patch
new file mode 100644
index 000000000000..78eac91a5244
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.55-undefined-behavior.patch
@@ -0,0 +1,62 @@
+From fc0fb5ba02953d6e15424ce3a2d8f5b52380ffb4 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 25 Jun 2023 13:43:35 -0400
+Subject: [PATCH 1/1] src/vecteur.cc: fix invalid vector indexing.
+
+A few places in vector.cc use the construct &buffer[n]-m where
+"buffer" is an std::vector and "n" its size. This is undefined
+behavior since the index is outside of the allowed range (0 through
+n-1). With GLIBCXX_ASSERTIONS enabled, it crashes on the out-of-
+bounds index.
+
+The most obvious fix is to use &buffer[n-1]-(m+1), which avoids the
+issue so long as n >= 1. I think this will always be the case in the
+affected code, but if I'm wrong, it can be fixed by adding a special
+case for n == 0.
+---
+ src/vecteur.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/vecteur.cc b/src/vecteur.cc
+index 89b1445..c91af66 100644
+--- a/src/vecteur.cc
++++ b/src/vecteur.cc
+@@ -7998,7 +7998,7 @@ namespace giac {
+ 	if (convertpos){
+ 	  int C=col+1;
+ 	  longlong * buf=&buffer[C];
+-	  longlong * bufend=&buffer[cmax]-8;
++	  longlong * bufend=&buffer[cmax-1]-7;
+ 	  const int * nline=&Nline[C];
+ 	  for (;buf<=bufend;buf+=8,nline+=8){
+ 	    longlong x,y;
+@@ -8022,7 +8022,7 @@ namespace giac {
+ 	else {
+ 	  int C=col+1;
+ 	  longlong * buf=&buffer[C];
+-	  longlong * bufend=&buffer[cmax]-8;
++	  longlong * bufend=&buffer[cmax-1]-7;
+ 	  const int * nline=&Nline[C];
+ 	  for (;buf<=bufend;buf+=8,nline+=8){
+ 	    buf[0] -= coeff*nline[0];
+@@ -8268,7 +8268,7 @@ namespace giac {
+ 	    }
+ #else
+ 	    int C=col+1;
+-	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax]-4;
++	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax-1]-3;
+ 	    const int *ptrN=&Nline[C];
+ 	    for (;ptr<ptrend;ptrN+=4,ptr+=4){
+ 	      longlong x = *ptr;
+@@ -8300,7 +8300,7 @@ namespace giac {
+ 	  }
+ 	  else {
+ 	    int C=col+1;
+-	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax]-4;
++	    longlong * ptr= &buffer[C],*ptrend=&buffer[cmax-1] - 3;
+ 	    const int *ptrN=&Nline[C];
+ 	    for (;ptr<ptrend;ptrN+=4,ptr+=4){
+ 	      *ptr -= coeff*(*ptrN);
+-- 
+2.39.3
+
diff --git a/sci-mathematics/giac/giac-1.9.0.55.ebuild b/sci-mathematics/giac/giac-1.9.0.55.ebuild
index dc56ce5cff71..287394488a2d 100644
--- a/sci-mathematics/giac/giac-1.9.0.55.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.55.ebuild
@@ -50,7 +50,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
 	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
 	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
-	"${FILESDIR}/${PN}-1.9.0.55-disable-failing-tests.patch"
+	"${FILESDIR}/${PN}-1.9.0.55-pari-2.15-test.patch"
+	"${FILESDIR}/${PN}-1.9.0.55-undefined-behavior.patch"
 )
 
 REQUIRED_USE="test? ( gui )"