commit: 5535a9a970135d31e7340bd95429582b7769ba5f
Author: Cyprien Nicolas (fulax) <cyprien <AT> nicolas <DOT> tf>
AuthorDate: Fri Jun 4 17:11:11 2021 +0000
Commit: Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Fri Jun 4 17:40:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=5535a9a9
dev-scheme/guile: Remove old, bump to 2.2.7
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Cyprien Nicolas <cyprien <AT> nicolas.tf>
.../files/guile-2.2.6-configure-ldflags.patch | 13 ----
.../files/guile-2.2.6-tests-00-repl-server.patch | 91 ----------------------
dev-scheme/guile/files/guile-2.2.7-stack-up.patch | 17 ++++
dev-scheme/guile/guile-2.0.14-r4.ebuild | 10 +--
.../{guile-2.2.6.ebuild => guile-2.2.7.ebuild} | 11 +--
dev-scheme/guile/guile-2.9.4.ebuild | 6 +-
dev-scheme/guile/guile-9999.ebuild | 4 +-
7 files changed, 33 insertions(+), 119 deletions(-)
diff --git a/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch
b/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch
deleted file mode 100644
index c368f98a..00000000
--- a/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9073deba0..92966ce34 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1688,7 +1688,7 @@ do
- done
-
- GUILE_CFLAGS="$GUILE_CFLAGS $PTHREAD_CFLAGS"
--GUILE_LIBS="$LDFLAGS $LIBS"
-+GUILE_LIBS="$LIBS"
-
- AC_SUBST(GUILE_LIBS)
- AC_SUBST(GUILE_CFLAGS)
diff --git a/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch
b/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch
deleted file mode 100644
index 37c7e298..00000000
--- a/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- guile-2.2.6/test-suite/tests/00-repl-server.test.old 2017-04-14
23:26:40.000000000 +0200
-+++ guile-2.2.6/test-suite/tests/00-repl-server.test 2019-07-07
15:14:59.681831790 +0200
-@@ -105,47 +105,48 @@
- ;;; Since we call 'primitive-fork', these tests must run before any
- ;;; tests that create threads.
-
--(with-test-prefix "repl-server"
-+(if (provided? 'socket)
-+ (with-test-prefix "repl-server"
-
-- (pass-if-equal "simple expression"
-- "scheme@(repl-server)> $1 = 42\n"
-- (with-repl-server socket
-- (read-until-prompt socket %last-line-before-prompt)
--
-- ;; Wait until 'repl-reader' in boot-9 has written the prompt.
-- ;; Otherwise, if we write too quickly, 'repl-reader' checks for
-- ;; 'char-ready?' and doesn't print the prompt.
-- (match (select (list socket) '() (list socket) 3)
-- (((_) () ())
-- (display "(+ 40 2)\n(quit)\n" socket)
-- (read-string socket)))))
--
-- (pass-if "HTTP inter-protocol attack" ;CVE-2016-8606
-- (with-repl-server socket
-- ;; Avoid SIGPIPE when the server closes the connection.
-- (sigaction SIGPIPE SIG_IGN)
--
-- (read-until-prompt socket %last-line-before-prompt)
--
-- ;; Simulate an HTTP inter-protocol attack.
-- (write-request (build-request (string->uri "http://localhost";))
-- socket)
--
-- ;; Make sure the server reacts by closing the connection. If it
-- ;; fails to do that, this test hangs.
-- (catch 'system-error
-- (lambda ()
-- (let loop ((n 0))
-- (display "(+ 40 2)\n(quit)\n" socket) ;trigger EPIPE
-- (read-string socket)
-- (if (> n 5)
-- #f ;failure
-- (begin
-- (sleep 1)
-- (loop (+ 1 n))))))
-- (lambda args
-- (->bool (memv (system-error-errno args)
-- (list ECONNRESET EPIPE ECONNABORTED))))))))
-+ (pass-if-equal "simple expression"
-+ "scheme@(repl-server)> $1 = 42\n"
-+ (with-repl-server socket
-+ (read-until-prompt socket %last-line-before-prompt)
-+
-+ ;; Wait until 'repl-reader' in boot-9 has written the prompt.
-+ ;; Otherwise, if we write too quickly, 'repl-reader' checks for
-+ ;; 'char-ready?' and doesn't print the prompt.
-+ (match (select (list socket) '() (list socket) 3)
-+ (((_) () ())
-+ (display "(+ 40 2)\n(quit)\n" socket)
-+ (read-string socket)))))
-+
-+ (pass-if "HTTP inter-protocol attack" ;CVE-2016-8606
-+ (with-repl-server socket
-+ ;; Avoid SIGPIPE when the server closes the connection.
-+ (sigaction SIGPIPE SIG_IGN)
-+
-+ (read-until-prompt socket %last-line-before-prompt)
-+
-+ ;; Simulate an HTTP inter-protocol attack.
-+ (write-request (build-request (string->uri "http://localhost";))
-+ socket)
-+
-+ ;; Make sure the server reacts by closing the connection. If it
-+ ;; fails to do that, this test hangs.
-+ (catch 'system-error
-+ (lambda ()
-+ (let loop ((n 0))
-+ (display "(+ 40 2)\n(quit)\n" socket) ;trigger EPIPE
-+ (read-string socket)
-+ (if (> n 5)
-+ #f ;failure
-+ (begin
-+ (sleep 1)
-+ (loop (+ 1 n))))))
-+ (lambda args
-+ (->bool (memv (system-error-errno args)
-+ (list ECONNRESET EPIPE ECONNABORTED)))))))))
-
- ;;; Local Variables:
- ;;; eval: (put 'with-repl-server 'scheme-indent-function 1)
diff --git a/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
b/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
new file mode 100644
index 00000000..de291421
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.7-stack-up.patch
@@ -0,0 +1,17 @@
+This patch (dropping an obsolete extra parameter to grow_stack) landed post
+2.2.7 and we're not likely to ever see a 2.2.8, as development has moved
+on to 3.x now.
+
+https://bugs.gentoo.org/747049
+https://www.mail-archive.com/[email protected]/msg15502.html
+--- a/libguile/continuations.c
++++ b/libguile/continuations.c
+@@ -302,7 +302,7 @@
+
+ #if SCM_STACK_GROWS_UP
+ if (dst + continuation->num_stack_items >= &stack_top_element)
+- grow_stack (cont, mra);
++ grow_stack (cont);
+ #else
+ dst -= continuation->num_stack_items;
+ if (dst <= &stack_top_element)
diff --git a/dev-scheme/guile/guile-2.0.14-r4.ebuild
b/dev-scheme/guile/guile-2.0.14-r4.ebuild
index f68b2613..0971ef6c 100644
--- a/dev-scheme/guile/guile-2.0.14-r4.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic autotools ltprune
+inherit flag-o-matic autotools
DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
HOMEPAGE="https://www.gnu.org/software/guile/";
SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
LICENSE="LGPL-3+"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" #
upstream recommended +networking +nls
# emacs useflag removal not working
@@ -18,7 +18,7 @@ REQUIRED_USE="regex"
RDEPEND="
>=dev-libs/boehm-gc-7.0:=[threads?]
dev-libs/gmp:=
- virtual/libffi:=
+ dev-libs/libffi:=
dev-libs/libltdl:=
dev-libs/libunistring:0=
sys-devel/libtool
@@ -74,7 +74,7 @@ src_configure() {
src_install() {
default
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
# From Novell
# https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild
b/dev-scheme/guile/guile-2.2.7.ebuild
similarity index 88%
rename from dev-scheme/guile/guile-2.2.6.ebuild
rename to dev-scheme/guile/guile-2.2.7.ebuild
index 09bb768e..af7ad600 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="2.2/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" #
upstream recommended +networking +nls
REQUIRED_USE="regex" # workaround for bug 596322
RESTRICT="strip"
@@ -21,7 +21,7 @@ RDEPEND="
!>=dev-scheme/guile-2.2:12
>=dev-libs/boehm-gc-7.0:=[threads?]
dev-libs/gmp:=
- virtual/libffi:=
+ dev-libs/libffi:=
dev-libs/libltdl:=
dev-libs/libunistring:0=
sys-libs/ncurses:0=
@@ -34,8 +34,9 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
- "${FILESDIR}/${P}-configure-ldflags.patch" # bug 590904
- "${FILESDIR}/${P}-tests-00-repl-server.patch" # bug 629004
+# "${FILESDIR}/${P}-configure-ldflags.patch" # bug 590904
+ "${FILESDIR}/${P}-stack-up.patch" # bug 747049
+# "${FILESDIR}/${P}-tests-00-repl-server.patch" # bug 629004
)
DOCS=( GUILE-VERSION HACKING README )
diff --git a/dev-scheme/guile/guile-2.9.4.ebuild
b/dev-scheme/guile/guile-2.9.4.ebuild
index 989fa372..7868f439 100644
--- a/dev-scheme/guile/guile-2.9.4.ebuild
+++ b/dev-scheme/guile/guile-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/guile/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug debug-malloc +deprecated +networking +regex +threads" # upstream
recommended +networking
REQUIRED_USE="regex" # workaround for bug 596322
RESTRICT="strip"
@@ -20,7 +20,7 @@ RESTRICT="strip"
RDEPEND="
>=dev-libs/boehm-gc-7.2:=[threads?]
>=dev-libs/gmp-4.2:=
- virtual/libffi:=
+ dev-libs/libffi:=
>=dev-libs/libltdl-1.5.6:=
>=dev-libs/libunistring-0.9.3:0=
sys-libs/ncurses:0=
diff --git a/dev-scheme/guile/guile-9999.ebuild
b/dev-scheme/guile/guile-9999.ebuild
index f571ceed..568c7ba8 100644
--- a/dev-scheme/guile/guile-9999.ebuild
+++ b/dev-scheme/guile/guile-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ RESTRICT="strip"
RDEPEND="
>=dev-libs/boehm-gc-7.2:=[threads?]
>=dev-libs/gmp-4.2:=
- virtual/libffi:=
+ dev-libs/libffi:=
>=dev-libs/libltdl-1.5.6:=
>=dev-libs/libunistring-0.9.3:0=
sys-libs/ncurses:0=
