From 372e9bdc887f84f7c4b08d517656eaa776327ec91ddcfdcc87f692bde5264f40 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 31 Jul 2018 07:01:33 +0000 Subject: [PATCH 1/3] Accepting request 624228 from home:pluskalm:branches:Base:System - Update to version 5.8.14: * several configury fixes to enable cross platform building. * fompletion of a change in "char-mapper" to enable bootstrapping * Guile 1.8 support was removed * Replace AG_SCM_STR02SCM with scm_from_latin1_string this breaks Guile 1.8. * adaptations for cross compiling * no more generating autoconf macros * fix internal implementation of forking off autogen in xml2ag * when calling abort() causes problems, exit() can now be called (via an option) instead. * add support for nanosecond precision in file times * suppress dumb warnings about embedded NUL bytes in formats. - Refresh patches - Drop not applying autogen-reproducible-tar.patch OBS-URL: https://build.opensuse.org/request/show/624228 OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=60 --- autogen-5.18.12.tar.xz | 3 --- autogen-5.18.12.tar.xz.sig | 11 ----------- autogen-5.18.14.tar.xz | 3 +++ autogen-5.18.14.tar.xz.sig | 11 +++++++++++ autogen-build_ldpath.patch | 6 +++--- autogen-catch-race-error.patch | 12 ++++++------ autogen-constant-timeout.patch | 15 +++++++-------- autogen-guile-2.2.patch | 20 ++++++++++---------- autogen-reproducible-tar.patch | 32 -------------------------------- autogen.changes | 19 +++++++++++++++++++ autogen.keyring | Bin 1186 -> 1735 bytes autogen.spec | 22 ++++++++-------------- 12 files changed, 67 insertions(+), 87 deletions(-) delete mode 100644 autogen-5.18.12.tar.xz delete mode 100644 autogen-5.18.12.tar.xz.sig create mode 100644 autogen-5.18.14.tar.xz create mode 100644 autogen-5.18.14.tar.xz.sig delete mode 100644 autogen-reproducible-tar.patch diff --git a/autogen-5.18.12.tar.xz b/autogen-5.18.12.tar.xz deleted file mode 100644 index 2509358..0000000 --- a/autogen-5.18.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be3ba62e883185b6ee8475edae97d7197d701d6b9ad9c3d2df53697110c1bfd8 -size 1018412 diff --git a/autogen-5.18.12.tar.xz.sig b/autogen-5.18.12.tar.xz.sig deleted file mode 100644 index 6ca1191..0000000 --- a/autogen-5.18.12.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABAgAGBQJXxLkRAAoJEMnvdt63Tudium8H/i7And79qZhuq8Z+jagHPP61 -3cLwOxVlhL8haPLS5Sj8uIG/eAt6SzW5Tg6+bwrsPQ6pq9yQL1xfDFMxr5JO4FCJ -97bdNUXkmnGadOGCRLP7Z3WRPmTEbWOxI3uTWmX8EQVMKpiIgQ5MghkyILNlgey3 -wUlAgJ9lRO0PZnPSRBVSYiFoS8wIWsWsxjrZePlVO40Yo82FpXulPtAGU4DA2sK+ -xCeE+pvhGwCTjRC6m372SNLKNPro6/YJRhS/QXmLTbh+aIeljJ3IA9daG2dfp8xS -wrF9TCdYCja3RX9tc7PZqieYvGCG96h+SBNtGTFl5m2mpnPow0OvI8Qm1yuXph0= -=lVeY ------END PGP SIGNATURE----- diff --git a/autogen-5.18.14.tar.xz b/autogen-5.18.14.tar.xz new file mode 100644 index 0000000..c14c6bc --- /dev/null +++ b/autogen-5.18.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc7ab99382116852fd4c73040c124799707b2d9b00a60b54e8b457daa7a06e4 +size 1023324 diff --git a/autogen-5.18.14.tar.xz.sig b/autogen-5.18.14.tar.xz.sig new file mode 100644 index 0000000..a7d0fa6 --- /dev/null +++ b/autogen-5.18.14.tar.xz.sig @@ -0,0 +1,11 @@ +-----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----- diff --git a/autogen-build_ldpath.patch b/autogen-build_ldpath.patch index 0d1abc9..d8452c1 100644 --- a/autogen-build_ldpath.patch +++ b/autogen-build_ldpath.patch @@ -3,10 +3,10 @@ doc/mk-agen-texi.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: doc/mk-agen-texi.sh +Index: autogen-5.18.14/doc/mk-agen-texi.sh =================================================================== ---- doc/mk-agen-texi.sh.orig -+++ 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() PATH=${top_builddir}/columns:${PATH} diff --git a/autogen-catch-race-error.patch b/autogen-catch-race-error.patch index 5e778d5..fb64919 100644 --- a/autogen-catch-race-error.patch +++ b/autogen-catch-race-error.patch @@ -3,10 +3,10 @@ instead of producing missing and incorrect files https://bugzilla.opensuse.org/show_bug.cgi?id=1021353 -Index: autogen-5.18.12/agen5/agDep.c +Index: autogen-5.18.14/agen5/agDep.c =================================================================== ---- autogen-5.18.12.orig/agen5/agDep.c -+++ autogen-5.18.12/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) pzn[len] = NUL; @@ -16,10 +16,10 @@ Index: autogen-5.18.12/agen5/agDep.c AGFREE(dep_file); dep_file = pzn; } while (false); -Index: autogen-5.18.12/agen5/expOutput.c +Index: autogen-5.18.14/agen5/expOutput.c =================================================================== ---- autogen-5.18.12.orig/agen5/expOutput.c -+++ autogen-5.18.12/agen5/expOutput.c +--- autogen-5.18.14.orig/agen5/expOutput.c ++++ autogen-5.18.14/agen5/expOutput.c @@ -251,7 +251,7 @@ ag_scm_out_move(SCM new_file) if (strcmp(pz, cur_fpstack->stk_fname) != 0) { diff --git a/autogen-constant-timeout.patch b/autogen-constant-timeout.patch index 11a6249..63b5c30 100644 --- a/autogen-constant-timeout.patch +++ b/autogen-constant-timeout.patch @@ -5,11 +5,11 @@ avoid using benchmarks from the build system that sometimes return 7 or 9 -Index: autogen-5.18.12/configure +Index: autogen-5.18.14/configure =================================================================== ---- autogen-5.18.12.orig/configure -+++ autogen-5.18.12/configure -@@ -17770,6 +17770,7 @@ then +--- autogen-5.18.14.orig/configure ++++ autogen-5.18.14/configure +@@ -18336,6 +18336,7 @@ then AG_TIMEOUT=${time_delta} fi @@ -17,11 +17,10 @@ Index: autogen-5.18.12/configure cat >>confdefs.h <<_ACEOF - -Index: autogen-5.18.12/configure.ac +Index: autogen-5.18.14/configure.ac =================================================================== ---- autogen-5.18.12.orig/configure.ac -+++ autogen-5.18.12/configure.ac +--- autogen-5.18.14.orig/configure.ac ++++ autogen-5.18.14/configure.ac @@ -191,6 +191,7 @@ then AG_TIMEOUT=${time_delta} diff --git a/autogen-guile-2.2.patch b/autogen-guile-2.2.patch index 73bc2fe..befc304 100644 --- a/autogen-guile-2.2.patch +++ b/autogen-guile-2.2.patch @@ -1,7 +1,7 @@ -Index: autogen-5.18.12/agen5/guile-iface.h +Index: autogen-5.18.14/agen5/guile-iface.h =================================================================== ---- autogen-5.18.12.orig/agen5/guile-iface.h -+++ autogen-5.18.12/agen5/guile-iface.h +--- autogen-5.18.14.orig/agen5/guile-iface.h ++++ autogen-5.18.14/agen5/guile-iface.h @@ -9,16 +9,13 @@ # error AutoGen does not work with this version of Guile choke me. @@ -20,11 +20,11 @@ Index: autogen-5.18.12/agen5/guile-iface.h #endif #endif /* MUTATING_GUILE_IFACE_H_GUARD */ -Index: autogen-5.18.12/configure +Index: autogen-5.18.14/configure =================================================================== ---- autogen-5.18.12.orig/configure -+++ autogen-5.18.12/configure -@@ -14198,7 +14198,7 @@ $as_echo "no" >&6; } +--- autogen-5.18.14.orig/configure ++++ autogen-5.18.14/configure +@@ -14734,7 +14734,7 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi @@ -33,10 +33,10 @@ Index: autogen-5.18.12/configure if test -n "$GUILE_EFFECTIVE_VERSION"; then _guile_tmp="" for v in $_guile_versions_to_search; do -Index: autogen-5.18.12/config/guile.m4 +Index: autogen-5.18.14/config/guile.m4 =================================================================== ---- autogen-5.18.12.orig/config/guile.m4 -+++ autogen-5.18.12/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], diff --git a/autogen-reproducible-tar.patch b/autogen-reproducible-tar.patch deleted file mode 100644 index 1e56da4..0000000 --- a/autogen-reproducible-tar.patch +++ /dev/null @@ -1,32 +0,0 @@ -Author: Bernhard M. Wiedemann -Date: 2018-03-09 - -https://sourceforge.net/p/autogen/bugs/182/ - -libopts-41.1.16.tar.gz contained timestamps from build -and indeterminism from filesystem readdir order. - -See https://reproducible-builds.org/ for why this matters. - -Index: autogen-5.18.12/pkg/libopts/mklibsrc.sh -=================================================================== ---- autogen-5.18.12.orig/pkg/libopts/mklibsrc.sh -+++ autogen-5.18.12/pkg/libopts/mklibsrc.sh -@@ -107,13 +107,15 @@ EOMakefile - | ${CLexe} -I4 --spread=1 --line-sep=" \\" - } > Makefile.am - --gz='gzip --best' -+gz='gzip --best -n' - sfx=tar.gz - - cd .. - echo ! cd `pwd` - echo ! tar cvf ${tag}.${sfx} ${tag} --tar cvf - ${tag} | $gz > ${top_builddir}/autoopts/${tag}.${sfx} -+rbopts="" -+[ -z "$SOURCE_DATE_EPOCH" ] || ! tar --help|grep -q sort= || rbopts="--sort=name --format=gnu --clamp-mtime --mtime @$SOURCE_DATE_EPOCH" -+tar cvf - $rbopts ${tag} | $gz > ${top_builddir}/autoopts/${tag}.${sfx} - rm -rf ${tag} - - ## Local Variables: diff --git a/autogen.changes b/autogen.changes index bc95b5f..88a2a6a 100644 --- a/autogen.changes +++ b/autogen.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Jul 20 08:28:31 UTC 2018 - mpluskal@suse.com + +- Update to version 5.8.14: + * several configury fixes to enable cross platform building. + * fompletion of a change in "char-mapper" to enable bootstrapping + * Guile 1.8 support was removed + * Replace AG_SCM_STR02SCM with scm_from_latin1_string this breaks + Guile 1.8. + * adaptations for cross compiling + * no more generating autoconf macros + * fix internal implementation of forking off autogen in xml2ag + * when calling abort() causes problems, exit() can now be called + (via an option) instead. + * add support for nanosecond precision in file times + * suppress dumb warnings about embedded NUL bytes in formats. +- Refresh patches +- Drop not applying autogen-reproducible-tar.patch + ------------------------------------------------------------------- Tue Mar 27 12:16:08 UTC 2018 - dimstar@opensuse.org diff --git a/autogen.keyring b/autogen.keyring index f65e1a79eb392d1f994bdaf686744ac9c54047df367a5f28cbcf1cfa3a0d9563..e22927cc48b3852def239a2a12d27e1eb00550494b12c8fd12861fd03c589202 100644 GIT binary patch literal 1735 zcmZ{l$Sjy&`I0B(gtRs^I5GaN zrq1zzzZfI{X8(~Jy@GxeKT3U$%OXIn;oB*`7ASnY%}~BDsqe4rCZ7<4U7t}GaC@A? ztJl!0?R|TE4-FnMFCR@hA$zED%&z4PmeHci ztDoy?wzbR?Hp<(!l6)Fkc=g+pdE<&zi;`_ut+|=SN+#}{KE5a9=ISoAoR7PBG&2j4 zqlBhATAqC9aX%3qU}?FL?+M=PR%{}yv^B$`x6kzk@kN^sC$L98o;RzUD4X`5x=L$$ zG1k*$6Z*QeoKCN_rVJKW(3I}%y}6Xh3<*G{olAImKp#%l=dMs0{{k|wm4-5&cz z0bUK^0uMyG2%5in@zSE-_@$P)MdyJX1t)|Dvcl&h6mwYswwxaKo&%urj-XtrS32R> zF6y+D!xk-d(lRUFDP`xL%HtC$q(=?+CRMm6JMFRiO14X5Pu>aP#$j+WJf4`oHiqwPmat=hmIl|IGWN5?@<|a;nHG6> zcb9DAJc=Cw{m-iFQaOp+(NSih`Fy^TRVd)X0ku^%2#}YG3;78pYOJ< zS2sQtC~hH^oQ<_PMBRg?B`TaTWoQ^T@1BDyzl^ymYT1Zo*LEziy9(c4|LP-jxcK{8 zwf3_D7trmC(-&2FLgxP_D{_N@d4qbw)TI#`QIcJE&2D_?h=Akf`&|V^pGGHy83I?g z&pk%CLGy8*xZO}|!lO>O^Q^)0K|A!V-T_~;1^nGUe2gH-`{#0RzGA;(@d?q!t3j?S zrGLWPv@yZVSVX@h0Xk;9#!F;Zjln<3Qh>ui2^={A^}jheA=0t{KCkU9Wl3sCOqx_i z(#}xDs!Un)bJCG1f#UOwWgiZaP+q;0N!7jNB_pA!=O;vza($qf96xg}YH^JGF}^`j z$#&l3dGxqOicw05!Z6|vvw$U5cfXJ^Aq>w*yK(q__(0YLkE?8L2_Kc*tBCx8RzZ3oab_o-Iu98YZlhm?j}7@dmgl7R#Pj7dnCLx=3YGK9J4@pt3NXux@Xd) z*tYSVx-m+a%ceJlv&EW9o9Jo?*3q~SN_Nai@7DMUH55k2mrb_U;sLrh?L00QHL3b%bbc8em=YBB|_CCCo;G~I`QQc z#~g?^+*)FFLCwen?KyeH1n;Lz)))n4e8dHaWLYhS^W@(yBmoK<1HWa`=`*`I!lK5_ zVuABA;FtIL6(EYMyiS@z0@V+KK>}T>UPEr2n(~baK0!u72RU-@SxqL4%=EG&SbOMcJa?rS3ba)hBeTcwYy=}hsCWEzYP zfS)`OrWoS60SyFKFT~>k2mqK#TKu31E&Qw{4pBxSB(Z#OmQz9nyy<6iQ3~1_-4vGn zr+))oXK;TfFmiix5(fPgIAbh3GXnWOBw2Wzvk8b13i4!T6&YnUY?*f&cOnLzxA>$Y z4ClN(;l%JiOjGp};P+!@`EjgfwplO`!O6{r{-r<_#ahji6u(V6fhxd$Rb^&O;K-+q z1~*A$MdeXbi7^Ak%a1&5NWzF96dJAY=CL}ZlMgn)yS zwQG;`;%0QhmIE6N>r!9+G38O+>xHgOQNo+-;Xwm*JD= 0.9.0 +BuildRequires: pkgconfig(guile-2.0) +BuildRequires: pkgconfig(libxml-2.0) # Since shared library and devel package were split, we need to require # libopts-devel untill all depending packages have fixed buildrequires -Requires: libopts-devel +Requires: pkgconfig(autoopts) Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} @@ -86,13 +83,14 @@ This package contains devel files for libopts %prep %setup -q -%patch1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %build +# Don't build with -Werror +sed -i "s|-Werror||g" configure.ac autoreconf -fiv %configure \ --disable-static \ @@ -100,7 +98,6 @@ autoreconf -fiv make %{?_smp_mflags} %install -export MAN_PAGE_DATE=$(date -u -r ChangeLog -I) %make_install find %{buildroot} -type f -name "*.la" -delete -print %fdupes -s %{buildroot}%{_datadir} @@ -118,7 +115,6 @@ make %{?_smp_mflags} check %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-, root, root) %doc NEWS ChangeLog %{_bindir}/autogen %{_bindir}/autoopts-config @@ -131,11 +127,9 @@ make %{?_smp_mflags} check %{_datadir}/autogen %files -n %{libname} -%defattr(-,root,root) %{_libdir}/libopts.so.* %files -n libopts-devel -%defattr(-,root,root) %{_libdir}/libopts.so %{_includedir}/* %{_mandir}/man3/*%{ext_man} From a73b500c4df794bd48618b1e5b5ed80731e668aaee7a6cb8dc384487afedcdc5 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 31 Jul 2018 14:15:58 +0000 Subject: [PATCH 2/3] Accepting request 626730 from home:Andreas_Schwab:Factory - Don't require libopts-devel from autogen - Rename libopts-devel to autoopts - Move all autoopts related files to autoopts - Don't run autoreconf - Don't remove -Werror - sprintf-overflow.patch: Fix sprintf overflow - autogen-guile-2.2.patch: properly add support for guile 2.2 - autogen-constant-timeout.patch: remove, pass AG_TIMEOUT to configure instead OBS-URL: https://build.opensuse.org/request/show/626730 OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=61 --- autogen-constant-timeout.patch | 31 ------------- autogen-guile-2.2.patch | 80 ++++++++++++++++++++++++---------- autogen.changes | 13 ++++++ autogen.spec | 80 +++++++++++++++++++++------------- sprintf-overflow.patch | 26 +++++++++++ 5 files changed, 144 insertions(+), 86 deletions(-) delete mode 100644 autogen-constant-timeout.patch create mode 100644 sprintf-overflow.patch diff --git a/autogen-constant-timeout.patch b/autogen-constant-timeout.patch deleted file mode 100644 index 63b5c30..0000000 --- a/autogen-constant-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -Author: Bernhard M. Wiedemann -Date: 2018-03-09 - -avoid using benchmarks from the build system -that sometimes return 7 or 9 - - -Index: autogen-5.18.14/configure -=================================================================== ---- autogen-5.18.14.orig/configure -+++ autogen-5.18.14/configure -@@ -18336,6 +18336,7 @@ then - - AG_TIMEOUT=${time_delta} - fi -+AG_TIMEOUT=12 - - - cat >>confdefs.h <<_ACEOF -Index: autogen-5.18.14/configure.ac -=================================================================== ---- autogen-5.18.14.orig/configure.ac -+++ autogen-5.18.14/configure.ac -@@ -191,6 +191,7 @@ then - - AG_TIMEOUT=${time_delta} - fi -+AG_TIMEOUT=12 - ] - AC_DEFINE_UNQUOTED(AG_DEFAULT_TIMEOUT, ${AG_TIMEOUT}, - [define to suitable timeout limit for shell command]) diff --git a/autogen-guile-2.2.patch b/autogen-guile-2.2.patch index befc304..33136d3 100644 --- a/autogen-guile-2.2.patch +++ b/autogen-guile-2.2.patch @@ -1,38 +1,57 @@ +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,16 +9,13 @@ +@@ -9,7 +9,7 @@ # error AutoGen does not work with this version of Guile choke me. -#elif GUILE_VERSION < 201000 -+#else ++#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)) - # define AG_SCM_TO_LONG(_v) scm_to_long(_v) - # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) - --#else --# error unknown GUILE_VERSION -- choke me. - #endif - - #endif /* MUTATING_GUILE_IFACE_H_GUARD */ -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 Index: autogen-5.18.14/config/guile.m4 =================================================================== --- autogen-5.18.14.orig/config/guile.m4 @@ -46,3 +65,16 @@ Index: autogen-5.18.14/config/guile.m4 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 diff --git a/autogen.changes b/autogen.changes index 88a2a6a..1812d49 100644 --- a/autogen.changes +++ b/autogen.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jul 31 08:50:01 UTC 2018 - schwab@suse.de + +- Don't require libopts-devel from autogen +- Rename libopts-devel to autoopts +- Move all autoopts related files to autoopts +- Don't run autoreconf +- Don't remove -Werror +- sprintf-overflow.patch: Fix sprintf overflow +- autogen-guile-2.2.patch: properly add support for guile 2.2 +- autogen-constant-timeout.patch: remove, pass AG_TIMEOUT to configure + instead + ------------------------------------------------------------------- Fri Jul 20 08:28:31 UTC 2018 - mpluskal@suse.com diff --git a/autogen.spec b/autogen.spec index 87e50dd..87aabd5 100644 --- a/autogen.spec +++ b/autogen.spec @@ -32,17 +32,13 @@ Patch1: autogen-build_ldpath.patch Patch2: autogen-catch-race-error.patch # PATCH-FIX-UPSTREAM -- guile 2.2 support Patch3: autogen-guile-2.2.patch -# PATCH-FIX-OPENSUSE -Patch5: autogen-constant-timeout.patch +# PATCH-FIX-UPSTREAM +Patch4: sprintf-overflow.patch BuildRequires: fdupes -BuildRequires: libtool BuildRequires: makeinfo BuildRequires: pkgconfig >= 0.9.0 BuildRequires: pkgconfig(guile-2.0) BuildRequires: pkgconfig(libxml-2.0) -# Since shared library and devel package were split, we need to require -# libopts-devel untill all depending packages have fixed buildrequires -Requires: pkgconfig(autoopts) Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} @@ -58,41 +54,47 @@ Summary: Shared library libopts Group: System/Libraries %description -n %{libname} -AutoGen is a tool designed for generating program files that contain -repetitive text with varied substitutions. Its goal is to simplify the -maintenance of programs that contain large amounts of repetitious text. -This is especially valuable if there are several blocks of such text that -must be kept synchronized in parallel tables. +AutoOpts is a tool that virtually eliminates the hassle of processing +options and keeping man pages, info docs and usage text up to date. This +package allows you to specify several program attributes, thousands of +option types and many option attributes. From this, it then produces all +the code necessary to parse and handle the command line and configuration +file options, and the documentation that should go with your program as +well. This package contains shared library libopts -%package -n libopts-devel -Summary: Development files for libopts +%package -n autoopts +Summary: Automated Option Processing Group: Development/Languages/C and C++ Requires: %{libname} = %{version}-%{release} +Requires: autogen Obsoletes: %{libname}-devel < %{version}-%{release} +Provides: autogen:/usr/bin/autoopts-config +Provides: libopts-devel -%description -n libopts-devel -AutoGen is a tool designed for generating program files that contain -repetitive text with varied substitutions. Its goal is to simplify the -maintenance of programs that contain large amounts of repetitious text. -This is especially valuable if there are several blocks of such text that -must be kept synchronized in parallel tables. - -This package contains devel files for libopts +%description -n autoopts +AutoOpts is a tool that virtually eliminates the hassle of processing +options and keeping man pages, info docs and usage text up to date. This +package allows you to specify several program attributes, thousands of +option types and many option attributes. From this, it then produces all +the code necessary to parse and handle the command line and configuration +file options, and the documentation that should go with your program as +well. %prep %setup -q %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch5 -p1 +%patch4 -p1 + +touch aclocal.m4 configure Makefile.in config-h.in %build -# Don't build with -Werror -sed -i "s|-Werror||g" configure.ac -autoreconf -fiv %configure \ + CFLAGS="%optflags -Wno-error=implicit-fallthrough" \ + AG_TIMEOUT=20 \ --disable-static \ --with-pic make %{?_smp_mflags} @@ -103,7 +105,15 @@ find %{buildroot} -type f -name "*.la" -delete -print %fdupes -s %{buildroot}%{_datadir} %check -make %{?_smp_mflags} check +make %{?_smp_mflags} check || { + for f in */test/test-suite.log; do + if test -f "$f"; then + echo "======== $f ========" + cat "$f" + fi + done + exit 1 +} %post %install_info --info-dir=%{_infodir} %{_infodir}/autogen.info%{ext_info} @@ -115,25 +125,33 @@ make %{?_smp_mflags} check %postun -n %{libname} -p /sbin/ldconfig %files -%doc NEWS ChangeLog +%doc NEWS +%license COPYING %{_bindir}/autogen -%{_bindir}/autoopts-config %{_bindir}/columns %{_bindir}/getdefs %{_bindir}/xml2ag -%{_libdir}/autogen %{_mandir}/man1/*%{ext_man} +%exclude %{_mandir}/man1/autoopts-config.1%{ext_man} %{_infodir}/*%{ext_info} -%{_datadir}/autogen +%dir %{_datadir}/autogen +%{_datadir}/autogen/fsm-trans.tlib +%{_datadir}/autogen/fsm-macro.tlib %files -n %{libname} %{_libdir}/libopts.so.* -%files -n libopts-devel +%files -n autoopts +%{_bindir}/autoopts-config %{_libdir}/libopts.so %{_includedir}/* +%{_mandir}/man1/autoopts-config.1%{ext_man} %{_mandir}/man3/*%{ext_man} +%{_libdir}/autogen %{_datadir}/aclocal/* +%{_datadir}/autogen +%exclude %{_datadir}/autogen/fsm-trans.tlib +%exclude %{_datadir}/autogen/fsm-macro.tlib %{_libdir}/pkgconfig/*.pc %changelog diff --git a/sprintf-overflow.patch b/sprintf-overflow.patch new file mode 100644 index 0000000..9448e08 --- /dev/null +++ b/sprintf-overflow.patch @@ -0,0 +1,26 @@ +Index: autogen-5.18.14/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 + OPTST_NO_USAGE_MASK | OPTST_DOCUMENT; + + static char const vfmtfmt[] = "%%-%us %%s\n"; +- char vfmt[sizeof(vfmtfmt)]; ++ char vfmt[sizeof(vfmtfmt) + 9]; + + /* + * Only handle client specified options. The "vendor option" follows +Index: autogen-5.18.14/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 + char * pzDef = *ppzDef; + char * pzOut = *ppzOut; + +- char def_bf[ MAXNAMELEN ]; ++ char def_bf[ 2 * MAXNAMELEN + 4 ]; + char name_bf[ MAXNAMELEN ]; + char * def_str = def_bf; + char * pzIfText = NULL; From 3b6b89fd5a762ec811e1106acfac2958900b2386abd69c8f3427be4fe185041a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 31 Jul 2018 14:48:02 +0000 Subject: [PATCH 3/3] Accepting request 626734 from home:Andreas_Schwab:Factory - Don't require libopts-devel from autogen - Rename libopts-devel to autoopts - Move all autoopts related files to autoopts - Don't run autoreconf - Don't remove -Werror - sprintf-overflow.patch: Fix sprintf overflow - autogen-guile-2.2.patch: properly add support for guile 2.2 - autogen-constant-timeout.patch: remove, use --enable-timeout instead OBS-URL: https://build.opensuse.org/request/show/626734 OBS-URL: https://build.opensuse.org/package/show/Base:System/autogen?expand=0&rev=62 --- autogen.changes | 2 +- autogen.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.changes b/autogen.changes index 1812d49..5aad74d 100644 --- a/autogen.changes +++ b/autogen.changes @@ -8,7 +8,7 @@ Tue Jul 31 08:50:01 UTC 2018 - schwab@suse.de - Don't remove -Werror - sprintf-overflow.patch: Fix sprintf overflow - autogen-guile-2.2.patch: properly add support for guile 2.2 -- autogen-constant-timeout.patch: remove, pass AG_TIMEOUT to configure +- autogen-constant-timeout.patch: remove, use --enable-timeout instead ------------------------------------------------------------------- diff --git a/autogen.spec b/autogen.spec index 87aabd5..ed443f4 100644 --- a/autogen.spec +++ b/autogen.spec @@ -94,7 +94,7 @@ touch aclocal.m4 configure Makefile.in config-h.in %build %configure \ CFLAGS="%optflags -Wno-error=implicit-fallthrough" \ - AG_TIMEOUT=20 \ + --enable-timeout=20 \ --disable-static \ --with-pic make %{?_smp_mflags}