November 2009 - darwinbuild-changes

[642] releases/Darwin9
by source_changes＠macosforge.org 16 Nov '09

16 Nov '09

Revision: 642 http://trac.macosforge.org/projects/darwinbuild/changeset/642 Author: wsiegrist(a)apple.com Date: 2009-11-16 10:37:10 -0800 (Mon, 16 Nov 2009) Log Message: ----------- Merge owner changes from r640 to Darwin9 Revision Links: -------------- http://trac.macosforge.org/projects/darwinbuild/changeset/640 Modified Paths: -------------- releases/Darwin9/CHANGES releases/Darwin9/darwinbuild/darwinbuild.in Property Changed: ---------------- releases/Darwin9/ releases/Darwin9/darwinbuild/darwinbuild.in releases/Darwin9/darwinbuild/darwinmaster.sh.in releases/Darwin9/darwinbuild/installXcode.in releases/Darwin9/darwinbuild/packageRoots.sh.in releases/Darwin9/darwinbuild/thinPackages.sh.in Property changes on: releases/Darwin9 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /trunk:432-434,602 + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /trunk:432-434,602,640 Modified: releases/Darwin9/CHANGES =================================================================== --- releases/Darwin9/CHANGES 2009-11-16 16:57:37 UTC (rev 641) +++ releases/Darwin9/CHANGES 2009-11-16 18:37:10 UTC (rev 642) @@ -2,6 +2,8 @@ ----------------------------------- Release Darwin9 [Now] + - darwinbuild: create buildroot images with root/wheel ownership and + attach them with owners on (Ben Huntsman) - darwinup: add dyld to dependency copy list Release 0.8.0 [29-Oct-2009] Modified: releases/Darwin9/darwinbuild/darwinbuild.in =================================================================== --- releases/Darwin9/darwinbuild/darwinbuild.in 2009-11-16 16:57:37 UTC (rev 641) +++ releases/Darwin9/darwinbuild/darwinbuild.in 2009-11-16 18:37:10 UTC (rev 642) @@ -193,7 +193,7 @@ else echo "Creating build root disk image ..." DMGVOLUME="BuildRoot_${build}_${stamp}" - hdiutil create -size 1t -fs HFSX -quiet \ + hdiutil create -size 1t -fs HFSX -quiet -uid 0 -gid 0 \ -volname $DMGVOLUME \ $DMGFILE ln -s "/Volumes/${DMGVOLUME}" BuildRoot @@ -247,7 +247,7 @@ stat -L $BuildRoot >> /dev/null 2>&1 if [ $? -eq 1 ]; then echo "*** Attaching build root disk image ..." - hdiutil attach $DMGFILE -readwrite + hdiutil attach $DMGFILE -readwrite -owners on if [ $? -ne 0 ]; then echo "Error: Unable to attach sparse disk image"; exit 70 Property changes on: releases/Darwin9/darwinbuild/darwinbuild.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /trunk/darwinbuild/darwinbuild:432-434 /trunk/darwinbuild/darwinbuild.in:602 + /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /trunk/darwinbuild/darwinbuild:432-434 /trunk/darwinbuild/darwinbuild.in:602,640 Property changes on: releases/Darwin9/darwinbuild/darwinmaster.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /trunk/darwinbuild/darwinmaster.sh:432-434 /trunk/darwinbuild/darwinmaster.sh.in:602 + /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /trunk/darwinbuild/darwinmaster.sh:432-434 /trunk/darwinbuild/darwinmaster.sh.in:602,640 Property changes on: releases/Darwin9/darwinbuild/installXcode.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /trunk/darwinbuild/installXcode:432-434 /trunk/darwinbuild/installXcode.in:602 + /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /trunk/darwinbuild/installXcode:432-434 /trunk/darwinbuild/installXcode.in:602,640 Property changes on: releases/Darwin9/darwinbuild/packageRoots.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /trunk/darwinbuild/packageRoots.sh:432-434 /trunk/darwinbuild/packageRoots.sh.in:602 + /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /trunk/darwinbuild/packageRoots.sh:432-434 /trunk/darwinbuild/packageRoots.sh.in:602,640 Property changes on: releases/Darwin9/darwinbuild/thinPackages.sh.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /trunk/darwinbuild/thinPackages.sh:432-434 /trunk/darwinbuild/thinPackages.sh.in:602 + /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /trunk/darwinbuild/thinPackages.sh:432-434 /trunk/darwinbuild/thinPackages.sh.in:602,640

