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

Accepting request 643730 from home:Andreas_Schwab:Factory

Browse Source 
- Update to version 5.8.16
  - Enable compiling with Guile 2.2
- autogen-guile-2.2.patch: removed
- installable-programs.patch: don't make programs uninstallable
- Rediff remaining patches

OBS-URL: https://build.opensuse.org/request/show/643730
OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=64
This commit is contained in:
Andreas Schwab 2018-10-22 13:47:14 +00:00 committed by Git OBS Bridge
parent 3b6b89fd5a
commit 9ff2051de9
11 changed files with 141 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autogen-5.18.14.tar.xz
View File

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

11
autogen-5.18.14.tar.xz.sig
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJbTSMkAAoJEMnvdt63TudiU2MH/1m9nCe4wB+C9S2nQG9mBqCz
SWDGh+zSD/JeRvSscfQji3CR8WJhcvld4XKi5/2TurDwZZCOd3gDzVJbv1C15dLU
6wT3WhavIsfIEd/l1aydE6YEBugdd6iSdnrGwXOt8vokLZVXAsYCI4r6Pyg0Bc+s
QofCgSMu/uMuBoUyyy+p9pcAiGzGwBgKzLkHzBkeGWFQr1jkQBrLyApbEEF+JHx5
69g43V5BaPayQA/v2PkRz9ZiBaMRSqYqsYUSifk+eZxxHS9TfauByu9ipLk/fy0+
zQlI5W7OP7iAl5Sls2S1/5okAlTEGiSku8Eh20j34YJoPVCDK8Hz9spL2eAa9QU=
=Lx4h
-----END PGP SIGNATURE-----

BIN
autogen-5.18.16.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

14
autogen-5.18.16.tar.xz.sig Normal file
View File

@ -0,0 +1,14 @@
-----BEGIN PGP SIGNATURE-----
iQGzBAABCgAdFiEEPu5R0TVbjsQNnzEiSVFD0F0HEtEFAluDAQ0ACgkQSVFD0F0H
EtEEZgwAoDEvCmntFdUgGfAvI92MCrALUEZWugrUXTnL8yHnMQJX696EBs+koMsr
rXIoTd3a4NCp8egyv71/6QIsUvoC6ieg0Y+uYLK4GdJb6veG+76L01cbIITcmTUx
gky28yxDnZRF5QB96a7NLRTQdKeH7ZxVMfMhsknbwXlzDcJSUAjk3LrV97qrIu51
QpFZvjDmW9pH0p5/fkosLCQm5QlkVAW8KTA6/3vtCaJA0c5LUodb8vzts4NJxrFt
JNLb9jZg/qfkMG+FEYHt0N1tJ1Efxiq6TNBwKWsFwGGwEkGH0GKnbd7tHGvEnlqK
z+Ofix6wswarBdfr+W/fXdVtrBZvNrY05PN7ygxlHREgHZ2IT02GfmY75qBb+tto
/EcwhsJtrZYMFvv+JBheWIHSvCDiZy7SsdH7xC1V8xgiDJaMto15X4iPu1TiLwMV
2t+fy50F7mUMGOVttw2sjlSrprx3chtoq066zFB9f5yRC5/G3E5oVGO/A8t+eUA7
LE+bzAXu
=r3ou
-----END PGP SIGNATURE-----

8
autogen-build_ldpath.patch
View File

@ -3,11 +3,11 @@
doc/mk-agen-texi.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Index: autogen-5.18.14/doc/mk-agen-texi.sh
Index: autogen-5.18.16/doc/mk-agen-texi.sh
===================================================================
--- autogen-5.18.14.orig/doc/mk-agen-texi.sh
+++ autogen-5.18.14/doc/mk-agen-texi.sh
@@ -93,9 +93,9 @@ setup_exports()
--- autogen-5.18.16.orig/doc/mk-agen-texi.sh
+++ autogen-5.18.16/doc/mk-agen-texi.sh
@@ -98,9 +98,9 @@ setup_exports()
PATH=${top_builddir}/columns:${PATH}
timer=`expr ${AG_TIMEOUT} '*' 5`

14
autogen-catch-race-error.patch
View File

