rpm/guile
SHA256
1
0
Fork 0
forked from pool/guile
Code Pull Requests Activity

Accepting request 439461 from devel:languages:misc

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/439461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/guile?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2016-11-11 13:30:58 +00:00 committed by Git OBS Bridge
commit 9ce3999c22
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guile.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 8 11:14:02 UTC 2016 - schwab@suse.de
- repl-server-test.patch: fix race in 00-repl-server.test
-------------------------------------------------------------------
Sat Oct 15 14:55:17 UTC 2016 - mpluskal@suse.com

2
guile.spec
View File

@ -41,6 +41,7 @@ Patch1: %{name}-64bit.patch
Patch2: %{name}-1.6.10-mktemp.patch
Patch3: %{name}-threads-test.patch
Patch4: %{name}-net-db-test.patch
Patch5: repl-server-test.patch
BuildRequires: gc-devel
BuildRequires: gmp-devel
BuildRequires: libffi-devel
@ -122,6 +123,7 @@ linked in as a library when building extensible programs.
%patch2
%patch3 -p1
%patch4 -p1
%patch5 -p1
# force rebuild with non-broken makeinfo
#rm -f doc/*/*.info

38
repl-server-test.patch Normal file
View File

@ -0,0 +1,38 @@
From 2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 4 Nov 2016 22:45:51 +0100
Subject: [PATCH] tests: Avoid race condition in REPL server test.
Fixes <http://bugs.gnu.org/24769>.
Reported by Rob Browning <rlb@defaultvalue.org>.
* test-suite/tests/00-repl-server.test ("simple expression"): Add call
to 'select' before 'display'.
---
test-suite/tests/00-repl-server.test | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/test-suite/tests/00-repl-server.test b/test-suite/tests/00-repl-server.test
index 1f570a9601..4b5ec0cb38 100644
--- a/test-suite/tests/00-repl-server.test
+++ b/test-suite/tests/00-repl-server.test
@@ -105,8 +105,14 @@ reached."
"scheme@(repl-server)> $1 = 42\n"
(with-repl-server socket
(read-until-prompt socket %last-line-before-prompt)
- (display "(+ 40 2)\n(quit)\n" socket)
- (read-string socket)))
+
+ ;; 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
--
2.10.2