diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2017-12-10 21:11:11 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw44@gmail.com> | 2017-12-10 21:11:58 +0800 |
| commit | c71529331ecb88a8d8a7aa27ad3eea04cb9ec188 (patch) | |
| tree | 376abf678554e0f9529a1f49ae280c324a6c6554 /guix | |
| parent | 1558fa7b5e3c23883082f6e9782a26a911c37cab (diff) | |
| download | copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.tar copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.tar.gz copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.tar.bz2 copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.tar.lz copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.tar.xz copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.tar.zst copr-rpm-spec-c71529331ecb88a8d8a7aa27ad3eea04cb9ec188.zip | |
guix: Workaround TLS crash on Guile 2.0
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/guix/guix-revert-tls-write-improvement.patch | 32 | ||||
| -rw-r--r-- | guix/guix/guix.spec | 6 |
2 files changed, 37 insertions, 1 deletions
diff --git a/guix/guix/guix-revert-tls-write-improvement.patch b/guix/guix/guix-revert-tls-write-improvement.patch new file mode 100644 index 0000000..01770b9 --- /dev/null +++ b/guix/guix/guix-revert-tls-write-improvement.patch @@ -0,0 +1,32 @@ +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 e777ddd..1dc486f 100644 --- a/guix/guix/guix.spec +++ b/guix/guix/guix.spec @@ -3,7 +3,7 @@ Name: guix Version: 0.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A purely functional package manager for the GNU system License: GPLv3+ @@ -14,6 +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 %global guix_user guixbuild %global guix_group guixbuild @@ -355,6 +356,9 @@ fi %changelog +* Sun Dec 10 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.14.0-3 +- Workaround TLS crash by reverting upstream commit 866f37f + * Sun Dec 10 2017 Ting-Wei Lan <lantw44@gmail.com> - 0.14.0-2 - Move guile-git to Requires because it is not optional - Do not show OK messages when validating bootstrap binraies |