1 0

[641] trunk/CHANGES
by source_changes＠macosforge.org 16 Nov '09

16 Nov '09

Revision: 641 http://trac.macosforge.org/projects/darwinbuild/changeset/641 Author: wsiegrist(a)apple.com Date: 2009-11-16 08:57:37 -0800 (Mon, 16 Nov 2009) Log Message: ----------- CHANGES for r640 Revision Links: -------------- http://trac.macosforge.org/projects/darwinbuild/changeset/640 Modified Paths: -------------- trunk/CHANGES Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2009-11-16 16:51:50 UTC (rev 640) +++ trunk/CHANGES 2009-11-16 16:57:37 UTC (rev 641) @@ -1,6 +1,10 @@ Darwin Build Scripts Change History ----------------------------------- +Release 12 [Now] + - darwinbuild: create buildroot images with root/wheel ownership and + attach them with owners on (Ben Huntsman) + Release 11 [29-Oct-2009] - fetch libredo_prebinding from src.macosforge.org if not found at build time

1 0

[640] trunk/darwinbuild/darwinbuild.in
by source_changes＠macosforge.org 16 Nov '09

16 Nov '09

Revision: 640 http://trac.macosforge.org/projects/darwinbuild/changeset/640 Author: wsiegrist(a)apple.com Date: 2009-11-16 08:51:50 -0800 (Mon, 16 Nov 2009) Log Message: ----------- Create buildroot disk images with root/wheel ownership. Attach images with owners on. Submitted by: Benjamin Huntsman Modified Paths: -------------- trunk/darwinbuild/darwinbuild.in Modified: trunk/darwinbuild/darwinbuild.in =================================================================== --- trunk/darwinbuild/darwinbuild.in 2009-11-14 01:04:14 UTC (rev 639) +++ trunk/darwinbuild/darwinbuild.in 2009-11-16 16:51:50 UTC (rev 640) @@ -183,7 +183,7 @@ else echo "Creating build root disk image ..." DMGVOLUME="BuildRoot_${build}_${stamp}" - hdiutil create -size 1t -fs HFSX -quiet \ + hdiutil create -size 1t -fs HFSX -quiet -uid 0 -gid 0 \ -volname $DMGVOLUME \ $DMGFILE ln -s "/Volumes/${DMGVOLUME}" BuildRoot @@ -237,7 +237,7 @@ stat -L $BuildRoot >> /dev/null 2>&1 if [ $? -eq 1 ]; then echo "*** Attaching build root disk image ..." - hdiutil attach $DMGFILE -readwrite + hdiutil attach $DMGFILE -readwrite -owners on if [ $? -ne 0 ]; then echo "Error: Unable to attach sparse disk image"; exit 70

1 0

[639] trunk/plists/10C540.plist
by source_changes＠macosforge.org 14 Nov '09

14 Nov '09

