dev-scheme/guile: Add 2.2.6 SLOT=2.2 + patches

Package-Manager: Portage-2.3.66, Repoman-2.3.11

5 files changed, 131 insertions, 15 deletions

diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index c102031f..0407a327 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -3,11 +3,13 @@ AUX guile-2.0.14-darwin.patch 1026 BLAKE2B 9193732cfb74931f7bf8e9b55c5c9dd2621ef
 AUX guile-2.0.14-ia64-fix-crash-thread-context-switch.patch 2426 BLAKE2B 5b2073a3780794e9466d8e5434ab98a91a821408ab792abbfaf61d09c95e113b99746b0da850115b4534bda00b1313cef5bb9b08c90c8bf9a04c81b1eb78faa3 SHA512 082f98ac4ee2f40dd3762006bf5c43022088b2286c9a8d63ae9e234d3c8527f3afcfba8076e0c8578e7fbed257294db6ce1a4513661b89f821579dc121d449ae
 AUX guile-2.0.14-tests-repl-server.patch 964 BLAKE2B 08ee4f7399b108c7bc30314b28b7e53e632a74e5d00e1a3d149c0771cbd2bbd91942a8e7a6c68680b5f2ace5648780b81466bdb9bbec48607753cddcb03298ac SHA512 e5a67524011e69fdd14c8feb70b42b1860fcce0dd889cf0defab48f7508391e14e0da24065cac040beeaeade445d5dd36f71d75d2fe4fae22cd14aff74b66898
 AUX guile-2.2.3-gentoo-sandbox.patch 361 BLAKE2B 997d4cec108f302f34b42c59c78d420c858f964b8587bed523d95fadedbf9981dd9c196934299413db9c23e940a4b88e798e4fff65cdea1507968494338313ba SHA512 450f44cbd2b3f0c7c02963c35e58e8d0e4a7192239993215b69713d8a1109692ab1e153efe685c27681069477a56e7bc52b34ebd8717a2c8695be8c6b8abe673
+AUX guile-2.2.6-configure-ldflags.patch 289 BLAKE2B b5bab84e60d366e3beeabdb74277a7dea01972a1afaaa6883691a27ed072fd7e507f16bd934c17ab3463e7a4ecf44d5d3da9fb3affd81bb59312d1121eada099 SHA512 6570f8eaa7e0c36db15b532f35b3731adacfc61dbaa088662587493c774d15013dcbf16ee29d8d5d311283ef42ce651e75612f3095da10f29aa45c72a7cf4ae0
+AUX guile-2.2.6-tests-00-repl-server.patch 3726 BLAKE2B a6850a281cd65c231bcd7944321a2aafe101219add52bfcb3ac01b70c9b071adaabf021001844f3c712bdfda405485a6607546ae5994d6497b3356d4bbf8da42 SHA512 6a702524332c661f4a1252c61759f1fbc227201154959b42085cda62ddd2df3858f9ebc451779fc743666bee48aa5589a31e7dfe8b0eefce813c40336c6e7bfa
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
-DIST guile-2.2.5.tar.gz 18126413 BLAKE2B 9b52402417ba62236c101b283cc4c1a1cac19d93c96b1df814ab357cb6e1aef2ef086e2181719d747f468841a5dd1c5146c062984280808ac64a5c7dfde85dba SHA512 1c07a6d16e00953d416bd8db5b1e9574c62751f745c203de5a910b9688cf93756fe2303ab084d9e9949bff11e6e14909304ecd1ef671be2a06c7c3f292f6380c
+DIST guile-2.2.6.tar.gz 18132818 BLAKE2B 9c2f7737d74d9e56bd9e3f42f287f6b48d9e381dff44ca3ad176ad64adf9b0d200c0b8d34a41e34b15ecf24fa28ddccaa9b033cead25583ff9984b5b7c09ced5 SHA512 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
 DIST guile-2.9.2.tar.gz 21564297 BLAKE2B 23ef2f2036bffe908d2aa6f9c9528d4883a58e9223d30bc8bb9c0159a7c6ca12b2580b6d1c698fba99265731d6fa4b00db141ef64351347348aa9c6d6641c5c3 SHA512 91dfb47bfaa20a53e961cec4f4ea29a81a2da5e5118726c003379e3202a5e5dad6c5dd6f0f4d9e17119c9431f59c0ae61ed2142628b2221029831e7e99d5587b
 EBUILD guile-2.0.14-r4.ebuild 2352 BLAKE2B 5ffa28dddf88b6e55f40e8b917767be9a4714719a6a2f380c01842f3cba08d296163f68a53332ef3846acaea1377cbfad62d817da8b0f66fec730f9e86aff366 SHA512 2aafc7934658b7d7e3e8df632890affa409e3aabf5d782e98da1812f2cc58870a4e80a4c726c2980df3d862d91a35c20c90978008fa2e1ede23422bc285f0e30
