diff --git a/guile-2.2.5.tar.xz b/guile-2.2.5.tar.xz deleted file mode 100644 index acfe24d..0000000 --- a/guile-2.2.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc3073f12d43650e643dc0111730b73a9fa11f131b9b72f66d01e82d83e685a7 -size 10870280 diff --git a/guile-2.2.5.tar.xz.sig b/guile-2.2.5.tar.xz.sig deleted file mode 100644 index 9e51b30..0000000 --- a/guile-2.2.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAl0LXyoACgkQCQsRmT2a -67XQThAAtMSWVJCdA3ZVkTe0LxPvRU0E/dFnmpTzrTJlrApwr54wKqbiPYresAQF -QAFn8pqZCma2RVocYDFlMDK7TWPDBPIQ2HS/+i5oD5rorP6EBgFsFj9YjILZckdD -+GwdpaL2EUf0s9ZJqYFoNfsIhwsLOe+3Tc0NA7fyROlamxJyU0v+Oo8nrHBZYfL7 -6EqVFCG9jIvMdbG/J+w6QyJN2/axb7iAMxv1uhi4YKRKaCFFPuDakaJ6mpBr+YfO -ri636V894J7Sd0t35nWfnx1PSL/kqLspguFvjT2xUk0lDVUJATgKzRmkRiF5THKb -t4nk1JtIfzkV8kDZg/28kfXGknm36GOiGYpbl9BBn9uc9IqlatgTbC63A8sWZ1Jh -2q4yDA2f09WoxWWoCoJVlSBbVlN5uEvnig1Ayd53Lf6oxXPsgYwk+Rl+CxGagwzr -fcqMDnAk6IzuUb41pmTtYOz090eIFFzLuZRud6hwXpcI2W2c/i8vDfQi1glvYJe4 -t9t+WLonK5XiJ0gNnlRnEx1F6j0JQfCHa/FjqpvIJ0wyLQ4H0ZOIZSw2yoK+QPF3 -lgv1jg9wPlJd1tdt9suX7rnr1p6rEfL3Kv8URXWSYICCkrjMrrqv8hcUCrfe5rKL -PfMXmMXvB/M+Id/ozEMoTpEmrrvW6ogJOH7zD+B+ijzyQp6ppAA= -=081E ------END PGP SIGNATURE----- diff --git a/guile-2.2.6.tar.xz b/guile-2.2.6.tar.xz new file mode 100644 index 0000000..6ebd515 --- /dev/null +++ b/guile-2.2.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b33576331465a60b003573541bf3b1c205936a16c407bc69f8419a527bf5c988 +size 10875692 diff --git a/guile-2.2.6.tar.xz.sig b/guile-2.2.6.tar.xz.sig new file mode 100644 index 0000000..b2771d0 --- /dev/null +++ b/guile-2.2.6.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAl0ZLusACgkQCQsRmT2a +67Uqiw/5ASXRdNsoR8l2zU7iN/Z1BRl8bPG1+5x0PQWtZgX2jVEYwNIt5iQEWFG6 +W3Wu4ud7SGF0d1msDRxkd7QNj3RGDDoTmzx06fekchHH73OVc1IAhhOko0KFK+wP +7QHEdiWjQai4ZSWEXJDQTMD10xVdaC9KlVjzehZqiWivJus9wsx4ZHNeV0hzqI9z +eo3VohGsHLBHTYqIZ6YJv3HXKKpdVT/DDLxLR9EkDKwacAUXWL3kQC7xBtKuP5+p +ayf6J06fV9E4mWjyFuv85oIxaKxTZPDpTndPYQ1CaWxpVDszZ3WB2GwcC1jmkQok +UG8KErr/AZH4g35DumEH7TqVn9YTSeJdrn65lTheCzuST3L1YT8xTszM+6aoF6Yr +RG35clk89foGS8noCllg3I0YsbkuQFo2kC44HgwBiw0JZDXmCpbhEaxonTJlv77O +tFtWyTmDwhQMPppGWm0hkloCN9pl9MWOjALg43YMd0cVVv44nLcWqFHdGwWY7KkV +HTjF7GbpmyHNI9UFAdrBvcy5zYSaTi5hf/cEHb5BwbGpS7Fyr2x7Qt4ECH1tbTnN +E59P1GIpM90rCzIvCI1Op1JAtWeR6S9QjfxTYvHRE5wSoHyiluuHBUXDFxLUqi+2 +HROfObjt/9iXsuftY9kQr0uVl2srF4YZNVXbq3n9dTruZ274lKg= +=VnqC +-----END PGP SIGNATURE----- diff --git a/guile.changes b/guile.changes index 8daf8fe..344ff81 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sat Jul 6 09:33:00 UTC 2019 - Jonathan Brielmaier + +- Update to version 2.2.6 + Changes compared to 2.2.5: + * Fix regression introduced in 2.2.5 that would break HTTP servers + * 'strftime' and 'strptime' honor the current locale encoding + * Re-export 'current-load-port' + * Minor documentation mistakes were fixed +- remove patches: + * revert-http-reader-change.patch: fix included in release + ------------------------------------------------------------------- Tue Jun 25 08:02:58 UTC 2019 - Jonathan Brielmaier diff --git a/guile.spec b/guile.spec index 54a1b87..e0090ef 100644 --- a/guile.spec +++ b/guile.spec @@ -23,7 +23,7 @@ %define libgver 1 %define gsuff %{guilemaj}_%{guilemin}-%{libgver} Name: guile -Version: %{guilevers}.5 +Version: %{guilevers}.6 Release: 0 Summary: GNU's Ubiquitous Intelligent Language for Extension License: GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later @@ -33,12 +33,10 @@ Source0: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz Source1: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=guile&download=1#/%{name}.keyring Source3: guile-rpmlintrc -# PATCH-FIX-UPSTREAM revert-http-reader-change.patch https://bugs.gnu.org/36350 -Patch0: revert-http-reader-change.patch # Fix the resulting /usr/lib64/pkgconfig/guile-2.2.pc -Patch1: guile-2.2-gc_pkgconfig_private.patch +Patch0: guile-2.2-gc_pkgconfig_private.patch # test fails always with heap error -Patch2: disable-test-out-of-memory.patch +Patch1: disable-test-out-of-memory.patch BuildRequires: gmp-devel BuildRequires: libffi-devel BuildRequires: libltdl-devel @@ -104,7 +102,6 @@ linked in as a library when building extensible programs. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # remove broken prebuilt objects rm -r prebuilt/32-bit-big-endian diff --git a/revert-http-reader-change.patch b/revert-http-reader-change.patch deleted file mode 100644 index 5ef2e7a..0000000 --- a/revert-http-reader-change.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e1225d013ed8673382d6d8f9300dd6b175c8b820 Mon Sep 17 00:00:00 2001 -From: Mark H Weaver -Date: Mon, 24 Jun 2019 10:24:28 -0400 -Subject: Revert "web: Add support for HTTP header continuation lines." - -Fixes . - -This reverts commit 73cde5ed7218a090ecee888870908af5445796f0. ---- - module/web/http.scm | 31 +++++++------------------------ - test-suite/tests/web-http.test | 11 +---------- - 2 files changed, 8 insertions(+), 34 deletions(-) - -diff --git a/module/web/http.scm b/module/web/http.scm -index f1ca733..de61c94 100644 ---- a/module/web/http.scm -+++ b/module/web/http.scm -@@ -1,6 +1,6 @@ - ;;; HTTP messages - --;; Copyright (C) 2010-2017, 2019 Free Software Foundation, Inc. -+;; Copyright (C) 2010-2017 Free Software Foundation, Inc. - - ;; This library is free software; you can redistribute it and/or - ;; modify it under the terms of the GNU Lesser General Public -@@ -152,35 +152,18 @@ The default writer will call ‘put-string’." - (lambda (val port) - (put-string port val))))) - --(define spaces-and-tabs -- (char-set #\space #\tab)) -- --(define (space-or-tab? c) -- (case c -- ((#\space #\tab) #t) -- (else #f))) -- - (define (read-header-line port) -- "Read an HTTP header line, including any continuation lines, and --return the combined string without its final CRLF or LF. Raise a --'bad-header' exception if the line does not end in CRLF or LF, or if EOF --is reached." -+ "Read an HTTP header line and return it without its final CRLF or LF. -+Raise a 'bad-header' exception if the line does not end in CRLF or LF, -+or if EOF is reached." - (match (%read-line port) - (((? string? line) . #\newline) - ;; '%read-line' does not consider #\return a delimiter; so if it's - ;; there, remove it. We are more tolerant than the RFC in that we - ;; tolerate LF-only endings. -- (let ((line (if (string-suffix? "\r" line) -- (string-drop-right line 1) -- line))) -- ;; If the next character is a space or tab, then there's at least -- ;; one continuation line. Read the continuation lines by calling -- ;; 'read-header-line' recursively, and append them to this header -- ;; line, folding the leading spaces and tabs to a single space. -- (if (space-or-tab? (lookahead-char port)) -- (string-append line " " (string-trim (read-header-line port) -- spaces-and-tabs)) -- line))) -+ (if (string-suffix? "\r" line) -+ (string-drop-right line 1) -+ line)) - ((line . _) ;EOF or missing delimiter - (bad-header 'read-header-line line)))) - -diff --git a/test-suite/tests/web-http.test b/test-suite/tests/web-http.test -index c1cf088..6337734 100644 ---- a/test-suite/tests/web-http.test -+++ b/test-suite/tests/web-http.test -@@ -1,6 +1,6 @@ - ;;;; web-http.test --- HTTP library -*- mode: scheme; coding: utf-8; -*- - ;;;; --;;;; Copyright (C) 2010-2011, 2014-2017, 2019 Free Software Foundation, Inc. -+;;;; Copyright (C) 2010-2011, 2014-2017 Free Software Foundation, Inc. - ;;;; - ;;;; This library is free software; you can redistribute it and/or - ;;;; modify it under the terms of the GNU Lesser General Public -@@ -242,15 +242,6 @@ - (pass-if-round-trip "Cache-Control: acme-cache-extension=100 quux\r\n") - (pass-if-round-trip "Cache-Control: acme-cache-extension=\"100, quux\"\r\n") - -- (let ((str "Cache-Control: acme-cache-extension=\"100,\r\n\t foo,\r\n quux\"\r\n") -- (val '(cache-control . ((acme-cache-extension . "100, foo, quux"))))) -- (pass-if-equal "continuation lines" -- val -- (call-with-values (lambda () -- (read-header (open-input-string str))) -- (lambda (sym val) -- (cons sym val))))) -- - (pass-if-parse connection "close" '(close)) - (pass-if-parse connection "Content-Encoding" '(content-encoding)) - --- -cgit v1.0-41-gc330