Revision: 639 http://trac.macosforge.org/projects/darwinbuild/changeset/639 Author: wsiegrist(a)apple.com Date: 2009-11-13 17:04:14 -0800 (Fri, 13 Nov 2009) Log Message: ----------- Adding plist for Darwin 10.2 Added Paths: ----------- trunk/plists/10C540.plist Added: trunk/plists/10C540.plist =================================================================== --- trunk/plists/10C540.plist (rev 0) +++ trunk/plists/10C540.plist 2009-11-14 01:04:14 UTC (rev 639) @@ -0,0 +1,157 @@ +// !$*UTF8*$! +{ + binary_sites = ( + "http://src.macosforge.org/Roots/10C540/", + ); + build = 10C540; + darwin = "Darwin 10.2"; + inherits = 10B504; + macosx = "Mac OS X 10.6.2"; + projects = { + AppleDisplays = { + version = 1170.0.10; + }; + AppleUSBAudio = { + version = 266.2.2; + }; + CF = { + version = 550.13; + }; + ChatServer = { + version = 326.1; + }; + DirectoryService = { + target = DirectoryServiceFW; + version = 621.1; + }; + ICU = { + version = 400.38; + }; + IOAudioFamily = { + version = 172.4.1; + }; + IOHIDFamily = { + version = 308; + }; + IOKitUser = { + version = 502.0.3; + }; + IONetworkingFamily = { + version = 62.1; + }; + IOSerialFamily = { + version = 56; + }; + IOUSBFamily = { + version = 385.4.1; + }; + IOUSBMassStorageClass = { + version = 251.0.2; + }; + KerberosHelper = { + version = 62.1; + }; + KerberosLibraries = { + version = 81.46.1; + }; + Libinfo = { + version = 324.1; + }; + Libsystem = { + version = 125; + }; + OpenLDAP = { + version = 143.1; + }; + PowerManagement = { + version = 211; + }; + TimeZoneData = { + version = 20; + }; + apache = { + version = 747; + }; + apr = { + version = 24; + }; + autozone = { + version = 141.1; + }; + cddafs = { + version = 242.0.1; + }; + configd = { + target = configd_base; + version = 289.2; + }; + cups = { + version = 218.4; + }; + fetchmail = { + version = 31; + }; + file = { + version = 37; + }; + files = { + version = 553.1; + }; + iodbc = { + version = 37; + }; + ipsec = { + target = "IPSec (Aggregate)"; + version = 92.4; + }; + kext_tools = { + version = 177.1; + }; + libdispatch = { + version = 84.5.3; + }; + libpcap = { + version = 20.2; + }; + libsecurity_apple_x509_tp = { + version = 37202; + }; + libsecurity_keychain = { + version = 37184; + }; + libxml2 = { + version = 21.3; + }; + mDNSResponder = { + version = 214; + }; + network_cmds = { + version = 325.1; + }; + ntfs = { + version = 65.1; + }; + objc4 = { + version = 437.1; + }; + postfix = { + version = 197.1; + }; + security_certificates = { + version = 37194; + }; + securityd = { + version = 37180; + }; + subversion = { + version = 35; + }; + webdavfs = { + version = 293; + }; + xnu = { + version = 1486.2.11; + }; + }; +} +

1 0

[638] trunk/darwinbuild/darwinbuild.in
by source_changes＠macosforge.org 12 Nov '09

12 Nov '09

Revision: 638 http://trac.macosforge.org/projects/darwinbuild/changeset/638 Author: wsiegrist(a)apple.com Date: 2009-11-12 07:06:13 -0800 (Thu, 12 Nov 2009) Log Message: ----------- Trigger Xcode integration when a project uses Common.make since Common.make uses xcrun. Fixes #104. Modified Paths: -------------- trunk/darwinbuild/darwinbuild.in Modified: trunk/darwinbuild/darwinbuild.in =================================================================== --- trunk/darwinbuild/darwinbuild.in 2009-11-11 23:44:51 UTC (rev 637) +++ trunk/darwinbuild/darwinbuild.in 2009-11-12 15:06:13 UTC (rev 638) @@ -595,7 +595,7 @@ buildtool="make" # test for hybrid make-xcode project - uses_xcrun=$(grep -Elir 'xcrun|Commands.make|BSDCommon.make|Standard.make' .) + uses_xcrun=$(grep -Elir 'xcrun|Commands.make|BSDCommon.make|Standard.make|Common.make' .) if [ -n "$uses_xcrun" -a $USE_CHROOT == "YES" ]; then export USE_CHROOT="NO" export INSTALL_XCODE="YES"

1 0

[637] branches/PR-7250612/darwinup
by source_changes＠macosforge.org 11 Nov '09

11 Nov '09

