diff -Nru automake1.11-1.11.6/debian/changelog automake1.11-1.11.6/debian/changelog --- automake1.11-1.11.6/debian/changelog 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/changelog 2016-12-24 21:58:25.000000000 +0000 @@ -1,3 +1,22 @@ +automake1.11 (1:1.11.6-4) unstable; urgency=medium + + * debian/compat, debian/control, debian/rules: Switch to debhelper 10. + * debian/control: Standards-Version to 3.9.8. + * debian/control: Fix description to mention legacy version. + (Closes: #838362) + * debian/patches/0004-Fix-unescaped-left-brace.patch: Fix unescaped left + brace. Thanks Helmut Grohne. (Closes: #826498) + * + debian/patches/0005-aclocal-declare-function-prototypes-do-not-use-in-fu.patch: + Fix for warnings with perl >= 5.16. Thanks Mauricio Faria de + Oliveira. (Closes: #752784) + * debian/patches/0006-install-sh-avoid-low-risk-race-in-tmp.patch: + Backport patch to avoid (low risk) race in /tmp in install-sh. Thanks + Pavel Raiskup. (Closes: #827346) + * debian/gbp.conf: Add gbp configuration to use pristine-tar. + + -- Eric Dorland Sat, 24 Dec 2016 16:58:25 -0500 + automake1.11 (1:1.11.6-3) unstable; urgency=medium * debian/copyright: New DEP-5 copyright file. diff -Nru automake1.11-1.11.6/debian/compat automake1.11-1.11.6/debian/compat --- automake1.11-1.11.6/debian/compat 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/compat 2016-12-24 21:58:25.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru automake1.11-1.11.6/debian/control automake1.11-1.11.6/debian/control --- automake1.11-1.11.6/debian/control 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/control 2016-12-24 21:58:25.000000000 +0000 @@ -2,8 +2,8 @@ Section: devel Priority: optional Maintainer: Eric Dorland -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 10) Build-Depends-Indep: autoconf (>= 2.62), autopoint, autotools-dev (>= 20020320.1), @@ -35,6 +35,6 @@ (with rules being thrown in occasionally). The generated `Makefile.in's are compliant with the GNU Makefile standards. . - Automake 1.11 fails to work in a number of situations that Automake - 1.4, 1.6, 1.7, 1.8, 1.9 and 1.10 did, so has been renamed so that the - previous version can continue to be made available. + Automake 1.11 is the legacy version of automake. The automake package + should be preferred and this package should only be used with older + software that doesn't support newer versions of automake. diff -Nru automake1.11-1.11.6/debian/gbp.conf automake1.11-1.11.6/debian/gbp.conf --- automake1.11-1.11.6/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/gbp.conf 2016-12-24 21:58:25.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff -Nru automake1.11-1.11.6/debian/patches/0004-Fix-unescaped-left-brace.patch automake1.11-1.11.6/debian/patches/0004-Fix-unescaped-left-brace.patch --- automake1.11-1.11.6/debian/patches/0004-Fix-unescaped-left-brace.patch 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/0004-Fix-unescaped-left-brace.patch 2016-12-24 21:58:25.000000000 +0000 @@ -0,0 +1,21 @@ +From: Eric Dorland +Date: Sat, 24 Dec 2016 11:00:25 -0500 +Subject: Fix unescaped left brace + +--- + automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/automake.in b/automake.in +index 921a6ae..003ce31 100644 +--- a/automake.in ++++ b/automake.in +@@ -4156,7 +4156,7 @@ sub substitute_ac_subst_variables_worker($) + sub substitute_ac_subst_variables ($) + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$\{([^ \t=:+{}]+)\}/&substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + diff -Nru automake1.11-1.11.6/debian/patches/0005-aclocal-declare-function-prototypes-do-not-use-in-fu.patch automake1.11-1.11.6/debian/patches/0005-aclocal-declare-function-prototypes-do-not-use-in-fu.patch --- automake1.11-1.11.6/debian/patches/0005-aclocal-declare-function-prototypes-do-not-use-in-fu.patch 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/0005-aclocal-declare-function-prototypes-do-not-use-in-fu.patch 2016-12-24 21:58:25.000000000 +0000 @@ -0,0 +1,133 @@ +From: Stefano Lattarini +Date: Mon, 28 May 2012 13:32:03 +0200 +Subject: aclocal: declare function prototypes, + do not use '&' in function calls + +This change will also fix automake bug#11543 (from a report by Matt +Burgess). + +* aclocal.in: Declare prototypes for almost all functions early, before +any actual function definition (but omit the prototype for the dynamically +generated '&search' function). Add prototypes to any function definition. +Remove '&' from function invocations (i.e., simply use "func(ARGS..)" +instead of "&func(ARGS...)"). +* THANKS: Update. + +Signed-off-by: Stefano Lattarini +--- + THANKS | 1 + + aclocal.in | 42 ++++++++++++++++++++++++++++++++++-------- + 2 files changed, 35 insertions(+), 8 deletions(-) + +diff --git a/THANKS b/THANKS +index e584fa7..ff0608c 100644 +--- a/THANKS ++++ b/THANKS +@@ -231,6 +231,7 @@ Martin Waitz tali@admingilde.org + Mathias Doreille doreille@smr.ch + Mathias Froehlich M.Froehlich@science-computing.de + Mathias Hasselmann mathias.hasselmann@gmx.de ++Matt Burgess matthew@linuxfromscratch.org + Matt Leach mleach@cygnus.com + Matthew D. Langston langston@SLAC.Stanford.EDU + Matthias Andree matthias.andree@gmx.de +diff --git a/aclocal.in b/aclocal.in +index 4764379..2f56b44 100644 +--- a/aclocal.in ++++ b/aclocal.in +@@ -152,8 +152,34 @@ my $erase_me; + + ################################################################ + ++# Prototypes for all subroutines. ++ ++sub unlink_tmp (;$); ++sub xmkdir_p ($); ++sub check_acinclude (); ++sub reset_maps (); ++sub install_file ($$); ++sub list_compare (address@hidden@); ++sub scan_m4_dirs ($@); ++sub scan_m4_files (); ++sub add_macro ($); ++sub scan_configure_dep ($); ++sub add_file ($); ++sub scan_file ($$$); ++sub strip_redundant_includes (%); ++sub trace_used_macros (); ++sub scan_configure (); ++sub write_aclocal ($@); ++sub usage ($); ++sub version (); ++sub handle_acdir_option ($$); ++sub parse_arguments (); ++sub parse_ACLOCAL_PATH (); ++ ++################################################################ ++ + # Erase temporary file ERASE_ME. Handle signals. +-sub unlink_tmp ++sub unlink_tmp (;$) + { + my ($sig) = @_; + +@@ -351,7 +377,7 @@ sub scan_m4_dirs ($@) + next if $file eq 'aclocal.m4'; + + my $fullfile = File::Spec->canonpath ("$m4dir/$file"); +- &scan_file ($type, $fullfile, 'aclocal'); ++ scan_file ($type, $fullfile, 'aclocal'); + } + closedir (DIR); + } +@@ -362,12 +388,12 @@ sub scan_m4_files () + { + # First, scan configure.ac. It may contain macro definitions, + # or may include other files that define macros. +- &scan_file (FT_USER, $configure_ac, 'aclocal'); ++ scan_file (FT_USER, $configure_ac, 'aclocal'); + + # Then, scan acinclude.m4 if it exists. + if (-f 'acinclude.m4') + { +- &scan_file (FT_USER, 'acinclude.m4', 'aclocal'); ++ scan_file (FT_USER, 'acinclude.m4', 'aclocal'); + } + + # Finally, scan all files in our search paths. +@@ -381,7 +407,7 @@ sub scan_m4_files () + my $search = "sub search {\nmy \$found = 0;\n"; + foreach my $key (reverse sort keys %map) + { +- $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key ++ $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key + . '"); $found = 1; }' . "\n"); + } + $search .= "return \$found;\n};\n"; +@@ -404,7 +430,7 @@ sub add_macro ($) + + verb "saw macro $macro"; + $macro_seen{$macro} = 1; +- &add_file ($map{$macro}); ++ add_file ($map{$macro}); + } + + # scan_configure_dep ($file) +@@ -466,7 +492,7 @@ sub scan_configure_dep ($) + } + + add_macro ($_) foreach (@rlist); +- &scan_configure_dep ($_) foreach @ilist; ++ scan_configure_dep ($_) foreach @ilist; + } + + # add_file ($FILE) +@@ -933,7 +959,7 @@ General help using GNU software: . + } + + # Print version and exit. +-sub version() ++sub version () + { + print < +Date: Sat, 24 Dec 2016 16:53:23 -0500 +Subject: install-sh: avoid (low risk) race in /tmp + +Backport of Pavel Raiskup's patch to fix install-sh race in /tmp + +Ensure that nobody can cross privilege boundaries by pre-creating +symlink on '$tmpdir' path. + +Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not +safe because '/tmp' directory is usually world-writeable and +'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by +attacker (at least for shells where $RANDOM is not supported). +So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. +This step would fail early if somebody wanted catch us. + +Note that systems that implement (and have enabled) +fs.protected_symlinks kernel feature are not affected even without +this commit. + +References: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 +https://bugzilla.redhat.com/show_bug.cgi?id=1140725 + +* lib/install-sh: Implement safer 'mkdir -p' test by running +'$mkdirprog $mkdir_mode "$tmpdir"' first. +--- + lib/install-sh | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/lib/install-sh b/lib/install-sh +index a9244eb..34f2f1b 100755 +--- a/lib/install-sh ++++ b/lib/install-sh +@@ -345,34 +345,41 @@ do + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) ++ # $RANDOM is not portable (e.g. dash); use it when possible to ++ # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + ++ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so ++ # create the $tmpdir first (and fail if unsuccessful) to make sure ++ # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && +- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 ++ $mkdirprog $mkdir_mode "$tmpdir" && ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +- ls_ld_tmpdir=`ls -ld "$tmpdir"` ++ test_tmpdir="$tmpdir/a" ++ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && +- $mkdirprog -m$different_mode -p -- "$tmpdir" && { +- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` ++ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi +- rmdir "$tmpdir/d" "$tmpdir" ++ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null ++ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; diff -Nru automake1.11-1.11.6/debian/patches/01-texi-rename.diff automake1.11-1.11.6/debian/patches/01-texi-rename.diff --- automake1.11-1.11.6/debian/patches/01-texi-rename.diff 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/01-texi-rename.diff 2016-12-24 21:58:25.000000000 +0000 @@ -1,11 +1,15 @@ From: Eric Dorland +Date: Sat, 24 Dec 2016 10:58:25 -0500 Subject: texi file rename for multiple automake versions -Last-Update: 2012-02-05 -Index: automake1.11/doc/automake.texi -=================================================================== ---- automake1.11.orig/doc/automake.texi 2012-02-04 21:24:38.000000000 -0500 -+++ automake1.11/doc/automake.texi 2012-02-05 01:36:25.383241991 -0500 +--- + doc/automake.texi | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/doc/automake.texi b/doc/automake.texi +index 1059fc1..10b605e 100644 +--- a/doc/automake.texi ++++ b/doc/automake.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @@ -16,7 +20,7 @@ @setchapternewpage off @c %**end of header -@@ -40,13 +40,13 @@ +@@ -40,13 +40,13 @@ section entitled ``GNU Free Documentation License.'' @dircategory Software development @direntry diff -Nru automake1.11-1.11.6/debian/patches/02-compile_f90_c_cxx-fix.diff automake1.11-1.11.6/debian/patches/02-compile_f90_c_cxx-fix.diff --- automake1.11-1.11.6/debian/patches/02-compile_f90_c_cxx-fix.diff 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/02-compile_f90_c_cxx-fix.diff 2016-12-24 21:58:25.000000000 +0000 @@ -1,3 +1,11 @@ +From: Eric Dorland +Date: Sat, 24 Dec 2016 10:58:25 -0500 +Subject: compile_f90_c_cxx-fix + +--- + tests/compile_f90_c_cxx.test | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test index 21ed65d..b2ec0fd 100755 --- a/tests/compile_f90_c_cxx.test diff -Nru automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff --- automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff 2016-12-24 21:58:25.000000000 +0000 @@ -1,5 +1,13 @@ +From: Eric Dorland +Date: Sat, 24 Dec 2016 10:58:25 -0500 +Subject: texinfo-fix-itemx + +--- + doc/automake.texi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + diff --git a/doc/automake.texi b/doc/automake.texi -index 1059fc1..a553772 100644 +index 10b605e..a4373aa 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -13089,7 +13089,7 @@ nicely. Conditionals, Locations, Variable and Rule definitions, diff -Nru automake1.11-1.11.6/debian/patches/series automake1.11-1.11.6/debian/patches/series --- automake1.11-1.11.6/debian/patches/series 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/series 2016-12-24 21:58:25.000000000 +0000 @@ -1,3 +1,6 @@ 01-texi-rename.diff 02-compile_f90_c_cxx-fix.diff 03-texinfo-fix-itemx.diff +0004-Fix-unescaped-left-brace.patch +0005-aclocal-declare-function-prototypes-do-not-use-in-fu.patch +0006-install-sh-avoid-low-risk-race-in-tmp.patch diff -Nru automake1.11-1.11.6/debian/rules automake1.11-1.11.6/debian/rules --- automake1.11-1.11.6/debian/rules 2014-10-20 00:14:05.000000000 +0000 +++ automake1.11-1.11.6/debian/rules 2016-12-24 21:58:25.000000000 +0000 @@ -5,7 +5,7 @@ infodir=doc %: - dh $@ + dh $@ --without autoreconf override_dh_auto_test: # Don't run the test suite, it's old and fails.