[gentoo-commits] repo/gentoo:master commit in: dev-gap/io/

[Joonas Niilola]

commit: c3a19dacfeb2d52fbc92c768541246b7a2e124b7
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May  8 07:32:38 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May  8 07:33:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a19dac

dev-gap/io: Stabilize 4.8.2-r1 amd64, #931511

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-gap/io/io-4.8.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-gap/io/io-4.8.2-r1.ebuild b/dev-gap/io/io-4.8.2-r1.ebuild
index 46c12ae997e9..f5c4b33df639 100644
--- a/dev-gap/io/io-4.8.2-r1.ebuild
+++ b/dev-gap/io/io-4.8.2-r1.ebuild
@@ -10,7 +10,7 @@ SLOT="0"
 
SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2;
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:="

[gentoo-commits] repo/gentoo:master commit in: dev-gap/io/, dev-gap/io/files/

[Michael Orlitzky]

commit: b485329f34dcbaa270e68b2715bcab11b7104313
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Feb  1 12:54:16 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Feb  1 12:54:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b485329f

dev-gap/io: backport fix for assertion failure

Signed-off-by: Michael Orlitzky  gentoo.org>

 .../io/files/io-4.8.2-fix-failed-assertion.patch   | 35 ++
 dev-gap/io/{io-4.8.2.ebuild => io-4.8.2-r1.ebuild} |  3 ++
 2 files changed, 38 insertions(+)

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 ..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 
+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
similarity index 89%
rename from dev-gap/io/io-4.8.2.ebuild
rename to 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() {

[gentoo-commits] repo/gentoo:master commit in: dev-gap/io/files/

[Michael Orlitzky]

commit: 3c224aaceab629efb81d65b57259a57714a57e9e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jan 17 00:34:32 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jan 22 11:29:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c224aac

dev-gap/io: drop unused patch

Suggested-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-gap/io/files/io-4.7.1-headers.patch | 13 -
 1 file changed, 13 deletions(-)

diff --git a/dev-gap/io/files/io-4.7.1-headers.patch 
b/dev-gap/io/files/io-4.7.1-headers.patch
deleted file mode 100644
index 7a7e1d1ff702..
--- a/dev-gap/io/files/io-4.7.1-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/io.c b/src/io.c
-index 60a21ea..bc2499b 100644
 a/src/io.c
-+++ b/src/io.c
-@@ -14,7 +14,7 @@
- #include "compiled.h" // GAP headers
- 
- #if GAP_KERNEL_MAJOR_VERSION >= 6
--#include "src/profile.h"
-+#include "profile.h"
- #endif
- 
- #undef PACKAGE