[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/, dev-scheme/guile/files/
commit: 5535a9a970135d31e7340bd95429582b7769ba5f
Author: Cyprien Nicolas (fulax) nicolas tf>
AuthorDate: Fri Jun 4 17:11:11 2021 +
Commit: Cyprien Nicolas gmail com>
CommitDate: Fri Jun 4 17:40:04 2021 +
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 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-.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..
--- 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..
--- 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.0 +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.
-+
[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/, dev-scheme/guile/files/
commit: 569a6cacb0c84ddbeee51eb808c37ce79c45b9b5
Author: Cyprien Nicolas (fulax) fulax fr>
AuthorDate: Sun Jul 7 15:03:03 2019 +
Commit: Cyprien Nicolas gmail com>
CommitDate: Sun Jul 7 15:03:03 2019 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=569a6cac
dev-scheme/guile: Add 2.2.6 SLOT=2.2 + patches
Package-Manager: Portage-2.3.66, Repoman-2.3.11
.../files/guile-2.2.6-configure-ldflags.patch | 13
.../files/guile-2.2.6-tests-00-repl-server.patch | 91 ++
.../{guile-2.2.5.ebuild => guile-2.2.6.ebuild} | 17 ++--
dev-scheme/guile/guile-2.9.2.ebuild| 17 ++--
4 files changed, 126 insertions(+), 12 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
new file mode 100644
index ..c368f98a
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.6-configure-ldflags.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index ..37c7e298
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.2.6-tests-00-repl-server.patch
@@ -0,0 +1,91 @@
+--- guile-2.2.6/test-suite/tests/00-repl-server.test.old 2017-04-14
23:26:40.0 +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)
++
[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/, dev-scheme/guile/files/
commit: 48f0e9ff67868013bcf43f044b297425ae451117
Author: Cyprien Nicolas (fulax) fulax fr>
AuthorDate: Sun Jun 23 15:58:55 2019 +
Commit: Cyprien Nicolas gmail com>
CommitDate: Sun Jun 23 15:58:55 2019 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=48f0e9ff
dev-scheme/guile: append -fno-fast-math to cflags, bug #598986
Package-Manager: Portage-2.3.66, Repoman-2.3.11
dev-scheme/guile/files/guile-2-snarf.patch | 47
dev-scheme/guile/files/guile-2.0.14-darwin.patch | 38 +
...0.14-ia64-fix-crash-thread-context-switch.patch | 63 ++
.../files/guile-2.0.14-tests-repl-server.patch | 25 +
.../{guile-2.2.5.ebuild => guile-2.0.14-r4.ebuild} | 54 ++-
dev-scheme/guile/guile-2.2.5.ebuild| 2 +
dev-scheme/guile/guile-2.9.2.ebuild| 2 +
dev-scheme/guile/guile-.ebuild | 2 +
8 files changed, 209 insertions(+), 24 deletions(-)
diff --git a/dev-scheme/guile/files/guile-2-snarf.patch
b/dev-scheme/guile/files/guile-2-snarf.patch
new file mode 100644
index ..c6ab5cd4
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2-snarf.patch
@@ -0,0 +1,47 @@
+From f775ab3654357fcaad294b95efb0b1c16de1eda8 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Sun, 19 Feb 2017 22:58:40 +
+Subject: guile-snarf: skip -g* arguments to avoid build failure
+
+* libguile/guile-snarf.in: skip -g* arguments to avoid failure on
+ -ggdb3.
+
+Bug: https://bugs.gentoo.org/608190
+Bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=25803
+Signed-off-by: Sergei Trofimovich
+---
+ libguile/guile-snarf.in | 16 ++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/libguile/guile-snarf.in b/libguile/guile-snarf.in
+index 47bbc04..22dc1d3 100644
+--- a/libguile/guile-snarf.in
b/libguile/guile-snarf.in
+@@ -95,10 +95,22 @@ if [ x"$CPP" = x ] ; then cpp="@CPP@" ; else cpp="$CPP" ;
fi
+
+ trap "rm -rf $tempdir" 0 1 2 15
+
++# filter out -g* flags from commandline
++# as some flags like -ggdb3 cause CPP
++
++cpp_args=""
++for arg in "$@"
++do
++case "$arg" in
++-g*) ;; # skip debug flag
++*) cpp_args="$cpp_args $arg" ;;
++esac
++done
++
+ if [ ! "$outfile" = "-" ] ; then
+-modern_snarf "$@" > $outfile
++modern_snarf $cpp_args > $outfile
+ else
+-modern_snarf "$@"
++modern_snarf $cpp_args
+ fi
+
+ # zonk outfile if errors occurred
+--
+cgit v1.0-41-gc330
+
diff --git a/dev-scheme/guile/files/guile-2.0.14-darwin.patch
b/dev-scheme/guile/files/guile-2.0.14-darwin.patch
new file mode 100644
index ..17741ae3
--- /dev/null
+++ b/dev-scheme/guile/files/guile-2.0.14-darwin.patch
@@ -0,0 +1,38 @@
+fix compilation on Darwin
+
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23
+https://bugs.gentoo.org/show_bug.cgi?id=612338
+
+--- guile-2.0.14/libguile/filesys.c
guile-2.0.14/libguile/filesys.c
+@@ -1486,6 +1486,9 @@
+ mode_bits = scm_i_mode_bits (mode);
+ }
+
++#ifdef __APPLE__
++ open_flags &= O_APPEND|O_SHLOCK|O_EXLOCK|O_CLOEXEC;
++#endif
+ SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
+ if (rv == -1)
+ SCM_SYSERROR;
+--- guile-2.0.14/libguile/stime.c
guile-2.0.14/libguile/stime.c
+@@ -830,6 +830,10 @@
+
+ #ifdef HAVE_POSIX_CPUTIME
+ {
++#ifdef __APPLE__
++if (clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &posix_run_time_base) == 0)
++ get_internal_run_time = get_internal_run_time_posix_timer;
++#else
+ clockid_t dummy;
+
+ /* Only use the _POSIX_CPUTIME clock if it's going to work across
+@@ -839,6 +843,7 @@
+ get_internal_run_time = get_internal_run_time_posix_timer;
+ else
+ errno = 0;
++#endif
+ }
+ #endif /* HAVE_POSIX_CPUTIME */
+ #endif /* HAVE_CLOCKTIME */
diff --git
a/dev-scheme/guile/files/guile-2.0.14-ia64-fix-crash-thread-context-switch.patch
b/dev-scheme/guile/files/guile-2.0.14-ia64-fix-crash-thread-context-switch.patch
new file mode 100644
index ..c2f136dd
--- /dev/null
+++
b/dev-scheme/guile/files/guile-2.0.14-ia64-fix-crash-thread-context-switch.patch
@@ -0,0 +1,63 @@
+From f9253439a8ded221f3423865c78de2a96a14 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Sun, 5 Nov 2017 09:30:45 +
+Subject: ia64: Fix crash in thread context switch.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes and .
+
+Backtrace looks like that:
+
+ Program terminated with signal SIGSEGV, Segmentation fault.
+ #0 0x2014a5c0 in scm_ia64_longjmp (JB=0x60817020, VAL=1) at
continuations.c:372
+ 372 t->pending_rbs_continuation->backing_store,
+ [Current thread is 1 (Thread 0x20049340 (LWP 8190))]
+ (gdb) bt
+ #0 0x2014a5c0 in scm_ia64_longjmp (JB=0x60817020, VAL=1) at
continuations.c:372
+ #1 0x20148
