October 2009 - darwinbuild-changes - lists.macosforge.org

[602] trunk/darwinup/Depot.cpp
by source_changes＠macosforge.org 23 Oct '09

23 Oct '09

Revision: 602 http://trac.macosforge.org/projects/darwinbuild/changeset/602 Author: wsiegrist(a)apple.com Date: 2009-10-23 10:30:12 -0700 (Fri, 23 Oct 2009) Log Message: ----------- Add dyld to list of tar dependencies Modified Paths: -------------- trunk/darwinup/Depot.cpp Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2009-10-15 20:31:31 UTC (rev 601) +++ trunk/darwinup/Depot.cpp 2009-10-23 17:30:12 UTC (rev 602) @@ -475,6 +475,7 @@ const char* tarfiles[] = {"/usr/bin/tar", "/usr/bin/gnutar", "/usr/bin/bsdtar", + "/usr/lib/dyld", "/usr/lib/libarchive", "/usr/lib/libbz2", "/usr/lib/libz",

1 0

[601] trunk
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 601 http://trac.macosforge.org/projects/darwinbuild/changeset/601 Author: wsiegrist(a)apple.com Date: 2009-10-15 13:31:31 -0700 (Thu, 15 Oct 2009) Log Message: ----------- Add patch for perl to add dtrace header Modified Paths: -------------- trunk/plists/10A432.plist Added Paths: ----------- trunk/patches/perl-63.pldtrace.patch Added: trunk/patches/perl-63.pldtrace.patch =================================================================== --- trunk/patches/perl-63.pldtrace.patch (rev 0) +++ trunk/patches/perl-63.pldtrace.patch 2009-10-15 20:31:31 UTC (rev 601) @@ -0,0 +1,122 @@ +diff -ruN ../perl-63.orig/5.10/GNUmakefile ./5.10/GNUmakefile +--- ../perl-63.orig/5.10/GNUmakefile 2009-10-15 13:21:53.000000000 -0700 ++++ ./5.10/GNUmakefile 2009-10-15 13:27:18.000000000 -0700 +@@ -169,7 +169,7 @@ + -e 's/@VERSION5_10@/$(ENV_VERSION5_10)/g' \ + fix/README.macosx.ed | ed - $(PROJECT)/README.macosx && \ + ed - $(PROJECT)/t/op/groups.t < fix/t_op_groups.t.ed +- dtrace -h -s $(SRCROOT)/$(FIX)/pldtrace.d -o '$(OBJROOT)/$(PLDTRACE_H)' ++ cp '$(SRCROOT)/$(FIX)/pldtrace.h' '$(OBJROOT)/$(PLDTRACE_H)' + @set -x && \ + cd '$(OBJROOT)' && \ + ed - $(PROJECT)/hints/darwin.sh < fix/darwin42.sh.ed && \ +diff -ruN ../perl-63.orig/5.10/fix/pldtrace.h ./5.10/fix/pldtrace.h +--- ../perl-63.orig/5.10/fix/pldtrace.h 1969-12-31 16:00:00.000000000 -0800 ++++ ./5.10/fix/pldtrace.h 2009-10-15 13:25:29.000000000 -0700 +@@ -0,0 +1,45 @@ ++/* ++ * Generated by dtrace(1M). ++ */ ++ ++#ifndef _PLDTRACE_H ++#define _PLDTRACE_H ++ ++#include <unistd.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define PERL_STABILITY "___dtrace_stability$perl$v1$4_4_5_4_4_5_4_4_5_4_4_5_4_4_5" ++ ++#define PERL_TYPEDEFS "___dtrace_typedefs$perl$v2" ++ ++#define PERL_SUB_ENTRY(arg0, arg1, arg2) \ ++do { \ ++ __asm__ volatile(".reference " PERL_TYPEDEFS); \ ++ __dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \ ++ __asm__ volatile(".reference " PERL_STABILITY); \ ++} while (0) ++#define PERL_SUB_ENTRY_ENABLED() \ ++ __dtrace_isenabled$perl$sub__entry$v1() ++#define PERL_SUB_RETURN(arg0, arg1, arg2) \ ++do { \ ++ __asm__ volatile(".reference " PERL_TYPEDEFS); \ ++ __dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \ ++ __asm__ volatile(".reference " PERL_STABILITY); \ ++} while (0) ++#define PERL_SUB_RETURN_ENABLED() \ ++ __dtrace_isenabled$perl$sub__return$v1() ++ ++ ++extern void __dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(char *, char *, int); ++extern int __dtrace_isenabled$perl$sub__entry$v1(void); ++extern void __dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(char *, char *, int); ++extern int __dtrace_isenabled$perl$sub__return$v1(void); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _PLDTRACE_H */ +diff -ruN ../perl-63.orig/5.8/GNUmakefile ./5.8/GNUmakefile +--- ../perl-63.orig/5.8/GNUmakefile 2009-10-15 13:21:53.000000000 -0700 ++++ ./5.8/GNUmakefile 2009-10-15 13:26:39.000000000 -0700 +@@ -165,7 +165,7 @@ + -e 's/@VERSION5_8@/$(ENV_VERSION5_8)/g' \ + -e 's/@VERSION5_10@/$(ENV_VERSION5_10)/g' \ + fix/README.macosx.ed | ed - $(PROJECT)/README.macosx +- dtrace -h -s $(SRCROOT)/$(FIX)/pldtrace.d -o '$(OBJROOT)/$(PLDTRACE_H)' ++ cp '$(SRCROOT)/$(FIX)/pldtrace.h' '$(OBJROOT)/$(PLDTRACE_H)' + @set -x && \ + cd '$(OBJROOT)' && \ + ed - $(PROJECT)/hints/darwin.sh < fix/darwin42.sh.ed +diff -ruN ../perl-63.orig/5.8/fix/pldtrace.h ./5.8/fix/pldtrace.h +--- ../perl-63.orig/5.8/fix/pldtrace.h 1969-12-31 16:00:00.000000000 -0800 ++++ ./5.8/fix/pldtrace.h 2009-10-15 13:25:43.000000000 -0700 +@@ -0,0 +1,45 @@ ++/* ++ * Generated by dtrace(1M). ++ */ ++ ++#ifndef _PLDTRACE_H ++#define _PLDTRACE_H ++ ++#include <unistd.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define PERL_STABILITY "___dtrace_stability$perl$v1$4_4_5_4_4_5_4_4_5_4_4_5_4_4_5" ++ ++#define PERL_TYPEDEFS "___dtrace_typedefs$perl$v2" ++ ++#define PERL_SUB_ENTRY(arg0, arg1, arg2) \ ++do { \ ++ __asm__ volatile(".reference " PERL_TYPEDEFS); \ ++ __dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \ ++ __asm__ volatile(".reference " PERL_STABILITY); \ ++} while (0) ++#define PERL_SUB_ENTRY_ENABLED() \ ++ __dtrace_isenabled$perl$sub__entry$v1() ++#define PERL_SUB_RETURN(arg0, arg1, arg2) \ ++do { \ ++ __asm__ volatile(".reference " PERL_TYPEDEFS); \ ++ __dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(arg0, arg1, arg2); \ ++ __asm__ volatile(".reference " PERL_STABILITY); \ ++} while (0) ++#define PERL_SUB_RETURN_ENABLED() \ ++ __dtrace_isenabled$perl$sub__return$v1() ++ ++ ++extern void __dtrace_probe$perl$sub__entry$v1$63686172202a$63686172202a$696e74(char *, char *, int); ++extern int __dtrace_isenabled$perl$sub__entry$v1(void); ++extern void __dtrace_probe$perl$sub__return$v1$63686172202a$63686172202a$696e74(char *, char *, int); ++extern int __dtrace_isenabled$perl$sub__return$v1(void); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _PLDTRACE_H */ Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-15 20:07:07 UTC (rev 600) +++ trunk/plists/10A432.plist 2009-10-15 20:31:31 UTC (rev 601) @@ -11651,6 +11651,9 @@ gcc, ); }; + patchfiles = ( + "perl-63.pldtrace.patch", + ); version = 63; }; portmap = {

