FYI: Fix copy-with-tar invocations [libtool--release--2.0--patch-55]

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to branch-1-4, branch-2-0 and HEAD.

  * looking for address@hidden/libtool--release--2.0--patch-54 to compare with
  * comparing to address@hidden/libtool--release--2.0--patch-54
  M  libltdl/Makefile.am
  M  libtoolize.m4sh
  M  ChangeLog
  M  libltdl/loaders/Makefile.am
  
  * modified files
  
  Index: Changelog
  from  Gary V. Vaughan  <address@hidden>
  
        * libltdl/Makefile.am (install-data-local): Don't force v7 tar
        format with the `o' flag in create mode.
        Set the umask to 0 when untarring to avoid copied files taking
        their mode from the installer's umask.
        * libltdl/loaders/Makefile.am (install-data-local): Ditto.
        * libtoolize.m4sh (func_copy_cb): Ditto.
        Ignore errors from failed `cd' in the tar processes, since we
        may be running in dryrun mode.
        Reported by Noah Misch <address@hidden>,
        Bob Friesenhahn <address@hidden>
  
  --- orig/libltdl/Makefile.am
  +++ mod/libltdl/Makefile.am
  @@ -67,7 +67,9 @@
   ## These are installed as a subdirectory of pkgdatadir so that
   ## libtoolize --ltdl can find them later:
   ltdldatadir          = $(pkgdatadir)/libltdl
  -ltdldatafiles                = COPYING.LIB Makefile.am README configure.ac \
  +ltdldatafiles                = COPYING.LIB README \
  +                       Makefile.am Makefile.in \
  +                       configure.ac configure \
                          $(libltdl_la_SOURCES) \
                          lt__dirent.c libltdl/lt__dirent.h \
                             lt__strl.c libltdl/lt__strl.h \
  @@ -77,8 +79,8 @@
   ## with libtoolize, we have to preserve their timestamps carefully:
   install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
  -     ( cd $(srcdir) && $(AMTAR) chof - $(ltdldatafiles); ) \
  -       | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
  +     ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
  +       | ( umask 0; cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
   
   ## Make sure these will be cleaned even when they're not built by default:
   CLEANFILES           = libltdl.la libltdlc.la libdlloader.la
  
  
  --- orig/libltdl/loaders/Makefile.am
  +++ mod/libltdl/loaders/Makefile.am
  @@ -47,12 +47,14 @@
   ## These are installed as a subdirectory of pkgdatadir so that
   ## libtoolize --ltdl can find them later:
   ltdldatadir          = $(pkgdatadir)/libltdl/loaders
  -ltdldatafiles                = Makefile.am dld_link.c dlopen.c dyld.c \
  +ltdldatafiles                = Makefile.am Makefile.in \
  +                       dld_link.c dlopen.c dyld.c \
                          load_add_on.c loadlibrary.c shl_load.c
   
   ## To avoid spurious reconfiguration when the user installs these files
   ## with libtoolize, we have to preserve their timestamps carefully:
   install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
  -     ( cd $(srcdir) && $(AMTAR) chof - $(ltdldatafiles); ) \
  -       | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
  +     ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
  +       | ( umask 0; cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
  +
  
  
  --- orig/libtoolize.m4sh
  +++ mod/libtoolize.m4sh
  @@ -230,8 +230,9 @@
       if $opt_link && $LN_S "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
         $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
         copy_return_status=0
  -    elif { ( cd "$my_srcdir" && $TAR chof - "$my_file" 2> /dev/null; ) \
  -        | ( cd "$my_destdir" && "$TAR" xf - > /dev/null 2>&1; ) } ; then
  +    elif { ( cd "$my_srcdir" 2>/dev/null && $TAR chf - "$my_file" 2> 
/dev/null; ) \
  +        | ( umask 0; cd "$my_destdir" 2>/dev/null && "$TAR" xf - > /dev/null 
2>&1; ) }
  +    then
         $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
         copy_return_status=0
       elif $CP -p "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
  
  
  
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://tkd.kicks-ass.net
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFCMHiWFRMICSmD1gYRAlZTAJ4rDkq9kaDiFFSzHLt/9HAiMo33nQCdGIkU
sgf/lPZr8pak3NP0Am8lI3M=
=Sw3K
-----END PGP SIGNATURE-----