pool/guile
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 459095 from devel:languages:misc

Browse Source 
- Update to version 2.0.14:
  * Bug fixes
    + Builds of .go files and of Guile itself are now
      bit-reproducible
    + 'number->locale-string' and 'monetary-amount->locale-string'
      fixes
    + (system base target) now recognizes "sh3" as a
      cross-compilation target
    + Fix race condition in '00-repl-server.test'
    + 'scandir' from (ice-9 ftw) no longer calls 'stat' for each
      entry
  * Several documentation improvements
- Drop no longer needed patches:
  * guile-fake-buildstamp.patch
  * repl-server-test.patch
- Small packaging cleanup with help of spec-cleaner (forwarded request 458687 from pluskalm)

OBS-URL: https://build.opensuse.org/request/show/459095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/guile?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2017-02-21 12:34:59 +00:00 committed by Git OBS Bridge
commit a84911e1b2
9 changed files with 56 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guile-2.0.13.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3744f2addc282a0de627aaef048f062982b44564d54ac31ff5217972529ed88b
size 4715940

17
guile-2.0.13.tar.xz.sig
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIqBAABCAAUBQJX/iLRDRxsdWRvQGdudS5vcmcACgkQCQsRmT2a67Vkow/+JX3y
bbRkmRoSdctiI1jCUJhiCFFhzVErx6JhpraZJQxE614beqFw9KzldyH88SVZ7kR+
AwdRVuO06wO3thZIXfBJ0tMUHCSfa8Q6VerYcOmxmx+L4STVNfDpFNsQVPVQS5Gw
/go6Irhyw4N8tZ5+SpnGHpBN25Kxxxb0dE9vVbyiSFXYHQfY6TCNaJjiOw4EB9no
J4PL3zZW9g3AnyTAruWtEuuMNIOTqkJkgwI6mJeR49owdBJYhejXConh+vQ73kea
0nMdsNc7BnsWUufo1c/kU5j6zPHo+olQ/kD5COeSBK3g3aaZTWstnM5ViFn8habl
FVKIn9UtCNPD+nGehIkNZ47Z7Akh18y4AMxgIHVUPQ5d1KVAxRVF4Szp/5BBZLi0
AZ21EyvcBoiFL4XaUDk4Lcjpj/ne4/WeFaj/BSlIr7oOAu/MBAot4noFox3clN7G
R4LURpvTf4et+Zj9Aecga41MyDH7mCFZ698Nu0nF5fS+TA9daByjQ3tzwFVJ2pCd
EwwEm9VX+AMac6YbEwaaGTOXn+ZaPrmGzm11/axtLfwe300NWy+tiOW9mD4vZWW6
Ksh5LPnu9dlL2PJkVW2j2/sq9BZwFdUe8U35Q/+9VSFHdT7NnWlpHvW0ty0uCOrO
+wbQKicQA8D8/HodYduLS2QYsMXxlaNpwtEUkaY=
=4kuU
-----END PGP SIGNATURE-----

3
guile-2.0.14.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82
size 4615196

17
guile-2.0.14.tar.xz.sig Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
iQJBBAABCAArFiEEPORkVYqE/cadtAz7CQsRmT2a67UFAliiLd4NHGx1ZG9AZ251
Lm9yZwAKCRAJCxGZPZrrtfFGD/9E6mQjedgPDHcmjyYtiapirAVDK3nnMht/rjqn
5JPt70MSX3XbYm1dW1UHXulCtUjNw4wBEtbTcIIuPe/ui7tbVrzk/sVuveCCH5/w
qj3ynBT6o+2heNfnfPKcYBZG2XIIgnkvjf2mibztyt2SPiXJ+0LKQJWMcd26NyiB
zdye0jD5L26yrEktfrpZIJVWnrL4vmIw8ay98VhoSjoYckVghoZob3RRdb+gfvy0
d/0OxEe9i9I4viqsXT5zIU7dm0SLogS187N/OAYDqsVXMYc40iRG45fvzhi4IsUy
YbjS1xjD36mHQL86abtCV6l7qykWBV5/Xgqa5NS05Vp5HhMLdc2D9Cc08N+g1nAH
XovUSSDQtlld9wo2xxVetkp/3/3uElw9b9MAVvjcT3Zrgh4xNcJTJMHmuR8598Xb
hoUvdNyKfCILabFhuIhqzcCfhjjyy3AOvKE/9/Uy1eklrWqhsQCNHlBhbvfdKXjB
JSscxuMTVRILhY9ikQyntUlt0lsLNj2K/V3PF+BdqjMSSgBA8rvkMLYouwEJsr4J
JTUN+Dg/rCMTr3++ERB9dlxBARG9726RsPJM2E0IUQb54LvLXTkaGd+LHzJyDzY3
qVp1I3wvm7FeECy1s3ZIm9gjjMeH1BDETZb6iuRxxYAfiu3Nmqp/t53c5x1ID66C
4aq7Lw==
=vgBV
-----END PGP SIGNATURE-----

26
guile-fake-buildstamp.patch
View File