1 0

[600] trunk/plists/10A432.plist
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 600 http://trac.macosforge.org/projects/darwinbuild/changeset/600 Author: wsiegrist(a)apple.com Date: 2009-10-15 13:07:07 -0700 (Thu, 15 Oct 2009) Log Message: ----------- Move Libinfo to lib dependency to work around missing inet.h from hdrs root. Modified Paths: -------------- trunk/plists/10A432.plist Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-15 19:43:31 UTC (rev 599) +++ trunk/plists/10A432.plist 2009-10-15 20:07:07 UTC (rev 600) @@ -11677,7 +11677,6 @@ header = ( CarbonHeaders, Libc_headers, - Libinfo, Librpcsvc, Libsyscall, gcc, @@ -11685,6 +11684,7 @@ xnu, ); lib = ( + Libinfo, Libsystem, dyld, tcp_wrappers,

1 0

[599] trunk
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 599 http://trac.macosforge.org/projects/darwinbuild/changeset/599 Author: wsiegrist(a)apple.com Date: 2009-10-15 12:43:31 -0700 (Thu, 15 Oct 2009) Log Message: ----------- Add patch to remove miniterm from ppp build process Modified Paths: -------------- trunk/plists/10A432.plist Added Paths: ----------- trunk/patches/ppp-412.miniterm_and_noerr.patch Added: trunk/patches/ppp-412.miniterm_and_noerr.patch =================================================================== --- trunk/patches/ppp-412.miniterm_and_noerr.patch (rev 0) +++ trunk/patches/ppp-412.miniterm_and_noerr.patch 2009-10-15 19:43:31 UTC (rev 599) @@ -0,0 +1,312 @@ +diff -ru ../ppp-412.orig/Dialogs/Dialogs.c ./Dialogs/Dialogs.c +--- ../ppp-412.orig/Dialogs/Dialogs.c 2009-10-05 17:11:45.000000000 -0700 ++++ ./Dialogs/Dialogs.c 2009-10-14 17:53:50.000000000 -0700 +@@ -191,7 +191,7 @@ + int status, timeout; + + status = pthread_detach(pthread_self()); +- if (status == noErr) { ++ if (status == 0) { + + // use an adaptative timeout + if (reminder < (60 * 5)) timeout = 30; +@@ -243,7 +243,7 @@ + + reminderresult = -1; + status = pthread_create(&reminderthread, NULL, dialog_reminder_thread, NULL); +- if (status == noErr) { ++ if (status == 0) { + // install a reminder watch dog every 2 seconds + TIMEOUT(dialog_reminder_watch, 0, 2); + } +diff -ru ../ppp-412.orig/ppp.xcodeproj/project.pbxproj ./ppp.xcodeproj/project.pbxproj +--- ../ppp-412.orig/ppp.xcodeproj/project.pbxproj 2009-10-05 17:11:45.000000000 -0700 ++++ ./ppp.xcodeproj/project.pbxproj 2009-10-14 17:51:46.000000000 -0700 +@@ -60,7 +60,6 @@ + dependencies = ( + 230560F205E1808C00EAB16F /* PBXTargetDependency */, + 230560F405E1808C00EAB16F /* PBXTargetDependency */, +- 230560F605E1808C00EAB16F /* PBXTargetDependency */, + 230560FA05E1808C00EAB16F /* PBXTargetDependency */, + ); + name = "Helpers (Aggregate)"; +@@ -186,14 +185,6 @@ + 23055F4F05E1808000EAB16F /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA86267E03F42E5604CA2DDA /* CoreFoundation.framework */; }; + 23055F5005E1808000EAB16F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 838BE5EF053C9D9A00F0D0CB /* SystemConfiguration.framework */; }; + 23055F5E05E1808000EAB16F /* PPP_VERSION.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 23A7DF9005DAD1A100A3589A /* PPP_VERSION.h */; }; +- 23055F6F05E1808100EAB16F /* MiniTerm.h in Headers */ = {isa = PBXBuildFile; fileRef = 013F974C001901697F000001 /* MiniTerm.h */; }; +- 23055F7005E1808100EAB16F /* PPP_VERSION.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A7DF9005DAD1A100A3589A /* PPP_VERSION.h */; }; +- 23055F7205E1808100EAB16F /* MiniTerm.nib in Resources */ = {isa = PBXBuildFile; fileRef = 013F9735001901697F000001 /* MiniTerm.nib */; }; +- 23055F7305E1808100EAB16F /* MiniTerm.iconheader in Resources */ = {isa = PBXBuildFile; fileRef = 013F974D001901697F000001 /* MiniTerm.iconheader */; }; +- 23055F7505E1808100EAB16F /* MiniTerm.m in Sources */ = {isa = PBXBuildFile; fileRef = 013F974E001901697F000001 /* MiniTerm.m */; }; +- 23055F7605E1808100EAB16F /* MiniTerm_main.m in Sources */ = {isa = PBXBuildFile; fileRef = 013F9752001901697F000001 /* MiniTerm_main.m */; }; +- 23055F7805E1808100EAB16F /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 013F977D001904737F000001 /* AppKit.framework */; }; +- 23055F7905E1808100EAB16F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F540B7FD0298B01601CA2D7A /* Carbon.framework */; }; + 23055F8105E1808100EAB16F /* PPP_VERSION.h in Headers */ = {isa = PBXBuildFile; fileRef = 23A7DF9005DAD1A100A3589A /* PPP_VERSION.h */; }; + 23055F8305E1808100EAB16F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 071EC566009889367F000001 /* Localizable.strings */; }; + 23055F8405E1808100EAB16F /* NetworkConnect.icns in Resources */ = {isa = PBXBuildFile; fileRef = 018CF39F00BDC8447F000001 /* NetworkConnect.icns */; }; +@@ -715,13 +706,6 @@ + remoteGlobalIDString = 2305601A05E1808300EAB16F; + remoteInfo = "vpnd (Tool) (Upgraded)"; + }; +- 230560F505E1808C00EAB16F /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = 7129A431FFF956F311CA2CDC /* Project object */; +- proxyType = 1; +- remoteGlobalIDString = 23055F6D05E1808100EAB16F; +- remoteInfo = "MiniTerm (Application) (Upgraded)"; +- }; + 230560F905E1808C00EAB16F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7129A431FFF956F311CA2CDC /* Project object */; +@@ -1144,7 +1128,6 @@ + 23055F5305E1808000EAB16F /* PPPoE-vpn-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "PPPoE-vpn-Info.plist"; path = "Drivers/PPPoE/PPPoE-vpn/PPPoE-vpn-Info.plist"; sourceTree = "<group>"; }; + 23055F5405E1808000EAB16F /* PPPoE.vpn */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PPPoE.vpn; sourceTree = BUILT_PRODUCTS_DIR; }; + 23055F7C05E1808100EAB16F /* MiniTerm-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "MiniTerm-Info.plist"; path = "Helpers/MiniTerm/MiniTerm-Info.plist"; sourceTree = SOURCE_ROOT; }; +- 23055F7D05E1808100EAB16F /* MiniTerm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MiniTerm.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 23055F8B05E1808100EAB16F /* PPPDialogs-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "PPPDialogs-Info.plist"; path = "Dialogs/PPPDialogs-Info.plist"; sourceTree = SOURCE_ROOT; }; + 23055F8C05E1808100EAB16F /* PPPDialogs.ppp */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PPPDialogs.ppp; sourceTree = BUILT_PRODUCTS_DIR; }; + 23055FA105E1808100EAB16F /* PPTP-ppp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = "PPTP-ppp-Info.plist"; path = "Drivers/PPTP/PPTP-plugin/PPTP-ppp-Info.plist"; sourceTree = "<group>"; }; +@@ -1426,15 +1409,6 @@ + ); + runOnlyForDeploymentPostprocessing = 0; + }; +- 23055F7705E1808100EAB16F /* Frameworks */ = { +- isa = PBXFrameworksBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- 23055F7805E1808100EAB16F /* AppKit.framework in Frameworks */, +- 23055F7905E1808100EAB16F /* Carbon.framework in Frameworks */, +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; + 23055F8705E1808100EAB16F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; +@@ -2074,7 +2048,6 @@ + 23055F3105E1808000EAB16F /* PPPoE.ppp */, + 23055F4705E1808000EAB16F /* PPPoE.kext */, + 23055F5405E1808000EAB16F /* PPPoE.vpn */, +- 23055F7D05E1808100EAB16F /* MiniTerm.app */, + 23055F8C05E1808100EAB16F /* PPPDialogs.ppp */, + 23055FA205E1808200EAB16F /* PPTP.ppp */, + 23055FB905E1808200EAB16F /* PPTP.kext */, +@@ -2499,15 +2472,6 @@ + ); + runOnlyForDeploymentPostprocessing = 0; + }; +- 23055F6E05E1808100EAB16F /* Headers */ = { +- isa = PBXHeadersBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- 23055F6F05E1808100EAB16F /* MiniTerm.h in Headers */, +- 23055F7005E1808100EAB16F /* PPP_VERSION.h in Headers */, +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; + 23055F8005E1808100EAB16F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; +@@ -2937,26 +2901,6 @@ + productReference = 23055F5405E1808000EAB16F /* PPPoE.vpn */; + productType = "com.apple.product-type.bundle"; + }; +- 23055F6D05E1808100EAB16F /* MiniTerm (Application) */ = { +- isa = PBXNativeTarget; +- buildConfigurationList = 72DD7974091AA0ED00EE4DEA /* Build configuration list for PBXNativeTarget "MiniTerm (Application)" */; +- buildPhases = ( +- 23055F6E05E1808100EAB16F /* Headers */, +- 23055F7105E1808100EAB16F /* Resources */, +- 23055F7405E1808100EAB16F /* Sources */, +- 23055F7705E1808100EAB16F /* Frameworks */, +- 23055F7A05E1808100EAB16F /* Rez */, +- ); +- buildRules = ( +- ); +- dependencies = ( +- ); +- name = "MiniTerm (Application)"; +- productInstallPath = /usr/libexec; +- productName = MiniTerm; +- productReference = 23055F7D05E1808100EAB16F /* MiniTerm.app */; +- productType = "com.apple.product-type.application"; +- }; + 23055F7F05E1808100EAB16F /* PPPDialogs (Plugin) */ = { + isa = PBXNativeTarget; + buildConfigurationList = 72DD7980091AA0ED00EE4DEA /* Build configuration list for PBXNativeTarget "PPPDialogs (Plugin)" */; +@@ -3553,7 +3497,6 @@ + 23055F4805E1808000EAB16F /* PPPoE (VPN Plugin) */, + 23055F5505E1808000EAB16F /* SampleCode (Aggregate) */, + 23055F5605E1808000EAB16F /* Helpers (Aggregate) */, +- 23055F6D05E1808100EAB16F /* MiniTerm (Application) */, + 23055F7F05E1808100EAB16F /* PPPDialogs (Plugin) */, + 23055F8D05E1808100EAB16F /* PPTP (Plugin) */, + 23055FA305E1808200EAB16F /* PPTP (Kernel Extension) */, +@@ -3628,15 +3571,6 @@ + ); + runOnlyForDeploymentPostprocessing = 0; + }; +- 23055F7105E1808100EAB16F /* Resources */ = { +- isa = PBXResourcesBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- 23055F7205E1808100EAB16F /* MiniTerm.nib in Resources */, +- 23055F7305E1808100EAB16F /* MiniTerm.iconheader in Resources */, +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; + 23055F8205E1808100EAB16F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; +@@ -3829,13 +3763,6 @@ + ); + runOnlyForDeploymentPostprocessing = 0; + }; +- 23055F7A05E1808100EAB16F /* Rez */ = { +- isa = PBXRezBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; + 23055F8905E1808100EAB16F /* Rez */ = { + isa = PBXRezBuildPhase; + buildActionMask = 2147483647; +@@ -4234,15 +4161,6 @@ + ); + runOnlyForDeploymentPostprocessing = 0; + }; +- 23055F7405E1808100EAB16F /* Sources */ = { +- isa = PBXSourcesBuildPhase; +- buildActionMask = 2147483647; +- files = ( +- 23055F7505E1808100EAB16F /* MiniTerm.m in Sources */, +- 23055F7605E1808100EAB16F /* MiniTerm_main.m in Sources */, +- ); +- runOnlyForDeploymentPostprocessing = 0; +- }; + 23055F8505E1808100EAB16F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; +@@ -4657,11 +4575,6 @@ + target = 2305601A05E1808300EAB16F /* vpnd (Tool) */; + targetProxy = 230560F305E1808C00EAB16F /* PBXContainerItemProxy */; + }; +- 230560F605E1808C00EAB16F /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- target = 23055F6D05E1808100EAB16F /* MiniTerm (Application) */; +- targetProxy = 230560F505E1808C00EAB16F /* PBXContainerItemProxy */; +- }; + 230560FA05E1808C00EAB16F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 230560C805E1808B00EAB16F /* chat (Tool) */; +@@ -5957,92 +5870,6 @@ + }; + name = Default; + }; +- 72DD7975091AA0ED00EE4DEA /* Development */ = { +- isa = XCBuildConfiguration; +- buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; +- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; +- COPY_PHASE_STRIP = NO; +- GCC_DYNAMIC_NO_PIC = NO; +- GCC_ENABLE_FIX_AND_CONTINUE = NO; +- GCC_GENERATE_DEBUGGING_SYMBOLS = YES; +- GCC_OPTIMIZATION_LEVEL = 0; +- GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; +- HEADER_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders/"; +- INFOPLIST_FILE = "Helpers/MiniTerm/MiniTerm-Info.plist"; +- INSTALL_MODE_FLAG = "u+w,go-w,a+rX"; +- INSTALL_PATH = /usr/libexec; +- MACOSX_DEPLOYMENT_TARGET = ""; +- OTHER_CFLAGS = ""; +- OTHER_LDFLAGS = ""; +- OTHER_REZFLAGS = ""; +- PPP_DEVELOPMENT = 1; +- PRODUCT_NAME = MiniTerm; +- SECTORDER_FLAGS = ""; +- WARNING_CFLAGS = ( +- "-Wmost", +- "-Wno-four-char-constants", +- "-Wno-unknown-pragmas", +- ); +- WRAPPER_EXTENSION = app; +- ZERO_LINK = NO; +- }; +- name = Development; +- }; +- 72DD7976091AA0ED00EE4DEA /* Deployment */ = { +- isa = XCBuildConfiguration; +- buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; +- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; +- COPY_PHASE_STRIP = YES; +- GCC_DYNAMIC_NO_PIC = YES; +- GCC_ENABLE_FIX_AND_CONTINUE = NO; +- GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; +- HEADER_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders/"; +- INFOPLIST_FILE = "Helpers/MiniTerm/MiniTerm-Info.plist"; +- INSTALL_MODE_FLAG = "u+w,go-w,a+rX"; +- INSTALL_PATH = /usr/libexec; +- MACOSX_DEPLOYMENT_TARGET = ""; +- OTHER_CFLAGS = ""; +- OTHER_LDFLAGS = ""; +- OTHER_REZFLAGS = ""; +- PRODUCT_NAME = MiniTerm; +- SECTORDER_FLAGS = ""; +- WARNING_CFLAGS = ( +- "-Wmost", +- "-Wno-four-char-constants", +- "-Wno-unknown-pragmas", +- ); +- WRAPPER_EXTENSION = app; +- ZERO_LINK = NO; +- }; +- name = Deployment; +- }; +- 72DD7977091AA0ED00EE4DEA /* Default */ = { +- isa = XCBuildConfiguration; +- buildSettings = { +- ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; +- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; +- GCC_DYNAMIC_NO_PIC = YES; +- HEADER_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/System.framework/PrivateHeaders/"; +- INFOPLIST_FILE = "Helpers/MiniTerm/MiniTerm-Info.plist"; +- INSTALL_MODE_FLAG = "u+w,go-w,a+rX"; +- INSTALL_PATH = /usr/libexec; +- MACOSX_DEPLOYMENT_TARGET = ""; +- OTHER_CFLAGS = ""; +- OTHER_LDFLAGS = ""; +- OTHER_REZFLAGS = ""; +- PRODUCT_NAME = MiniTerm; +- SECTORDER_FLAGS = ""; +- WARNING_CFLAGS = ( +- "-Wmost", +- "-Wno-four-char-constants", +- "-Wno-unknown-pragmas", +- ); +- WRAPPER_EXTENSION = app; +- }; +- name = Default; +- }; + 72DD7979091AA0ED00EE4DEA /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { +@@ -8950,16 +8777,6 @@ + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; +- 72DD7974091AA0ED00EE4DEA /* Build configuration list for PBXNativeTarget "MiniTerm (Application)" */ = { +- isa = XCConfigurationList; +- buildConfigurations = ( +- 72DD7975091AA0ED00EE4DEA /* Development */, +- 72DD7976091AA0ED00EE4DEA /* Deployment */, +- 72DD7977091AA0ED00EE4DEA /* Default */, +- ); +- defaultConfigurationIsVisible = 0; +- defaultConfigurationName = Default; +- }; + 72DD7978091AA0ED00EE4DEA /* Build configuration list for PBXNativeTarget "chat (Tool)" */ = { + isa = XCConfigurationList; + buildConfigurations = ( Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-15 18:06:55 UTC (rev 598) +++ trunk/plists/10A432.plist 2009-10-15 19:43:31 UTC (rev 599) @@ -11859,6 +11859,7 @@ }; patchfiles = ( "ppp-412.xauthvendor.patch", + "ppp-412.miniterm_and_noerr.patch", ); version = 412; };

