diff options
Diffstat (limited to 'dev-gap')
| -rw-r--r-- | dev-gap/Manifest.gz | bin | 10078 -> 10078 bytes | |||
| -rw-r--r-- | dev-gap/io/Manifest | 3 | ||||
| -rw-r--r-- | dev-gap/io/files/io-4.8.2-fix-failed-assertion.patch | 35 | ||||
| -rw-r--r-- | dev-gap/io/io-4.8.2-r1.ebuild (renamed from dev-gap/io/io-4.8.2.ebuild) | 3 |
4 files changed, 40 insertions, 1 deletions
diff --git a/dev-gap/Manifest.gz b/dev-gap/Manifest.gz Binary files differindex ad66d7cd11d8..bad2d8bce921 100644 --- a/dev-gap/Manifest.gz +++ b/dev-gap/Manifest.gz diff --git a/dev-gap/io/Manifest b/dev-gap/io/Manifest index 33c3c960c0b6..f1022c6481c8 100644 --- a/dev-gap/io/Manifest +++ b/dev-gap/io/Manifest @@ -1,3 +1,4 @@ +AUX io-4.8.2-fix-failed-assertion.patch 1011 BLAKE2B ce87d6e15148734f4602a2206fefba58b13ffd64db542b5acdb056ff8d651da2360dd008900a732b6431dea031bb3c4dce10f7a42050095c5507c318e6b500c7 SHA512 a90aa8c40a52c3d27de35c92baa02066950cbe52b28c85081d465ca9cea4200277b7a6b1d588abc1254f9ce175f9f6a2e0d13a41b65df22c4b3d45022fff36fc DIST io-4.8.2.tar.bz2 587425 BLAKE2B 1c8e9cb398b64823f0cdcaa7be5c81b22ae852ff812e24005e0e4462d6f0880fc9e1fd221e57bc7baa25e14c7bf742a377721f8209c4dfe03a67d5d72b60a603 SHA512 84738ce4e09eeb896b7d2f1f187e90da5ca08dbe8b0066dfa41d425cc989c78fc5c37729fb04a77bdc22e9a692c061be05f8d0719bfc0e0ea94f57987108ba78 -EBUILD io-4.8.2.ebuild 771 BLAKE2B 5863e97cbd00c9a0fb80bf981b497fd6acbbb05f89c089374cbbc915bc1c95c9b25cdcbd158df4ddd72400a48f4831b1a629523a9a8bd39d201a3d057a19e742 SHA512 e8d7e128543fec92a6ff283a3debbd2541c6f326d7b929890eee4974797d33306f16c1a301b37c42ba2b482075b744f30fe984937fef15a658755da512a6684a +EBUILD io-4.8.2-r1.ebuild 866 BLAKE2B bf4455f1e10fc9d2670129b59094cc8eba8468ab40a38ae5ff20c3822036f61794992947c8421ef7c05e116bb61904abd009b3f1c069aa22e3a392355a53167b SHA512 be39547ce877650298e31229f688a7c07ae80b6a8bea1df725f1594889034e569030a0431ea974390d4925ae64c42426b4eefe1ae1f8b9bdf5a467d7b6486ecc MISC metadata.xml 888 BLAKE2B b6a3a5b482ba48142815a906159ad623c823df6a8813f73d455ce8bc25b2d31b74d3252918d592b32f3ca6aa61a66f0f6a4470ddb142cd30275d85767cdf1be8 SHA512 5d5eba8f90e28940f46f991f94f7349a740f22593aa0a6a178d147813a6a6da260bb30e9ecd8d4d60e6ac12d492db7fc86806642185f1a36369e7eeb9a8f4398 diff --git a/dev-gap/io/files/io-4.8.2-fix-failed-assertion.patch b/dev-gap/io/files/io-4.8.2-fix-failed-assertion.patch new file mode 100644 index 000000000000..059cc3387b2b --- /dev/null +++ b/dev-gap/io/files/io-4.8.2-fix-failed-assertion.patch @@ -0,0 +1,35 @@ +From edfbed91b1c98abbed7c57463b88a1e8e134f2c3 Mon Sep 17 00:00:00 2001 +From: Chris Jefferson <caj21@st-andrews.ac.uk> +Date: Wed, 24 Jan 2024 11:18:09 +0800 +Subject: [PATCH] Check arguments to IO_gmtime and IO_localtime + +--- + src/io.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/io.c b/src/io.c +index 731880e..2a1536e 100644 +--- a/src/io.c ++++ b/src/io.c +@@ -1777,6 +1777,10 @@ static Obj FuncIO_gmtime(Obj self, Obj time) + Obj tmp; + time_t t; + struct tm * s; ++ if (!IS_INT(time)) { ++ SyClearErrorNo(); ++ return Fail; ++ } + if (!IS_INTOBJ(time)) { + tmp = QuoInt(time, INTOBJ_INT(256)); + if (!IS_INTOBJ(tmp)) +@@ -1808,6 +1812,10 @@ static Obj FuncIO_localtime(Obj self, Obj time) + Obj tmp; + time_t t; + struct tm * s; ++ if (!IS_INT(time)) { ++ SyClearErrorNo(); ++ return Fail; ++ } + if (!IS_INTOBJ(time)) { + tmp = QuoInt(time, INTOBJ_INT(256)); + if (!IS_INTOBJ(tmp)) diff --git a/dev-gap/io/io-4.8.2.ebuild b/dev-gap/io/io-4.8.2-r1.ebuild index 06e9f54c7b67..46c12ae997e9 100644 --- a/dev-gap/io/io-4.8.2.ebuild +++ b/dev-gap/io/io-4.8.2-r1.ebuild @@ -16,6 +16,9 @@ IUSE="examples" DEPEND="sci-mathematics/gap:=" RDEPEND="${DEPEND}" +# backport, merged upstream already +PATCHES=( "${FILESDIR}/${P}-fix-failed-assertion.patch" ) + gap-pkg_enable_tests src_prepare() { |