[59813] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Thu Oct 22 19:41:37 PDT 2009
Revision: 59813
http://trac.macports.org/changeset/59813
Author: blb at macports.org
Date: 2009-10-22 19:41:34 -0700 (Thu, 22 Oct 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/images-and-archives/base/doc/macports.conf.in
branches/images-and-archives/base/src/darwintracelib1.0/Makefile
branches/images-and-archives/base/src/macports1.0/macports.tcl
branches/images-and-archives/base/src/pextlib1.0/sha256cmd.c
branches/images-and-archives/base/src/port/port.tcl
branches/images-and-archives/base/src/port1.0/portutil.tcl
branches/images-and-archives/base/src/registry1.0/portuninstall.tcl
branches/images-and-archives/base/src/registry1.0/registry.tcl
branches/images-and-archives/base/tests/Makefile
branches/images-and-archives/base/tests/test/case-insensitive-deactivate/Makefile
branches/images-and-archives/base/tests/test/checksums-1/master
branches/images-and-archives/base/tests/test/cvs-and-patchsites/master
branches/images-and-archives/base/tests/test/dependencies-c/master
branches/images-and-archives/base/tests/test/dependencies-d/master
branches/images-and-archives/base/tests/test/dependencies-e/master
branches/images-and-archives/base/tests/test/envvariables/master
branches/images-and-archives/base/tests/test/site-tags/master
branches/images-and-archives/base/tests/test/trace/master
branches/images-and-archives/base/tests/test/universal-2/master
branches/images-and-archives/base/tests/test/variants/master
branches/images-and-archives/base/tests/test/xcodeversion/master
Added Paths:
-----------
branches/images-and-archives/base/tests/test/dependencies-e/error_expected
Property Changed:
----------------
branches/images-and-archives/base/
branches/images-and-archives/base/portmgr/fedora/
Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/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:50249-59431
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/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:50249-59811
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/images-and-archives/base/doc/macports.conf.in
===================================================================
--- branches/images-and-archives/base/doc/macports.conf.in 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/doc/macports.conf.in 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,7 +1,7 @@
# MacPorts system wide configuration file
# $Id$
-# Set the directory in which to install ports
+# Set the directory in which to install ports. Must match where MacPorts itself is installed.
prefix @prefix_expanded@
# Set the user to run MacPorts compiles, etc as when privileges are dropped during an install
@@ -12,7 +12,7 @@
# Type of storage to use for the port registry information, "flat" or "sqlite"
# NOTE: sqlite not yet supported.
-portdbformat flat
+#portdbformat flat
# PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default
# paths are given in the example; it need not be uncommented. Customizing binpath is intended for advanced users only.
@@ -36,22 +36,22 @@
# CPU architecture to compile for. Defaults to i386 or ppc on Mac OS X 10.5
# and earlier, depending on the CPU type detected at runtime. On Mac OS X 10.6
# the default is x86_64 if the CPU supports it, i386 otherwise.
-#build_arch i386
+#build_arch @host_cpu@
# CPU architectures to use for Universal Binaries (+universal variant)
universal_archs @UNIVERSAL_ARCHS@
# Use ccache (C/C++ compiler cache) - see http://ccache.samba.org/
-configureccache no
+#configureccache no
# Use distcc (distributed compiler) - see http://distcc.samba.org/
-configuredistcc no
+#configuredistcc no
# Use pipes rather than intermediate files when compiling C/C++/etc
-configurepipe no
+#configurepipe yes
# Lowered scheduling priority (0-20) to use for make when building ports
-buildnicevalue 0
+#buildnicevalue 0
# Number of simultaneous make jobs (commands) to use when building ports. This
# value may be set to 0 so the number of simultaneous make jobs will be set to
@@ -59,8 +59,11 @@
# of physical memory plus one, whichever is less.
#buildmakejobs 0
+# umask value to use when a port installs its files
+#destroot_umask 022
+
# Set whether to automatically execute "clean" after "install" of ports
-portautoclean yes
+#portautoclean yes
# Rsync server to fetch MacPorts sources from. Note that this is only used
# for selfupdate. The source(s) for the ports tree are set in sources.conf.
@@ -68,13 +71,13 @@
# for the current list):
# rsync.macports.org - California, USA (master)
# trd.no.rsync.macports.org - Trondheim, Norway
-rsync_server rsync.macports.org
+#rsync_server rsync.macports.org
# Rsync directory from which to pull the base/ component (infrastructure) of MacPorts
-rsync_dir release/base/
+#rsync_dir release/base/
# Rsync options
-rsync_options -rtzv --delete-after
+#rsync_options -rtzv --delete-after
# Options for generated startup items
# startupitem_type may be "default", "systemstarter", "launchd", or "none";
@@ -83,7 +86,7 @@
# launchd, while older Mac OS X systems will default to systemstarter. If
# option "none" is chosen, port startupitems are ignored and no startupitems
# are installed.
-startupitem_type default
+#startupitem_type default
# Extra environment variables to keep. Any variables listed here are added
# to the list of variables that are not removed from the environment used
Property changes on: branches/images-and-archives/base/portmgr/fedora
___________________________________________________________________
Modified: svn:ignore
- macports.spec
+
Modified: branches/images-and-archives/base/src/darwintracelib1.0/Makefile
===================================================================
--- branches/images-and-archives/base/src/darwintracelib1.0/Makefile 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/darwintracelib1.0/Makefile 2009-10-23 02:41:34 UTC (rev 59813)
@@ -2,6 +2,8 @@
SHLIB_NAME= darwintrace${SHLIB_SUFFIX}
INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
+test::
+
include ../../Mk/macports.autoconf.mk
all:: ${SHLIB_NAME}
Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-10-23 02:41:34 UTC (rev 59813)
@@ -600,7 +600,7 @@
set macports::configuredistcc no
}
if {![info exists macports::configurepipe]} {
- set macports::configurepipe no
+ set macports::configurepipe yes
}
# Default mp build options
@@ -2052,6 +2052,9 @@
array unset portinfo
array set portinfo [lindex $res 1]
if {![info exists portinfo(porturl)]} {
+ if {![macports::ui_isset ports_debug]} {
+ ui_msg ""
+ }
ui_error "Dependency '$dep_portname' not found."
return 1
}
Modified: branches/images-and-archives/base/src/pextlib1.0/sha256cmd.c
===================================================================
--- branches/images-and-archives/base/src/pextlib1.0/sha256cmd.c 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/pextlib1.0/sha256cmd.c 2009-10-23 02:41:34 UTC (rev 59813)
@@ -49,6 +49,15 @@
#define COMMON_DIGEST_FOR_OPENSSL
#include <CommonCrypto/CommonDigest.h>
+/* Tiger compatibility */
+#ifndef SHA256_DIGEST_LENGTH
+#define SHA256_DIGEST_LENGTH CC_SHA256_DIGEST_LENGTH
+#define SHA256_CTX CC_SHA256_CTX
+#define SHA256_Init(c) CC_SHA256_Init(c)
+#define SHA256_Update(c,d,l) CC_SHA256_Update(c,d,l)
+#define SHA256_Final(m, c) CC_SHA256_Final(m,c)
+#endif
+
#include "md_wrappers.h"
CHECKSUMEnd(SHA256_, SHA256_CTX, SHA256_DIGEST_LENGTH)
CHECKSUMFile(SHA256_, SHA256_CTX)
Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/port/port.tcl 2009-10-23 02:41:34 UTC (rev 59813)
@@ -78,11 +78,10 @@
set cmds "$cmds$new"
}
- set cmdText [string range "
-Supported commands
+ set cmdText "Supported commands
------------------
$cmds
-" 1 end-1]
+"
set text {
Pseudo-portnames
@@ -116,7 +115,7 @@
porthier(7), portstyle(7). Also, see http://www.macports.org.
}
- puts "$cmdText $text"
+ puts "$cmdText$text"
}
@@ -3577,6 +3576,9 @@
set cmd_argc $argc
set cmd_argn 0
+# make sure we're using a sane umask
+umask 022
+
# If we've been invoked as portf, then the first argument is assumed
# to be the name of a command file (i.e., there is an implicit -F
# before any arguments).
Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1836,6 +1836,10 @@
ui_debug "adding the default universal variant"
variant universal {}
}
+
+ if {[variant_isset universal] && ![variant_exists universal]} {
+ ui_warn "[option name] has no universal variant"
+ }
}
# Target class definition.
@@ -2254,16 +2258,22 @@
# @param attributes the attributes for the file
proc fileAttrsAsRoot {file attributes} {
global euid macportsuser
- if {[getuid] == 0 && [geteuid] != 0} {
- # Started as root, but not root now
- seteuid $euid
- ui_debug "euid changed to: [geteuid]"
- ui_debug "setting attributes on $file"
- eval file attributes {$file} $attributes
- seteuid [name_to_uid "$macportsuser"]
- ui_debug "euid changed to: [geteuid]"
+ if {[getuid] == 0} {
+ if {[geteuid] != 0} {
+ # Started as root, but not root now
+ seteuid $euid
+ ui_debug "euid changed to: [geteuid]"
+ ui_debug "setting attributes on $file"
+ eval file attributes {$file} $attributes
+ seteuid [name_to_uid "$macportsuser"]
+ ui_debug "euid changed to: [geteuid]"
+ } else {
+ eval file attributes {$file} $attributes
+ }
} else {
- eval file attributes {$file} $attributes
+ # not root, so can't set owner/group
+ set permissions [lindex $attributes [expr [lsearch $attributes "-permissions"] + 1]]
+ file attributes $file -permissions $permissions
}
}
Modified: branches/images-and-archives/base/src/registry1.0/portuninstall.tcl
===================================================================
--- branches/images-and-archives/base/src/registry1.0/portuninstall.tcl 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/registry1.0/portuninstall.tcl 2009-10-23 02:41:34 UTC (rev 59813)
@@ -48,7 +48,7 @@
if { [llength $ilist] > 1 } {
set portname [lindex [lindex $ilist 0] 0]
ui_msg "$UI_PREFIX [msgcat::mc "The following versions of $portname are currently installed:"]"
- foreach i $ilist {
+ foreach i [portlist_sortint $ilist] {
set iname [lindex $i 0]
set iversion [lindex $i 1]
set irevision [lindex $i 2]
Modified: branches/images-and-archives/base/src/registry1.0/registry.tcl
===================================================================
--- branches/images-and-archives/base/src/registry1.0/registry.tcl 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/src/registry1.0/registry.tcl 2009-10-23 02:41:34 UTC (rev 59813)
@@ -618,6 +618,7 @@
global macports::prefix
set files [list]
+ set timestamp [clock seconds]
# This is big and hairy and probably could be done better.
# First, we need to check the source file, make sure it exists
@@ -638,8 +639,6 @@
set port [registry::file_registered $file]
- set timestamp [clock seconds]
-
if { $port != 0 && $force != 1 && $port != $name } {
return -code error "Image error: $file is being used by the active $port port. Please deactivate this port first, or use 'port -f activate $name' to force the activation."
} elseif { [file exists $file] && $force != 1 } {
Modified: branches/images-and-archives/base/tests/Makefile
===================================================================
--- branches/images-and-archives/base/tests/Makefile 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/Makefile 2009-10-23 02:41:34 UTC (rev 59813)
@@ -21,15 +21,14 @@
cp sources.conf /tmp/macports-tests/opt/local/etc/macports/
/tmp/macports-tests/ports/PortIndex: /tmp/macports-tests/opt/local/etc/macports/sources.conf PortIndex
- cp PortIndex /tmp/macports-tests/ports/PortIndex
+ cp PortIndex PortIndex.quick /tmp/macports-tests/ports/
PortIndex:
$(bindir)/portindex
clean:
rm -rf /tmp/macports-tests/
- rm -f PortIndex
- rm -f PortIndex.quick
+ rm -f PortIndex PortIndex.quick
for testname in $(TESTS); do \
rm -f test/$$testname/{output,output.sed,difference,work}; \
done
@@ -52,7 +51,7 @@
( cd $$subdir && \
PORTSRC=$(PWD)/test-macports.conf $(bindir)/port clean > /dev/null && \
PORTSRC=$(PWD)/test-macports.conf $(bindir)/port test > output 2>&1 \
- || (cat output; exit 1) && \
+ || ([ -e error_expected ] || (cat output; exit 1)) && \
sed -e "s|${PWD}|PWD|g" < output > output.sed && \
diff output.sed master 2>&1 | tee difference && \
if [ -s difference ]; then \
@@ -63,7 +62,7 @@
fi || exit 1; \
done
@rm -rf /tmp/macports-tests/
- @rm -f PortIndex
+ @rm -f PortIndex PortIndex.quick
# Run specific test
# Prepend the directory name with "test-" and use it as target
Modified: branches/images-and-archives/base/tests/test/case-insensitive-deactivate/Makefile
===================================================================
--- branches/images-and-archives/base/tests/test/case-insensitive-deactivate/Makefile 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/case-insensitive-deactivate/Makefile 2009-10-23 02:41:34 UTC (rev 59813)
@@ -14,13 +14,13 @@
test:
@echo port install $(TESTPORT1)
@sed 's/@name@/$(TESTPORT1)/' Portfile.in > Portfile
- @PORTSRC=$(PORTSRC) $(bindir)/port -x install > output 2>&1 || (cat output; exit 1)
+ @PORTSRC=$(PORTSRC) $(bindir)/port install > output 2>&1 || (cat output; exit 1)
@if [ ! -f $(TESTFILE) ]; then \
echo "FAILED: File should exist after install: $(TESTFILE)" && exit 1; \
fi
@echo port uninstall $(TESTPORT2)
@sed 's/@name@/$(TESTPORT2)/' Portfile.in > Portfile
- @PORTSRC=$(PORTSRC) $(bindir)/port -x uninstall > output 2>&1 || (cat output; exit 1)
+ @PORTSRC=$(PORTSRC) $(bindir)/port uninstall > output 2>&1 || (cat output; exit 1)
@if [ -f $(TESTFILE) ]; then \
rm $(TESTFILE); \
echo "FAILED: File should NOT exist after uninstall: $(TESTFILE)" && exit 1; \
Modified: branches/images-and-archives/base/tests/test/checksums-1/master
===================================================================
--- branches/images-and-archives/base/tests/test/checksums-1/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/checksums-1/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for checksum
---> Fetching checksum
---> Verifying checksum(s) for checksum
---> Extracting checksum
Modified: branches/images-and-archives/base/tests/test/cvs-and-patchsites/master
===================================================================
--- branches/images-and-archives/base/tests/test/cvs-and-patchsites/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/cvs-and-patchsites/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for cvs-and-patchsites
---> Fetching cvs-and-patchsites
---> Attempting to fetch patch-1.5.14.dgc.xlabel_ext.9 from http://home.uchicago.edu/~dgc/sw/mutt/
---> Verifying checksum(s) for cvs-and-patchsites
Modified: branches/images-and-archives/base/tests/test/dependencies-c/master
===================================================================
--- branches/images-and-archives/base/tests/test/dependencies-c/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/dependencies-c/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for dependencies-c
---> Fetching dependencies-b
---> Verifying checksum(s) for dependencies-b
---> Extracting dependencies-b
Modified: branches/images-and-archives/base/tests/test/dependencies-d/master
===================================================================
--- branches/images-and-archives/base/tests/test/dependencies-d/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/dependencies-d/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,5 +1,6 @@
Warning: depends option is not handled yet
Warning: depends option is not handled yet
+---> Computing dependencies for dependencies-d
---> Fetching dependencies-b
---> Verifying checksum(s) for dependencies-b
---> Extracting dependencies-b
Modified: branches/images-and-archives/base/tests/test/dependencies-e/master
===================================================================
--- branches/images-and-archives/base/tests/test/dependencies-e/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/dependencies-e/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,2 +1,3 @@
+---> Computing dependencies for dependencies-e
Error: Dependency 'docbook-xml-4.1.2' not found.
Error: Status 1 encountered during processing.
Modified: branches/images-and-archives/base/tests/test/envvariables/master
===================================================================
--- branches/images-and-archives/base/tests/test/envvariables/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/envvariables/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for envvariables
---> Fetching envvariables
---> Verifying checksum(s) for envvariables
---> Extracting envvariables
Modified: branches/images-and-archives/base/tests/test/site-tags/master
===================================================================
--- branches/images-and-archives/base/tests/test/site-tags/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/site-tags/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for site-tags
---> Fetching site-tags
---> Attempting to fetch app-bm.tar.gz from http://www.douglas.stebila.ca/code/vim/app/
---> Attempting to fetch doc.tar.gz from http://www.douglas.stebila.ca/code/vim/doc/
Modified: branches/images-and-archives/base/tests/test/trace/master
===================================================================
--- branches/images-and-archives/base/tests/test/trace/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/trace/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for trace
---> Fetching trace
---> Verifying checksum(s) for trace
---> Extracting trace
Modified: branches/images-and-archives/base/tests/test/universal-2/master
===================================================================
--- branches/images-and-archives/base/tests/test/universal-2/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/universal-2/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,2 +1 @@
-no info for 'variants'
variants:
Modified: branches/images-and-archives/base/tests/test/variants/master
===================================================================
--- branches/images-and-archives/base/tests/test/variants/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/variants/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,5 +1,6 @@
Utopia platform -- 1
-Utopia platform -- 2
+Utopia platform -- 1
+---> Computing dependencies for variants
---> Fetching variants
---> Verifying checksum(s) for variants
---> Extracting variants
Modified: branches/images-and-archives/base/tests/test/xcodeversion/master
===================================================================
--- branches/images-and-archives/base/tests/test/xcodeversion/master 2009-10-23 02:33:08 UTC (rev 59812)
+++ branches/images-and-archives/base/tests/test/xcodeversion/master 2009-10-23 02:41:34 UTC (rev 59813)
@@ -1,3 +1,4 @@
+---> Computing dependencies for xcodeversion
---> Fetching xcodeversion
---> Verifying checksum(s) for xcodeversion
---> Extracting xcodeversion
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091022/5348b738/attachment-0001.html>
More information about the macports-changes
mailing list