1 0

[598] trunk
by source_changes＠macosforge.org 15 Oct '09

15 Oct '09

Revision: 598 http://trac.macosforge.org/projects/darwinbuild/changeset/598 Author: wsiegrist(a)apple.com Date: 2009-10-15 11:06:55 -0700 (Thu, 15 Oct 2009) Log Message: ----------- Add patch to workaround postfix use of dtrace Modified Paths: -------------- trunk/plists/10A432.plist Added Paths: ----------- trunk/patches/postfix-197.dtrace-postfix.patch Added: trunk/patches/postfix-197.dtrace-postfix.patch =================================================================== --- trunk/patches/postfix-197.dtrace-postfix.patch (rev 0) +++ trunk/patches/postfix-197.dtrace-postfix.patch 2009-10-15 18:06:55 UTC (rev 598) @@ -0,0 +1,69 @@ +diff -ruN ../postfix-197.orig/postfix/src/util/dtrace-postfix.h ./postfix/src/util/dtrace-postfix.h +--- ../postfix-197.orig/postfix/src/util/dtrace-postfix.h 1969-12-31 16:00:00.000000000 -0800 ++++ ./postfix/src/util/dtrace-postfix.h 2009-10-14 19:01:12.000000000 -0700 +@@ -0,0 +1,65 @@ ++/* ++ * Generated by dtrace(1M). ++ */ ++ ++#ifndef _DTRACE_POSTFIX_H ++#define _DTRACE_POSTFIX_H ++ ++#include <unistd.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define POSTFIX_STABILITY "___dtrace_stability$postfix$v1$1_1_0_1_1_0_1_1_0_1_1_0_1_1_0" ++ ++#define POSTFIX_TYPEDEFS "___dtrace_typedefs$postfix$v2" ++ ++#define POSTFIX_OD_LOOKUP_FINISH(arg0, arg1, arg2) \ ++do { \ ++ __asm__ volatile(".reference " POSTFIX_TYPEDEFS); \ ++ __dtrace_probe$postfix$od__lookup__finish$v1$63686172202a$766f6964202a$696e74(arg0, arg1, arg2); \ ++ __asm__ volatile(".reference " POSTFIX_STABILITY); \ ++} while (0) ++#define POSTFIX_OD_LOOKUP_FINISH_ENABLED() \ ++ __dtrace_isenabled$postfix$od__lookup__finish$v1() ++#define POSTFIX_OD_LOOKUP_START(arg0, arg1) \ ++do { \ ++ __asm__ volatile(".reference " POSTFIX_TYPEDEFS); \ ++ __dtrace_probe$postfix$od__lookup__start$v1$63686172202a$766f6964202a(arg0, arg1); \ ++ __asm__ volatile(".reference " POSTFIX_STABILITY); \ ++} while (0) ++#define POSTFIX_OD_LOOKUP_START_ENABLED() \ ++ __dtrace_isenabled$postfix$od__lookup__start$v1() ++#define POSTFIX_SMTP_DEQUEUE(arg0) \ ++do { \ ++ __asm__ volatile(".reference " POSTFIX_TYPEDEFS); \ ++ __dtrace_probe$postfix$smtp__dequeue$v1$766f6964202a(arg0); \ ++ __asm__ volatile(".reference " POSTFIX_STABILITY); \ ++} while (0) ++#define POSTFIX_SMTP_DEQUEUE_ENABLED() \ ++ __dtrace_isenabled$postfix$smtp__dequeue$v1() ++#define POSTFIX_SMTP_RECEIVE(arg0) \ ++do { \ ++ __asm__ volatile(".reference " POSTFIX_TYPEDEFS); \ ++ __dtrace_probe$postfix$smtp__receive$v1$766f6964202a(arg0); \ ++ __asm__ volatile(".reference " POSTFIX_STABILITY); \ ++} while (0) ++#define POSTFIX_SMTP_RECEIVE_ENABLED() \ ++ __dtrace_isenabled$postfix$smtp__receive$v1() ++ ++ ++extern void __dtrace_probe$postfix$od__lookup__finish$v1$63686172202a$766f6964202a$696e74(char *, void *, int); ++extern int __dtrace_isenabled$postfix$od__lookup__finish$v1(void); ++extern void __dtrace_probe$postfix$od__lookup__start$v1$63686172202a$766f6964202a(char *, void *); ++extern int __dtrace_isenabled$postfix$od__lookup__start$v1(void); ++extern void __dtrace_probe$postfix$smtp__dequeue$v1$766f6964202a(void *); ++extern int __dtrace_isenabled$postfix$smtp__dequeue$v1(void); ++extern void __dtrace_probe$postfix$smtp__receive$v1$766f6964202a(void *); ++extern int __dtrace_isenabled$postfix$smtp__receive$v1(void); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _DTRACE_POSTFIX_H */ Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-12 23:00:28 UTC (rev 597) +++ trunk/plists/10A432.plist 2009-10-15 18:06:55 UTC (rev 598) @@ -11771,6 +11771,9 @@ gcc, ); }; + patchfiles = ( + "postfix-197.dtrace-postfix.patch", + ); version = 197; }; ppp = {

