[Automake-commit] [SCM] GNU Automake branch, branch-1-6, updated. Release-1-6-3-4-gdd64c78

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=dd64c78280dd12b4ad7a99502c78b13db447069a

The branch, branch-1-6 has been updated
       via  dd64c78280dd12b4ad7a99502c78b13db447069a (commit)
       via  e30bf87d9b0503a5e1a7d400597a63502b9a74e5 (commit)
      from  32686af46bcd2dc4067e8f9a84d1fbfcbcf57055 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd64c78280dd12b4ad7a99502c78b13db447069a
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Dec 8 22:33:21 2009 +0100

    Update NEWS.
    
    * NEWS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit e30bf87d9b0503a5e1a7d400597a63502b9a74e5
Author: Jim Meyering <address@hidden>
Date:   Tue Dec 1 22:48:15 2009 +0100

    do not put world-writable directories in distribution tarballs
    
    * lib/am/distdir.am (distdir): Do not make all directories
    group- or world-writable.  Instead, use 755.
    * NEWS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   11 +++++++++++
 Makefile.in       |    3 ++-
 NEWS              |    6 ++++++
 lib/am/distdir.am |    9 +++------
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aece1f7..2653b5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-08  Ralf Wildenhues  <address@hidden>
+
+       * NEWS: Update.
+
+2009-11-28  Jim Meyering  <address@hidden>
+
+       do not put world-writable directories in distribution tarballs
+       * lib/am/distdir.am (distdir): Do not make all directories
+       group- or world-writable.  Instead, use 755.
+       * NEWS: Update.
+
 2002-08-02  Alexandre Duret-Lutz  <address@hidden>
 
        * automake.texi (Python): Fix wording.
diff --git a/Makefile.in b/Makefile.in
index dd24a2d..595468b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -403,7 +403,8 @@ distdir: $(DISTFILES)
        $(MAKE) $(AM_MAKEFLAGS) \
          top_distdir="${top_distdir}" distdir="$(distdir)" \
          dist-info
-       -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       -find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} 
\; \
diff --git a/NEWS b/NEWS
index cab345f..b7f843d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+New in 1.6.3a:
+* The distribution is tarred up with mode 755 now by the `dist*' targets.
+  This fixes a race condition where untrusted users could modify files
+  in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
+  build directory was world-searchable.  This is CVE-2009-4029.
+
 New in 1.6.3:
 * Support for AM_INIT_GETTEXT([external])
 * Bug fixes, including:
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index d7b7fa0..c5736f0 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -147,11 +147,7 @@ if %?DIST-TARGETS%
 endif %?DIST-TARGETS%
 ##
 ## This complex find command will try to avoid changing the modes of
-## links into the source tree, in case they're hard-linked.  It will
-## also make directories writable by everybody, because some
-## brain-dead tar implementations change ownership and permissions of
-## a directory before extracting the files, thus becoming unable to
-## extract them.
+## links into the source tree, in case they're hard-linked.
 ##
 ## Ignore return result from chmod, because it might give an error
 ## if we chmod a symlink.
@@ -164,7 +160,8 @@ endif %?DIST-TARGETS%
 ## the file in place in the source tree.
 ##
 if %?TOPDIR_P%
-       -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       -find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} 
\; \


hooks/post-receive
-- 
GNU Automake