-EBUILD guile-2.2.5.ebuild 2519 BLAKE2B 2c7cb0deeb7b534b009d5e4f191c26c43173c1f6d92e7001c6ad01c463bd9f5f657fc97ed2ee60c3997c48cbbf68e8daf5431538554b9b089933331726fc7701 SHA512 518aa88e02a930f7bb283e9c56fe84810c06f591e0dfd8cdaaa4e804b6ef5bb4b706a10887bd9863987b2099f0cafe3b4c2e8c88bdb8630f6d28ecd74fc24ef8
-EBUILD guile-2.9.2.ebuild 2452 BLAKE2B beef273c96d341df0cf5642d37f6ff0686aa79e9371553101322e73ee9e35ce8bd6eb5078fdb9c74d5de386539818e8d9e308a192b7e8c64d7b603ee9f0aec49 SHA512 6df90f4a9b5dd135894c913b4e608d1abfb974b9e790023c243ab7d52c408b7eb7c8ea3966ca6778401bac7fc15b9c1c6b9b4f4bfc2f0bf4755c74aa5b772d73
+EBUILD guile-2.2.6.ebuild 2539 BLAKE2B c0d6929a090a79673563274a26559d663d40c4022d77ca7c815d0eeb2218a10c6bc760451de0feed9241065320152c3a769cc643f172a5be8a80409b31dcedd6 SHA512 52f5d24f541dcd04339e6edb638ba114ac72d49ca1c1be93b22e81e5c103212f018d0f549cc859b86ad57b4e091bd69a7f5c7348c87ffcd7fc0e471c7e4659b2
+EBUILD guile-2.9.2.ebuild 2460 BLAKE2B a887ecdead117b740ffd3b5bb50b20d9b11e0791806f5cccc15b8ac1936cd03eaf2d6289b53675403c2f01921185e5c2cc490c0478e2b2224dac628786afab15 SHA512 81e93e39884699b37370abeb16b3149983240cdffc0bdcf4ffb00b18c510bad31c45b1966fafdfd1a3dfb419cd1bbb56588e1e3eeffa8c9ed2011dd754aab364
 EBUILD guile-9999.ebuild 2379 BLAKE2B e064e9946f66f4e4b24e5f5fc2f56042eb1eb9d373e722e8d98e4eb0a3439a7111e610581831792797c319fcd4e19557cc1725d37de5462629b348bd5bdbe6d5 SHA512 4c8c25472d129ad3a6323bb77a665427041f24189c58d5c8dedad8a3b5a4d35b828d837268173887c182db9313ec04780aefce20a3e6e155f7989a6bbc8f7ed0
 MISC metadata.xml 853 BLAKE2B 14e193fda4ff6397d2ab6aedaeab4320883da005e869491072deb1a38a0afab199692466dd7321cf0e6ca79c3f198f64efbb3a611dcd653ce514cc81d78a78e1 SHA512 958758b1ff1a2fc0a4fe9931b74fa38450b52a2081738f2dfc3b6310433ab01ed68752e256ecb9c4f23db7a22d14e0e72da1f99208be012550c62e308b349667
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 00000000..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 00000000..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.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/guile-2.2.5.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index 23095046..09bb768e 100644
--- a/dev-scheme/guile/guile-2.2.5.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 MAJOR="2.2"
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
@@ -32,9 +32,18 @@ BDEPEND="
 	sys-devel/libtool
 	sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+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
+)
 DOCS=( GUILE-VERSION HACKING README )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# see bug #178499
 	filter-flags -ftree-vectorize
@@ -69,10 +78,6 @@ src_install() {
 	# The guile.m4 macro files conflicts with other slots
 	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
-	# Bug #590904, LDFLAGS are copied within the pkg-config gile
-	sed -i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-${MAJOR}.pc \
-		-e s:"${LDFLAGS}"::
-
 	# From Novell
 	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
 	dodir /usr/share/gdb/auto-load/$(get_libdir)
diff --git a/dev-scheme/guile/guile-2.9.2.ebuild b/dev-scheme/guile/guile-2.9.2.ebuild
index 852109f4..dfb51d49 100644
--- a/dev-scheme/guile/guile-2.9.2.ebuild
+++ b/dev-scheme/guile/guile-2.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 MAJOR="3.0"
 DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions"
@@ -31,9 +31,18 @@ BDEPEND="
 	sys-devel/libtool
 	sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-gentoo-sandbox.patch"
+	"${FILESDIR}/${PN}-2.2.6-configure-ldflags.patch"
+	"${FILESDIR}/${PN}-2.2.6-tests-00-repl-server.patch"
+)
 DOCS=( GUILE-VERSION HACKING README )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# see bug #178499
 	filter-flags -ftree-vectorize
@@ -67,10 +76,6 @@ src_install() {
 	# The guile.m4 macro files conflicts with other slots
 	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
-	# Bug #590904, LDFLAGS are copied within the pkg-config gile
-	sed -i "${ED}"/usr/$(get_libdir)/pkgconfig/guile-${MAJOR}.pc \
-		-e s:"${LDFLAGS}"::
-
 	# From Novell
 	# 	https://bugzilla.novell.com/show_bug.cgi?id=874028#c0
 	dodir /usr/share/gdb/auto-load/$(get_libdir)