1 0

[597] trunk/darwinbuild/manifest.c
by source_changes＠macosforge.org 12 Oct '09

12 Oct '09

Revision: 597 http://trac.macosforge.org/projects/darwinbuild/changeset/597 Author: wsiegrist(a)apple.com Date: 2009-10-12 16:00:28 -0700 (Mon, 12 Oct 2009) Log Message: ----------- Use ssize_t for reading since read() can return negative values. Modified Paths: -------------- trunk/darwinbuild/manifest.c Modified: trunk/darwinbuild/manifest.c =================================================================== --- trunk/darwinbuild/manifest.c 2009-10-12 22:40:21 UTC (rev 596) +++ trunk/darwinbuild/manifest.c 2009-10-12 23:00:28 UTC (rev 597) @@ -77,7 +77,7 @@ EVP_DigestInit(&ctx, md); - unsigned int len; + ssize_t len; const unsigned int blocklen = 8192; static unsigned char* block = NULL; if (block == NULL) { @@ -88,10 +88,10 @@ if (len == 0) { close(fd); break; } if ((len < 0) && (errno == EINTR)) continue; if (len < 0) { close(fd); return NULL; } - EVP_DigestUpdate(&ctx, block, len); + EVP_DigestUpdate(&ctx, block, (size_t)len); } - EVP_DigestFinal(&ctx, digstr, &len); + EVP_DigestFinal(&ctx, digstr, NULL); return format_digest(digstr); }

