summaryrefslogtreecommitdiff
path: root/dev-gap
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2024-02-01 18:31:40 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2024-02-01 18:31:40 +0000
commit3344c6dbd83208be46bd32956720acfd725eee81 (patch)
tree07e1d6970b0e1528c8c7dad3f334045f1eba8e88 /dev-gap
parentea9f7f5544b44712ccc1a12cde64dc4e352402c2 (diff)
downloadbaldeagleos-repo-3344c6dbd83208be46bd32956720acfd725eee81.tar.gz
baldeagleos-repo-3344c6dbd83208be46bd32956720acfd725eee81.tar.xz
baldeagleos-repo-3344c6dbd83208be46bd32956720acfd725eee81.zip
Adding metadata
Diffstat (limited to 'dev-gap')
-rw-r--r--dev-gap/io/files/io-4.8.2-fix-failed-assertion.patch35
-rw-r--r--dev-gap/io/io-4.8.2-r1.ebuild (renamed from dev-gap/io/io-4.8.2.ebuild)3
2 files changed, 38 insertions, 0 deletions
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() {