Revision: 637 http://trac.macosforge.org/projects/darwinbuild/changeset/637 Author: wsiegrist(a)apple.com Date: 2009-11-11 15:44:51 -0800 (Wed, 11 Nov 2009) Log Message: ----------- Ensure -p option is an absolute path. Ignore EEXIST when making directories during install since we use copyfile() instead of rename() now. Uninstall root when install fails so we leave the system in a consistent state. Modified Paths: -------------- branches/PR-7250612/darwinup/File.cpp branches/PR-7250612/darwinup/main.cpp Modified: branches/PR-7250612/darwinup/File.cpp =================================================================== --- branches/PR-7250612/darwinup/File.cpp 2009-11-11 23:43:07 UTC (rev 636) +++ branches/PR-7250612/darwinup/File.cpp 2009-11-11 23:44:51 UTC (rev 637) @@ -296,6 +296,7 @@ IF_DEBUG("[install] mkdir(%s, %04o)\n", dstpath, mode); if (res == 0) res = mkdir(dstpath, mode); + if (res && errno == EEXIST) res = 0; if (res != 0) fprintf(stderr, "ERROR: %s:%d: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno); if (res == 0) res = chown(dstpath, uid, gid); if (res != 0) fprintf(stderr, "ERROR: %s:%d: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno); Modified: branches/PR-7250612/darwinup/main.cpp =================================================================== --- branches/PR-7250612/darwinup/main.cpp 2009-11-11 23:43:07 UTC (rev 636) +++ branches/PR-7250612/darwinup/main.cpp 2009-11-11 23:44:51 UTC (rev 637) @@ -64,10 +64,14 @@ verbosity |= VERBOSE; break; case 'p': - if (strlen(optarg) > (PATH_MAX - 1)) { - fprintf(stderr, "Error: -p option value is too long \n"); - exit(3); - } + if (optarg[0] != '/') { + fprintf(stderr, "Error: -p option must be an absolute path\n"); + exit(4); + } + if (strlen(optarg) > (PATH_MAX - 1)) { + fprintf(stderr, "Error: -p option value is too long \n"); + exit(4); + } join_path(&path, optarg, "/"); break; case '?': @@ -101,7 +105,14 @@ uuid_unparse_upper(archive->uuid(), uuid); fprintf(stdout, "%s\n", uuid); } else { - fprintf(stderr, "An error occurred.\n"); + fprintf(stderr, "Error: Install failed. Rolling back installation.\n"); + res = depot->uninstall(archive); + if (res) { + fprintf(stderr, "Error: Unable to rollback installation. " + "Your system is in an inconsistent state! File a bug!\n"); + } else { + fprintf(stderr, "Rollback successful.\n"); + } res = 1; } } else {

1 0

[636] branches/PR-7250612/testing/darwinup
by source_changes＠macosforge.org 11 Nov '09

11 Nov '09

Revision: 636 http://trac.macosforge.org/projects/darwinbuild/changeset/636 Author: wsiegrist(a)apple.com Date: 2009-11-11 15:43:07 -0800 (Wed, 11 Nov 2009) Log Message: ----------- Add test case for gracefully rolling back a bad install Modified Paths: -------------- branches/PR-7250612/testing/darwinup/run-tests.sh Added Paths: ----------- branches/PR-7250612/testing/darwinup/root4.tar.gz Added: branches/PR-7250612/testing/darwinup/root4.tar.gz =================================================================== (Binary files differ) Property changes on: branches/PR-7250612/testing/darwinup/root4.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/PR-7250612/testing/darwinup/run-tests.sh =================================================================== --- branches/PR-7250612/testing/darwinup/run-tests.sh 2009-11-11 18:25:38 UTC (rev 635) +++ branches/PR-7250612/testing/darwinup/run-tests.sh 2009-11-11 23:43:07 UTC (rev 636) @@ -22,6 +22,7 @@ do tar zxvf $R.tar.gz -C $PREFIX done; +tar zxvf root4.tar.gz -C $PREFIX mkdir -p $ORIG cp -R $DEST/* $ORIG/ @@ -108,6 +109,11 @@ echo "DIFF: diffing original test files to dest (should be no diffs) ..." diff -qru $ORIG $DEST 2>&1 | grep -v \\.DarwinDepot +echo "TEST: Trying a root that will fail due to object change ..." +darwinup -vv -p $DEST install $PREFIX/root4 +if [ $? -ne 1 ]; then exit 1; fi +echo "DIFF: diffing original test files to dest (should be no diffs) ..." +diff -qru $ORIG $DEST 2>&1 | grep -v \\.DarwinDepot echo "INFO: Done testing!"

1 0

[635] branches/PR-7250612/darwinup/Depot.cpp
by source_changes＠macosforge.org 11 Nov '09

11 Nov '09

