summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiroslav Lichvar <mlichvar@redhat.com>2017-02-14 09:01:11 +0100
committerMiroslav Lichvar <mlichvar@redhat.com>2017-02-14 09:01:11 +0100
commit76923ddf7d1922fdf8312f8c085679165f51b6af (patch)
treed418bd5a904568292caea40719bb56a6b633ec0f
parent0d76abb3984ad69ec6e1966d5f2ce0a852fbf51e (diff)
downloadguile-76923ddf7d1922fdf8312f8c085679165f51b6af.tar.gz
guile-76923ddf7d1922fdf8312f8c085679165f51b6af.tar.xz
guile-76923ddf7d1922fdf8312f8c085679165f51b6af.zip
update to 2.0.14
-rw-r--r--.gitignore2
-rw-r--r--guile-repltest.patch33
-rw-r--r--guile.spec4
-rw-r--r--sources2
4 files changed, 3 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore
index 0225cda..5dfaeb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/guile-2.0.13.tar.xz
+/guile-2.0.14.tar.xz
diff --git a/guile-repltest.patch b/guile-repltest.patch
deleted file mode 100644
index 73dadb0..0000000
--- a/guile-repltest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4
-Author: Ludovic Courtès <ludo@gnu.org>
-Date: Fri Nov 4 22:45:51 2016 +0100
-
- 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'.
-
-diff --git a/test-suite/tests/00-repl-server.test b/test-suite/tests/00-repl-server.test
-index 1f570a9..4b5ec0c 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
diff --git a/guile.spec b/guile.spec
index 75efde7..dfeda23 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,7 +1,7 @@
Summary: A GNU implementation of Scheme for application extensibility
Name: guile
%define mver 2.0
-Version: 2.0.13
+Version: 2.0.14
Release: 4%{?dist}
Epoch: 5
Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz
@@ -15,7 +15,6 @@ Requires(preun): /sbin/install-info
Requires: coreutils
Patch1: guile-multilib.patch
-Patch2: guile-repltest.patch
Patch3: guile-threadstest.patch
%description
@@ -45,7 +44,6 @@ install the guile package.
%prep
%setup -q -n guile-%version
%patch1 -p1 -b .multilib
-%patch2 -p1 -b .repltest
%patch3 -p1 -b .threadstest
%build
diff --git a/sources b/sources
index b5b7315..8642c4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d50bbb19672b72aa1e1c96e8f024bf00 guile-2.0.13.tar.xz
+SHA512 (guile-2.0.14.tar.xz) = 2cad60ab8aa77be44bc4988eaa3a2f0652637f315322abd6011c18f1800c3a461eefa15a14fd54d0d48031b093bc56dfc6cd15dc0a8260b97b40521bff793db6