@ -1,26 +0,0 @@
Index: libguile/Makefile.am
===================================================================
--- libguile/Makefile.am.orig 2016-07-21 14:25:17.550695136 +0200
+++ libguile/Makefile.am 2016-07-21 14:25:22.414650084 +0200
@@ -721,7 +721,7 @@
>> libpath.tmp
@echo ' { "LIBS", "@GUILE_LIBS@" }, \' >> libpath.tmp
@echo ' { "CFLAGS", "@GUILE_CFLAGS@" }, \' >> libpath.tmp
- @echo ' { "buildstamp", "'`date -u +'%Y-%m-%d %T'`'" }, \' >> libpath.tmp
+ @echo ' { "buildstamp", "'1970-01-01 00:00:01'" }, \' >> libpath.tmp
@echo '}' >> libpath.tmp
$(AM_V_GEN)mv libpath.tmp libpath.h
Index: libguile/Makefile.in
===================================================================
--- libguile/Makefile.in.orig 2016-07-21 14:25:17.550695136 +0200
+++ libguile/Makefile.in 2016-07-21 14:25:22.414650084 +0200
@@ -3732,7 +3732,7 @@
>> libpath.tmp
@echo ' { "LIBS", "@GUILE_LIBS@" }, \' >> libpath.tmp
@echo ' { "CFLAGS", "@GUILE_CFLAGS@" }, \' >> libpath.tmp
- @echo ' { "buildstamp", "'`date -u +'%Y-%m-%d %T'`'" }, \' >> libpath.tmp
+ @echo ' { "buildstamp", "'1970-01-01 00:00:02'" }, \' >> libpath.tmp
@echo '}' >> libpath.tmp
$(AM_V_GEN)mv libpath.tmp libpath.h

20
guile.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Fri Feb 17 12:45:52 UTC 2017 - mpluskal@suse.com
- Update to version 2.0.14:
* Bug fixes
+ Builds of .go files and of Guile itself are now
bit-reproducible
+ 'number->locale-string' and 'monetary-amount->locale-string'
fixes
+ (system base target) now recognizes "sh3" as a
cross-compilation target
+ Fix race condition in '00-repl-server.test'
+ 'scandir' from (ice-9 ftw) no longer calls 'stat' for each
entry
* Several documentation improvements
- Drop no longer needed patches:
* guile-fake-buildstamp.patch
* repl-server-test.patch
- Small packaging cleanup with help of spec-cleaner
-------------------------------------------------------------------
Tue Nov 8 11:14:02 UTC 2016 - schwab@suse.de

BIN
guile.keyring
View File

Binary file not shown.

40
guile.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package guile
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,7 @@
%define libgreadver 18
%define greadsuff v-%{libgreadver}-%{libgreadver}
Name: guile
Version: %{guilevers}.13
Version: %{guilevers}.14
Release: 0
Summary: GNU's Ubiquitous Intelligent Language for Extension
License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+
@ -36,24 +36,19 @@ 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
# suse specific
Patch0: %{name}-fake-buildstamp.patch
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
BuildRequires: libltdl-devel
BuildRequires: libunistring-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig
BuildRequires: readline-devel
Requires(pre): %{install_info_prereq}
Requires(pre): fileutils
Requires(pre): sh-utils
Conflicts: slib < 3a5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This is Guile, a portable, embeddable Scheme implementation written in
@ -110,6 +105,8 @@ Requires: libguilereadline-%{greadsuff} = %{version}
Requires: libunistring-devel
Requires: ncurses-devel
Requires: readline-devel
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
%description devel
This is Guile, a portable, embeddable Scheme implementation written in
@ -118,12 +115,10 @@ linked in as a library when building extensible programs.
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3 -p1
%patch4 -p1
%patch5 -p1
# force rebuild with non-broken makeinfo
#rm -f doc/*/*.info
@ -139,7 +134,7 @@ make %{?_smp_mflags}
LD_LIBRARY_PATH="." make check
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%make_install
mkdir -p %{buildroot}%{_datadir}/guile/site
find %{buildroot} -type f -name "*.la" -delete -print
# bug #874028
@ -147,12 +142,12 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}
mv %{buildroot}%{_libdir}/libguile*-gdb.scm %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/
%post devel
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info%{ext_info}
%postun devel
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz
%preun devel
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
%install_info_delete --info-dir=%{_infodir} %{_infodir}/r5rs.info%{ext_info}
%pre
# Remove obsolete files (< SuSE Linux 10.2)
@ -160,11 +155,8 @@ rm -f var/adm/SuSEconfig/md5%{_datadir}/guile/*/slibcat
rm -f usr/share/guile/site/slibcat.SuSEconfig
%post -n libguile-%{gsuff} -p /sbin/ldconfig
%postun -n libguile-%{gsuff} -p /sbin/ldconfig
%post -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
%postun -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
%files
@ -174,7 +166,7 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
%{_bindir}/guile-tools
%{_bindir}/guild
%{_bindir}/guile
%{_mandir}/man1/guile.1.gz
%{_mandir}/man1/guile.1%{ext_man}
%files -n libguile-%{gsuff}
%defattr(-,root,root)
@ -200,10 +192,10 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
%dir %{_includedir}/%{name}/%{guilevers}
%{_includedir}/%{name}/%{guilevers}/*
%{_datadir}/aclocal/guile.m4
%doc %{_infodir}/%{name}.info.gz
%doc %{_infodir}/%{name}.info-[0-9].gz
%doc %{_infodir}/%{name}.info-1[0-9].gz
%doc %{_infodir}/r5rs.info.gz
%{_infodir}/%{name}.info%{ext_info}
%{_infodir}/%{name}.info-[0-9]%{ext_info}
%{_infodir}/%{name}.info-1[0-9]%{ext_info}
%{_infodir}/r5rs.info%{ext_info}
%{_libdir}/libguile-%{guilevers}.so
%{_libdir}/pkgconfig/guile-%{guilevers}.pc
# bug #874028

38
repl-server-test.patch
View File

@ -1,38 +0,0 @@
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