[Automake-commit] [SCM] GNU Automake branch, branch-1-9, updated. Release-1-9-6-9-g7ba6e84

[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=7ba6e84e89677cb24d504a070e9387cbc74f8747

The branch, branch-1-9 has been updated
       via  7ba6e84e89677cb24d504a070e9387cbc74f8747 (commit)
       via  365dc7e0b44579510f19f109f2db8d4a88891d0c (commit)
      from  be1c7641763ba148070891c44cfb3027aa433855 (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 7ba6e84e89677cb24d504a070e9387cbc74f8747
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Dec 8 22:31:37 2009 +0100

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

commit 365dc7e0b44579510f19f109f2db8d4a88891d0c
Author: Jim Meyering <address@hidden>
Date:   Tue Dec 1 21:48:07 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              |    8 ++++++++
 lib/am/distdir.am |    9 +++------
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0360a2..1bb240f 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.
+
 2005-10-17  Stepan Kasal  <address@hidden>
 
        * doc/automake.texi (Program and Library Variables): Typo.
diff --git a/Makefile.in b/Makefile.in
index 68d236d..b7aa318 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -415,7 +415,8 @@ distdir: $(DISTFILES)
              || exit 1; \
          fi; \
        done
-       -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 bc26dbd..2a317b2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
 Bugs fixes in 1.9.6a:
+
+* Longstanding bugs:
+
+  - 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.
+
 
 Bugs fixed in 1.9.6:
 
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 151f5f0..b64b2de 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -192,11 +192,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.
@@ -209,7 +205,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