guix: Fix TLS crash on Guile 2.0 with upstream patch

3 files changed, 36 insertions, 34 deletions

diff --git a/guix/guix/guix-fix-cond-expand-for-guile-2.0.patch b/guix/guix/guix-fix-cond-expand-for-guile-2.0.patch
new file mode 100644
index 0000000..ddce4ad
--- /dev/null
+++ b/guix/guix/guix-fix-cond-expand-for-guile-2.0.patch
@@ -0,0 +1,31 @@
+From 7f04197fef905790fd392f8d686d00ae95a0d04c Mon Sep 17 00:00:00 2001
+From: Eric Bavier <bavier@cray.com>
+Date: Mon, 4 Dec 2017 10:33:31 -0600
+Subject: utils: Fix cond-expand for Guile 2.0.(https://bugs.gnu.org/29642)
+
+* guix/build/download.scm (tls-wrap): Use 'guile-2.2' feature instead.
+---
+ guix/build/download.scm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/guix/build/download.scm b/guix/build/download.scm
+index 4490d22..609a100 100644
+--- a/guix/build/download.scm
++++ b/guix/build/download.scm
+@@ -308,10 +308,10 @@ host name without trailing dot."
+       (register-tls-record-port record port)
+ 
+       ;; Write HTTP requests line by line rather than byte by byte:
+-      ;; <https://bugs.gnu.org/22966>.  This is not possible on Guile 2.0.
++      ;; <https://bugs.gnu.org/22966>.  This is possible with Guile >= 2.2.
+       (cond-expand
+-        (guile-2.0 #f)
+-        (else (setvbuf record 'line)))
++        (guile-2.2 (setvbuf record 'line))
++        (else #f))
+ 
+       record)))
+ 
+-- 
+cgit v1.0-41-gc330
+
diff --git a/guix/guix/guix-revert-tls-write-improvement.patch b/guix/guix/guix-revert-tls-write-improvement.patch
deleted file mode 100644
index 01770b9..0000000
--- a/guix/guix/guix-revert-tls-write-improvement.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 41d6038882d4f0a50fc07f8ea3016a3bd7529c4f Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw44@gmail.com>
-Date: Sun, 10 Dec 2017 15:43:18 +0800
-Subject: [PATCH] Revert "download: Improve efficiency of 'write-request' over
- TLS."
-
-This reverts commit 866f37fb7e4f3e0bd695a951071383cdff3da8cd.
----
- guix/build/download.scm | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/guix/build/download.scm b/guix/build/download.scm
-index 4490d225e..90de269f9 100644
---- a/guix/build/download.scm
-+++ b/guix/build/download.scm
-@@ -306,13 +306,6 @@ host name without trailing dot."
-       ;; never be closed.  So we use `fileno', but keep a weak reference to
-       ;; PORT, so the file descriptor gets closed when RECORD is GC'd.
-       (register-tls-record-port record port)
--
--      ;; Write HTTP requests line by line rather than byte by byte:
--      ;; <https://bugs.gnu.org/22966>.  This is not possible on Guile 2.0.
--      (cond-expand
--        (guile-2.0 #f)
--        (else (setvbuf record 'line)))
--
-       record)))
- 
- (define (ensure-uri uri-or-string)                ;XXX: copied from (web http)
--- 
-2.14.3
-
diff --git a/guix/guix/guix.spec b/guix/guix/guix.spec
index 1dc486f..34b4308 100644
--- a/guix/guix/guix.spec
+++ b/guix/guix/guix.spec
@@ -3,7 +3,7 @@
 
 Name:           guix
 Version:        0.14.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A purely functional package manager for the GNU system
 
 License:        GPLv3+
@@ -14,7 +14,7 @@ Source2:        https://alpha.gnu.org/gnu/guix/bootstrap/armhf-linux/20150101/gu
 Source3:        https://alpha.gnu.org/gnu/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz#/i686-linux-20131110-guile-2.0.9.tar.xz
 Source4:        https://alpha.gnu.org/gnu/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz#/mips64el-linux-20131110-guile-2.0.9.tar.xz
 Source5:        https://alpha.gnu.org/gnu/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz#/x86_64-linux-20131110-guile-2.0.9.tar.xz
-Patch0:         guix-revert-tls-write-improvement.patch
+Patch0:         guix-fix-cond-expand-for-guile-2.0.patch
 
 %global guix_user         guixbuild
 %global guix_group        guixbuild
@@ -356,6 +356,9 @@ fi
 
 
 %changelog
+* Tue Dec 12 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.14.0-4
+- Fix TLS crash with upstream commit 7f04197
+
 * Sun Dec 10 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.14.0-3
 - Workaround TLS crash by reverting upstream commit 866f37f