* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spin/, sci-mathematics/spin/files/
@ 2016-01-09 12:00 Paweł Hajdan
0 siblings, 0 replies; 3+ messages in thread
From: Paweł Hajdan @ 2016-01-09 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 4ab1ec46b906ee138dabf798d8b48ed4a7fcd580
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 11:59:54 2016 +0000
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 12:00:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab1ec46
sci-mathematics/spin: version bump (6.4.5); now the license is BSD
Package-Manager: portage-2.2.20.1
sci-mathematics/spin/Manifest | 1 +
.../spin/files/spin-6.4.5-makefile.patch | 20 +++++++++
sci-mathematics/spin/spin-6.4.5.ebuild | 48 ++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index 91ce723..edf4e37 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,3 +1,4 @@
DIST spin621.tar.gz 463101 SHA256 2b3a9163e1bce4cb6402550819f6e190449e0e5aeb7b81630a017e130f7921cb SHA512 b10a306bc48b964f8fefec07ee9745ae62faee8af3a62d4f7cc24ee808f69cbc7705b9f33782f76dd28e3ab7a5eeb645759763edc702bf8cb81645ddf3f796b7 WHIRLPOOL 13bb5f820167248857c97ce4e05ab7411f4209da69edc5391aa18ef905825794f1db2d5fb933f4bb2e9b332638b7be8de2bd27b338c4b36314a4cac874a92ba8
DIST spin623.tar.gz 465637 SHA256 a056a7d360c4ab0322e5e8d09c6a0f23178b2ad471413e208136c5a29f1650ec SHA512 7a4faeee95a8c10b6a875e6bbfe6fdab91f982401601cd33d2701a8001ee27aa21738fe10e01720505b54f9b1369e0e79ae19bdf7909b0ef23bc49f70d76992b WHIRLPOOL 7bb4450313037c65ba0326b3261584592950060fdc28de6bb968958ed7f75976ee45d72499970a08e44021a71d70c2aa61f12072d5a1be266f07968a17db0890
DIST spin625.tar.gz 468314 SHA256 3273c15af419912b00f1a3b9683af8f516a6a2afae788a575006d5fee0ecf330 SHA512 1679fb52981da762f6a5955116bfa0906bf12de7a219319fedf7ba068ba0c2ad51aa6a49d3b30115391f7070c7169c7c0753a23ef95257d350a9160e2d1f3ded WHIRLPOOL 6d4743449b28f0bd132fe69ea37160c4cce258d020883297f76df34e01e1acaf236c420f2aca600994d310d029051cc0bb2378237efa11903695018144c02733
+DIST spin645.tar.gz 672549 SHA256 44081282eb63cd9df763ebbcf8bad19dbeefecbebf8ac2cc090ea92e2ab71875 SHA512 77bc35bb852c0448915c655bf11910d0b226d30d66abaa63311e6227de03f920ca026e7399cbeebdae631368fd8091f1e8330bd3094bd4febdf7d5c7a81834ad WHIRLPOOL 15fb07d6c0dac8d054cefe2810588ece60bf67bbb920f6ee8800b391b00fbf93d7f7f21988ac7dd84aa644a88a27524af8462fbb4cec438eaee11159683ce2af
diff --git a/sci-mathematics/spin/files/spin-6.4.5-makefile.patch b/sci-mathematics/spin/files/spin-6.4.5-makefile.patch
new file mode 100644
index 0000000..64b76ec
--- /dev/null
+++ b/sci-mathematics/spin/files/spin-6.4.5-makefile.patch
@@ -0,0 +1,20 @@
+--- makefile.orig 2016-01-09 12:51:10.260008241 +0100
++++ makefile 2016-01-09 12:52:04.666673549 +0100
+@@ -7,8 +7,6 @@
+ # see also ./make_pc for a simpler script not requiring make
+ # for 32-bit compilation, use ./make32
+
+-CC=gcc
+-CFLAGS=-O2 -DNXT # on some systems add: -I/usr/include
+ # on a PC: add -DPC
+ # on Solaris: add -DSOLARIS
+ # on a Mac: add -DMAC
+@@ -37,7 +35,7 @@
+ tl_mem.o tl_rewrt.o tl_cache.o
+
+ spin: $(SPIN_OS) $(TL_OS) spin.o
+- $(CC) $(CFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
+
+ install: spin
+ cp spin /usr/local/bin
diff --git a/sci-mathematics/spin/spin-6.4.5.ebuild b/sci-mathematics/spin/spin-6.4.5.ebuild
new file mode 100644
index 0000000..5b32111
--- /dev/null
+++ b/sci-mathematics/spin/spin-6.4.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(replace_all_version_separators '')
+MY_P="${PN}${MY_PV}"
+
+DESCRIPTION="Tool for formal verification of distributed software systems"
+HOMEPAGE="http://spinroot.com/"
+SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz tk"
+
+DEPEND="sys-devel/bison"
+RDEPEND="sys-devel/gcc
+ sys-process/time
+ tk? (
+ dev-lang/tk
+ graphviz? ( media-gfx/graphviz )
+ )"
+
+S="${WORKDIR}/Spin/Src${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-6.4.5-makefile.patch"
+}
+
+src_compile() {
+ tc-export CC
+ default
+}
+
+src_install() {
+ dobin spin
+ doman ../Man/spin.1
+ dodoc ../Doc/*
+ if use tk; then
+ newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin
+ make_desktop_entry ispin
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spin/, sci-mathematics/spin/files/
@ 2018-03-29 19:23 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-03-29 19:23 UTC (permalink / raw
To: gentoo-commits
commit: cd5b9f0e04cde405529db99df0ff76fb3ae47fbe
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Tue Mar 27 15:17:04 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 19:22:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5b9f0e
sci-mathematics/spin: Remove old
Closes: https://github.com/gentoo/gentoo/pull/7646
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sci-mathematics/spin/Manifest | 3 --
.../spin/files/spin-6.2.1-makefile.patch | 21 ----------
.../spin/files/spin-6.2.5-makefile.patch | 21 ----------
sci-mathematics/spin/spin-6.2.1.ebuild | 42 -------------------
sci-mathematics/spin/spin-6.2.3.ebuild | 47 ----------------------
sci-mathematics/spin/spin-6.2.5.ebuild | 47 ----------------------
6 files changed, 181 deletions(-)
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index 3c3012f074a..c1bdf87e9cb 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,4 +1 @@
-DIST spin621.tar.gz 463101 BLAKE2B 8c786ef7e224b1035dbdb55a826e360537b78c76e35a532ce5930df851a92ee8070676b54831466a00ca85aaddeb21c8ab457bef733367b93e5d7939ce58b362 SHA512 b10a306bc48b964f8fefec07ee9745ae62faee8af3a62d4f7cc24ee808f69cbc7705b9f33782f76dd28e3ab7a5eeb645759763edc702bf8cb81645ddf3f796b7
-DIST spin623.tar.gz 465637 BLAKE2B 2a8dbd34eeaf2b56178d4624fb40f41a6ca174cd09e6c5df14a2a1bfea4bc392dfe0d939a006ff85e7d35c60bac1eb5d0cabb8fdbd09c2d67613713723a4c752 SHA512 7a4faeee95a8c10b6a875e6bbfe6fdab91f982401601cd33d2701a8001ee27aa21738fe10e01720505b54f9b1369e0e79ae19bdf7909b0ef23bc49f70d76992b
-DIST spin625.tar.gz 468314 BLAKE2B 58287bb1055bf19c104d8d8f321eab27daaa30bc08575bba40ded4756f4d05f243365fe003df72934dc771a00cfb5ee611cb2161007d9a20660d7b029a96deb4 SHA512 1679fb52981da762f6a5955116bfa0906bf12de7a219319fedf7ba068ba0c2ad51aa6a49d3b30115391f7070c7169c7c0753a23ef95257d350a9160e2d1f3ded
DIST spin645.tar.gz 672549 BLAKE2B 5b0f7d5ef8fbec84a4423938c10272f804084d05d470a69ef954ee261752b238b16643054d934617861fb02ef4a318c708a8464102572d34b71c883cb84fe450 SHA512 77bc35bb852c0448915c655bf11910d0b226d30d66abaa63311e6227de03f920ca026e7399cbeebdae631368fd8091f1e8330bd3094bd4febdf7d5c7a81834ad
diff --git a/sci-mathematics/spin/files/spin-6.2.1-makefile.patch b/sci-mathematics/spin/files/spin-6.2.1-makefile.patch
deleted file mode 100644
index 9133f54f9fa..00000000000
--- a/sci-mathematics/spin/files/spin-6.2.1-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- makefile.orig 2012-05-21 14:59:56.000000000 +0200
-+++ makefile 2012-05-21 15:00:47.000000000 +0200
-@@ -13,9 +13,6 @@
-
- # see also ./make_pc for a simpler script, not requiring make
-
--CC=gcc
--CFLAGS=-O2 -DNXT # on some systems add: -I/usr/include
--
- # CC=gcc -m32 # 32bit compilation on a 64bit system
- # for a more picky compilation use gcc-4 and:
- # CFLAGS=-std=c99 -Wstrict-prototypes -pedantic -fno-strength-reduce -fno-builtin -W -Wshadow -Wpointer-arith -Wcast-qual -Winline -Wall -g -DNXT -DPC
-@@ -43,7 +40,7 @@
- tl_mem.o tl_rewrt.o tl_cache.o
-
- spin: $(SPIN_OS) $(TL_OS) spin.o
-- $(CC) $(CFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
-
- spin.o: spin.y
- $(YACC) $(YFLAGS) spin.y
diff --git a/sci-mathematics/spin/files/spin-6.2.5-makefile.patch b/sci-mathematics/spin/files/spin-6.2.5-makefile.patch
deleted file mode 100644
index 585e78b6f55..00000000000
--- a/sci-mathematics/spin/files/spin-6.2.5-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- makefile.orig 2013-05-05 01:21:02.000000000 +0200
-+++ makefile 2013-11-18 01:07:20.000000000 +0100
-@@ -13,9 +13,6 @@
-
- # see also ./make_pc for a simpler script, not requiring make
-
--CC=gcc
--CFLAGS=-O2 -DNXT # on some systems add: -I/usr/include
--
- # CFLAGS=-g -O2 -DNXT
-
- # CC=gcc -m32 # 32bit compilation on a 64bit system
-@@ -45,7 +42,7 @@
- tl_mem.o tl_rewrt.o tl_cache.o
-
- spin: $(SPIN_OS) $(TL_OS) spin.o
-- $(CC) $(CFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
-
- spin.o: spin.y
- $(YACC) $(YFLAGS) spin.y
diff --git a/sci-mathematics/spin/spin-6.2.1.ebuild b/sci-mathematics/spin/spin-6.2.1.ebuild
deleted file mode 100644
index 201885a95b4..00000000000
--- a/sci-mathematics/spin/spin-6.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils versionator
-
-MY_PV=$(replace_all_version_separators '')
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="Tool for formal verification of distributed software systems"
-HOMEPAGE="http://spinroot.com/"
-SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz"
-
-LICENSE="|| ( spin-commercial spin-educational )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz tk"
-
-DEPEND="sys-devel/bison"
-RDEPEND="sys-devel/gcc
- sys-process/time
- tk? (
- dev-lang/tk
- graphviz? ( media-gfx/graphviz )
- )"
-
-S="${WORKDIR}/Spin/Src${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-6.2.1-makefile.patch"
-}
-
-src_install() {
- dobin spin
- doman ../Man/spin.1
- dodoc ../Doc/*
- if use tk; then
- newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin
- make_desktop_entry ispin
- fi
-}
diff --git a/sci-mathematics/spin/spin-6.2.3.ebuild b/sci-mathematics/spin/spin-6.2.3.ebuild
deleted file mode 100644
index 906dd06fff9..00000000000
--- a/sci-mathematics/spin/spin-6.2.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators '')
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="Tool for formal verification of distributed software systems"
-HOMEPAGE="http://spinroot.com/"
-SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz"
-
-LICENSE="|| ( spin-commercial spin-educational )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz tk"
-
-DEPEND="sys-devel/bison"
-RDEPEND="sys-devel/gcc
- sys-process/time
- tk? (
- dev-lang/tk
- graphviz? ( media-gfx/graphviz )
- )"
-
-S="${WORKDIR}/Spin/Src${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-6.2.1-makefile.patch"
-}
-
-src_compile() {
- tc-export CC
- default
-}
-
-src_install() {
- dobin spin
- doman ../Man/spin.1
- dodoc ../Doc/*
- if use tk; then
- newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin
- make_desktop_entry ispin
- fi
-}
diff --git a/sci-mathematics/spin/spin-6.2.5.ebuild b/sci-mathematics/spin/spin-6.2.5.ebuild
deleted file mode 100644
index 435fb87b5c1..00000000000
--- a/sci-mathematics/spin/spin-6.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators '')
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="Tool for formal verification of distributed software systems"
-HOMEPAGE="http://spinroot.com/"
-SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz"
-
-LICENSE="|| ( spin-commercial spin-educational )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz tk"
-
-DEPEND="sys-devel/bison"
-RDEPEND="sys-devel/gcc
- sys-process/time
- tk? (
- dev-lang/tk
- graphviz? ( media-gfx/graphviz )
- )"
-
-S="${WORKDIR}/Spin/Src${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-6.2.5-makefile.patch"
-}
-
-src_compile() {
- tc-export CC
- default
-}
-
-src_install() {
- dobin spin
- doman ../Man/spin.1
- dodoc ../Doc/*
- if use tk; then
- newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin
- make_desktop_entry ispin
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spin/, sci-mathematics/spin/files/
@ 2022-01-16 8:57 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2022-01-16 8:57 UTC (permalink / raw
To: gentoo-commits
commit: 69c2ae786d9151a8358198a73a8bcd0583ac9a1f
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 08:56:16 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 08:57:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c2ae78
sci-mathematics/spin: backport upstream fix for CVE-2021-46168
Closes: https://bugs.gentoo.org/831220
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../spin/files/spin-6.5.2-nesting_limit.patch | 55 ++++++++++++++++++++++
.../{spin-6.5.2.ebuild => spin-6.5.2-r1.ebuild} | 3 +-
2 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/spin/files/spin-6.5.2-nesting_limit.patch b/sci-mathematics/spin/files/spin-6.5.2-nesting_limit.patch
new file mode 100644
index 000000000000..c73152e8485c
--- /dev/null
+++ b/sci-mathematics/spin/files/spin-6.5.2-nesting_limit.patch
@@ -0,0 +1,55 @@
+Backported upstream changes to address CVE-2021-46168.
+
+From 62cf91c944ea457c218528e9021443a0cbe05758 Mon Sep 17 00:00:00 2001
+From: nimble-code <gerard.holzmann@gmail.com>
+Date: Sun, 2 Jan 2022 11:26:40 -0800
+Subject: [PATCH] fix
+
+--- a/sched.c
++++ b/sched.c
+@@ -18,7 +18,7 @@ extern int lineno, nr_errs, dumptab, xspin, jumpsteps, columns;
+ extern int u_sync, Elcnt, interactive, TstOnly, cutoff;
+ extern short has_enabled, has_priority, has_code, replay;
+ extern int limited_vis, product, nclaims, old_priority_rules;
+-extern int old_scope_rules, scope_seq[128], scope_level, has_stdin;
++extern int old_scope_rules, scope_seq[256], scope_level, has_stdin;
+
+ extern int pc_highest(Lextok *n);
+ extern void putpostlude(void);
+--- a/spinlex.c
++++ b/spinlex.c
+@@ -51,7 +51,7 @@ extern int implied_semis, ltl_mode, in_seq, par_cnt;
+
+ short has_stack = 0;
+ int lineno = 1;
+-int scope_seq[128], scope_level = 0;
++int scope_seq[256], scope_level = 0;
+ char CurScope[MAXSCOPESZ];
+ char yytext[2048];
+ FILE *yyin, *yyout;
+From 9ecb1af6d174532f3a77acae3a1d424fe7345a3e Mon Sep 17 00:00:00 2001
+From: nimble-code <gerard.holzmann@gmail.com>
+Date: Sat, 15 Jan 2022 10:39:38 -0800
+Subject: [PATCH] nesting limit
+
+--- a/spinlex.c
++++ b/spinlex.c
+@@ -1704,8 +1704,16 @@ lex(void)
+ case '|': c = follow('|', OR, '|'); break;
+ case ';': c = SEMI; break;
+ case '.': c = follow('.', DOTDOT, '.'); break;
+- case '{': scope_seq[scope_level++]++; set_cur_scope(); break;
+- case '}': scope_level--; set_cur_scope(); break;
++ case '{':
++ assert(scope_level < sizeof(scope_seq)-1);
++ scope_seq[scope_level++]++;
++ set_cur_scope();
++ break;
++ case '}':
++ assert(scope_level > 0);
++ scope_level--;
++ set_cur_scope();
++ break;
+ default : break;
+ }
+ ValToken(0, c)
diff --git a/sci-mathematics/spin/spin-6.5.2.ebuild b/sci-mathematics/spin/spin-6.5.2-r1.ebuild
similarity index 92%
rename from sci-mathematics/spin/spin-6.5.2.ebuild
rename to sci-mathematics/spin/spin-6.5.2-r1.ebuild
index 5e4110e9abeb..0e1f17681a7c 100644
--- a/sci-mathematics/spin/spin-6.5.2.ebuild
+++ b/sci-mathematics/spin/spin-6.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,6 +27,7 @@ BDEPEND="virtual/yacc"
PATCHES=(
"${FILESDIR}"/${PN}-6.5.2-makefile.patch
+ "${FILESDIR}"/${PN}-6.5.2-nesting_limit.patch
)
S="${WORKDIR}"/${MY_P}/Src
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-16 8:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-29 19:23 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/spin/, sci-mathematics/spin/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-01-16 8:57 Marek Szuba
2016-01-09 12:00 Paweł Hajdan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox