[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-51-ge7a59b3

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

The branch, branch-1.11 has been updated
       via  e7a59b3ed59ad4b43fe45b30611cb55608e53bb9 (commit)
       via  efb6899421e6a581445c3ed9ee7ff768975489ef (commit)
      from  942c6d5bc4f9cc6da65de4ea4310337929810941 (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 e7a59b3ed59ad4b43fe45b30611cb55608e53bb9
Merge: 942c6d5bc4f9cc6da65de4ea4310337929810941 
efb6899421e6a581445c3ed9ee7ff768975489ef
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Nov 30 22:38:11 2009 +0100

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog          |    8 ++++++++
 Makefile.in        |    3 ++-
 lib/am/distdir.am  |    9 +++------
 tests/subpkg4.test |    2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8be4c1d..5bea33b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+       * tests/subpkg4.test (test-distdir-is-readable): Check for new,
+       more restricted permissions.
+
 2009-11-29  Karl Berry  <address@hidden>
 
        Rewrite `gnupload --help' examples.
diff --git a/Makefile.in b/Makefile.in
index 18e1f5d..a255d32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -570,7 +570,8 @@ distdir: $(DISTFILES)
          top_distdir="$(top_distdir)" distdir="$(distdir)" \
          dist-hook
        -test -n "$(am__skip_mode_fix)" \
-       || 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 $(install_sh) -c -m a+r {} {} \; \
diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index e3294fb..dcaed5e 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -279,11 +279,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.
@@ -301,7 +297,8 @@ endif %?DIST-TARGETS%
 ##
 if %?TOPDIR_P%
        -test -n "$(am__skip_mode_fix)" \
-       || 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 $(install_sh) -c -m a+r {} {} \; \
diff --git a/tests/subpkg4.test b/tests/subpkg4.test
index 8e8371b..1a6835a 100755
--- a/tests/subpkg4.test
+++ b/tests/subpkg4.test
@@ -24,7 +24,7 @@ set -e
 cat >Makefile.am <<'END'
 SUBDIRS = subpkg
 test-distdir-is-readable:
-       bad_dirs=`find $(distdir) -type d ! -perm -777 -print`; \
+       bad_dirs=`find $(distdir) -type d ! -perm -755 -print`; \
        if test -n "$$bad_dirs"; then \
          echo "directories not permissive: $$bad_dirs" >&2; \
          exit 1; \


hooks/post-receive
-- 
GNU Automake