commit 1275dae975c16b7f32430f75fdfa7b496b2778f4
Author: Jerry James <jamesjer(a)betterlinux.com>
Date: Fri May 31 16:57:30 2013 -0600
Update to 20130521 snapshot for bug fixes.
Rebase patches.
gcl-2.6.8-alloca.patch | 12 ++++++------
gcl-2.6.8-asm-signal-h.patch | 4 ++--
gcl-2.6.8-extension.patch | 16 ++++++++--------
gcl-2.6.8-getcwd.patch | 4 ++--
gcl-2.6.8-largefile.patch | 26 +++++++++++++-------------
gcl-2.6.8-rename.patch | 2 +-
gcl-2.6.8-texinfo.patch | 8 ++++----
gcl-2.6.8-unrandomize.patch | 6 +++---
gcl.spec | 10 +++++++---
sources | 2 +-
10 files changed, 47 insertions(+), 43 deletions(-)
---
diff --git a/gcl-2.6.8-alloca.patch b/gcl-2.6.8-alloca.patch
index b09f84c..3e6e788 100644
--- a/gcl-2.6.8-alloca.patch
+++ b/gcl-2.6.8-alloca.patch
@@ -1,5 +1,5 @@
---- ./configure.in.orig 2012-07-26 09:38:23.701365523 -0600
-+++ ./configure.in 2012-07-26 09:46:52.534571240 -0600
+--- ./configure.in.orig 2013-05-10 08:26:52.000000000 -0600
++++ ./configure.in 2013-05-10 08:26:52.000000000 -0600
@@ -1926,33 +1926,7 @@ AC_SUBST(NOTIFY)
# alloca
@@ -35,8 +35,8 @@
# dlopen etc
# idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
---- ./configure.orig 2013-05-10 09:55:18.206122299 -0600
-+++ ./configure 2013-05-10 10:01:04.970561031 -0600
+--- ./configure.orig 2013-05-10 08:32:03.000000000 -0600
++++ ./configure 2013-05-10 08:32:03.000000000 -0600
@@ -629,6 +629,7 @@ O3FLAGS
NIFLAGS
FINAL_CFLAGS
@@ -343,8 +343,8 @@
# dlopen etc
---- ./h/gclincl.h.in.orig 2012-01-16 13:08:04.000000000 -0700
-+++ ./h/gclincl.h.in 2013-05-10 10:06:39.000000000 -0600
+--- ./h/gclincl.h.in.orig 2013-05-16 08:51:00.000000000 -0600
++++ ./h/gclincl.h.in 2013-05-16 08:51:00.000000000 -0600
@@ -56,9 +56,9 @@ SGC is enabled. */
diff --git a/gcl-2.6.8-asm-signal-h.patch b/gcl-2.6.8-asm-signal-h.patch
index 39bf418..460ec2b 100644
--- a/gcl-2.6.8-asm-signal-h.patch
+++ b/gcl-2.6.8-asm-signal-h.patch
@@ -1,5 +1,5 @@
---- ./configure.in.orig 2012-07-26 09:52:37.218033294 -0600
-+++ ./configure.in 2012-07-26 09:56:25.786676566 -0600
+--- ./configure.in.orig 2013-05-10 08:26:52.000000000 -0600
++++ ./configure.in 2013-05-10 08:26:52.000000000 -0600
@@ -1644,7 +1644,7 @@ AC_MSG_RESULT(no))
#if test $use = "386-linux" ; then
diff --git a/gcl-2.6.8-extension.patch b/gcl-2.6.8-extension.patch
index d32971e..ee3cc27 100644
--- a/gcl-2.6.8-extension.patch
+++ b/gcl-2.6.8-extension.patch
@@ -1,5 +1,5 @@
---- ./configure.in.orig 2012-07-26 09:46:52.534571240 -0600
-+++ ./configure.in 2012-07-26 09:50:25.715238529 -0600
+--- ./configure.in.orig 2013-05-10 08:26:52.000000000 -0600
++++ ./configure.in 2013-05-10 08:26:52.000000000 -0600
@@ -421,6 +421,7 @@ if test "$LDFLAGS" = "" ; then
LDFLAGS=" "
fi
@@ -24,8 +24,8 @@
#include <math.h>
]],[[
float f;
---- ./configure.orig 2013-05-10 10:01:04.970561031 -0600
-+++ ./configure 2013-05-10 10:16:24.215085642 -0600
+--- ./configure.orig 2013-05-10 08:32:03.000000000 -0600
++++ ./configure 2013-05-10 08:32:03.000000000 -0600
@@ -674,9 +674,9 @@ GMPDIR
GMP
MAKEINFO
@@ -1435,8 +1435,8 @@
#include <math.h>
int
---- ./h/gclincl.h.in.orig 2013-05-10 10:06:39.000000000 -0600
-+++ ./h/gclincl.h.in 2013-05-10 10:16:24.000000000 -0600
+--- ./h/gclincl.h.in.orig 2013-05-16 08:51:00.000000000 -0600
++++ ./h/gclincl.h.in 2013-05-16 08:51:00.000000000 -0600
@@ -1,4 +1,7 @@
/* h/gclincl.h.in. Generated from configure.in by autoheader. */
+/* Whether compiling on a glibc-based system */
@@ -1499,8 +1499,8 @@
+
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
---- ./acconfig.h.orig 2013-05-10 10:06:32.124044034 -0600
-+++ ./acconfig.h 2013-05-10 10:16:16.267098177 -0600
+--- ./acconfig.h.orig 2012-07-26 09:46:52.000000000 -0600
++++ ./acconfig.h 2013-05-16 08:51:00.000000000 -0600
@@ -1,3 +1,6 @@
+/* Whether compiling on a glibc-based system */
+#undef _GNU_SOURCE
diff --git a/gcl-2.6.8-getcwd.patch b/gcl-2.6.8-getcwd.patch
index ee5ee25..72abce1 100644
--- a/gcl-2.6.8-getcwd.patch
+++ b/gcl-2.6.8-getcwd.patch
@@ -1,5 +1,5 @@
---- o/unixfsys.c.orig 2010-12-29 11:52:55.301247671 -0700
-+++ o/unixfsys.c 2010-12-29 11:58:52.389645190 -0700
+--- ./o/unixfsys.c.orig 2013-01-21 14:18:53.323182657 -0700
++++ ./o/unixfsys.c 2013-01-21 14:18:53.323182657 -0700
@@ -150,17 +150,6 @@ DEV_FOUND:
#endif
diff --git a/gcl-2.6.8-largefile.patch b/gcl-2.6.8-largefile.patch
index 70b1f42..7098fd6 100644
--- a/gcl-2.6.8-largefile.patch
+++ b/gcl-2.6.8-largefile.patch
@@ -294,7 +294,7 @@
{data=0;}
else{
--- ./o/file.d.orig 2013-05-11 14:29:11.000000000 -0600
-+++ ./o/file.d 2013-05-13 14:46:33.928671146 -0600
++++ ./o/file.d 2013-05-31 16:44:36.727101429 -0600
@@ -410,7 +410,7 @@ object if_exists, if_does_not_exist;
FEerror("Cannot write pipe output to temporary file",0);
if (pclose(pp)<0)
@@ -304,7 +304,7 @@
FEerror("Cannot rewind temporary file\n",0);
goto AGAIN;
}
-@@ -1314,7 +1314,7 @@ BEGIN:
+@@ -1321,7 +1321,7 @@ BEGIN:
}
}
@@ -313,7 +313,7 @@
file_position(strm)
object strm;
{
-@@ -1326,7 +1326,7 @@ BEGIN:
+@@ -1333,7 +1333,7 @@ BEGIN:
/* return(strm->sm.sm_int0); */
if (strm->sm.sm_fp == NULL)
closed_stream(strm);
@@ -322,7 +322,7 @@
case smm_socket:
return -1;
-@@ -1357,7 +1357,7 @@ BEGIN:
+@@ -1364,7 +1364,7 @@ BEGIN:
int
file_position_set(strm, disp)
object strm;
@@ -331,7 +331,7 @@
{
BEGIN:
switch (strm->sm.sm_mode) {
-@@ -1367,7 +1367,7 @@ BEGIN:
+@@ -1374,7 +1374,7 @@ BEGIN:
case smm_output:
case smm_io:
@@ -340,7 +340,7 @@
return(-1);
/* strm->sm.sm_int0 = disp; */
return(0);
-@@ -1403,7 +1403,7 @@ BEGIN:
+@@ -1410,7 +1410,7 @@ BEGIN:
}
}
@@ -349,7 +349,7 @@
file_length(strm)
object strm;
{
-@@ -1766,14 +1766,14 @@ LFD(Lstream_element_type)()
+@@ -1773,14 +1773,14 @@ LFD(Lstream_element_type)()
@)
@(defun file_position (file_stream &o position)
@@ -366,7 +366,7 @@
} else {
if (position == sKstart)
i = 0;
-@@ -1800,7 +1800,7 @@ LFD(Lfile_length)()
+@@ -1807,7 +1807,7 @@ LFD(Lfile_length)()
if (i < 0)
vs_base[0] = Cnil;
else
@@ -375,7 +375,7 @@
}
object sSAload_pathnameA;
-@@ -2699,22 +2699,22 @@ read_fasl_data(const char *str) {
+@@ -2706,22 +2706,22 @@ read_fasl_data(const char *str) {
#ifdef BSD
fp = faslfile->sm.sm_fp;
fread(&header, sizeof(header), 1, fp);
@@ -402,7 +402,7 @@
while ((i = getc(fp)) == 0)
;
ungetc(i, fp);
-@@ -2723,7 +2723,7 @@ read_fasl_data(const char *str) {
+@@ -2730,7 +2730,7 @@ read_fasl_data(const char *str) {
#ifdef E15
fp = faslfile->sm.sm_fp;
fread(&header, sizeof(header), 1, fp);
@@ -514,7 +514,7 @@
COPY_TO_SAVE;
---- ./o/unixfsys.c.orig 2013-05-13 14:42:55.958085843 -0600
+--- ./o/unixfsys.c.orig 2013-01-21 14:18:53.000000000 -0700
+++ ./o/unixfsys.c 2013-05-13 14:46:33.929671144 -0600
@@ -414,7 +414,7 @@ backup_fopen(char *filename, char *optio
return(fopen(filename, option));
@@ -689,7 +689,7 @@
fwrite(&tab,sizeof(tab),1,symout);
fclose(symout);
#ifdef AIX3
---- ./configure.in.orig 2013-05-13 14:45:23.256804964 -0600
+--- ./configure.in.orig 2013-05-10 08:26:52.000000000 -0600
+++ ./configure.in 2013-05-13 14:46:51.387638090 -0600
@@ -425,7 +425,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC
@@ -700,7 +700,7 @@
# can only test for numbers -- CM
# if test "${GCC}" -eq "yes" ; then
---- ./configure.orig 2013-05-13 14:45:23.258804961 -0600
+--- ./configure.orig 2013-05-10 10:23:17.000000000 -0600
+++ ./configure 2013-05-13 14:46:55.322630640 -0600
@@ -763,6 +763,7 @@ enable_static
enable_pic
diff --git a/gcl-2.6.8-rename.patch b/gcl-2.6.8-rename.patch
index b4a51d2..800092d 100644
--- a/gcl-2.6.8-rename.patch
+++ b/gcl-2.6.8-rename.patch
@@ -1,4 +1,4 @@
---- ./o/unixfsys.c.orig 2013-01-21 13:57:43.000000000 -0700
+--- ./o/unixfsys.c.orig 2013-01-21 11:37:48.000000000 -0700
+++ ./o/unixfsys.c 2013-01-21 14:18:53.323182657 -0700
@@ -411,11 +411,17 @@ FILE *
backup_fopen(char *filename, char *option)
diff --git a/gcl-2.6.8-texinfo.patch b/gcl-2.6.8-texinfo.patch
index 31b8e97..57fdcea 100644
--- a/gcl-2.6.8-texinfo.patch
+++ b/gcl-2.6.8-texinfo.patch
@@ -1225,15 +1225,15 @@
@subsubheading Arguments::
--- ./info/gcl-tk.texi.orig 2013-05-11 07:35:21.000000000 -0600
-+++ ./info/gcl-tk.texi 2013-05-13 10:12:56.274561378 -0600
-@@ -2,6 +2,7 @@
- @c -*-texinfo-*-
++++ ./info/gcl-tk.texi 2013-05-31 16:03:43.187080653 -0600
+@@ -10,6 +10,7 @@
+
@c @smallbook
@setfilename gcl-tk.info
+@settitle GCL TK Manual
+ @synindex vr fn
@c to update the menus do:
- @c (texinfo-multiple-files-update "gcl-tk.texi" t t)
--- ./info/chap-23.texi.orig 2002-10-18 04:31:14.000000000 -0600
+++ ./info/chap-23.texi 2013-05-13 10:11:19.766813176 -0600
@@ -1174,7 +1174,7 @@ Controls the interpretation of tokens by
diff --git a/gcl-2.6.8-unrandomize.patch b/gcl-2.6.8-unrandomize.patch
index 2568fd7..a5eb439 100644
--- a/gcl-2.6.8-unrandomize.patch
+++ b/gcl-2.6.8-unrandomize.patch
@@ -1,5 +1,5 @@
---- ./configure.in.orig 2012-07-26 09:50:25.715238529 -0600
-+++ ./configure.in 2012-07-26 09:52:37.218033294 -0600
+--- ./configure.in.orig 2013-05-10 08:26:52.000000000 -0600
++++ ./configure.in 2013-05-10 08:26:52.000000000 -0600
@@ -1187,9 +1187,11 @@ if test "$HAVE_SBRK" = "1" ; then
AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
@@ -62,7 +62,7 @@
b = (void *) malloc(1000);
fp = fopen("conftest1","w");
---- ./configure.orig 2013-05-10 10:16:24.215085642 -0600
+--- ./configure.orig 2013-05-10 08:32:03.000000000 -0600
+++ ./configure 2013-05-10 10:19:55.934751565 -0600
@@ -7086,9 +7086,11 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/gcl.spec b/gcl.spec
index e3399f4..2457e69 100644
--- a/gcl.spec
+++ b/gcl.spec
@@ -8,11 +8,11 @@
%global __global_cflags %(printf %%s '%__global_cflags' | sed -r 's/
-fstack-protector( --param=ssp-buffer-size=[[:digit:]]+)?//')
# Prerelease of 2.6.8
-%global alphatag 20130511cvs
+%global alphatag 20130521cvs
Name: gcl
Version: 2.6.8
-Release: 0.16.%{alphatag}%{?dist}
+Release: 0.17.%{alphatag}%{?dist}
Summary: GNU Common Lisp
Group: Development/Languages
@@ -21,7 +21,7 @@ URL:
http://www.gnu.org/software/gcl/
# The source for this package was pulled from upstream's CVS repository. Use
# the following commands to generate the tarball:
# cvs -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/gcl export \
-# -r Version_2_6_8pre -D 2013-05-12 -d gcl-2.6.8 gcl
+# -r Version_2_6_8pre -D 2013-05-22 -d gcl-2.6.8 gcl
# tar cvJf gcl-2.6.8.tar.xz gcl-2.6.8
Source0: %{name}-%{version}.tar.xz
Source1: gcl.el
@@ -350,6 +350,10 @@ fi
%changelog
+* Fri May 31 2013 Jerry James <loganjerry(a)gmail.com> - 2.6.8-0.17.20130521cvs
+- Update to 20130521 snapshot for bug fixes
+- Rebase patches
+
* Fri Mar 22 2013 Jerry James <loganjerry(a)gmail.com> - 2.6.8-0.16.20130511cvs
- Update to 20130511 snapshot for bug fixes
- Add -largefile patch
diff --git a/sources b/sources
index 44d2a19..cbc7096 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-719fb6322a3b2eb603f7cb9fadd00c0e gcl-2.6.8.tar.xz
+7cd4492c2df2d1746b03dd0bb9c4a557 gcl-2.6.8.tar.xz
b965d4ea561a9c3e019c65be69fcfb1e gcl-2.6.8-info.tar.xz