Revision: 635 http://trac.macosforge.org/projects/darwinbuild/changeset/635 Author: wsiegrist(a)apple.com Date: 2009-11-11 10:25:38 -0800 (Wed, 11 Nov 2009) Log Message: ----------- Always use copyfile to backup files so there is no chance of the host system needing a file we temporarily moved out of the way. Modified Paths: -------------- branches/PR-7250612/darwinup/Depot.cpp Modified: branches/PR-7250612/darwinup/Depot.cpp =================================================================== --- branches/PR-7250612/darwinup/Depot.cpp 2009-11-11 18:13:31 UTC (rev 634) +++ branches/PR-7250612/darwinup/Depot.cpp 2009-11-11 18:25:38 UTC (rev 635) @@ -467,36 +467,9 @@ ++context->files_modified; // XXX: res = file->backup() + IF_DEBUG("[backup] copyfile(%s, %s)\n", path, dstpath); + res = copyfile(path, dstpath, NULL, COPYFILE_ALL); - // copy files used by gnutar and libarchive instead of moving them - // since we use tar during the archive process - size_t i = 0; - bool docopy = false; - const char* tarfiles[] = {"/usr/bin/tar", - "/usr/bin/gnutar", - "/usr/bin/bsdtar", - "/usr/lib/dyld", - "/usr/lib/libarchive", - "/usr/lib/libbz2", - "/usr/lib/libz", - "/usr/lib/libSystem", - "/usr/lib/libiconv", - "/usr/lib/libgcc_s"}; - size_t numfiles = sizeof(tarfiles)/sizeof(*tarfiles); - for (i = 0; i < numfiles; i++) { - if (strncmp(tarfiles[i], relpath, strlen(tarfiles[i])) == 0) { - docopy = true; - break; - } - } - if (docopy) { - IF_DEBUG("[backup] copyfile(%s, %s)\n", path, dstpath); - res = copyfile(path, dstpath, NULL, COPYFILE_ALL); - } else { - IF_DEBUG("[backup] rename(%s, %s)\n", path, dstpath); - res = rename(path, dstpath); - } - if (res != 0) fprintf(stderr, "%s:%d: backup failed: %s: %s (%d)\n", __FILE__, __LINE__, dstpath, strerror(errno), errno); free(path); free(dstpath);

1 0

[634] branches/PR-7250612/
by source_changes＠macosforge.org 11 Nov '09

11 Nov '09

Revision: 634 http://trac.macosforge.org/projects/darwinbuild/changeset/634 Author: wsiegrist(a)apple.com Date: 2009-11-11 10:13:31 -0800 (Wed, 11 Nov 2009) Log Message: ----------- "Branch for PR-7250612 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- branches/PR-7250612/ Property changes on: branches/PR-7250612 ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /trunk:432-434

1 0

[633] branches/PR-6634286/darwinup
by source_changes＠macosforge.org 11 Nov '09

11 Nov '09