1 0

[596] trunk/darwinxref/cfutils.c
by source_changes＠macosforge.org 12 Oct '09

12 Oct '09

Revision: 596 http://trac.macosforge.org/projects/darwinbuild/changeset/596 Author: wsiegrist(a)apple.com Date: 2009-10-12 15:40:21 -0700 (Mon, 12 Oct 2009) Log Message: ----------- CFStringGetBytes returns number of characters, so we need to retrive number of bytes as well for determining where to put the null at the end of result buffer. Modified Paths: -------------- trunk/darwinxref/cfutils.c Modified: trunk/darwinxref/cfutils.c =================================================================== --- trunk/darwinxref/cfutils.c 2009-10-09 22:52:07 UTC (rev 595) +++ trunk/darwinxref/cfutils.c 2009-10-12 22:40:21 UTC (rev 596) @@ -54,8 +54,9 @@ CFIndex size = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8); result = malloc(size+1); if (result != NULL) { - length = CFStringGetBytes(str, CFRangeMake(0, length), kCFStringEncodingUTF8, '?', 0, (UInt8*)result, size, NULL); - result[length] = 0; + CFIndex numbytes; + length = CFStringGetBytes(str, CFRangeMake(0, length), kCFStringEncodingUTF8, '?', 0, (UInt8*)result, size, &numbytes); + result[numbytes] = 0; } } return result;

