This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] PR other/43620: Update to Automake 1.11.1.


On Thu, 1 Apr 2010, Ralf Wildenhues wrote:

> Current GCC trunk will likely not upload to gnu.org which checks for
> presence of an Automake 'make dist' rule security bug (GCC doesn't use
> this rule).  See here:
> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43620
> http://sourceware.org/ml/binutils/2010-03/msg00452.html
> 
> There are a few alternative ways out for trunk:
> 1) remove all automake-generated dist rules from the build tree, GCC
>    doesn't use them anyway,
> 2) upgrade to Automake 1.11.1,
> 3) convince gnu.org admins to reconsider the upload rules.
> 
> Patch below implements (2).  I will also post another patch that
> implements (1) instead.  I consider both of them equally safe (haven't
> heard of a regression of 1.11.1 over 1.11 yet), but (1) changes libjava,
> classpath, libltdl, which are all upstream sources, and the changes are
> not supposed for upstream (because they might actually want to use 'make
> dist').
> 
> Below shown is only the non-regenerated part of the patch; attached find
> the complete patch, gzip'ed.  The only part of this patch which isn't
> completely trivial (yeah, famous last words) is that Automake 1.11.1
> fixed AM_PROG_GCJ to use AC_CHECK_TOOLS instead of AC_CHECK_PROG for
> finding gcj; but since the toplevel Makefile will export $(GCJ) in any
> case, that shouldn't have any impact.
> 
> Bootstrapping finished, I've started a regtest but I don't see in which
> way this patch could cause any fail at all (and it won't finish before
> midnight over here).
> 
> OK to commit?

I'm ok with updating trunk to 1.11.1 from a RM perspective but
can't approve the patch.  Paolo?

Thanks,
Richard.

> binutils will update to 1.11.1 too, apparently:
> http://sourceware.org/ml/binutils/2010-03/msg00444.html
> I guess I'll be checking gdb too.
> 
> Thanks,
> Ralf
> 
> Update to Automake 1.11.1.
> 
> gcc/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* doc/install.texi (Prerequisites): Bump Automake version to 1.11.1.
> 	* aclocal.m4: Regenerate.
> 
> ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* lto-plugin/Makefile.in: Regenerate.
> 	* lto-plugin/aclocal.m4: Regenerate.
> 
> intl/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* aclocal.m4: Regenerate.
> 
> boehm-gc/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* include/Makefile.in: Regenerate.
> 
> fixincludes/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* aclocal.m4: Regenerate.
> 
> libcpp/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* aclocal.m4: Regenerate.
> 
> libdecnumber/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* aclocal.m4: Regenerate.
> 
> libffi/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* include/Makefile.in: Regenerate.
> 	* man/Makefile.in: Regenerate.
> 	* testsuite/Makefile.in: Regenerate.
> 
> libgfortran/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 
> libgomp/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* testsuite/Makefile.in: Regenerate.
> 
> libjava/classpath/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* HACKING: Update required Automake version.
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* doc/Makefile.in: Regenerate.
> 	* doc/api/Makefile.in: Regenerate.
> 	* examples/Makefile.in: Regenerate.
> 	* external/Makefile.in: Regenerate.
> 	* external/jsr166/Makefile.in: Regenerate.
> 	* external/relaxngDatatype/Makefile.in: Regenerate.
> 	* external/sax/Makefile.in: Regenerate.
> 	* external/w3c_dom/Makefile.in: Regenerate.
> 	* include/Makefile.in: Regenerate.
> 	* lib/Makefile.in: Regenerate.
> 	* native/Makefile.in: Regenerate.
> 	* native/fdlibm/Makefile.in: Regenerate.
> 	* native/jawt/Makefile.in: Regenerate.
> 	* native/jni/Makefile.in: Regenerate.
> 	* native/jni/classpath/Makefile.in: Regenerate.
> 	* native/jni/gconf-peer/Makefile.in: Regenerate.
> 	* native/jni/gstreamer-peer/Makefile.in: Regenerate.
> 	* native/jni/gtk-peer/Makefile.in: Regenerate.
> 	* native/jni/java-io/Makefile.in: Regenerate.
> 	* native/jni/java-lang/Makefile.in: Regenerate.
> 	* native/jni/java-math/Makefile.in: Regenerate.
> 	* native/jni/java-net/Makefile.in: Regenerate.
> 	* native/jni/java-nio/Makefile.in: Regenerate.
> 	* native/jni/java-util/Makefile.in: Regenerate.
> 	* native/jni/midi-alsa/Makefile.in: Regenerate.
> 	* native/jni/midi-dssi/Makefile.in: Regenerate.
> 	* native/jni/native-lib/Makefile.in: Regenerate.
> 	* native/jni/qt-peer/Makefile.in: Regenerate.
> 	* native/jni/xmlj/Makefile.in: Regenerate.
> 	* native/plugin/Makefile.in: Regenerate.
> 	* resource/Makefile.in: Regenerate.
> 	* scripts/Makefile.in: Regenerate.
> 	* tools/Makefile.in: Regenerate.
> 
> libjava/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* configure: Regenerate.
> 	* gcj/Makefile.in: Regenerate.
> 	* include/Makefile.in: Regenerate.
> 	* testsuite/Makefile.in: Regenerate.
> 
> libjava/libltdl/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 
> libmudflap/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* testsuite/Makefile.in: Regenerate.
> 
> libobjc/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* aclocal.m4: Regenerate.
> 
> libssp/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 
> libstdc++-v3/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 	* doc/Makefile.in: Regenerate.
> 	* include/Makefile.in: Regenerate.
> 	* libsupc++/Makefile.in: Regenerate.
> 	* po/Makefile.in: Regenerate.
> 	* python/Makefile.in: Regenerate.
> 	* src/Makefile.in: Regenerate.
> 	* testsuite/Makefile.in: Regenerate.
> 
> zlib/ChangeLog:
> 2010-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	* Makefile.in: Regenerate.
> 	* aclocal.m4: Regenerate.
> 
> diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
> index 7c81314..e633df4 100644
> --- a/gcc/doc/install.texi
> +++ b/gcc/doc/install.texi
> @@ -374,7 +374,7 @@ not installed in your default library search patch.
>  Necessary when modifying @file{configure.ac}, @file{aclocal.m4}, etc.@:
>  to regenerate @file{configure} and @file{config.in} files.
>  
> -@item automake version 1.11
> +@item automake version 1.11.1
>  
>  Necessary when modifying a @file{Makefile.am} file to regenerate its
>  associated @file{Makefile.in}.
> @@ -385,7 +385,7 @@ file.  Specifically this applies to the @file{gcc}, @file{intl},
>  as any of their subdirectories.
>  
>  For directories that use automake, GCC requires the latest release in
> -the 1.11 series, which is currently 1.11.  When regenerating a directory
> +the 1.11 series, which is currently 1.11.1.  When regenerating a directory
>  to a newer version, please update all the directories using an older 1.11
>  to the latest released version.
>  
> diff --git a/libjava/HACKING b/libjava/HACKING
> index fa38027..3e99bed 100644
> --- a/libjava/HACKING
> +++ b/libjava/HACKING
> @@ -91,7 +91,7 @@ To import a new release:
>      in the classpath/ChangeLog.gcj file.
>     (Don't forget to svn resolved files.)
>  - Use auto* to create configure, Makefile.in, etc
> -  Make sure you have Automake 1.11 installed. Exactly that version!
> +  Make sure you have Automake 1.11.1 installed. Exactly that version!
>    You have to make sure to use the gcc libtool.m4 and gcc lt* scripts
>    cd .../classpath
>    cp ../../lt* .
> 

-- 
Richard Guenther <rguenther@suse.de>
Novell / SUSE Labs
SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 - GF: Markus Rex


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]