[120077] branches/release_2_3/base
cal at macports.org
cal at macports.org
Wed May 14 16:02:08 PDT 2014
Revision: 120077
https://trac.macports.org/changeset/120077
Author: cal at macports.org
Date: 2014-05-14 16:02:08 -0700 (Wed, 14 May 2014)
Log Message:
-----------
Merge r120074 from trunk and regenerate configure:
base: aclocal.m4: use umask 0022 when extracting vendor tarballs
Conflicts resolved by backporting the change.
Revision Links:
--------------
https://trac.macports.org/changeset/120074
Modified Paths:
--------------
branches/release_2_3/base/aclocal.m4
branches/release_2_3/base/configure
Property Changed:
----------------
branches/release_2_3/base/
Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/release_2_3/base/aclocal.m4
===================================================================
--- branches/release_2_3/base/aclocal.m4 2014-05-14 22:59:06 UTC (rev 120076)
+++ branches/release_2_3/base/aclocal.m4 2014-05-14 23:02:08 UTC (rev 120077)
@@ -116,7 +116,7 @@
mp_tarball_vendordir="$(dirname "$mp_tarball")"
AS_MKDIR_P(["$mp_tarball_vendordir"])
AC_MSG_NOTICE([=== extracting $mp_tarball])
- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
+ (cd "$mp_tarball_vendordir"; umask 0022; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
fi
if ! test -d "$ac_dir"; then
AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
Modified: branches/release_2_3/base/configure
===================================================================
--- branches/release_2_3/base/configure 2014-05-14 22:59:06 UTC (rev 120076)
+++ branches/release_2_3/base/configure 2014-05-14 23:02:08 UTC (rev 120077)
@@ -9524,7 +9524,7 @@
as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
{ $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
$as_echo "$as_me: === extracting $mp_tarball" >&6;}
- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ (cd "$mp_tarball_vendordir"; umask 0022; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
fi
if ! test -d "$ac_dir"; then
as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
@@ -9842,7 +9842,7 @@
as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
{ $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
$as_echo "$as_me: === extracting $mp_tarball" >&6;}
- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ (cd "$mp_tarball_vendordir"; umask 0022; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
fi
if ! test -d "$ac_dir"; then
as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
@@ -10157,7 +10157,7 @@
as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
{ $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
$as_echo "$as_me: === extracting $mp_tarball" >&6;}
- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ (cd "$mp_tarball_vendordir"; umask 0022; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
fi
if ! test -d "$ac_dir"; then
as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140514/76df1a43/attachment.html>
More information about the macports-changes
mailing list