@ -3,11 +3,11 @@ instead of producing missing and incorrect files
https://bugzilla.opensuse.org/show_bug.cgi?id=1021353
Index: autogen-5.18.14/agen5/agDep.c
Index: autogen-5.18.16/agen5/agDep.c
===================================================================
--- autogen-5.18.14.orig/agen5/agDep.c
+++ autogen-5.18.14/agen5/agDep.c
@@ -303,7 +303,7 @@ tidy_dep_file(void)
--- autogen-5.18.16.orig/agen5/agDep.c
+++ autogen-5.18.16/agen5/agDep.c
@@ -308,7 +308,7 @@ tidy_dep_file(void)
pzn[len] = NUL;
unlink(pzn);
@ -16,10 +16,10 @@ Index: autogen-5.18.14/agen5/agDep.c
AGFREE(dep_file);
dep_file = pzn;
} while (false);
Index: autogen-5.18.14/agen5/expOutput.c
Index: autogen-5.18.16/agen5/expOutput.c
===================================================================
--- autogen-5.18.14.orig/agen5/expOutput.c
+++ autogen-5.18.14/agen5/expOutput.c
--- autogen-5.18.16.orig/agen5/expOutput.c
+++ autogen-5.18.16/agen5/expOutput.c
@@ -251,7 +251,7 @@ ag_scm_out_move(SCM new_file)
if (strcmp(pz, cur_fpstack->stk_fname) != 0) {

80
autogen-guile-2.2.patch
View File

@ -1,80 +0,0 @@
Index: autogen-5.18.14/agen5/guile-iface.def
===================================================================
--- autogen-5.18.14.orig/agen5/guile-iface.def
+++ autogen-5.18.14/agen5/guile-iface.def
@@ -35,31 +35,31 @@ invalid = '200000-200003',
iface = {
i-name = is_proc;
i-args = '_p';
- i-impl = { i-end = '201'; i-code = 'scm_is_true( scm_procedure_p(_p))'; };
+ i-impl = { i-end = '202'; i-code = 'scm_is_true( scm_procedure_p(_p))'; };
};
iface = {
i-name = list_p;
i-args = '_l';
- i-impl = { i-end = '201'; i-code = 'scm_is_true( scm_list_p(_l))'; };
+ i-impl = { i-end = '202'; i-code = 'scm_is_true( scm_list_p(_l))'; };
};
iface = {
i-name = pair_p;
i-args = '_p';
- i-impl = { i-end = '201'; i-code = 'scm_is_true( scm_pair_p(_p))'; };
+ i-impl = { i-end = '202'; i-code = 'scm_is_true( scm_pair_p(_p))'; };
};
iface = {
i-name = to_long;
i-args = '_v';
- i-impl = { i-end = '201'; i-code = 'scm_to_long(_v)'; };
+ i-impl = { i-end = '202'; i-code = 'scm_to_long(_v)'; };
};
iface = {
i-name = to_ulong;
i-args = '_v';
- i-impl = { i-end = '201'; i-code = '((unsigned long)scm_to_ulong(_v))'; };
+ i-impl = { i-end = '202'; i-code = '((unsigned long)scm_to_ulong(_v))'; };
};
/* end of guile-iface.def */
Index: autogen-5.18.14/agen5/guile-iface.h
===================================================================
--- autogen-5.18.14.orig/agen5/guile-iface.h
+++ autogen-5.18.14/agen5/guile-iface.h
@@ -9,7 +9,7 @@
# error AutoGen does not work with this version of Guile
choke me.
-#elif GUILE_VERSION < 201000
+#elif GUILE_VERSION < 202000
# define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
# define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
# define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
Index: autogen-5.18.14/config/guile.m4
===================================================================
--- autogen-5.18.14.orig/config/guile.m4
+++ autogen-5.18.14/config/guile.m4
@@ -61,7 +61,7 @@
#
AC_DEFUN([GUILE_PKG],
[PKG_PROG_PKG_CONFIG
- _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
+ _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
Index: autogen-5.18.14/configure
===================================================================
--- autogen-5.18.14.orig/configure
+++ autogen-5.18.14/configure
@@ -14734,7 +14734,7 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
- _guile_versions_to_search="2.0 1.8"
+ _guile_versions_to_search="2.2 2.0 1.8"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do

9
autogen.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Oct 16 07:41:12 UTC 2018 - schwab@suse.de
- Update to version 5.8.16
- Enable compiling with Guile 2.2
- autogen-guile-2.2.patch: removed
- installable-programs.patch: don't make programs uninstallable
- Rediff remaining patches
-------------------------------------------------------------------
Tue Jul 31 08:50:01 UTC 2018 - schwab@suse.de

11
autogen.spec
View File

@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libname libopts25
Name: autogen
Version: 5.18.14
Version: 5.18.16
Release: 0
Summary: Automated Text File Generator
License: GPL-3.0-or-later
@ -30,8 +30,8 @@ Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=aut
Patch1: autogen-build_ldpath.patch
# PATCH-FIX-UPSTREAM -- https://savannah.gnu.org/support/index.php?109234 boo#1021353
Patch2: autogen-catch-race-error.patch
# PATCH-FIX-UPSTREAM -- guile 2.2 support
Patch3: autogen-guile-2.2.patch
# PATCH-FIX-UPSTREAM don't make programs uninstallable
Patch3: installable-programs.patch
# PATCH-FIX-UPSTREAM
Patch4: sprintf-overflow.patch
BuildRequires: fdupes
@ -89,11 +89,8 @@ well.
%patch3 -p1
%patch4 -p1
touch aclocal.m4 configure Makefile.in config-h.in
%build
%configure \
CFLAGS="%optflags -Wno-error=implicit-fallthrough" \
--enable-timeout=20 \
--disable-static \
--with-pic

92
installable-programs.patch Normal file
View File

@ -0,0 +1,92 @@
Index: autogen-5.18.16/agen5/Makefile.am
===================================================================
--- autogen-5.18.16.orig/agen5/Makefile.am
+++ autogen-5.18.16/agen5/Makefile.am
@@ -63,7 +63,7 @@ SNV_LIB = $(top_builddir)/snprin
nodist_autogen_SOURCES = ag.c
autogen_SOURCES = $(gen_csrc)
autogen_LDADD = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
+autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
autogen_CFLAGS = $(GUILE_CFLAGS)
stamp_script = $(srcdir)/mk-stamps.sh
Index: autogen-5.18.16/agen5/Makefile.in
===================================================================
--- autogen-5.18.16.orig/agen5/Makefile.in
+++ autogen-5.18.16/agen5/Makefile.in
@@ -482,7 +482,7 @@ SNV_LIB = $(top_builddir)/snprintfv/libs
nodist_autogen_SOURCES = ag.c
autogen_SOURCES = $(gen_csrc)
autogen_LDADD = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
+autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
autogen_CFLAGS = $(GUILE_CFLAGS)
stamp_script = $(srcdir)/mk-stamps.sh
AM_YFLAGS = -d
Index: autogen-5.18.16/columns/Makefile.am
===================================================================
--- autogen-5.18.16.orig/columns/Makefile.am
+++ autogen-5.18.16/columns/Makefile.am
@@ -20,7 +20,6 @@
## with this program. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS = columns
-columns_LDFLAGS = -no-install
csrc = opts.h columns.c opts.c
nodist_columns_SOURCES = cols.c
Index: autogen-5.18.16/columns/Makefile.in
===================================================================
--- autogen-5.18.16.orig/columns/Makefile.in
+++ autogen-5.18.16/columns/Makefile.in
@@ -128,7 +128,7 @@ am__v_lt_0 = --silent
am__v_lt_1 =
columns_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(columns_LDFLAGS) $(LDFLAGS) -o $@
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -389,7 +389,6 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-columns_LDFLAGS = -no-install
csrc = opts.h columns.c opts.c
nodist_columns_SOURCES = cols.c
LO_LIB = $(top_builddir)/autoopts/libopts.la
Index: autogen-5.18.16/getdefs/Makefile.am
===================================================================
--- autogen-5.18.16.orig/getdefs/Makefile.am
+++ autogen-5.18.16/getdefs/Makefile.am
@@ -23,7 +23,6 @@
TARG = getdefs
bin_PROGRAMS = getdefs
-getdefs_LDFLAGS = -no-install
gdsrcs = getdefs.h proto.h gdemit.c gdinit.c getdefs.c
getdefs_SOURCES = proto.h
BUILT_SOURCES = gd.c
Index: autogen-5.18.16/getdefs/Makefile.in
===================================================================
--- autogen-5.18.16.orig/getdefs/Makefile.in
+++ autogen-5.18.16/getdefs/Makefile.in
@@ -130,7 +130,7 @@ am__v_lt_0 = --silent
am__v_lt_1 =
getdefs_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(getdefs_LDFLAGS) $(LDFLAGS) -o $@
+ $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -434,7 +434,6 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
TARG = getdefs
-getdefs_LDFLAGS = -no-install
gdsrcs = getdefs.h proto.h gdemit.c gdinit.c getdefs.c
getdefs_SOURCES = proto.h
BUILT_SOURCES = gd.c

16
sprintf-overflow.patch
View File

@ -1,8 +1,8 @@
Index: autogen-5.18.14/autoopts/usage.c
Index: autogen-5.18.16/autoopts/usage.c
===================================================================
--- autogen-5.18.14.orig/autoopts/usage.c
+++ autogen-5.18.14/autoopts/usage.c
@@ -765,7 +765,7 @@ prt_vendor_opts(tOptions * opts, char co
--- autogen-5.18.16.orig/autoopts/usage.c
+++ autogen-5.18.16/autoopts/usage.c
@@ -711,7 +711,7 @@ prt_vendor_opts(tOptions * opts, char co
OPTST_NO_USAGE_MASK | OPTST_DOCUMENT;
static char const vfmtfmt[] = "%%-%us %%s\n";
@ -11,11 +11,11 @@ Index: autogen-5.18.14/autoopts/usage.c
/*
* Only handle client specified options. The "vendor option" follows
Index: autogen-5.18.14/getdefs/getdefs.c
Index: autogen-5.18.16/getdefs/getdefs.c
===================================================================
--- autogen-5.18.14.orig/getdefs/getdefs.c
+++ autogen-5.18.14/getdefs/getdefs.c
@@ -421,7 +421,7 @@ buildPreamble(char ** ppzDef, char ** pp
--- autogen-5.18.16.orig/getdefs/getdefs.c
+++ autogen-5.18.16/getdefs/getdefs.c
@@ -374,7 +374,7 @@ buildPreamble(char ** ppzDef, char ** pp
char * pzDef = *ppzDef;
char * pzOut = *ppzOut;