Revision: 633 http://trac.macosforge.org/projects/darwinbuild/changeset/633 Author: wsiegrist(a)apple.com Date: 2009-11-11 09:48:28 -0800 (Wed, 11 Nov 2009) Log Message: ----------- Add a -h option that prints usage. Require darwinup be run as root since many things darwinup does requires root anyway. Create backing store with mode 0750. Split out Depot constructions and initialization so failure is easier to detect and handle. Modified Paths: -------------- branches/PR-6634286/darwinup/Depot.cpp branches/PR-6634286/darwinup/Depot.h branches/PR-6634286/darwinup/main.cpp Modified: branches/PR-6634286/darwinup/Depot.cpp =================================================================== --- branches/PR-6634286/darwinup/Depot.cpp 2009-11-10 21:20:18 UTC (rev 632) +++ branches/PR-6634286/darwinup/Depot.cpp 2009-11-11 17:48:28 UTC (rev 633) @@ -42,62 +42,85 @@ #include <sqlite3.h> Depot::Depot() { - m_prefix = NULL; + m_prefix = NULL; m_depot_path = NULL; m_database_path = NULL; m_archives_path = NULL; m_db = NULL; m_lock_fd = -1; m_is_locked = 0; + m_depot_mode = 0750; } Depot::Depot(const char* prefix) { m_lock_fd = -1; m_is_locked = 0; + m_depot_mode = 0750; + asprintf(&m_prefix, "%s", prefix); join_path(&m_depot_path, m_prefix, "/.DarwinDepot"); join_path(&m_database_path, m_depot_path, "/Database-V100"); join_path(&m_archives_path, m_depot_path, "/Archives"); +} - mkdir(m_depot_path, m_depot_mode); - mkdir(m_archives_path, m_depot_mode); +Depot::~Depot() { + if (m_lock_fd != -1) this->unlock(); + if (m_db) sqlite3_close(m_db); + if (m_prefix) free(m_prefix); + if (m_depot_path) free(m_depot_path); + if (m_database_path) free(m_database_path); + if (m_archives_path) free(m_archives_path); +} +const char* Depot::archives_path() { return m_archives_path; } +const char* Depot::prefix() { return m_prefix; } + +// Initialize the depot storage on disk +int Depot::initialize() { int res = 0; - + + // initialization requires all these paths to be set + if (!(m_prefix && m_depot_path && m_database_path && m_archives_path)) { + return -1; + } + + res = mkdir(m_depot_path, m_depot_mode); + if (res && errno != EEXIST) { + perror(m_depot_path); + return res; + } + res = mkdir(m_archives_path, m_depot_mode); + if (res && errno != EEXIST) { + perror(m_archives_path); + return res; + } + res = this->lock(LOCK_SH); - if (res == 0) { - m_is_locked = 1; - } - + if (res) return res; + m_is_locked = 1; + int exists = is_regular_file(m_database_path); - + res = sqlite3_open(m_database_path, &m_db); - if (res != 0) { + if (res) { sqlite3_close(m_db); m_db = NULL; } - + if (m_db && !exists) { this->SQL("CREATE TABLE archives (serial INTEGER PRIMARY KEY AUTOINCREMENT, uuid BLOB UNIQUE, name TEXT, date_added INTEGER, active INTEGER, info INTEGER)"); this->SQL("CREATE TABLE files (serial INTEGER PRIMARY KEY AUTOINCREMENT, archive INTEGER, info INTEGER, mode INTEGER, uid INTEGER, gid INTEGER, size INTEGER, digest BLOB, path TEXT)"); - this->SQL("CREATE INDEX archives_uuid ON archives (uuid)"); this->SQL("CREATE INDEX files_path ON files (path)"); } + + return res; } -Depot::~Depot() { - if (m_lock_fd != -1) this->unlock(); - if (m_db) sqlite3_close(m_db); - if (m_prefix) free(m_prefix); - if (m_depot_path) free(m_depot_path); - if (m_database_path) free(m_database_path); - if (m_archives_path) free(m_archives_path); +int Depot::is_initialized() { + return (m_db != NULL); } -const char* Depot::archives_path() { return m_archives_path; } -const char* Depot::prefix() { return m_prefix; } - // Unserialize an archive from the database. // Find the archive by UUID. // XXX: should be memoized @@ -1022,9 +1045,10 @@ m_lock_fd = open(m_depot_path, O_RDONLY); if (m_lock_fd == -1) { perror(m_depot_path); - res = -1; + res = m_lock_fd; } } + if (res) return res; res = flock(m_lock_fd, operation); if (res == -1) { perror(m_depot_path); Modified: branches/PR-6634286/darwinup/Depot.h =================================================================== --- branches/PR-6634286/darwinup/Depot.h 2009-11-10 21:20:18 UTC (rev 632) +++ branches/PR-6634286/darwinup/Depot.h 2009-11-11 17:48:28 UTC (rev 633) @@ -37,6 +37,9 @@ virtual ~Depot(); + int initialize(); + int is_initialized(); + const char* prefix(); const char* database_path(); const char* archives_path(); Modified: branches/PR-6634286/darwinup/main.cpp =================================================================== --- branches/PR-6634286/darwinup/main.cpp 2009-11-10 21:20:18 UTC (rev 632) +++ branches/PR-6634286/darwinup/main.cpp 2009-11-11 17:48:28 UTC (rev 633) @@ -57,7 +57,7 @@ char* path = NULL; int ch; - while ((ch = getopt(argc, argv, "p:v")) != -1) { + while ((ch = getopt(argc, argv, "p:vh")) != -1) { switch (ch) { case 'v': verbosity <<= 1; @@ -71,6 +71,7 @@ join_path(&path, optarg, "/"); break; case '?': + case 'h': default: usage(progname); } @@ -78,20 +79,26 @@ argc -= optind; argv += optind; + // you must be root + uid_t uid = getuid(); + if (uid) { + fprintf(stderr, "You must be root to run this tool.\n"); + exit(3); + } + int res = 0; if (!path) { asprintf(&path, "/"); } + Depot* depot = new Depot(path); - if (!depot->is_locked()) { - fprintf(stderr, - "Error: unable to access and lock %s. " \ - "The directory must exist and be writable.\n", depot->prefix()); + res = depot->initialize(); + if (res) { + fprintf(stderr, "Error: unable to initialize storage.\n"); exit(2); } - - + if (argc == 2 && strcmp(argv[0], "install") == 0) { char uuid[37]; Archive* archive = ArchiveFactory(argv[1]);

1 0