1 0

[595] trunk/plists/10A432.plist
by source_changes＠macosforge.org 09 Oct '09

09 Oct '09

Revision: 595 http://trac.macosforge.org/projects/darwinbuild/changeset/595 Author: wsiegrist(a)apple.com Date: 2009-10-09 15:52:07 -0700 (Fri, 09 Oct 2009) Log Message: ----------- More dependencies Modified Paths: -------------- trunk/plists/10A432.plist Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-06 00:55:50 UTC (rev 594) +++ trunk/plists/10A432.plist 2009-10-09 22:52:07 UTC (rev 595) @@ -11838,6 +11838,7 @@ DirectoryService, IOKitUser, Libsystem, + OpenBSM, OpenSSL098, Security, configd, @@ -12818,11 +12819,28 @@ dependencies = { lib = ( CF, + CarbonHeaders, + CommonCrypto, + Csu, + Libc_headers, + Libsyscall, Libsystem, Security, + cctools, dyld, + gcc, + gcc_select, + launchd_libs, + libdispatch, + libsecurity_cdsa_client, + libsecurity_cdsa_utilities, + libsecurity_cdsa_utils, + libsecurity_codesigning, + libsecurity_utilities, + libsecurityd, libstdcxx, objc4, + xnu, ); }; patchfiles = (

1 0

[594] trunk/darwinxref/Makefile
by source_changes＠macosforge.org 06 Oct '09

06 Oct '09

Revision: 594 http://trac.macosforge.org/projects/darwinbuild/changeset/594 Author: wsiegrist(a)apple.com Date: 2009-10-05 17:55:50 -0700 (Mon, 05 Oct 2009) Log Message: ----------- Build fix. Running make install without first doing make fails to install .so plugins due to $(wildcard) evaluating before the all rule finishes. Modified Paths: -------------- trunk/darwinxref/Makefile Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2009-10-05 20:36:33 UTC (rev 593) +++ trunk/darwinxref/Makefile 2009-10-06 00:55:50 UTC (rev 594) @@ -47,7 +47,7 @@ all: \ darwinxref \ - $(PLUGIN_SOURCES:c=so) \ + $(PLUGIN_SOURCES:.c=.so) \ upgrade_plist \ apple_plugins @@ -58,7 +58,7 @@ [ -d $(DATDIR)/plugins ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)/plugins - $(INSTALL) $(INSTALL_DOC_FLAGS) $(wildcard $(OBJROOT)/plugins/*.so) $(wildcard plugins/*.tcl) $(DATDIR)/plugins + $(INSTALL) $(INSTALL_DOC_FLAGS) $(OBJROOT)/plugins/*.so plugins/*.tcl $(DATDIR)/plugins [ -d $(INCDIR) ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(INCDIR)

1 0

[593] trunk/plists/10A432.plist
by source_changes＠macosforge.org 05 Oct '09

05 Oct '09

Revision: 593 http://trac.macosforge.org/projects/darwinbuild/changeset/593 Author: wsiegrist(a)apple.com Date: 2009-10-05 13:36:33 -0700 (Mon, 05 Oct 2009) Log Message: ----------- Fix typo Modified Paths: -------------- trunk/plists/10A432.plist Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-05 20:35:15 UTC (rev 592) +++ trunk/plists/10A432.plist 2009-10-05 20:36:33 UTC (rev 593) @@ -4065,7 +4065,7 @@ IOKitUser, IOUSBFamily, Libc_headers, - Libsyscall + Libsyscall, Libsystem, Security, SmartCardServices,

1 0