Ything-RepoMirrors/PureDarwin
1
0
Fork 0
mirror of https://github.com/PureDarwin/PureDarwin.git synced 2026-01-25 04:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove darwinbuild plists and patches"

Browse Source 
These should be kept around, for the benefit
of people who still use darwinbuild. We have
not converted the entire codebase to Cake yet.

This reverts commit 6bf6bc8dbe.
This commit is contained in:
William Kent
2021-01-25 10:14:24 -05:00
parent dc7574c7f2
commit 23e0c76ada
189 changed files with 35806 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
patches/AppleIntelE1000-45.p1.patch Normal file
View File

@@ -0,0 +1,84 @@
diff -ru AppleIntelE1000-45/AppleIntelE1000.cpp AppleIntelE1000-45.pd1/AppleIntelE1000.cpp
--- AppleIntelE1000-45/AppleIntelE1000.cpp 2012-09-24 03:17:31.000000000 +0200
+++ AppleIntelE1000-45.pd1/AppleIntelE1000.cpp 2012-10-09 02:15:13.678228337 +0200
@@ -1389,10 +1389,17 @@
tx_ring->size = tx_ring->count * sizeof(struct e1000_tx_desc);
tx_ring->size = ALIGN(tx_ring->size, 4096);
+#if defined(MAC_OS_X_VERSION_10_6)
tx_ring->pool = IOBufferMemoryDescriptor::inTaskWithPhysicalMask(kernel_task,
kIODirectionInOut | kIOMemoryPhysicallyContiguous,
tx_ring->size,
0xFFFF0000UL); // 32-bits, 64K-aligned
+#else
+ tx_ring->pool = IOBufferMemoryDescriptor::withOptions(kIOMemoryPhysicallyContiguous,
+ tx_ring->size,
+ PAGE_SIZE);
+#endif
+
if(tx_ring->pool){
tx_ring->pool->prepare();
tx_ring->desc = (void*)tx_ring->pool->getBytesNoCopy();
@@ -1583,10 +1590,17 @@
rx_ring->size = rx_ring->count * desc_len;
rx_ring->size = ALIGN(rx_ring->size, 4096);
+#if defined(MAC_OS_X_VERSION_10_6)
rx_ring->pool = IOBufferMemoryDescriptor::inTaskWithPhysicalMask(kernel_task,kIODirectionInOut | kIOMemoryPhysicallyContiguous,
rx_ring->size,
0xFFFF0000UL); // 32-bits, 64K-aligned
+#else
+ rx_ring->pool = IOBufferMemoryDescriptor::withOptions(kIOMemoryPhysicallyContiguous,
+ rx_ring->size,
+ PAGE_SIZE);
+#endif
+
if(rx_ring->pool){
rx_ring->pool->prepare();
rx_ring->desc = (void*)rx_ring->pool->getBytesNoCopy();
@@ -5306,7 +5320,7 @@
RELEASE(mediumDict);
RELEASE(csrPCIAddress);
- RELEASE(flashPCIAddress);
+ //RELEASE(flashPCIAddress);
RELEASE(txMbufCursor);
@@ -5325,7 +5339,7 @@
pciDevice = NULL;
mediumDict = NULL;
csrPCIAddress = NULL;
- flashPCIAddress = NULL;
+ //flashPCIAddress = NULL;
interruptSource = NULL;
watchdogSource = NULL;
phyinfoSource = NULL;
@@ -5389,11 +5403,11 @@
E1000_DBG("csrPCIAddress.\n");
return false;
}
- flashPCIAddress = pciDevice->mapDeviceMemoryWithRegister(kIOPCIConfigBaseAddress1);
+ /*flashPCIAddress = pciDevice->mapDeviceMemoryWithRegister(kIOPCIConfigBaseAddress1);
if (flashPCIAddress == NULL) {
E1000_DBG("flashPCIAddress.\n");
return false;
- }
+ }*/
createWorkLoop(); // dummy call
e1000_set_mtu(ETH_DATA_LEN);
diff -ru AppleIntelE1000-45/AppleIntelE1000.h AppleIntelE1000-45.pd1/AppleIntelE1000.h
--- AppleIntelE1000-45/AppleIntelE1000.h 2012-09-24 03:17:31.000000000 +0200
+++ AppleIntelE1000-45.pd1/AppleIntelE1000.h 2012-10-09 01:52:31.000000000 +0200
@@ -121,7 +121,7 @@
public:
IOMemoryMap * csrPCIAddress;
- IOMemoryMap * flashPCIAddress;
+ //IOMemoryMap * flashPCIAddress;
IOMbufNaturalMemoryCursor * txMbufCursor;

27
patches/AppleIntelPIIXATA-201.0.2.Add_qemu_id.p1.patch Normal file
View File

@@ -0,0 +1,27 @@
diff -ru AppleIntelPIIXATA-201.0.2/AppleIntelPIIXATA.xcodeproj/project.pbxproj AppleIntelPIIXATA-201.0.2.pd1/AppleIntelPIIXATA.xcodeproj/project.pbxproj
--- AppleIntelPIIXATA-201.0.2/AppleIntelPIIXATA.xcodeproj/project.pbxproj 2009-06-03 00:20:39.000000000 +0200
+++ AppleIntelPIIXATA-201.0.2.pd1/AppleIntelPIIXATA.xcodeproj/project.pbxproj 2012-09-10 17:58:26.076597732 +0200
@@ -67,6 +67,23 @@
<string>2.0.1</string>
<key>IOKitPersonalities</key>
<dict>
+ <key>PIIX3 ATA Controller</key>
+ <dict>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.driver.AppleIntelPIIXATA</string>
+ <key>Controller Name</key>
+ <string>PIIX3</string>
+ <key>IOClass</key>
+ <string>AppleIntelPIIXATARoot</string>
+ <key>IOPCIPrimaryMatch</key>
+ <string>0x70108086</string>
+ <key>IOProbeScore</key>
+ <integer>2000</integer>
+ <key>IOProviderClass</key>
+ <string>IOPCIDevice</string>
+ <key>Supported Transfer Modes</key>
+ <string>0x00061d</string>
+ </dict>
<key>ESB2 ATA/100</key>
<dict>
<key>CFBundleIdentifier</key>

22
patches/ApplePS2Controller-8.OSMemberFunctionCast.p1.patch Normal file
View File

@@ -0,0 +1,22 @@
diff -ru ApplePS2Controller-8/ApplePS2Controller.cpp ApplePS2Controller-8.pd1/ApplePS2Controller.cpp
--- ApplePS2Controller-8/ApplePS2Controller.cpp 2004-08-14 06:38:11.000000000 -0700
+++ ApplePS2Controller-8.pd1/ApplePS2Controller.cpp 2012-09-09 08:18:31.000000000 -0700
@@ -280,12 +280,12 @@
//
_workLoop = IOWorkLoop::workLoop();
- _interruptSourceMouse = IOInterruptEventSource::interruptEventSource(
- this, (IOInterruptEventAction) &ApplePS2Controller::interruptOccurred);
- _interruptSourceKeyboard = IOInterruptEventSource::interruptEventSource(
- this, (IOInterruptEventAction) &ApplePS2Controller::interruptOccurred);
- _interruptSourceQueue = IOInterruptEventSource::interruptEventSource(
- this, (IOInterruptEventAction) &ApplePS2Controller::processRequestQueue);
+ _interruptSourceMouse = IOInterruptEventSource::interruptEventSource( this,
+ OSMemberFunctionCast(IOInterruptEventAction, this, &ApplePS2Controller::interruptOccurred));
+ _interruptSourceKeyboard = IOInterruptEventSource::interruptEventSource( this,
+ OSMemberFunctionCast(IOInterruptEventAction, this, &ApplePS2Controller::interruptOccurred));
+ _interruptSourceQueue = IOInterruptEventSource::interruptEventSource( this,
+ OSMemberFunctionCast(IOInterruptEventAction, this, &ApplePS2Controller::processRequestQueue));
if ( !_workLoop ||
!_interruptSourceMouse ||

21
patches/ApplePS2Mouse-10.OSMemberFunctionCast.p1.patch Normal file
View File

@@ -0,0 +1,21 @@
diff -ru ApplePS2Mouse-10/ApplePS2Mouse.cpp ApplePS2Mouse-10.pd1/ApplePS2Mouse.cpp
--- ApplePS2Mouse-10/ApplePS2Mouse.cpp 2004-05-13 16:17:33.000000000 -0700
+++ ApplePS2Mouse-10.pd1/ApplePS2Mouse.cpp 2012-09-09 08:30:10.000000000 -0700
@@ -136,7 +136,7 @@
//
_device->installInterruptAction(this,
- (PS2InterruptAction)&ApplePS2Mouse::interruptOccurred);
+ OSMemberFunctionCast(PS2InterruptAction, this, &ApplePS2Mouse::interruptOccurred));
_interruptHandlerInstalled = true;
//
@@ -144,7 +144,7 @@
//
_device->installPowerControlAction( this,
- (PS2PowerControlAction) &ApplePS2Mouse::setDevicePowerState );
+ OSMemberFunctionCast(PS2PowerControlAction, this, &ApplePS2Mouse::setDevicePowerState));
_powerControlHandlerInstalled = true;
return true;

326
patches/AppleRAID-3.0.19.rm_artest.p1.patch Normal file
View File

@@ -0,0 +1,326 @@
diff -ru AppleRAID-3.0.19/AppleRAID.xcodeproj/project.pbxproj AppleRAID-3.0.19.pd1/AppleRAID.xcodeproj/project.pbxproj
--- AppleRAID-3.0.19/AppleRAID.xcodeproj/project.pbxproj 2007-07-17 08:39:39.000000000 +0200
+++ AppleRAID-3.0.19.pd1/AppleRAID.xcodeproj/project.pbxproj 2012-09-22 09:32:14.000000000 +0200
@@ -15,7 +15,6 @@
dependencies = (
59532CE50682639100CA9D0A /* PBXTargetDependency */,
59532CE70682639100CA9D0A /* PBXTargetDependency */,
- 598B5C3406C31578002F076B /* PBXTargetDependency */,
);
name = AppleRAID;
productName = AppleRAID;
@@ -25,18 +24,13 @@
/* Begin PBXBuildFile section */
00BDB3A00AC8F6FC00FF22E8 /* AppleLVMStorageRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00BDB39E0AC8F6FC00FF22E8 /* AppleLVMStorageRequest.cpp */; };
00BDB3A10AC8F6FC00FF22E8 /* AppleLVMStorageRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 00BDB39F0AC8F6FC00FF22E8 /* AppleLVMStorageRequest.h */; };
- 5920240C06B61456006D5564 /* MediaKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5920240A06B61456006D5564 /* MediaKit.framework */; };
5930E3840A4B94E800B01DE9 /* AppleLVMVolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5930E3820A4B94E800B01DE9 /* AppleLVMVolume.cpp */; };
5930E3850A4B94E800B01DE9 /* AppleLVMVolume.h in Headers */ = {isa = PBXBuildFile; fileRef = 5930E3830A4B94E800B01DE9 /* AppleLVMVolume.h */; };
5945426A06C3135D003E58FB /* AppleRAIDStorageRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5945426906C3135D003E58FB /* AppleRAIDStorageRequest.cpp */; };
59532CEC0682647300CA9D0A /* AppleRAIDUserLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 59532CEB0682647300CA9D0A /* AppleRAIDUserLib.c */; };
59532D0E0682683E00CA9D0A /* AppleRAIDUserLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 59532D0D0682683E00CA9D0A /* AppleRAIDUserLib.h */; };
- 59532D2E068269D800CA9D0A /* artest.c in Sources */ = {isa = PBXBuildFile; fileRef = 59532D2D068269D800CA9D0A /* artest.c */; };
- 59532D5606826BE100CA9D0A /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59532D5506826BE100CA9D0A /* CoreFoundation.framework */; };
- 59532D9606826BFE00CA9D0A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59532D9506826BFE00CA9D0A /* IOKit.framework */; };
5977B253069E41FD001BEC49 /* AppleRAIDConcatSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5977B251069E41FD001BEC49 /* AppleRAIDConcatSet.cpp */; };
5977B254069E41FD001BEC49 /* AppleRAIDConcatSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 5977B252069E41FD001BEC49 /* AppleRAIDConcatSet.h */; };
- 597ABB950898249300D7ED96 /* libAppleRAID.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 59532CCF068261AC00CA9D0A /* libAppleRAID.a */; };
598562980662D045008C1FA5 /* AppleRAIDUserClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 598562960662D045008C1FA5 /* AppleRAIDUserClient.cpp */; };
598562990662D045008C1FA5 /* AppleRAIDUserClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 598562970662D045008C1FA5 /* AppleRAIDUserClient.h */; };
59AE1F5E0A437C110079A186 /* AppleLVMGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 59AE1F5D0A437C110079A186 /* AppleLVMGroup.h */; };
@@ -76,13 +70,6 @@
remoteGlobalIDString = 59532CCE068261AC00CA9D0A;
remoteInfo = AppleRAIDLib;
};
- 598B5C3306C31578002F076B /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 59532D250682697700CA9D0A;
- remoteInfo = artest;
- };
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -114,8 +101,6 @@
59532CCF068261AC00CA9D0A /* libAppleRAID.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAppleRAID.a; sourceTree = BUILT_PRODUCTS_DIR; };
59532CEB0682647300CA9D0A /* AppleRAIDUserLib.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = AppleRAIDUserLib.c; sourceTree = "<group>"; };
59532D0D0682683E00CA9D0A /* AppleRAIDUserLib.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppleRAIDUserLib.h; sourceTree = "<group>"; };
- 59532D260682697700CA9D0A /* artest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = artest; sourceTree = BUILT_PRODUCTS_DIR; };
- 59532D2D068269D800CA9D0A /* artest.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = artest.c; sourceTree = "<group>"; };
59532D5506826BE100CA9D0A /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
59532D9506826BFE00CA9D0A /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
5977B251069E41FD001BEC49 /* AppleRAIDConcatSet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AppleRAIDConcatSet.cpp; sourceTree = "<group>"; };
@@ -133,33 +118,18 @@
59CCE30C0505888F0041E990 /* AppleRAIDGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AppleRAIDGlobals.cpp; sourceTree = "<group>"; };
59CCE30D0505888F0041E990 /* AppleRAIDGlobals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppleRAIDGlobals.h; sourceTree = "<group>"; };
59CCE33B05058BF60041E990 /* AppleRAID.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AppleRAID.cpp; sourceTree = "<group>"; };
- 59CD7BDF0634F4FC00F84FF8 /* AppleRAID-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "AppleRAID-Info.plist"; sourceTree = "<group>"; };
+ 59CD7BDF0634F4FC00F84FF8 /* AppleRAID-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "AppleRAID-Info.plist"; sourceTree = "<group>"; };
59CD7BE00634F4FC00F84FF8 /* AppleRAID.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppleRAID.kext; sourceTree = BUILT_PRODUCTS_DIR; };
59DF8561069E3FEF00409DEF /* AppleRAIDStripeSet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AppleRAIDStripeSet.cpp; sourceTree = "<group>"; };
59DF8562069E3FEF00409DEF /* AppleRAIDStripeSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppleRAIDStripeSet.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
-/* Begin PBXFrameworksBuildPhase section */
- 59532D240682697700CA9D0A /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 59532D5606826BE100CA9D0A /* CoreFoundation.framework in Frameworks */,
- 59532D9606826BFE00CA9D0A /* IOKit.framework in Frameworks */,
- 5920240C06B61456006D5564 /* MediaKit.framework in Frameworks */,
- 597ABB950898249300D7ED96 /* libAppleRAID.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
/* Begin PBXGroup section */
089C166AFE841209C02AAC07 /* AppleRAID */ = {
isa = PBXGroup;
children = (
59532CBC0682611E00CA9D0A /* Driver */,
59532CEF0682647F00CA9D0A /* Library */,
- 59532D2A068269A500CA9D0A /* Test */,
59532E5506826C7A00CA9D0A /* External Frameworks */,
);
name = AppleRAID;
@@ -239,15 +209,6 @@
name = Library;
sourceTree = "<group>";
};
- 59532D2A068269A500CA9D0A /* Test */ = {
- isa = PBXGroup;
- children = (
- 59532D2D068269D800CA9D0A /* artest.c */,
- 5953306D06826C9D00CA9D0A /* Products */,
- );
- name = Test;
- sourceTree = "<group>";
- };
59532E5506826C7A00CA9D0A /* External Frameworks */ = {
isa = PBXGroup;
children = (
@@ -258,14 +219,6 @@
name = "External Frameworks";
sourceTree = "<group>";
};
- 5953306D06826C9D00CA9D0A /* Products */ = {
- isa = PBXGroup;
- children = (
- 59532D260682697700CA9D0A /* artest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
59AE1F580A437BD90079A186 /* LVM Plugin */ = {
isa = PBXGroup;
children = (
@@ -290,13 +243,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 59532D220682697700CA9D0A /* Headers */ = {
- isa = PBXHeadersBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
59CD7BC80634F4FC00F84FF8 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
@@ -338,23 +284,6 @@
productReference = 59532CCF068261AC00CA9D0A /* libAppleRAID.a */;
productType = "com.apple.product-type.library.static";
};
- 59532D250682697700CA9D0A /* artest */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 591B6A9D08980EDE000BDB04 /* Build configuration list for PBXNativeTarget "artest" */;
- buildPhases = (
- 59532D220682697700CA9D0A /* Headers */,
- 59532D230682697700CA9D0A /* Sources */,
- 59532D240682697700CA9D0A /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = artest;
- productName = artest;
- productReference = 59532D260682697700CA9D0A /* artest */;
- productType = "com.apple.product-type.tool";
- };
59CD7BC60634F4FC00F84FF8 /* AppleRAIDKext */ = {
isa = PBXNativeTarget;
buildConfigurationList = 591B6A9508980EDE000BDB04 /* Build configuration list for PBXNativeTarget "AppleRAIDKext" */;
@@ -380,15 +309,16 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 591B6AA508980EDE000BDB04 /* Build configuration list for PBXProject "AppleRAID" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 089C166AFE841209C02AAC07 /* AppleRAID */;
productRefGroup = 59532CD0068261AC00CA9D0A /* Products */;
projectDirPath = "";
+ projectRoot = "";
targets = (
59532CD30682625600CA9D0A /* AppleRAID */,
59CD7BC60634F4FC00F84FF8 /* AppleRAIDKext */,
59532CCE068261AC00CA9D0A /* AppleRAIDLib */,
- 59532D250682697700CA9D0A /* artest */,
);
};
/* End PBXProject section */
@@ -423,14 +353,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 59532D230682697700CA9D0A /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 59532D2E068269D800CA9D0A /* artest.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
59CD7BD30634F4FC00F84FF8 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -465,11 +387,6 @@
target = 59532CCE068261AC00CA9D0A /* AppleRAIDLib */;
targetProxy = 59532CE60682639100CA9D0A /* PBXContainerItemProxy */;
};
- 598B5C3406C31578002F076B /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 59532D250682697700CA9D0A /* artest */;
- targetProxy = 598B5C3306C31578002F076B /* PBXContainerItemProxy */;
- };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@@ -497,7 +414,6 @@
MODULE_IOKIT = YES;
MODULE_NAME = com.apple.driver.AppleRAID;
MODULE_VERSION = "";
- OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
@@ -593,7 +509,6 @@
INSTALLHDRS_COPY_PHASE = YES;
INSTALL_PATH = /usr/local/lib;
LIBRARY_STYLE = STATIC;
- OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
@@ -648,82 +563,6 @@
};
name = Default;
};
- 591B6A9E08980EDE000BDB04 /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PRECOMPILE_PREFIX_HEADER = NO;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INSTALL_PATH = /usr/local/bin;
- LIBRARY_SEARCH_PATHS = "";
- OPTIMIZATION_CFLAGS = "-O0";
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = artest;
- SECTORDER_FLAGS = "";
- VALID_ARCHS = "ppc i386";
- WARNING_CFLAGS = "-Wmost";
- ZERO_LINK = YES;
- };
- name = Development;
- };
- 591B6A9F08980EDE000BDB04 /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = NO;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INSTALL_PATH = /usr/local/bin;
- LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = artest;
- SECTORDER_FLAGS = "";
- VALID_ARCHS = "ppc i386";
- WARNING_CFLAGS = "-Wmost";
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- 591B6AA008980EDE000BDB04 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
- GCC_PRECOMPILE_PREFIX_HEADER = NO;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INSTALL_PATH = /usr/local/bin;
- LIBRARY_SEARCH_PATHS = "";
- OTHER_CFLAGS = "";
- OTHER_LDFLAGS = "";
- OTHER_REZFLAGS = "";
- PREBINDING = NO;
- PRODUCT_NAME = artest;
- SECTORDER_FLAGS = "";
- VALID_ARCHS = "ppc i386";
- WARNING_CFLAGS = "-Wmost";
- };
- name = Default;
- };
591B6AA208980EDE000BDB04 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -732,7 +571,6 @@
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
- OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
@@ -825,16 +663,6 @@
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
- };
- 591B6A9D08980EDE000BDB04 /* Build configuration list for PBXNativeTarget "artest" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 591B6A9E08980EDE000BDB04 /* Development */,
- 591B6A9F08980EDE000BDB04 /* Deployment */,
- 591B6AA008980EDE000BDB04 /* Default */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
};
591B6AA108980EDE000BDB04 /* Build configuration list for PBXAggregateTarget "AppleRAID" */ = {
isa = XCConfigurationList;

11
patches/CF-476.15.BuildCFLite.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- CF-476.15/BuildCFLite.origin 2008-10-30 13:16:27.000000000 +0100
+++ CF-476.15/BuildCFLite 2008-10-30 13:13:22.000000000 +0100
@@ -83,7 +83,7 @@
/bin/chmod -RH a-w,a+rX $DSTBASE/CoreFoundation.framework
/bin/chmod -RH u+w $DSTBASE
-install_name_tool -id /System/Library/Frameworks/CoreFoundation/Versions/A/CoreFoundation $DSTBASE/CoreFoundation.framework/Versions/A/CoreFoundation
+install_name_tool -id /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation $DSTBASE/CoreFoundation.framework/Versions/A/CoreFoundation
echo "Installing done. The framework is in $DSTBASE"

14
patches/CF-476.15.CFBundle_Resources.p1.patch Normal file
View File

@@ -0,0 +1,14 @@
--- CF-476.15/CFBundle_Resources.c.origin 2008-10-27 00:22:47.000000000 +0100
+++ CF-476.15/CFBundle_Resources.c 2008-10-27 00:23:14.000000000 +0100
@@ -2173,3 +2173,11 @@
}
return result;
}
+
+CFNotificationCenterRef CFNotificationCenterGetLocalCenter(void) {return;};
+void CFNotificationCenterAddObserver(CFNotificationCenterRef center, const void *observer, CFNotificationCallback callBack, CFStringRef name, const void *object, CFNotificationSuspensionBehavior suspensionBehavior){return;};
+void * const NSGenericException;
+
+CFStringRef _kCFBundleResourceSpecificationKey(CFBundleRef bundle, CFStringRef key, CFStringRef value, CFStringRef tableName) {
+ return 0;
+}

916
patches/CF-476.19-pf_allpatches.p1.patch Normal file
View File

@@ -0,0 +1,916 @@
diff -ru CF-476.19/BuildCFLite CF-476.19-patched/BuildCFLite
--- CF-476.19/BuildCFLite 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/BuildCFLite 2012-10-09 15:56:57.000000000 +0200
@@ -18,11 +18,11 @@
-PUBLIC_HEADERS="CFArray.h CFBag.h CFBase.h CFBinaryHeap.h CFBitVector.h CFBundle.h CFByteOrder.h CFCalendar.h CFCharacterSet.h CFData.h CFDate.h CFDateFormatter.h CFDictionary.h CFError.h CFLocale.h CFMachPort.h CFMessagePort.h CFNumber.h CFNumberFormatter.h CFPlugIn.h CFPlugInCOM.h CFPreferences.h CFPropertyList.h CFRunLoop.h CFSet.h CFSocket.h CFStream.h CFString.h CFStringEncodingExt.h CFTimeZone.h CFTree.h CFURL.h CFURLAccess.h CFUUID.h CFUserNotification.h CFXMLNode.h CFXMLParser.h CoreFoundation.h"
+PUBLIC_HEADERS="CFArray.h CFBag.h CFBase.h CFBinaryHeap.h CFBitVector.h CFBundle.h CFByteOrder.h CFCalendar.h CFCharacterSet.h CFData.h CFDate.h CFDateFormatter.h CFDictionary.h CFError.h CFLocale.h CFMachPort.h CFMessagePort.h CFNumber.h CFNumberFormatter.h CFPlugIn.h CFPlugInCOM.h CFPreferences.h CFPropertyList.h CFRunLoop.h CFSet.h CFSocket.h CFStream.h CFString.h CFStringEncodingExt.h CFTimeZone.h CFTree.h CFURL.h CFURLAccess.h CFUUID.h CFUserNotification.h CFXMLNode.h CFXMLParser.h CoreFoundation.h CFNotificationCenter.h CFFileDescriptor.h"
PRIVATE_HEADERS="CFBundlePriv.h CFCharacterSetPriv.h CFError_Private.h CFLogUtilities.h CFPriv.h CFRuntime.h CFStorage.h CFStreamAbstract.h CFStreamPriv.h CFStreamInternal.h CFStringDefaultEncoding.h CFStringEncodingConverter.h CFStringEncodingConverterExt.h CFUniChar.h CFUnicodeDecomposition.h CFUnicodePrecomposition.h ForFoundationOnly.h"
OBJBASE=../CF-Objects
-ARCHFLAGS="-arch ppc -arch ppc64 -arch i386 -arch x86_64"
+ARCHFLAGS="-arch i386"
CFLAGS="-c -pipe -std=gnu99 -g -Wmost -Wno-trigraphs -mmacosx-version-min=10.5 -fconstant-cfstrings -fexceptions -DCF_BUILDING_CF=1 -DDEPLOYMENT_TARGET_MACOSX=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5 -DU_SHOW_DRAFT_API=1 -I$OBJBASE -DVERSION=476.10"
LFLAGS="-dynamiclib -mmacosx-version-min=10.5 -twolevel_namespace -init ___CFInitialize -compatibility_version 150 -current_version 476 -sectcreate __UNICODE __csbitmaps CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data $UNICODE_DATA_FILE -segprot __UNICODE r r"
@@ -47,8 +47,8 @@
fi
done
echo "Linking $STYLE ..."
- echo /usr/bin/gcc $STYLE_LFLAGS -install_name /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation_$STYLE $ARCHFLAGS $LFLAGS $OBJBASE/$STYLE/*.o -licucore.A -lobjc -o $OBJBASE/CoreFoundation_$STYLE
- /usr/bin/gcc $STYLE_LFLAGS -install_name /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation_$STYLE $ARCHFLAGS $LFLAGS $OBJBASE/$STYLE/*.o -licucore.A -lobjc -o $OBJBASE/CoreFoundation_$STYLE
+ echo /usr/bin/gcc $STYLE_LFLAGS -install_name /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation_$STYLE $ARCHFLAGS $LFLAGS $OBJBASE/$STYLE/*.o -F/System/Library/Frameworks -framework Foundation -licucore.A -lobjc -o $OBJBASE/CoreFoundation_$STYLE
+ /usr/bin/gcc $STYLE_LFLAGS -install_name /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation_$STYLE $ARCHFLAGS $LFLAGS $OBJBASE/$STYLE/*.o -F/System/Library/Frameworks -framework Foundation -licucore.A -lobjc -o $OBJBASE/CoreFoundation_$STYLE
if [ $? -ne 0 ]; then
echo "*** Linking $STYLE failed ***"
exit 1
diff -ru CF-476.19/CFApplicationPreferences.c CF-476.19-patched/CFApplicationPreferences.c
--- CF-476.19/CFApplicationPreferences.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFApplicationPreferences.c 2012-10-09 15:56:57.000000000 +0200
@@ -670,3 +670,18 @@
updateDictRep(self);
__CFSpinUnlock(&__CFApplicationPreferencesLock);
}
+
+/*
+ * just a stub for puredarwin, for compatibility
+ * must really search in source from where is it called and patch here
+ * this is not the place to do thisBoolean
+ */
+
+Boolean CFPreferencesAppValueIsForced(CFStringRef key, CFStringRef applicationID)
+{
+ //try this as it must return something
+ return false;
+
+}
+
+
diff -ru CF-476.19/CFArray.c CF-476.19-patched/CFArray.c
--- CF-476.19/CFArray.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFArray.c 2012-10-09 15:56:57.000000000 +0200
@@ -1179,3 +1179,10 @@
CFArrayAppendValue(array, CFArrayGetValueAtIndex(otherArray, idx));
}
}
+
+
+
+/* PureFoundation - start _sjc_ */
+bool _CFArrayIsMutable(CFArrayRef array) { return (__CFArrayGetType(array) == __kCFArrayImmutable) ? false : true; }
+/* PureFoundation - end */
+
diff -ru CF-476.19/CFArray.h CF-476.19-patched/CFArray.h
--- CF-476.19/CFArray.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFArray.h 2012-10-09 15:56:57.000000000 +0200
@@ -687,6 +687,11 @@
CF_EXPORT
void CFArrayAppendArray(CFMutableArrayRef theArray, CFArrayRef otherArray, CFRange otherRange);
+/* PureFoundation - start _sjc_ */
+CF_EXPORT
+bool _CFArrayIsMutable(CFArrayRef array);
+/* PureFoundation - end */
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFARRAY__ */
diff -ru CF-476.19/CFBinaryPList.c CF-476.19-patched/CFBinaryPList.c
--- CF-476.19/CFBinaryPList.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFBinaryPList.c 2012-10-09 15:56:56.000000000 +0200
@@ -36,6 +36,9 @@
#include <CoreFoundation/CFPropertyList.h>
#include <CoreFoundation/CFByteOrder.h>
#include <CoreFoundation/CFRuntime.h>
+// sjc -- 22/2/09
+#include <CoreFoundation/CFStream.h>
+// END
#include <stdio.h>
#include <limits.h>
#include <string.h>
@@ -167,7 +170,14 @@
CFDataAppendBytes((CFMutableDataRef)buf->stream, bytes, length);
buf->written += length;
} else {
+ /* sjc -- 22/2/09 SystemConfiguration relies on being able to serialize a plist
+ * to a write stream. There seems no reason why this isn't supported. The old code
+ * read:
CFAssert(false, __kCFLogAssertion, "Streams are not supported on this platform");
+ */
+ CFIndex lengthWritten = CFWriteStreamWrite((CFWriteStreamRef)buf->stream, bytes, length);
+ buf->written += lengthWritten;
+ // END
}
}
Seulement dans CF-476.19-patched/: CFBridgingPF.h
diff -ru CF-476.19/CFBundle.c CF-476.19-patched/CFBundle.c
--- CF-476.19/CFBundle.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFBundle.c 2012-10-09 21:25:32.836857334 +0200
@@ -128,6 +128,10 @@
CONST_STRING_DECL(_kCFBundleResolvedPathKey, "NSBundleResolvedPath")
CONST_STRING_DECL(_kCFBundlePrincipalClassKey, "NSPrincipalClass")
+// PureFoundation -- _sjc_ -- 9/2/09
+CONST_STRING_DECL(_kCFBundleResourceSpecificationKey, "CFBundleResourceSpecification")
+// PureFoundation -- END
+
static CFTypeID __kCFBundleTypeID = _kCFRuntimeNotATypeID;
struct __CFBundle {
@@ -401,6 +405,7 @@
return outURL;
}
+
CFURLRef _CFBundleCopyBundleURLForExecutableURL(CFURLRef url) {
CFURLRef resolvedURL, outurl = NULL;
CFStringRef str;
@@ -414,6 +419,44 @@
return outurl;
}
+
+
+static uint8_t _CFBundleEffectiveLayoutVersion(CFBundleRef bundle) {
+ uint8_t localVersion = bundle->_version;
+ // exclude type 0 bundles with no binary (or CFM binary) and no Info.plist, since they give too many false positives
+ if (0 == localVersion) {
+ CFDictionaryRef infoDict = CFBundleGetInfoDictionary(bundle);
+ if (!infoDict || 0 == CFDictionaryGetCount(infoDict)) {
+#if defined(BINARY_SUPPORT_DYLD)
+ CFURLRef executableURL = CFBundleCopyExecutableURL(bundle);
+ if (executableURL) {
+ if (bundle->_binaryType == __CFBundleUnknownBinary) bundle->_binaryType = _CFBundleGrokBinaryType(executableURL);
+ if (bundle->_binaryType == __CFBundleCFMBinary || bundle->_binaryType == __CFBundleUnreadableBinary) {
+ localVersion = 4;
+ } else {
+ bundle->_resourceData._executableLacksResourceFork = true;
+ }
+ CFRelease(executableURL);
+ } else {
+ localVersion = 4;
+ }
+#elif defined(BINARY_SUPPORT_CFM)
+ localVersion = 4;
+#else
+ CFURLRef executableURL = CFBundleCopyExecutableURL(bundle);
+ if (executableURL) {
+ CFRelease(executableURL);
+ } else {
+ localVersion = 4;
+ }
+#endif /* BINARY_SUPPORT_CFM && BINARY_SUPPORT_DYLD */
+ }
+ }
+ return localVersion;
+}
+
+
+
CFBundleRef _CFBundleCreateIfLooksLikeBundle(CFAllocatorRef allocator, CFURLRef url) {
CFBundleRef bundle = CFBundleCreate(allocator, url);
@@ -453,6 +496,17 @@
return bundle;
}
+/* Backport from CF-550*/
+CFBundleRef _CFBundleCreateIfMightBeBundle(CFAllocatorRef allocator, CFURLRef url) {
+ return _CFBundleCreateIfLooksLikeBundle(allocator, url);
+}
+
+/* Backport from CF-550*/
+CFBundleRef _CFBundleCreateWithExecutableURLIfMightBeBundle(CFAllocatorRef allocator, CFURLRef url) {
+ return _CFBundleCreateWithExecutableURLIfLooksLikeBundle(allocator, url);
+}
+
+
CFBundleRef _CFBundleGetMainBundleIfLooksLikeBundle(void) {
CFBundleRef mainBundle = CFBundleGetMainBundle();
if (mainBundle && (3 == mainBundle->_version || 4 == mainBundle->_version)) mainBundle = NULL;
diff -ru CF-476.19/CFBundle.h CF-476.19-patched/CFBundle.h
--- CF-476.19/CFBundle.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFBundle.h 2012-10-09 21:33:33.108847794 +0200
@@ -350,6 +350,15 @@
CF_EXPORT
void CFBundleCloseBundleResourceMap(CFBundleRef bundle, CFBundleRefNum refNum);
+
+/* For Code Signing */
+/* backport from CF-550 */
+CF_EXPORT
+CFBundleRef _CFBundleCreateIfMightBeBundle(CFAllocatorRef allocator, CFURLRef url);
+/* backport from CF-550 */
+CF_EXPORT
+CFBundleRef _CFBundleCreateWithExecutableURLIfMightBeBundle(CFAllocatorRef allocator, CFURLRef url);
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFBUNDLE__ */
diff -ru CF-476.19/CFBundlePriv.h CF-476.19-patched/CFBundlePriv.h
--- CF-476.19/CFBundlePriv.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFBundlePriv.h 2012-10-09 21:27:11.144855383 +0200
@@ -109,6 +109,9 @@
const CFStringRef _kCFBundleOldTypeOSTypesKey;
+
+
+
/* Functions for examining directories that may "look like" bundles */
CF_EXPORT
@@ -135,6 +138,8 @@
CF_EXPORT
CFBundleRef _CFBundleGetExistingBundleWithBundleURL(CFURLRef bundleURL);
+
+
/* Functions for examining the structure of a bundle */
CF_EXPORT
@@ -144,6 +149,8 @@
CFURLRef _CFBundleCopyInfoPlistURL(CFBundleRef bundle);
+
+
/* Functions for working without a bundle instance */
CF_EXPORT
diff -ru CF-476.19/CFBundle_Resources.c CF-476.19-patched/CFBundle_Resources.c
--- CF-476.19/CFBundle_Resources.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFBundle_Resources.c 2012-10-09 21:27:35.260854902 +0200
@@ -2173,3 +2173,4 @@
}
return result;
}
+
diff -ru CF-476.19/CFCharacterSet.c CF-476.19-patched/CFCharacterSet.c
--- CF-476.19/CFCharacterSet.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFCharacterSet.c 2012-10-09 15:56:57.000000000 +0200
@@ -2725,3 +2725,8 @@
}
}
}
+
+/* PureFoundation - start _sjc_ */
+bool _CFCharacterSetIsMutable(CFCharacterSetRef cset) { return __CFCSetIsMutable(cset); }
+/* PureFoundation - end */
+
diff -ru CF-476.19/CFCharacterSet.h CF-476.19-patched/CFCharacterSet.h
--- CF-476.19/CFCharacterSet.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFCharacterSet.h 2012-10-09 15:56:57.000000000 +0200
@@ -409,6 +409,10 @@
CF_EXPORT
void CFCharacterSetInvert(CFMutableCharacterSetRef theSet);
+/* PureFoundation - start _sjc_ */
+CF_EXPORT bool _CFCharacterSetIsMutable(CFCharacterSetRef cset);
+/* PureFoundation - end */
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFCHARACTERSET__ */
diff -ru CF-476.19/CFData.c CF-476.19-patched/CFData.c
--- CF-476.19/CFData.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFData.c 2012-10-09 15:56:57.000000000 +0200
@@ -411,6 +411,10 @@
__CFDataSetLength(data, newCount);
}
+/* PureFoundation - start _sjc_ */
+bool __PFDataIsMutable( CFDataRef data ) { return ( (__CFMutableVariety(data) == kCFMutable) || (__CFMutableVariety(data) == kCFFixedMutable) ); }
+/* PureFoundation - end */
+
#undef __CFDataValidateRange
#undef __CFGenericValidateMutabilityFlags
diff -ru CF-476.19/CFData.h CF-476.19-patched/CFData.h
--- CF-476.19/CFData.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFData.h 2012-10-09 15:56:57.000000000 +0200
@@ -80,6 +80,11 @@
CF_EXPORT
void CFDataDeleteBytes(CFMutableDataRef theData, CFRange range);
+/* PureFoundation - start _sjc_ */
+CF_EXPORT
+bool __PFDataIsMutable(CFDataRef data);
+/* PureFoundation - end */
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFDATA__ */
diff -ru CF-476.19/CFDictionary.c CF-476.19-patched/CFDictionary.c
--- CF-476.19/CFDictionary.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFDictionary.c 2012-10-09 15:56:57.000000000 +0200
@@ -1462,6 +1462,10 @@
}
}
+/* PureFoundation - start _sjc_ */
+bool _CFDictionaryIsMutable(CFDictionaryRef dict) { return (__CFHashGetType(dict) == __kCFHashMutable); }
+/* PureFoundation - end */
+
#undef CF_OBJC_KVO_WILLCHANGE
#undef CF_OBJC_KVO_DIDCHANGE
diff -ru CF-476.19/CFDictionary.h CF-476.19-patched/CFDictionary.h
--- CF-476.19/CFDictionary.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFDictionary.h 2012-10-09 15:56:57.000000000 +0200
@@ -683,6 +683,10 @@
CF_EXPORT
void CFDictionaryRemoveAllValues(CFMutableDictionaryRef theDict);
+/* PureFoundation - start _sjc_ */
+CF_EXPORT bool _CFDictionaryIsMutable(CFDictionaryRef dict);
+/* PureFoundation - end */
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFDICTIONARY__ */
Seulement dans CF-476.19-patched/: CFFileDescriptor.c
Seulement dans CF-476.19-patched/: CFFileDescriptor.h
diff -ru CF-476.19/CFInternal.h CF-476.19-patched/CFInternal.h
--- CF-476.19/CFInternal.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFInternal.h 2012-10-09 15:56:57.000000000 +0200
@@ -74,6 +74,10 @@
#include "ForFoundationOnly.h"
+/* PureFoundation - start */
+Class _PFNSURLClass;
+/* PureFoundation - end */
+
CF_EXPORT const char *_CFProcessName(void);
CF_EXPORT CFStringRef _CFProcessNameString(void);
@@ -441,7 +445,12 @@
CF_EXPORT CFIndex _CFStartOfPathExtension(UniChar *unichars, CFIndex length);
CF_EXPORT CFIndex _CFLengthAfterDeletingPathExtension(UniChar *unichars, CFIndex length);
-#define CF_IS_OBJC(typeID, obj) (false)
+/* PureFoundation - start opencflite*/
+
+//#define CF_IS_OBJC(typeID, obj) (false)
+#define CF_IS_OBJC(typeID, obj) (((CFRuntimeBase *)(obj))->_cfisa != NULL && ((CFRuntimeBase *)(obj))->_cfisa != __CFISAForTypeID(typeID))
+
+/* PureFoundation - end */
#define CF_OBJC_VOIDCALL0(obj, sel)
#define CF_OBJC_VOIDCALL1(obj, sel, a1)
@@ -467,7 +476,16 @@
#define CF_OBJC_FUNCDISPATCH5(typeID, rettype, obj, sel, a1, a2, a3, a4, a5)
#endif //__WIN32__
-#define __CFISAForTypeID(x) (0)
+/* PureFoundation - start _sjc_
+ * _sjc_ : To re-enable the CF-Foundation bridge,
+ * this has be re-instated as a full function. It
+ * can be found implemented in CFRuntime.c ~line 200
+ */
+
+//#define __CFISAForTypeID(x) (0)
+uintptr_t __CFISAForTypeID( CFTypeID cf_id );
+
+/* PureFoundation - end */
#define __CFMaxRuntimeTypes 65535
diff -ru CF-476.19/CFLocale.c CF-476.19-patched/CFLocale.c
--- CF-476.19/CFLocale.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFLocale.c 2012-10-09 15:56:57.000000000 +0200
@@ -979,5 +979,30 @@
CONST_STRING_DECL(kCFHebrewCalendar, "hebrew")
CONST_STRING_DECL(kCFChineseCalendar, "chinese")
+// PureFoundation -- 10/2/09 -- _sjc_
+CONST_STRING_DECL(NSBuddhistCalendar, "buddhist")
+CONST_STRING_DECL(NSChineseCalendar, "chinese")
+CONST_STRING_DECL(NSGregorianCalendar, "gregorian")
+CONST_STRING_DECL(NSHebrewCalendar, "hebrew")
+CONST_STRING_DECL(NSIslamicCalendar, "islamic")
+CONST_STRING_DECL(NSIslamicCivilCalendar, "islamic-civil")
+CONST_STRING_DECL(NSJapaneseCalendar, "japanese")
+CONST_STRING_DECL(NSLocaleCalendar, "locale:calendarref")
+// PureFoundation -- 12/2/09 -- _sjc_
+CONST_STRING_DECL(NSLocaleIdentifier, "locale:id")
+CONST_STRING_DECL(NSLocaleLanguageCode, "locale:language code")
+CONST_STRING_DECL(NSLocaleCountryCode, "locale:country code")
+CONST_STRING_DECL(NSLocaleScriptCode, "locale:script code")
+CONST_STRING_DECL(NSLocaleVariantCode, "locale:variant code")
+CONST_STRING_DECL(NSLocaleExemplarCharacterSet, "locale:exemplar characters")
+CONST_STRING_DECL(NSLocaleCollationIdentifier, "collation")
+CONST_STRING_DECL(NSLocaleUsesMetricSystem, "locale:uses metric")
+CONST_STRING_DECL(NSLocaleMeasurementSystem, "locale:measurement system")
+CONST_STRING_DECL(NSLocaleDecimalSeparator, "locale:decimal separator")
+CONST_STRING_DECL(NSLocaleGroupingSeparator, "locale:grouping separator")
+CONST_STRING_DECL(NSLocaleCurrencySymbol, "locale:currency symbol")
+CONST_STRING_DECL(NSLocaleCurrencyCode, "currency")
+// PureFoundation -- END
+
#undef kMaxICUNameSize
diff -ru CF-476.19/CFLocale.h CF-476.19-patched/CFLocale.h
--- CF-476.19/CFLocale.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFLocale.h 2012-10-09 15:56:57.000000000 +0200
@@ -176,6 +176,31 @@
CF_EXPORT const CFStringRef kCFIslamicCivilCalendar AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
CF_EXPORT const CFStringRef kCFJapaneseCalendar AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+// PureFoundation -- 10/2/09 -- _sjc_
+CF_EXPORT const CFStringRef NSBuddhistCalendar;
+CF_EXPORT const CFStringRef NSChineseCalendar;
+CF_EXPORT const CFStringRef NSGregorianCalendar;
+CF_EXPORT const CFStringRef NSHebrewCalendar;
+CF_EXPORT const CFStringRef NSIslamicCalendar;
+CF_EXPORT const CFStringRef NSIslamicCivilCalendar;
+CF_EXPORT const CFStringRef NSJapaneseCalendar;
+CF_EXPORT const CFStringRef NSLocaleCalendar;
+// PureFoundation -- 12/2/09 -- _sjc_
+CF_EXPORT const CFStringRef NSLocaleIdentifier;
+CF_EXPORT const CFStringRef NSLocaleLanguageCode;
+CF_EXPORT const CFStringRef NSLocaleCountryCode;
+CF_EXPORT const CFStringRef NSLocaleScriptCode;
+CF_EXPORT const CFStringRef NSLocaleVariantCode;
+CF_EXPORT const CFStringRef NSLocaleExemplarCharacterSet;
+CF_EXPORT const CFStringRef NSLocaleCalendar;
+CF_EXPORT const CFStringRef NSLocaleCollationIdentifier;
+CF_EXPORT const CFStringRef NSLocaleUsesMetricSystem;
+CF_EXPORT const CFStringRef NSLocaleMeasurementSystem;
+CF_EXPORT const CFStringRef NSLocaleDecimalSeparator;
+CF_EXPORT const CFStringRef NSLocaleGroupingSeparator;
+CF_EXPORT const CFStringRef NSLocaleCurrencySymbol;
+CF_EXPORT const CFStringRef NSLocaleCurrencyCode;
+// PureFoundation -- END
CF_EXTERN_C_END
Seulement dans CF-476.19-patched/: CFNotificationCenter.c
Seulement dans CF-476.19-patched/: CFNotificationCenter.h
diff -ru CF-476.19/CFNumber.c CF-476.19-patched/CFNumber.c
--- CF-476.19/CFNumber.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFNumber.c 2012-10-09 15:56:57.000000000 +0200
@@ -77,6 +77,9 @@
__private_extern__ void __CFBooleanInitialize(void) {
__kCFBooleanTypeID = _CFRuntimeRegisterClass(&__CFBooleanClass);
+ /* PureFoundation - start _sjc_ */
+ _CFRuntimeBridgeClasses( __kCFBooleanTypeID, "NSCFBoolean" );
+ /* PureFoundation - end */
_CFRuntimeSetInstanceTypeID(&__kCFBooleanTrue, __kCFBooleanTypeID);
__kCFBooleanTrue._base._cfisa = __CFISAForTypeID(__kCFBooleanTypeID);
_CFRuntimeSetInstanceTypeID(&__kCFBooleanFalse, __kCFBooleanTypeID);
@@ -864,6 +867,10 @@
__private_extern__ void __CFNumberInitialize(void) {
__kCFNumberTypeID = _CFRuntimeRegisterClass(&__CFNumberClass);
+
+ /* PureFoundation - start _sjc */
+ _CFRuntimeBridgeClasses( __kCFNumberTypeID, "NSCFNumber" );
+ /* PureFoundation - end */
_CFRuntimeSetInstanceTypeID(&__kCFNumberNaN, __kCFNumberTypeID);
__kCFNumberNaN._base._cfisa = __CFISAForTypeID(__kCFNumberTypeID);
diff -ru CF-476.19/CFPreferences.h CF-476.19-patched/CFPreferences.h
--- CF-476.19/CFPreferences.h 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFPreferences.h 2012-10-09 15:56:57.000000000 +0200
@@ -136,6 +136,11 @@
CF_EXPORT
CFArrayRef CFPreferencesCopyKeyList(CFStringRef applicationID, CFStringRef userName, CFStringRef hostName);
+/*just a stub for puredarwin, for compatibility
+ * must really search in source from where is it called and patch here
+ * this is not the place to do this
+ */
+CF_EXPORT Boolean CFPreferencesAppValueIsForced(CFStringRef key, CFStringRef applicationID);
CF_EXTERN_C_END
diff -ru CF-476.19/CFRuntime.c CF-476.19-patched/CFRuntime.c
--- CF-476.19/CFRuntime.c 2009-08-10 22:32:50.000000000 +0200
+++ CF-476.19-patched/CFRuntime.c 2012-10-10 02:33:27.160490360 +0200
@@ -39,6 +39,11 @@
#include <unistd.h>
#include "auto_stubs.h"
+/* PureFoundation - start rafi
+ * Needed for the inline : "CF_INLINE int CFTYPE_IS_OBJC" */
+#include <objc/message.h>
+/* PureFoundation - end */
+
#define __CFRecordAllocationEvent(a, b, c, d, e) ((void)0)
enum {
@@ -48,6 +53,14 @@
__kCFReleaseEvent = 29
};
+// PureFoundation -- 9/2/09 -- _sjc_
+CONST_STRING_DECL(NSGenericException, "NSGenericException")
+CONST_STRING_DECL(NSRangeException, "NSRangeException")
+CONST_STRING_DECL(NSInvalidArgumentException, "NSInvalidArgumentException")
+CONST_STRING_DECL(NSInternalInconsistencyException, "NSInternalInconsistencyException")
+CONST_STRING_DECL(NSMallocException, "NSMallocException")
+// PureFoundation - end
+
#include <malloc/malloc.h>
extern void __HALT(void);
@@ -178,10 +191,97 @@
return __CFRuntimeClassTableCount - 1;
}
+/* PureFoundation - start _sjc
+ * "PureFoundation" alterations designed to reinstate the CF-Foundation
+ * bridge. Set up a table of CFTypeID-Foundation Class pointers pairs,
+ * used to populate the _cfisa/ISA pointer of bridged CF objects
+ * Not great code. eg. not currently 64-bit safe.
+ */
+
+//void _CFRuntimeBridgeClasses(CFTypeID cf_typeID, const char *objc_classname) {
+// return;
+//}
+
+#define PF_BTS 32
+struct __PFBridgeTableStruct {
+ CFTypeID id;
+ Class class;
+};
+struct __PFBridgeTableStruct _PFBridgeTable[PF_BTS];
+static int _PFBridgeCount = 0;
+
+/* PureFoundation
+ * Write a CFTypeID-Foundation class pair into the _PFBridgeTable.
+ * Uses the obj-c runtime to look up the class pointer.
+ *
+ * This is currently called from +[NSObject load]
+ * in "PureFoundation"'s Foundation.framework.
+ * However, this means that eg. string objects declared as @""s
+ * are not bridged.
+ */
+
void _CFRuntimeBridgeClasses(CFTypeID cf_typeID, const char *objc_classname) {
- return;
+ //fprintf(stderr,"%s\n", __func__);
+ //fprintf(stderr,"\t SET CFTypeID %d", cf_typeID);
+
+ if( _PFBridgeCount == PF_BTS ) return;
+
+ Class cls = (Class)objc_getClass(objc_classname);
+
+ if( cls != nil )
+ {
+ //fprintf(stderr,"\t Class %d\t Classname %s\n", cls, objc_classname);
+ _PFBridgeTable[_PFBridgeCount].id = cf_typeID;
+ _PFBridgeTable[_PFBridgeCount].class = cls;
+ _PFBridgeCount++;
+ }
+ return;
+}
+
+/* PureFoundation
+ * Search _PFBridgeTable for the class pointer which corresponds to the
+ * given CFTypeID. Yes, it would have been much faster to just use the
+ * type id as an index into the table, but then it would probably need
+ * about 260 gaps, most of which aren't used.
+ */
+
+uintptr_t __CFISAForTypeID( CFTypeID cf_id ) {
+ //fprintf(stderr,"%s\n", __func__);
+ //fprintf(stderr,"\t GET CFTypeID %d",cf_id);
+
+ if(_PFBridgeCount != 0)
+ {
+ for( int i = 0; i < _PFBridgeCount; i++ )
+ {
+ if( cf_id == _PFBridgeTable[i].id )
+ {
+ //fprintf(stderr,"\t Class %d\t loop: %d\n", _PFBridgeTable[i].class, i );
+ return (uintptr_t)_PFBridgeTable[i].class;
+ }
+ }
+ }
+ //fprintf(stderr,"\tReturning a 0 ISA\n");
+ return 0;
}
+/* PureFoundation
+ * _sjc_ :
+ * Search for an object class in the _PFBridgeTable. Called by the CFTYPE_IS_OBJC macro. This
+ * is the simplest solution I could come up with. In an ideal world we could just compare
+ * _cfisa to 0, but somewhere along the way it seems to get stomped.
+ *
+ * bool _PFIsObjCObject( CFTypeRef obj ) ...
+ *
+ * rafi :
+ * Backport CF-550 macro instead, with the CF_IS_OBJC
+ * macro used in opencflite, Cf CFInternal.h
+ * PFIsObject bridges all CF type to NS and not only NS to CF (based
+ * on the pf6 patch).
+ *
+ */
+
+/* PureFoundation - end */
+
const CFRuntimeClass * _CFRuntimeGetClassWithTypeID(CFTypeID typeID) {
return __CFRuntimeClassTable[typeID];
}
@@ -311,10 +411,31 @@
#define __CFGenericAssertIsCF(cf) \
CFAssert2(cf != NULL && (NULL != __CFRuntimeClassTable[__CFGenericTypeID_inline(cf)]) && (__kCFNotATypeTypeID != __CFGenericTypeID_inline(cf)) && (__kCFTypeTypeID != __CFGenericTypeID_inline(cf)), __kCFLogAssertion, "%s(): pointer %p is not a CF object", __PRETTY_FUNCTION__, cf);
-#define CFTYPE_IS_OBJC(obj) (false)
-#define CFTYPE_OBJC_FUNCDISPATCH0(rettype, obj, sel) do {} while (0)
+/* PureFoundation - start rafi
+ * Macro from CF-550 need a real CFTYPE_IS_OBJC.
+ */
+
+//#define CFTYPE_IS_OBJC(obj) (false)
+//#define CFTYPE_OBJC_FUNCDISPATCH0(rettype, obj, sel) do {} while (0)
+
+CF_INLINE int CFTYPE_IS_OBJC(const void *obj) {
+ CFTypeID typeID = __CFGenericTypeID_inline(obj);
+ return CF_IS_OBJC(typeID, obj);
+}
+
+
+#define CFTYPE_OBJC_FUNCDISPATCH0(rettype, obj, sel) \
+ if (CFTYPE_IS_OBJC(obj)) \
+ {rettype (*func)(void *, SEL) = (rettype (*)(void *, SEL))objc_msgSend; \
+ static SEL s = NULL; if (!s) s = sel_registerName(sel); \
+ return func((void *)obj, s);}
+
+
#define CFTYPE_OBJC_FUNCDISPATCH1(rettype, obj, sel, a1) do {} while (0)
+/* PureFoundation - end */
+
+
CFTypeID CFGetTypeID(CFTypeRef cf) {
#if defined(DEBUG)
if (NULL == cf) HALT;
@@ -552,7 +673,12 @@
}
CFHashCode CFHash(CFTypeRef cf) {
- CFTYPE_OBJC_FUNCDISPATCH0(CFHashCode, cf, "hash");
+ /* PureFoundation - start _sjc
+ * Let all bridged objects have access to the CFHash functions*/
+
+ //CFTYPE_OBJC_FUNCDISPATCH0(CFHashCode, cf, "hash");
+
+ /* PureFoundation - end */
__CFGenericAssertIsCF(cf);
return _CFHash(cf);
}
@@ -706,12 +832,28 @@
/*** _CFRuntimeCreateInstance() can finally be called generally after this line. ***/
__CFRuntimeClassTableCount = 7;
+
+ /* PureFoundation - start _sjc
+ * Since CFString always grabs TypeID 7, and creates some strings itself,
+ * we'll create this bridge before __CFStringInitialize() */
+ _CFRuntimeBridgeClasses( 7, "NSCFString" );
+ _CFRuntimeBridgeClasses( 7, "NSCFConstantString" );
+ /* PureFoundation - end */
+
__CFStringInitialize(); // CFString's TypeID must be 0x7, now and forever
__CFRuntimeClassTableCount = 16;
__CFDictionaryInitialize();
__CFArrayInitialize();
__CFDataInitialize();
__CFSetInitialize();
+
+ /* PureFoundation - start _sjc */
+ _CFRuntimeBridgeClasses( CFArrayGetTypeID(), "NSCFArray" );
+ _CFRuntimeBridgeClasses( CFDictionaryGetTypeID(), "NSCFDictionary" );
+ _CFRuntimeBridgeClasses( CFDataGetTypeID(), "NSCFData" );
+ _CFRuntimeBridgeClasses( CFSetGetTypeID(), "NSCFSet" );
+ /* PureFoundation - end */
+
__CFNullInitialize(); // See above for hard-coding of this position
__CFBooleanInitialize(); // See above for hard-coding of this position
__CFNumberInitialize(); // See above for hard-coding of this position
@@ -749,7 +891,46 @@
__CFRunLoopTimerInitialize();
__CFSocketInitialize();
#endif
-
+
+ __CFFileDescriptorInitialize();
+ __CFNotificationCenterInitialize();
+
+
+ /* PureFoundation - start _sjc
+ * Bridge the remaining classes (I don't think that CF creates any of
+ * these classes for its own use between when they're initialized and
+ * here).
+ */
+ _CFRuntimeBridgeClasses( CFErrorGetTypeID(), "NSError" );
+ _CFRuntimeBridgeClasses( CFURLGetTypeID(), "PFURL" );
+ _CFRuntimeBridgeClasses( CFRunLoopTimerGetTypeID(), "NSCFTimer" );
+ _CFRuntimeBridgeClasses( CFCalendarGetTypeID(), "NSCFCalendar" );
+ _CFRuntimeBridgeClasses( CFCharacterSetGetTypeID(), "NSCFCharacterSet" );
+ _CFRuntimeBridgeClasses( CFDataGetTypeID(), "NSCFData" );
+ _CFRuntimeBridgeClasses( CFDateGetTypeID(), "NSCFDate" );
+ _CFRuntimeBridgeClasses( CFLocaleGetTypeID(), "NSCFLocale" );
+ _CFRuntimeBridgeClasses( CFTimeZoneGetTypeID(), "NSCFTimeZone" );
+ _CFRuntimeBridgeClasses( CFReadStreamGetTypeID(), "NSCFInputStream" );
+ _CFRuntimeBridgeClasses( CFWriteStreamGetTypeID(), "NSCFOutputStream" );
+ /* set a static var for use in CFURL.c */
+ _PFNSURLClass = (Class)objc_getClass("NSURL");
+ /* extend the bridge to compiler-produced constant strings */
+ uintptr_t *ptr = (uintptr_t *)objc_getClass("NSCFConstantString");
+ if (ptr) {
+ __CFConstantStringClassReference[0] = *ptr++;
+ __CFConstantStringClassReference[1] = *ptr++;
+ __CFConstantStringClassReference[2] = *ptr++;
+ __CFConstantStringClassReference[3] = *ptr++;
+ __CFConstantStringClassReference[4] = *ptr++;
+ __CFConstantStringClassReference[5] = *ptr++;
+ __CFConstantStringClassReference[6] = *ptr++;
+ __CFConstantStringClassReference[7] = *ptr++;
+ __CFConstantStringClassReference[8] = *ptr++;
+ __CFConstantStringClassReference[9] = *ptr++;
+ __CFConstantStringClassReference[10] = *ptr++;
+ __CFConstantStringClassReference[11] = NULL;
+ }
+ /* PureFoundation - end */
#if DEPLOYMENT_TARGET_MACOSX
{
diff -ru CF-476.19/CFSet.c CF-476.19-patched/CFSet.c
--- CF-476.19/CFSet.c 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/CFSet.c 2012-10-09 15:56:57.000000000 +0200
@@ -1462,6 +1462,10 @@
}
}
+/* PureFoundation - start _sjc */
+bool _CFSetIsMutable(CFSetRef set) { return (__CFHashGetType(set) == __kCFHashMutable); }
+/* PureFoundation - end */
+
#undef CF_OBJC_KVO_WILLCHANGE
#undef CF_OBJC_KVO_DIDCHANGE
diff -ru CF-476.19/CFSet.h CF-476.19-patched/CFSet.h
--- CF-476.19/CFSet.h 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/CFSet.h 2012-10-09 15:56:57.000000000 +0200
@@ -500,6 +500,10 @@
CF_EXPORT
void CFSetRemoveAllValues(CFMutableSetRef theSet);
+/* PureFoundation - start _sjc */
+CF_EXPORT bool _CFSetIsMutable(CFSetRef set);
+/* PureFoundation - end */
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFSET__ */
diff -ru CF-476.19/CFString.c CF-476.19-patched/CFString.c
--- CF-476.19/CFString.c 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/CFString.c 2012-10-09 20:31:57.184921212 +0200
@@ -5784,6 +5784,10 @@
+/* PureFoundation - start _sjc */
+bool __CFStringIsMutable( CFStringRef str ) { return __CFStrIsMutable(str); }
+/* PureFoundation - end */
+
#undef HANGUL_SBASE
#undef HANGUL_LBASE
#undef HANGUL_VBASE
@@ -5794,3 +5798,13 @@
#undef HANGUL_TCOUNT
#undef HANGUL_NCOUNT
+Boolean
+CFStringTransform (CFMutableStringRef str, CFRange *range,
+ CFStringRef transform, Boolean reverse)
+{
+ return true;
+}
+
+
+
+
diff -ru CF-476.19/CFString.h CF-476.19-patched/CFString.h
--- CF-476.19/CFString.h 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/CFString.h 2012-10-10 01:02:48.656598391 +0200
@@ -692,6 +692,7 @@
You can pass one of the predefined transforms below, or any valid ICU transform ID as defined in the ICU User Guide. Note that we do not support arbitrary set of ICU transform rules.
*/
+CF_EXPORT
Boolean CFStringTransform(CFMutableStringRef string, CFRange *range, CFStringRef transform, Boolean reverse) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
/* Transform identifiers for CFStringTransform()
@@ -837,6 +838,10 @@
CF_EXPORT
CFStringRef __CFStringMakeConstantString(const char *cStr); /* Private; do not use */
+/* PureFoundation - start _sjc */
+CF_EXPORT bool __CFStringIsMutable( CFStringRef str );
+/* PureFoundation - end */
+
CF_EXTERN_C_END
#endif /* ! __COREFOUNDATION_CFSTRING__ */
diff -ru CF-476.19/CFURL.c CF-476.19-patched/CFURL.c
--- CF-476.19/CFURL.c 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/CFURL.c 2012-10-09 15:56:57.000000000 +0200
@@ -42,6 +42,31 @@
#include <sys/types.h>
#endif
+
+/* PureFoundation - start _sjc
+ * Re-define certain macros to allow obj-c message dispatch */
+#include <objc/runtime.h>
+#include <objc/message.h>
+
+#undef CF_IS_OBJC
+#undef CF_OBJC_CALL0
+#undef CF_OBJC_FUNCDISPATCH0
+
+#define CF_IS_OBJC(typeID, obj) (_PFIsNSURL(obj))
+
+#define CF_OBJC_CALL0(rettype, retvar, obj, sel) retvar = (rettype)objc_msgSend((id)obj, sel_getUid(sel))
+
+#define CF_OBJC_FUNCDISPATCH0(typeID, rettype, obj, sel) if(_PFIsNSURL((CFTypeRef)obj)) return (rettype)objc_msgSend((id)obj, sel_getUid(sel))
+
+bool _PFIsNSURL(CFTypeRef obj)
+{
+ // CFLog(0, CFSTR("\n_PFIsNSURL !!!\n\n"));
+ // fprintf(stderr,"\t_PFIsNSURL\n");
+ return (*(Class *)obj == _PFNSURLClass) ? TRUE : FALSE;
+}
+/* PureFoundation - end */
+
+
static CFArrayRef HFSPathToURLComponents(CFStringRef path, CFAllocatorRef alloc, Boolean isDir);
static CFArrayRef WindowsPathToURLComponents(CFStringRef path, CFAllocatorRef alloc, Boolean isDir);
static CFStringRef WindowsPathToURLPath(CFStringRef path, CFAllocatorRef alloc, Boolean isDir);
@@ -4213,4 +4238,19 @@
return url;
}
+/* PureFoundation - start _sjc
+ * Restore the macros re-defined above to their values from CFInternal.h
+ *
+ * rafi - change CF_IS_OBJ to the actual value in CFInternal.h */
+
+#undef CF_IS_OBJC
+#undef CF_OBJC_CALL0
+#undef CF_OBJC_FUNCDISPATCH0
+
+#define CF_IS_OBJC(typeID, obj) (((CFRuntimeBase *)(obj))->_cfisa != NULL && ((CFRuntimeBase *)(obj))->_cfisa != __CFISAForTypeID(typeID))
+#define CF_OBJC_CALL0(rettype, retvar, obj, sel) do { } while(0)
+#define CF_OBJC_FUNCDISPATCH0(typeID, rettype, obj, sel) do { } while(0)
+/* PureFoundation - end */
+
+
diff -ru CF-476.19/CoreFoundation.h CF-476.19-patched/CoreFoundation.h
--- CF-476.19/CoreFoundation.h 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/CoreFoundation.h 2012-10-09 15:56:57.000000000 +0200
@@ -71,10 +71,12 @@
#include <CoreFoundation/CFDateFormatter.h>
#include <CoreFoundation/CFDictionary.h>
#include <CoreFoundation/CFError.h>
+#include <CoreFoundation/CFFileDescriptor.h>
#include <CoreFoundation/CFLocale.h>
#include <CoreFoundation/CFLogUtilities.h>
#include <CoreFoundation/CFMachPort.h>
#include <CoreFoundation/CFMessagePort.h>
+#include <CoreFoundation/CFNotificationCenter.h>
#include <CoreFoundation/CFNumber.h>
#include <CoreFoundation/CFNumberFormatter.h>
#include <CoreFoundation/CFPlugIn.h>
Seulement dans CF-476.19-patched/: CoreFoundation_Prefix.h
diff -ru CF-476.19/ForFoundationOnly.h CF-476.19-patched/ForFoundationOnly.h
--- CF-476.19/ForFoundationOnly.h 2009-08-10 22:32:51.000000000 +0200
+++ CF-476.19-patched/ForFoundationOnly.h 2012-10-09 15:56:57.000000000 +0200
@@ -70,6 +70,16 @@
CF_EXPORT const CFStringRef _kCFBundleInitialPathKey;
CF_EXPORT const CFStringRef _kCFBundleResolvedPathKey;
CF_EXPORT const CFStringRef _kCFBundlePrincipalClassKey;
+// PureFoundation -- _sjc_ -- 9/2/09
+CF_EXPORT const CFStringRef _kCFBundleResourceSpecificationKey;
+
+CF_EXPORT const CFStringRef NSGenericException;
+CF_EXPORT const CFStringRef NSRangeException;
+CF_EXPORT const CFStringRef NSInvalidArgumentException;
+CF_EXPORT const CFStringRef NSInternalInconsistencyException;
+
+CF_EXPORT const CFStringRef NSMallocException;
+// PureFoundation -- END
CF_EXPORT CFArrayRef _CFFindBundleResources(CFBundleRef bundle, CFURLRef bundleURL, CFStringRef subDirName, CFArrayRef searchLanguages, CFStringRef resName, CFArrayRef resTypes, CFIndex limit, UInt8 version);

391
patches/CF-476.pf1_CFFileDescriptor.c.p1.patch Normal file
View File

@@ -0,0 +1,391 @@
--- /dev/null 2012-10-07 21:09:48.844745905 +0200
+++ CF-476.19-patched/CFFileDescriptor.c 2012-10-10 02:36:01.936487286 +0200
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2009 Stuart Crook. All rights reserved.
+ *
+ * Created by Stuart Crook on 02/03/2009.
+ * This source code is a reverse-engineered implementation of the notification center from
+ * Apple's core foundation library.
+ *
+ * The PureFoundation code base consists of a combination of original code provided by contributors
+ * and open-source code drawn from a nuber of other projects -- chiefly Cocotron (www.coctron.org)
+ * and GNUStep (www.gnustep.org). Under the principal that the least-liberal licence trumps the others,
+ * the PureFoundation project as a whole is released under the GNU Lesser General Public License (LGPL).
+ * Where code has been included from other projects, that project's licence, along with a note of the
+ * exact source (eg. file name) is included inline in the source.
+ *
+ * Since PureFoundation is a dynamically-loaded shared library, it is my interpretation of the LGPL
+ * that any application linking to it is not automatically bound by its terms.
+ *
+ * See the text of the LGPL (from http://www.gnu.org/licenses/lgpl-3.0.txt, accessed 26/2/09):
+ *
+ */
+
+#include <CoreFoundation/CFRunLoop.h>
+#include "CFPriv.h"
+//#include <CoreFoundation/CoreFoundation_Prefix.h>
+#include "CFInternal.h"
+#include <CoreFoundation/CFFileDescriptor.h>
+
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX
+// for kqueue
+#include <sys/types.h>
+#if DEPLOYMENT_TARGET_MACOSX
+#include <sys/event.h>
+#endif
+#include <sys/time.h>
+
+// for threads
+#include <pthread.h>
+
+#if defined(__MACH__)
+// for mach ports
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <mach/notify.h>
+#endif
+
+// for close
+#include <unistd.h>
+#elif DEPLOYMENT_TARGET_WINDOWS
+#include <io.h>
+#include <stdio.h>
+#define close _close
+#endif
+
+
+typedef struct __CFFileDescriptor {
+ CFRuntimeBase _base;
+ CFFileDescriptorNativeDescriptor fd;
+ CFFileDescriptorNativeDescriptor qd;
+ CFFileDescriptorCallBack callback;
+ CFFileDescriptorContext context; // includes info for callback
+ CFRunLoopSourceRef rls;
+#if defined(__MACH__)
+ mach_port_t port;
+#endif
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX
+ pthread_t thread;
+#endif
+ CFSpinLock_t lock;
+} __CFFileDescriptor;
+
+
+#if DEPLOYMENT_TARGET_MACOSX
+/*
+ * callbacks, etc.
+ */
+// threaded kqueue watcher
+void *_CFFDWait(void *info)
+{
+ CFFileDescriptorRef f = (CFFileDescriptorRef)info;
+
+ struct kevent events[2];
+ //struct kevent change[2];
+ struct timespec ts = { 0, 0 };
+ int res;
+ mach_msg_header_t header;
+ mach_msg_id_t msgid;
+ mach_msg_return_t ret;
+
+ header.msgh_bits = MACH_MSGH_BITS_REMOTE(MACH_MSG_TYPE_MAKE_SEND);
+ header.msgh_size = 0;
+ header.msgh_remote_port = f->port;
+ header.msgh_local_port = MACH_PORT_NULL;
+ header.msgh_reserved = 0;
+
+ while(TRUE)
+ {
+ res = kevent(f->qd, NULL, 0, events, 2, NULL);
+
+ if( res > 0 )
+ {
+ msgid = 0;
+ for( int i = 0; i < res; i++ )
+ msgid |= ((events[i].filter == EVFILT_READ) ? kCFFileDescriptorReadCallBack : kCFFileDescriptorWriteCallBack);
+
+ //fprintf(stderr, "sending message, id = %d\n", msgid);
+
+ header.msgh_id = msgid;
+ ret = mach_msg(&header, MACH_SEND_MSG, sizeof(mach_msg_header_t), 0, MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+
+ //fprintf(stderr, "message ret = %X\n", ret);
+ if( ret == MACH_MSG_SUCCESS ) fprintf(stderr, "message sent OK\n");
+ }
+ }
+}
+
+// runloop get port callback: lazily create and start thread, if needed
+mach_port_t __CFFDGetPort(void *info)
+{
+ CFFileDescriptorRef f = (CFFileDescriptorRef)info;
+ __CFSpinLock(&f->lock);
+ if( f->port == MACH_PORT_NULL )
+ {
+ // create a mach_port (taken from CFMachPort source)
+ mach_port_t port;
+ pthread_t thread;
+
+ if(KERN_SUCCESS != mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &port))
+ {
+ __CFSpinUnlock(&f->lock);
+ return MACH_PORT_NULL;
+ }
+
+ if(0 != pthread_create(&thread, NULL, _CFFDWait, info)) // info is the file descriptor
+ {
+ mach_port_destroy(mach_task_self(), port);
+ __CFSpinUnlock(&f->lock);
+ return MACH_PORT_NULL;
+ }
+
+ f->port = port;
+ f->thread = thread;
+ }
+ __CFSpinUnlock(&f->lock);
+ return f->port;
+}
+#endif
+
+// main runloop callback: invoke the user's callback
+void *__CFFDRunLoopCallBack(void *msg, CFIndex size, CFAllocatorRef allocator, void *info)
+{
+ //fprintf(stderr, "runloop callback\n");
+#if defined(__MACH__)
+ ((__CFFileDescriptor *)info)->callback(info, ((mach_msg_header_t *)msg)->msgh_id, ((__CFFileDescriptor *)info)->context.info);
+#endif
+ return NULL;
+}
+
+
+static void __CFFileDescriptorDeallocate(CFTypeRef cf) {
+ CFFileDescriptorRef f = (CFFileDescriptorRef)cf;
+ __CFSpinLock(&f->lock);
+ //fprintf(stderr, "deallocating a CFFileDescriptor\n");
+ CFFileDescriptorInvalidate(f); // does most of the tear-down
+ __CFSpinUnlock(&f->lock);
+}
+
+static const CFRuntimeClass __CFFileDescriptorClass = {
+ 0,
+ "CFFileDescriptor",
+ NULL, // init
+ NULL, // copy
+ __CFFileDescriptorDeallocate,
+ NULL, //__CFDataEqual,
+ NULL, //__CFDataHash,
+ NULL, //
+ NULL, //__CFDataCopyDescription
+};
+
+static CFTypeID __kCFFileDescriptorTypeID = _kCFRuntimeNotATypeID;
+CFTypeID CFFileDescriptorGetTypeID(void) { return __kCFFileDescriptorTypeID; }
+
+// register the type with the CF runtime
+__private_extern__ void __CFFileDescriptorInitialize(void) {
+ __kCFFileDescriptorTypeID = _CFRuntimeRegisterClass(&__CFFileDescriptorClass);
+ //fprintf(stderr, "Registered CFFileDescriptor as type %d\n", __kCFFileDescriptorTypeID);
+}
+
+// use the base reserved bits for storage (like CFMachPort does)
+Boolean __CFFDIsValid(CFFileDescriptorRef f) {
+ return (Boolean)__CFBitfieldGetValue(((const CFRuntimeBase *)f)->_cfinfo[CF_INFO_BITS], 0, 0);
+}
+
+// create a file descriptor object
+CFFileDescriptorRef CFFileDescriptorCreate(CFAllocatorRef allocator, CFFileDescriptorNativeDescriptor fd, Boolean closeOnInvalidate, CFFileDescriptorCallBack callout, const CFFileDescriptorContext *context)
+{
+ if(callout == NULL) return NULL;
+
+#if DEPLOYMENT_TARGET_MACOSX
+ // create the kqueue and add the events we'll be monitoring, disabled
+ int qd = kqueue();
+ //fprintf(stderr, "kqueue() returned %d\n", qd);
+#else
+ int qd = 0;
+#endif
+ if( qd == -1 ) return NULL;
+
+ CFIndex size = sizeof(struct __CFFileDescriptor) - sizeof(CFRuntimeBase);
+ CFFileDescriptorRef memory = (CFFileDescriptorRef)_CFRuntimeCreateInstance(allocator, __kCFFileDescriptorTypeID, size, NULL);
+ if (memory == NULL) { close(qd); return NULL; }
+
+ //fprintf(stderr, "Allocated %d at %p\n", size, memory);
+
+ memory->fd = fd;
+ memory->qd = qd;
+ memory->callback = callout;
+
+ memory->context.version = 0;
+ if( context == NULL )
+ {
+ memory->context.info = NULL;
+ memory->context.retain = NULL;
+ memory->context.release = NULL;
+ memory->context.copyDescription = NULL;
+ }
+ else
+ {
+ memory->context.info = context->info;
+ memory->context.retain = context->retain;
+ memory->context.release = context->release;
+ memory->context.copyDescription = context->copyDescription;
+ }
+
+ memory->rls = NULL;
+#if DEPLOYMENT_TARGET_MACOSX
+ memory->port = MACH_PORT_NULL;
+#endif
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_LINUX
+ memory->thread = NULL;
+#endif
+
+ __CFBitfieldSetValue(((CFRuntimeBase *)memory)->_cfinfo[CF_INFO_BITS], 0, 0, 1); // valid
+ __CFBitfieldSetValue(((CFRuntimeBase *)memory)->_cfinfo[CF_INFO_BITS], 1, 1, closeOnInvalidate);
+
+ return memory;
+}
+
+
+CFFileDescriptorNativeDescriptor CFFileDescriptorGetNativeDescriptor(CFFileDescriptorRef f)
+{
+ //fprintf(stderr, "Entering CFFileDescriptorNativeDescriptor()\n");
+
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) || !__CFFDIsValid(f) ) return -1;
+
+ //fprintf(stderr, "Leaving CFFileDescriptorNativeDescriptor()\n");
+ return f->fd;
+}
+
+void CFFileDescriptorGetContext(CFFileDescriptorRef f, CFFileDescriptorContext *context)
+{
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) || (context == NULL) || (context->version != 0) || !__CFFDIsValid(f) )
+ return;
+
+ context->info = f->context.info;
+ context->retain = f->context.retain;
+ context->release = f->context.release;
+ context->copyDescription = f->context.copyDescription;
+}
+
+// enable callbacks, setting kqueue filter, regardless of whether watcher thread is running
+void CFFileDescriptorEnableCallBacks(CFFileDescriptorRef f, CFOptionFlags callBackTypes)
+{
+ //fprintf(stderr, "Entering CFFileDescriptorEnableCallBacks() with flags = %d\n", callBackTypes);
+
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) || !__CFFDIsValid(f) ) return;
+
+ __CFSpinLock(&f->lock);
+
+#if DEPLOYMENT_TARGET_MACOSX
+ struct kevent ev;
+ struct timespec ts = { 0, 0 };
+
+ if( callBackTypes | kCFFileDescriptorReadCallBack )
+ {
+ EV_SET(&ev, f->fd, EVFILT_READ, EV_ADD|EV_ONESHOT, 0, 0, 0);
+ kevent(f->qd, &ev, 1, NULL, 0, &ts);
+ }
+
+ if( callBackTypes | kCFFileDescriptorWriteCallBack )
+ {
+ EV_SET(&ev, f->fd, EVFILT_WRITE, EV_ADD|EV_ONESHOT, 0, 0, 0);
+ kevent(f->qd, &ev, 1, NULL, 0, &ts);
+ }
+#endif
+
+ __CFSpinUnlock(&f->lock);
+}
+
+// disable callbacks, setting kqueue filter, regardless of whether watcher thread is running
+void CFFileDescriptorDisableCallBacks(CFFileDescriptorRef f, CFOptionFlags callBackTypes)
+{
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) || !__CFFDIsValid(f) ) return;
+
+ __CFSpinLock(&f->lock);
+
+#if DEPLOYMENT_TARGET_MACOSX
+ struct kevent ev;
+ struct timespec ts = { 0, 0 };
+
+ if( callBackTypes | kCFFileDescriptorReadCallBack )
+ {
+ EV_SET(&ev, f->fd, EVFILT_READ, EV_DELETE, 0, 0, 0);
+ kevent(f->qd, &ev, 1, NULL, 0, &ts);
+ }
+
+ if( callBackTypes | kCFFileDescriptorWriteCallBack )
+ {
+ EV_SET(&ev, f->fd, EVFILT_WRITE, EV_DELETE, 0, 0, 0);
+ kevent(f->qd, &ev, 1, NULL, 0, &ts);
+ }
+#endif
+
+ __CFSpinUnlock(&f->lock);
+}
+
+// invalidate the file descriptor, possibly closing the fd
+void CFFileDescriptorInvalidate(CFFileDescriptorRef f)
+{
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) || !__CFFDIsValid(f) ) return;
+
+ __CFSpinLock(&f->lock);
+
+ __CFBitfieldSetValue(((CFRuntimeBase *)f)->_cfinfo[CF_INFO_BITS], 0, 0, 0); // invalidate flag
+
+#if DEPLOYMENT_TARGET_MACOSX
+ if( f->thread != NULL ) // assume there is a thread and a mach port
+ {
+ pthread_cancel(f->thread);
+ mach_port_destroy(mach_task_self(), f->port);
+
+ f->thread = NULL;
+ f->port = MACH_PORT_NULL;
+ }
+#endif
+
+ if( f->rls != NULL )
+ {
+ CFRelease(f->rls);
+ f->rls = NULL;
+ }
+
+#if DEPLOYMENT_TARGET_MACOSX
+ close(f->qd);
+ f->qd = -1;
+#endif
+
+ if( __CFBitfieldGetValue(((const CFRuntimeBase *)f)->_cfinfo[CF_INFO_BITS], 1, 1) ) // close fd on invalidate
+ close(f->fd);
+
+ __CFSpinUnlock(&f->lock);
+}
+
+// is file descriptor still valid, based on _base header flags?
+Boolean CFFileDescriptorIsValid(CFFileDescriptorRef f)
+{
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) ) return FALSE;
+ return __CFFDIsValid(f);
+}
+
+CFRunLoopSourceRef CFFileDescriptorCreateRunLoopSource(CFAllocatorRef allocator, CFFileDescriptorRef f, CFIndex order)
+{
+ //fprintf(stderr,"Entering CFFileDescriptorCreateRunLoopSource()\n");
+
+ if( (f == NULL) || (CFGetTypeID(f) != CFFileDescriptorGetTypeID()) || !__CFFDIsValid(f) ) return NULL;
+
+ __CFSpinLock(&f->lock);
+ if( f->rls == NULL )
+ {
+#if DEPLOYMENT_TARGET_MACOSX
+ CFRunLoopSourceContext1 context = { 1, CFRetain(f), (CFAllocatorRetainCallBack)f->context.retain, (CFAllocatorReleaseCallBack)f->context.release, (CFAllocatorCopyDescriptionCallBack)f->context.copyDescription, NULL, NULL, __CFFDGetPort, __CFFDRunLoopCallBack };
+ CFRunLoopSourceRef rls = CFRunLoopSourceCreate( allocator, order, (CFRunLoopSourceContext *)&context );
+ if( rls != NULL ) f->rls = rls;
+#endif
+ }
+ __CFSpinUnlock(&f->lock);
+ //fprintf(stderr,"Leaving CFFileDescriptorCreateRunLoopSource()\n");
+
+ return f->rls;
+}

61
patches/CF-476.pf2_CFFileDescriptor.h.p1.patch Normal file
View File

@@ -0,0 +1,61 @@
--- /dev/null 2012-10-07 21:09:48.844745905 +0200
+++ CF-476.pd1/CFFileDescriptor.h 2012-09-12 13:02:31.000000000 +0200
@@ -0,0 +1,58 @@
+/*
+ * CFFileDescriptor.h
+ *
+ * Stuart Crook, 2/3/09
+ */
+
+#if !defined(__COREFOUNDATION_CFFILEDESCRIPTOR__)
+#define __COREFOUNDATION_CFFILEDESCRIPTOR__ 1
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFRunLoop.h>
+
+#if (MAC_OS_X_VERSION_10_5 <= MAC_OS_X_VERSION_MAX_ALLOWED) || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
+
+CF_EXTERN_C_BEGIN
+
+typedef int CFFileDescriptorNativeDescriptor;
+
+typedef struct __CFFileDescriptor * CFFileDescriptorRef;
+
+/* Callback Reason Types */
+enum {
+ kCFFileDescriptorReadCallBack = 1 << 0,
+ kCFFileDescriptorWriteCallBack = 1 << 1
+};
+
+typedef void (*CFFileDescriptorCallBack)(CFFileDescriptorRef f, CFOptionFlags callBackTypes, void *info);
+
+typedef struct {
+ CFIndex version;
+ void * info;
+ void * (*retain)(void *info);
+ void (*release)(void *info);
+ CFStringRef (*copyDescription)(void *info);
+} CFFileDescriptorContext;
+
+CF_EXPORT CFTypeID CFFileDescriptorGetTypeID(void);
+
+CF_EXPORT CFFileDescriptorRef CFFileDescriptorCreate(CFAllocatorRef allocator, CFFileDescriptorNativeDescriptor fd, Boolean closeOnInvalidate, CFFileDescriptorCallBack callout, const CFFileDescriptorContext *context);
+
+CF_EXPORT CFFileDescriptorNativeDescriptor CFFileDescriptorGetNativeDescriptor(CFFileDescriptorRef f);
+
+CF_EXPORT void CFFileDescriptorGetContext(CFFileDescriptorRef f, CFFileDescriptorContext *context);
+
+CF_EXPORT void CFFileDescriptorEnableCallBacks(CFFileDescriptorRef f, CFOptionFlags callBackTypes);
+CF_EXPORT void CFFileDescriptorDisableCallBacks(CFFileDescriptorRef f, CFOptionFlags callBackTypes);
+
+CF_EXPORT void CFFileDescriptorInvalidate(CFFileDescriptorRef f);
+CF_EXPORT Boolean CFFileDescriptorIsValid(CFFileDescriptorRef f);
+
+CF_EXPORT CFRunLoopSourceRef CFFileDescriptorCreateRunLoopSource(CFAllocatorRef allocator, CFFileDescriptorRef f, CFIndex order);
+
+CF_EXTERN_C_END
+
+#endif
+
+#endif /* ! __COREFOUNDATION_CFFILEDESCRIPTOR__ */
+

1314
patches/CF-476.pf3_CFNotificationCenter.c.p1.patch Normal file
View File

File diff suppressed because it is too large Load Diff

79
patches/CF-476.pf4_CFNotificationCenter.h.p1.patch Normal file
View File

@@ -0,0 +1,79 @@
diff -ruN CF-476.17/CFNotificationCenter.h CF-476.17.basic.patched/CFNotificationCenter.h
--- CF-476.17/CFNotificationCenter.h 1970-01-01 01:00:00.000000000 +0100
+++ CF-476.17.basic.patched/CFNotificationCenter.h 2009-02-21 16:01:17.000000000 +0000
@@ -0,0 +1,75 @@
+/* CFNotificationCenter.h
+ Copyright (c) 1998-2007, Apple Inc. All rights reserved.
+*/
+
+#if !defined(__COREFOUNDATION_CFNOTIFICATIONCENTER__)
+#define __COREFOUNDATION_CFNOTIFICATIONCENTER__ 1
+
+#include <CoreFoundation/CFBase.h>
+#include <CoreFoundation/CFDictionary.h>
+
+CF_EXTERN_C_BEGIN
+
+typedef struct __CFNotificationCenter * CFNotificationCenterRef;
+
+typedef void (*CFNotificationCallback)(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo);
+
+enum {
+ CFNotificationSuspensionBehaviorDrop = 1,
+ // The server will not queue any notifications with this name and object while the process/app is in the background.
+ CFNotificationSuspensionBehaviorCoalesce = 2,
+ // The server will only queue the last notification of the specified name and object; earlier notifications are dropped.
+ CFNotificationSuspensionBehaviorHold = 3,
+ // The server will hold all matching notifications until the queue has been filled (queue size determined by the server) at which point the server may flush queued notifications.
+ CFNotificationSuspensionBehaviorDeliverImmediately = 4
+ // The server will deliver notifications matching this registration whether or not the process is in the background. When a notification with this suspension behavior is matched, it has the effect of first flushing any queued notifications.
+};
+typedef CFIndex CFNotificationSuspensionBehavior;
+
+CF_EXPORT CFTypeID CFNotificationCenterGetTypeID(void);
+
+CF_EXPORT CFNotificationCenterRef CFNotificationCenterGetLocalCenter(void) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+
+CF_EXPORT CFNotificationCenterRef CFNotificationCenterGetDistributedCenter(void);
+
+CF_EXPORT CFNotificationCenterRef CFNotificationCenterGetDarwinNotifyCenter(void) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+// The Darwin Notify Center is based on the <notify.h> API.
+// For this center, there are limitations in the API. There are no notification "objects",
+// "userInfo" cannot be passed in the notification, and there are no suspension behaviors
+// (always "deliver immediately"). Other limitations in the <notify.h> API as described in
+// that header will also apply.
+// - In the CFNotificationCallback, the 'object' and 'userInfo' parameters must be ignored.
+// - CFNotificationCenterAddObserver(): the 'object' and 'suspensionBehavior' arguments are ignored.
+// - CFNotificationCenterAddObserver(): the 'name' argument may not be NULL (for this center).
+// - CFNotificationCenterRemoveObserver(): the 'object' argument is ignored.
+// - CFNotificationCenterPostNotification(): the 'object', 'userInfo', and 'deliverImmediately' arguments are ignored.
+// - CFNotificationCenterPostNotificationWithOptions(): the 'object', 'userInfo', and 'options' arguments are ignored.
+// The Darwin Notify Center has no notion of per-user sessions, all notifications are system-wide.
+// As with distributed notifications, the main thread's run loop must be running in one of the
+// common modes (usually kCFRunLoopDefaultMode) for Darwin-style notifications to be delivered.
+// NOTE: NULL or 0 should be passed for all ignored arguments to ensure future compatibility.
+
+
+CF_EXPORT void CFNotificationCenterAddObserver(CFNotificationCenterRef center, const void *observer, CFNotificationCallback callBack, CFStringRef name, const void *object, CFNotificationSuspensionBehavior suspensionBehavior);
+
+CF_EXPORT void CFNotificationCenterRemoveObserver(CFNotificationCenterRef center, const void *observer, CFStringRef name, const void *object);
+CF_EXPORT void CFNotificationCenterRemoveEveryObserver(CFNotificationCenterRef center, const void *observer);
+
+CF_EXPORT void CFNotificationCenterPostNotification(CFNotificationCenterRef center, CFStringRef name, const void *object, CFDictionaryRef userInfo, Boolean deliverImmediately);
+
+#if MAC_OS_X_VERSION_10_3 <= MAC_OS_X_VERSION_MAX_ALLOWED
+
+enum {
+ kCFNotificationDeliverImmediately = (1 << 0),
+ kCFNotificationPostToAllSessions = (1 << 1)
+};
+
+void CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterRef center, CFStringRef name, const void *object, CFDictionaryRef userInfo, CFOptionFlags options) AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER;
+
+#endif
+
+
+CF_EXTERN_C_END
+
+#endif /* ! __COREFOUNDATION_CFNOTIFICATIONCENTER__ */
+

50
patches/CFNetwork-129.20.rm_CoreServices.p1.patch Normal file
View File

@@ -0,0 +1,50 @@
diff -ru CFNetwork-129.20/HTTP/NTLM/ntlmBlobPriv.cpp CFNetwork-129.20.pd1/HTTP/NTLM/ntlmBlobPriv.cpp
--- CFNetwork-129.20/HTTP/NTLM/ntlmBlobPriv.cpp 2007-03-27 07:55:09.000000000 +0200
+++ CFNetwork-129.20.pd1/HTTP/NTLM/ntlmBlobPriv.cpp 2012-09-12 03:32:31.926197240 +0200
@@ -47,7 +47,9 @@
* Private routines used by NtlmGenerator module.
*/
#include "ntlmBlobPriv.h"
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CarbonCore/MacErrors.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
@@ -455,7 +457,7 @@
crtn = CSSM_EncryptDataUpdate(ccHand,
&ptext, 1,
&ctext, 1,
- &bytesEncrypted);
+ (CSSM_SIZE*)&bytesEncrypted);
if(crtn) {
#ifndef NDEBUG
cssmPerror("CSSM_EncryptDataUpdate", crtn);
diff -ru CFNetwork-129.20/HTTP/NTLM/ntlmBlobPriv.h CFNetwork-129.20.pd1/HTTP/NTLM/ntlmBlobPriv.h
--- CFNetwork-129.20/HTTP/NTLM/ntlmBlobPriv.h 2007-03-27 07:55:09.000000000 +0200
+++ CFNetwork-129.20.pd1/HTTP/NTLM/ntlmBlobPriv.h 2012-09-12 03:24:06.514207280 +0200
@@ -55,7 +55,8 @@
#include <stdint.h>
#include <Security/cssmtype.h>
#include <Security/SecBase.h>
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
+#include <CoreFoundation/CoreFoundation.h>
#ifdef __cplusplus
extern "C" {
diff -ru CFNetwork-129.20/HTTP/NTLM/NtlmGenerator.cpp CFNetwork-129.20.pd1/HTTP/NTLM/NtlmGenerator.cpp
--- CFNetwork-129.20/HTTP/NTLM/NtlmGenerator.cpp 2007-03-27 07:55:09.000000000 +0200
+++ CFNetwork-129.20.pd1/HTTP/NTLM/NtlmGenerator.cpp 2012-09-12 03:28:08.222202478 +0200
@@ -55,7 +55,9 @@
#include "NtlmGenerator.h"
#include "ntlmBlobPriv.h"
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CarbonCore/MacErrors.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>

37
patches/CarbonHeaders-9G55.Makefile_and_kNilOptions.p1.patch Normal file
View File

@@ -0,0 +1,37 @@
diff -ru CarbonHeaders-9G55/MacTypes.h CarbonHeaders-9G55.pd1/MacTypes.h
--- CarbonHeaders-9G55/MacTypes.h 2009-01-13 21:59:09.000000000 +0100
+++ CarbonHeaders-9G55.pd1/MacTypes.h 2012-09-09 21:07:11.502089020 +0200
@@ -348,9 +348,11 @@
noErr = 0
};
+#if 0
enum {
kNilOptions = 0
};
+#endif
#define kInvalidID 0
enum {
diff -ru CarbonHeaders-9G55/Makefile CarbonHeaders-9G55.pd1/Makefile
--- CarbonHeaders-9G55/Makefile 2009-02-18 21:53:46.000000000 +0100
+++ CarbonHeaders-9G55.pd1/Makefile 2012-09-09 21:09:59.234085688 +0200
@@ -8,6 +8,7 @@
CORESERVICES=$(DSTROOT)/System/Library/Frameworks/CoreServices.framework
CARBONCORE=$(DSTROOT)/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework
CARBONCORE_HEADERS=$(CARBONCORE)/Versions/A/Headers
+CARBON_KERN_HEADERS=$(DSTROOT)/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
install:
mkdir -p $(INCLUDE)
@@ -19,6 +20,9 @@
mkdir -p $(CARBONCORE_HEADERS)
+ mkdir -p $(CARBON_KERN_HEADERS)
+ cp TargetConditionals.h $(CARBON_KERN_HEADERS)
+
ln -hfs /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers $(INCLUDE)/CarbonCore
ln -hfs A $(CORESERVICES)/Versions/Current
ln -hfs A $(CARBONCORE)/Versions/Current
Seulement dans CarbonHeaders-9G55.pd1/: Makefile~

68
patches/DSPasswordServerPlugin-208.6.CarbonHeadersCorrection.p1.patch Normal file
View File

@@ -0,0 +1,68 @@
diff -ru DSPasswordServerPlugin-208.6/AuthFile.mm DSPasswordServerPlugin-208.6.pd1/AuthFile.mm
--- DSPasswordServerPlugin-208.6/AuthFile.mm 2007-03-12 23:40:05.000000000 +0100
+++ DSPasswordServerPlugin-208.6.pd1/AuthFile.mm 2012-09-11 05:27:20.211776665 +0200
@@ -38,7 +38,9 @@
#endif
#include <TargetConditionals.h>
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
+#include <CarbonCore/endian.h>
+
#include <CommonCrypto/CommonDigest.h>
#include <sys/param.h>
Seulement dans DSPasswordServerPlugin-208.6.pd1/: AuthFile.mm~
diff -ru DSPasswordServerPlugin-208.6/CAuthFileBase.cpp DSPasswordServerPlugin-208.6.pd1/CAuthFileBase.cpp
--- DSPasswordServerPlugin-208.6/CAuthFileBase.cpp 2007-01-11 02:30:55.000000000 +0100
+++ DSPasswordServerPlugin-208.6.pd1/CAuthFileBase.cpp 2012-09-11 05:03:49.887804682 +0200
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <openssl/err.h>
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
#include <TargetConditionals.h>
#include "DSMutexSemaphore.h"
diff -ru DSPasswordServerPlugin-208.6/CPSUtilities.cpp DSPasswordServerPlugin-208.6.pd1/CPSUtilities.cpp
--- DSPasswordServerPlugin-208.6/CPSUtilities.cpp 2007-09-14 00:57:15.000000000 +0200
+++ DSPasswordServerPlugin-208.6.pd1/CPSUtilities.cpp 2012-09-11 05:05:44.151802411 +0200
@@ -59,6 +59,9 @@
#include "SASLCode.h"
#include "CAuthFileBase.h"
+#include <CarbonCore/MacTypes.h>
+
+
#define kMinTrialTime 140000
#define kMaxTrialTime 1250000
#define kMaxIPAddrs 32
diff -ru DSPasswordServerPlugin-208.6/CReplicaFile.cpp DSPasswordServerPlugin-208.6.pd1/CReplicaFile.cpp
--- DSPasswordServerPlugin-208.6/CReplicaFile.cpp 2008-04-15 23:28:49.000000000 +0200
+++ DSPasswordServerPlugin-208.6.pd1/CReplicaFile.cpp 2012-09-11 05:02:09.791806669 +0200
@@ -1871,7 +1871,7 @@
char *tptr = outHexStr;
char base16table[16] = { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' };
- if ( inData == nil || outHexStr == nil )
+ if ( inData == NULL || outHexStr == NULL )
return false;
for ( int idx = 0; idx < len; idx++ )
diff -ru DSPasswordServerPlugin-208.6/SMBAuth.c DSPasswordServerPlugin-208.6.pd1/SMBAuth.c
--- DSPasswordServerPlugin-208.6/SMBAuth.c 2007-02-07 01:06:59.000000000 +0100
+++ DSPasswordServerPlugin-208.6.pd1/SMBAuth.c 2012-09-11 05:31:21.999771863 +0200
@@ -31,7 +31,11 @@
#include <syslog.h>
#include <CommonCrypto/CommonCryptor.h>
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
+#include <CarbonCore/Endian.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+
/*!
* @header SMBAuth

52
patches/DSPasswordServerPlugin-208.6.rm_CoreServices.p1.patch Normal file
View File

@@ -0,0 +1,52 @@
diff -ru DSPasswordServerPlugin-208.6/CPSPlugInUtils.cpp DSPasswordServerPlugin-208.6.pd1/CPSPlugInUtils.cpp
--- DSPasswordServerPlugin-208.6/CPSPlugInUtils.cpp 2007-05-09 20:19:14.000000000 +0200
+++ DSPasswordServerPlugin-208.6.pd1/CPSPlugInUtils.cpp 2012-09-12 11:34:29.645622816 +0200
@@ -24,7 +24,8 @@
#include <arpa/inet.h>
#include "CPSPlugInUtils.h"
#include <PasswordServer/AuthDBFileDefs.h>
-#include <CoreServices/CoreServices.h>
+//#include <CoreServices/CoreServices.h>
+#include <CFNetwork/CFNetwork.h>
#define DEBUGLOG(A,args...) CShared::LogIt( 0x0F, (A), ##args )
diff -ru DSPasswordServerPlugin-208.6/PasswordServerPlugin.xcodeproj/project.pbxproj DSPasswordServerPlugin-208.6.pd1/PasswordServerPlugin.xcodeproj/project.pbxproj
--- DSPasswordServerPlugin-208.6/PasswordServerPlugin.xcodeproj/project.pbxproj 2008-09-25 23:33:20.000000000 +0200
+++ DSPasswordServerPlugin-208.6.pd1/PasswordServerPlugin.xcodeproj/project.pbxproj 2012-09-12 11:46:25.397608597 +0200
@@ -105,7 +105,7 @@
AABD3D410830037A00C77166 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
AABD3D420830037A00C77166 /* libsasl2.2.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C1E240294335201DD284B /* libsasl2.2.0.1.dylib */; };
AABD3F06083022D000C77166 /* DirectoryService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABD3F05083022D000C77166 /* DirectoryService.framework */; };
- AAE4827509F9855D00DDDA9A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE4827409F9855D00DDDA9A /* CoreServices.framework */; };
+ AAE4827509F9855D00DDDA9A /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE4827409F9855D00DDDA9A /* CFNetwork.framework */; };
AAEF117B094E0950006E4198 /* AuthDBFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = AAEF1179094E0950006E4198 /* AuthDBFile.mm */; };
AAEF117C094E0950006E4198 /* AuthOverflowFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = AAEF117A094E0950006E4198 /* AuthOverflowFile.mm */; };
AAEF118F094E0986006E4198 /* SMBAuth.c in Sources */ = {isa = PBXBuildFile; fileRef = AAEF118D094E0986006E4198 /* SMBAuth.c */; };
@@ -201,7 +201,7 @@
AABD3D440830037A00C77166 /* Info-PasswordServerFramework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-PasswordServerFramework.plist"; sourceTree = "<group>"; };
AABD3D450830037A00C77166 /* PasswordServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PasswordServer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
AABD3F05083022D000C77166 /* DirectoryService.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DirectoryService.framework; path = /System/Library/Frameworks/DirectoryService.framework; sourceTree = "<absolute>"; };
- AAE4827409F9855D00DDDA9A /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+ AAE4827409F9855D00DDDA9A /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = /System/Library/Frameworks/CFNetwork.framework; sourceTree = "<absolute>"; };
AAEF1179094E0950006E4198 /* AuthDBFile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AuthDBFile.mm; sourceTree = "<group>"; };
AAEF117A094E0950006E4198 /* AuthOverflowFile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AuthOverflowFile.mm; sourceTree = "<group>"; };
AAEF118D094E0986006E4198 /* SMBAuth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SMBAuth.c; sourceTree = "<group>"; };
@@ -273,7 +273,7 @@
AABD3F06083022D000C77166 /* DirectoryService.framework in Frameworks */,
AABD3D050830037A00C77166 /* DirectoryServiceCore.framework in Frameworks */,
AABD3D060830037A00C77166 /* PasswordServer.framework in Frameworks */,
- AAE4827509F9855D00DDDA9A /* CoreServices.framework in Frameworks */,
+ AAE4827509F9855D00DDDA9A /* CFNetwork.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -306,7 +306,7 @@
089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
isa = PBXGroup;
children = (
- AAE4827409F9855D00DDDA9A /* CoreServices.framework */,
+ AAE4827409F9855D00DDDA9A /* CFNetwork.framework */,
0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
AABD3F05083022D000C77166 /* DirectoryService.framework */,
F56C1E41029436AB01DD284B /* DirectoryServiceCore.framework */,

38
patches/DarwinTools-1.pd_patch.p1.patch Normal file
View File

@@ -0,0 +1,38 @@
diff -ru DarwinTools-1/Makefile DarwinTools-1.pd1/Makefile
--- DarwinTools-1/Makefile 2005-04-29 07:02:41.000000000 +0200
+++ DarwinTools-1.pd1/Makefile 2012-09-24 04:26:00.334310423 +0200
@@ -30,8 +30,4 @@
$(INSTALL) -c -m 0755 "$(SYMROOT)/$@" "$(DSTROOT)/usr/bin"
$(STRIP) "$(DSTROOT)/usr/bin/$@"
-startupfiletool: startupfiletool.c
- $(CC) $(RC_CFLAGS) -o "$(SYMROOT)/$@" $^
- $(MKDIR) "$(DSTROOT)/usr/sbin"
- $(INSTALL) -c -m 0755 "$(SYMROOT)/$@" "$(DSTROOT)/usr/sbin"
- $(STRIP) "$(DSTROOT)/usr/sbin/$@"
+
diff -ru DarwinTools-1/SystemVersion.plist DarwinTools-1.pd1/SystemVersion.plist
--- DarwinTools-1/SystemVersion.plist 2005-04-28 00:44:22.000000000 +0200
+++ DarwinTools-1.pd1/SystemVersion.plist 2012-09-24 04:29:19.958306458 +0200
@@ -3,16 +3,16 @@
<plist version="1.0">
<dict>
<key>ProductBuildVersion</key>
- <string>8A428</string>
+ <string>9L30</string>
<key>ProductCopyright</key>
- <string></string>
+ <string>(c) 1983-2009 Apple Inc. / (c) 2009 The PureDarwin Project</string>
<key>ProductName</key>
<string>Darwin</string>
<key>ProductUserVisibleVersion</key>
- <string>8.0</string>
+ <string>9.8</string>
<key>ProductVersion</key>
- <string>8.0</string>
+ <string>9.8</string>
<key>MacOSXProductVersion</key>
- <string>10.4</string>
+ <string>10.5.8</string>
</dict>
</plist>

34
patches/DirectoryService-514.25.CFFileDescriptor_fix.p1.patch Normal file
View File

@@ -0,0 +1,34 @@
diff -ru DirectoryService-514.25/PlugIns/BSD/FlatFileNode.h DirectoryService-514.25.pd1/PlugIns/BSD/FlatFileNode.h
--- DirectoryService-514.25/PlugIns/BSD/FlatFileNode.h 2008-03-14 16:09:41.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/BSD/FlatFileNode.h 2012-09-12 13:30:26.000000000 +0200
@@ -24,6 +24,7 @@
#ifndef _FLATFILENODE_H
#define _FLATFILENODE_H
+#include <CoreFoundation/CFFileDescriptor.h>
#include <sqlite3.h>
#include <map>
#include <string> //STL string class
diff -ru DirectoryService-514.25/PlugIns/LDAPv3/DSAPIWrapper.cpp DirectoryService-514.25.pd1/PlugIns/LDAPv3/DSAPIWrapper.cpp
--- DirectoryService-514.25/PlugIns/LDAPv3/DSAPIWrapper.cpp 2008-04-29 19:46:21.000000000 +0200
+++ DirectoryService-514.25.pd1/PlugIns/LDAPv3/DSAPIWrapper.cpp 2012-09-12 13:31:38.000000000 +0200
@@ -90,7 +90,7 @@
DSAPIWrapper::OpenSpecificPasswordServerNode( const char *inServerAddress )
{
char pwServerNodeStr[256];
- tDataList *pDataList = nil;
+ tDataList *pDataList = NULL;
tDirStatus status = eDSNoErr;
if ( inServerAddress == NULL )
diff -ru DirectoryService-514.25/PlugIns/Local/CDSLocalPluginNode.h DirectoryService-514.25.pd1/PlugIns/Local/CDSLocalPluginNode.h
--- DirectoryService-514.25/PlugIns/Local/CDSLocalPluginNode.h 2008-03-14 16:09:41.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/Local/CDSLocalPluginNode.h 2012-09-12 13:27:48.000000000 +0200
@@ -29,6 +29,7 @@
#ifndef _CDSLocalPluginNode_
#define _CDSLocalPluginNode_ 1
+#include <CoreFoundation/CFFileDescriptor.h>
#include "CDSLocalPlugin.h"
#include "DSMutexSemaphore.h"
#include "DSEventSemaphore.h"

77
patches/DirectoryService-514.25.DSMutexSemaphore.cpp.p1.patch Normal file
View File

@@ -0,0 +1,77 @@
diff -ru DirectoryService-514.25/Threads/DSMutexSemaphore.cpp DirectoryService-514.25.pd1/Threads/DSMutexSemaphore.cpp
--- DirectoryService-514.25/Threads/DSMutexSemaphore.cpp 2007-06-08 22:54:57.000000000 +0200
+++ DirectoryService-514.25.pd1/Threads/DSMutexSemaphore.cpp 2012-09-11 04:36:27.871837299 +0200
@@ -37,7 +37,7 @@
#include <sys/types.h>
#include <sys/sysctl.h>
#include <unistd.h> // for _POSIX_THREADS
-#include "dslockstat.h"
+//#include "dslockstat.h"
// Uncomment the following line in addition to enabling DEBUG_LOCKS and we will use try lock to acquire a lock and spin
// until we do. After 60 seconds we will log what locks we are waiting on
@@ -159,8 +159,8 @@
}
else
{
- if ( mLockHistoryInfo->fShouldDTrace )
- DSLOCKSTAT_MUTEX_RELEASE( (long) &mMutex, (char *) mMutexName, "no file info", 0 );
+ /*if ( mLockHistoryInfo->fShouldDTrace )
+ DSLOCKSTAT_MUTEX_RELEASE( (long) &mMutex, (char *) mMutexName, "no file info", 0 );*/
}
}
@@ -267,7 +267,7 @@
int error = pthread_mutex_unlock( &mMutex );
if ( error == 0 )
{
- if ( DSLOCKSTAT_MUTEX_RELEASE_ENABLED() && mLockHistoryInfo->fShouldDTrace )
+ /*if ( DSLOCKSTAT_MUTEX_RELEASE_ENABLED() && mLockHistoryInfo->fShouldDTrace )
{
char *shortName = rindex( file, '/' );
if ( shortName == NULL )
@@ -275,7 +275,7 @@
else
shortName++;
DSLOCKSTAT_MUTEX_RELEASE( (long) &mMutex, (char *) mMutexName, shortName, line );
- }
+ }*/
#if defined(DEBUG_LOCKS)
if ( (--mLockHistoryInfo->fThreadOwnerCount) == 0 )
@@ -336,7 +336,7 @@
if ( error == 0 )
{
// we have our own flag so we don't dtrace certain locks
- if ( DSLOCKSTAT_MUTEX_ACQUIRE_ENABLED() && mLockHistoryInfo->fShouldDTrace )
+ /*if ( DSLOCKSTAT_MUTEX_ACQUIRE_ENABLED() && mLockHistoryInfo->fShouldDTrace )
{
char *shortName = rindex( file, '/' );
if ( shortName == NULL )
@@ -344,7 +344,7 @@
else
shortName++;
DSLOCKSTAT_MUTEX_ACQUIRE( (long) &mMutex, (char *) mMutexName, shortName, line );
- }
+ }*/
#if defined(DEBUG_LOCKS)
OSSpinLockLock( &mLockHistoryInfo->fOSLock );
@@ -383,7 +383,7 @@
int error = pthread_mutex_trylock( &mMutex );
if ( error == 0 )
{
- if ( DSLOCKSTAT_MUTEX_ACQUIRE_ENABLED() && mLockHistoryInfo->fShouldDTrace )
+ /*if ( DSLOCKSTAT_MUTEX_ACQUIRE_ENABLED() && mLockHistoryInfo->fShouldDTrace )
{
char *shortName = rindex( file, '/' );
if ( shortName == NULL )
@@ -391,7 +391,7 @@
else
shortName++;
DSLOCKSTAT_MUTEX_ACQUIRE( (long) &mMutex, (char *) mMutexName, shortName, line );
- }
+ }*/
#if defined(DEBUG_LOCKS)
OSSpinLockLock( &mLockHistoryInfo->fOSLock );

39
patches/DirectoryService-514.25.HAVE_CORE_SERVER_0.p1.patch Normal file
View File

@@ -0,0 +1,39 @@
diff -ru DirectoryService-514.25/DirectoryService.xcodeproj/project.pbxproj DirectoryService-514.25.pd1/DirectoryService.xcodeproj/project.pbxproj
--- DirectoryService-514.25/DirectoryService.xcodeproj/project.pbxproj 2012-09-12 11:57:47.000000000 +0200
+++ DirectoryService-514.25.pd1/DirectoryService.xcodeproj/project.pbxproj 2012-09-12 12:03:02.661588789 +0200
@@ -3715,7 +3715,7 @@
DSSERVERTCP,
SERVERINTERNAL,
"__MigTypeCheck=1",
- "HAVE_CORE_SERVER=1",
+ "HAVE_CORE_SERVER=0",
DEBUG_LOCKS,
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -3794,7 +3794,7 @@
DSSERVERTCP,
SERVERINTERNAL,
"__MigTypeCheck=1",
- "HAVE_CORE_SERVER=1",
+ "HAVE_CORE_SERVER=0",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
@@ -3853,7 +3853,7 @@
DSSERVERTCP,
SERVERINTERNAL,
"__MigTypeCheck=1",
- "HAVE_CORE_SERVER=1",
+ "HAVE_CORE_SERVER=0",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
@@ -3865,7 +3865,7 @@
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = (
"-fconstant-cfstrings",
- "-DHAVE_CORE_SERVER=1",
+ "-DHAVE_CORE_SERVER=0",
);
OTHER_LDFLAGS = (
"-weak_framework",

339
patches/DirectoryService-514.25.removeFoundationDependancy.p1.patch Normal file
View File

@@ -0,0 +1,339 @@
diff -ru DirectoryService-514.25/PlugIns/Common/BaseDirectoryPlugin.cpp DirectoryService-514.25.pd1/PlugIns/Common/BaseDirectoryPlugin.cpp
--- DirectoryService-514.25/PlugIns/Common/BaseDirectoryPlugin.cpp 2009-02-05 00:33:24.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/Common/BaseDirectoryPlugin.cpp 2012-09-11 20:24:36.710707255 +0200
@@ -37,7 +37,7 @@
extern "C" int ConvertXMLPolicyToSpaceDelimited( const char *inXMLDataStr, char **outPolicyStr );
-#ifndef __OBJC__
+#if 1
#define EXCEPTION_START try {
#define EXCEPTION_END } catch ( ... ) { \
DbgLog( kLogPlugin, "%s: uncaught exception in %s:%d", fPlugInName, __FILE__, __LINE__ ); \
@@ -561,7 +561,7 @@
goto failure;
}
-#ifndef __OBJC__
+#if 1
cfNodeName = pContext->fVirtualNode->CopyNodeName();
#else
cfNodeName = (CFStringRef) [pContext->fVirtualNode copyNodeName];
@@ -699,7 +699,7 @@
inData->fInRequestData->fBufferLength, kCFAllocatorNull );
CFMutableDataRef cfResponseData = CFDataCreateMutable( kCFAllocatorDefault, inData->fOutRequestResponse->fBufferSize );
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->CustomCall( inData->fInRequestCode, cfRequestData, cfResponseData,
inData->fOutRequestResponse->fBufferSize );
#else
@@ -760,7 +760,7 @@
pContext = (sBDPINodeContext *) MakeContextData( kBDPIDirNode );
if ( pContext == NULL )
{
-#ifndef __OBJC__
+#if 1
delete pEngine;
#else
[pEngine release];
@@ -885,7 +885,7 @@
if ( cfAttributes != NULL )
{
-#ifndef __OBJC__
+#if 1
cfNodeInfo = pContext->fVirtualNode->CopyNodeInfo( cfAttributes );
#else
cfNodeInfo = (CFMutableDictionaryRef) [pContext->fVirtualNode copyNodeInfo: (NSArray *)cfAttributes];
@@ -1054,7 +1054,7 @@
if( pUsername != NULL && CFStringGetLength(pUsername) != 0 )
{
// we don't use name and password yet...
-#ifndef __OBJC__
+#if 1
CFDictionaryRef userPolicy = inContext->fVirtualNode->CopyPasswordPolicyForRecord( inRecordType, pUsername );
#else
CFDictionaryRef userPolicy = (CFDictionaryRef) [inContext->fVirtualNode copyPasswordPolicyForRecord: (NSString *) inRecordType withName: (NSString *)pUsername];
@@ -1153,7 +1153,7 @@
cfPassword = CFStringCreateWithBytes( kCFAllocatorDefault, (const UInt8 *) pData, stringLen, kCFStringEncodingUTF8, false );
-#ifndef __OBJC__
+#if 1
if ( bAuthOnly )
siResult = inContext->fVirtualNode->VerifyCredentials( inRecordType, cfUserName, cfPassword );
else
@@ -1256,7 +1256,7 @@
cfPassword2 = CFStringCreateWithBytes( kCFAllocatorDefault, (const UInt8 *) pData, stringLen, kCFStringEncodingUTF8, false );
}
-#ifndef __OBJC__
+#if 1
siResult = inContext->fVirtualNode->ChangePassword( inRecordType, cfUserName, (cfPassword2 ? cfPassword1 : NULL), (cfPassword2 ? cfPassword2 : cfPassword1) );
#else
siResult = [inContext->fVirtualNode changePassword: (NSString *)inRecordType recordName: (NSString *)cfUserName oldPassword: (NSString *)(cfPassword2 ? cfPassword1 : NULL)
@@ -1341,7 +1341,7 @@
inData->fOutRecEntryCount = 0;
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->SearchRecords( pContinue, inData->fInDataBuff, &(inData->fOutRecEntryCount) );
#else
siResult = [pContext->fVirtualNode searchRecords: pContinue buffer: inData->fInDataBuff outCount: &(inData->fOutRecEntryCount)];
@@ -1483,7 +1483,7 @@
inData->fOutMatchRecordCount = 0;
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->SearchRecords( pContinue, inData->fOutDataBuff, &(inData->fOutMatchRecordCount) );
#else
siResult = [pContext->fVirtualNode searchRecords: pContinue buffer: inData->fOutDataBuff outCount: &(inData->fOutMatchRecordCount)];
@@ -1555,7 +1555,7 @@
cfRecName = CFStringCreateWithCString( kCFAllocatorDefault, inData->fInRecName->fBufferData, kCFStringEncodingUTF8 );
cfRecType = CFStringCreateWithCString( kCFAllocatorDefault, inData->fInRecType->fBufferData, kCFStringEncodingUTF8 );
-#ifndef __OBJC__
+#if 1
pRecord = pContext->fVirtualNode->RecordOpen( cfRecType, cfRecName );
#else
pRecord = (CFMutableDictionaryRef) [pContext->fVirtualNode recordOpenName: (NSString *)cfRecName recordType: (NSString *)cfRecType];
@@ -1735,7 +1735,7 @@
// arbitrary max length
cfRecType = (CFStringRef) CFDictionaryGetValue( pContext->fRecord, kBDPITypeKey );
-#ifndef __OBJC__
+#if 1
pOutAttrEntry->fAttributeValueMaxSize = pContext->fVirtualNode->MaximumSizeForAttribute( cfRecType, cfAttributeName );
#else
pOutAttrEntry->fAttributeValueMaxSize = [pContext->fVirtualNode maximumSize: (NSString *)cfRecType forAttribute: (NSString *)cfAttributeName];
@@ -1778,7 +1778,7 @@
cfRecName = CFStringCreateWithCString( kCFAllocatorDefault, inData->fInRecName->fBufferData, kCFStringEncodingUTF8 );
cfRecType = CFStringCreateWithCString( kCFAllocatorDefault, inData->fInRecType->fBufferData, kCFStringEncodingUTF8 );
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->RecordCreate( cfRecType, cfRecName );
#else
siResult = [pContext->fVirtualNode recordCreateName: (NSString *)cfRecName recordType: (NSString *)cfRecType];
@@ -1786,7 +1786,7 @@
if( siResult == eDSNoErr && (inData->fType == kCreateRecordAndOpen || inData->fInOpen) )
{
-#ifndef __OBJC__
+#if 1
CFMutableDictionaryRef pRecord = pContext->fVirtualNode->RecordOpen( cfRecType, cfRecName );
#else
CFMutableDictionaryRef pRecord = (CFMutableDictionaryRef) [pContext->fVirtualNode recordOpenName: (NSString *)cfRecName recordType: (NSString *)cfRecType];
@@ -1825,7 +1825,7 @@
sBDPIRecordEntryContext *pContext = (sBDPIRecordEntryContext *) fContextHash->GetItemData( inData->fInRecRef );
if ( pContext != NULL )
{
-#ifndef __OBJC__
+#if 1
if ( pContext->fVirtualNode->AllowChangesForAttribute(pContext->fRecord, CFSTR(kDSNAttrRecordType)) )
#else
if ( [pContext->fVirtualNode allowChanges: (NSDictionary *)pContext->fRecord forAttribute: @kDSNAttrRecordType] )
@@ -1834,7 +1834,7 @@
CFStringRef cfType = CFStringCreateWithCString( kCFAllocatorDefault, inData->fInNewRecType->fBufferData, kCFStringEncodingUTF8 );
if ( cfType != NULL )
{
-#ifndef __OBJC__
+#if 1
siResult = (tDirStatus) pContext->fVirtualNode->RecordSetType( pContext->fRecord, cfType );
#else
siResult = (tDirStatus) [pContext->fVirtualNode record: (NSMutableDictionary *)pContext->fRecord setRecordType: (NSString *)cfType];
@@ -1867,7 +1867,7 @@
sBDPIRecordEntryContext *pContext = (sBDPIRecordEntryContext *) fContextHash->GetItemData( inData->fInRecRef );
if ( pContext != NULL )
{
-#ifndef __OBJC__
+#if 1
siResult = (tDirStatus)pContext->fVirtualNode->RecordDelete( pContext->fRecord );
#else
siResult = (tDirStatus)[pContext->fVirtualNode recordDelete: (NSDictionary *)pContext->fRecord];
@@ -1890,7 +1890,7 @@
sBDPIRecordEntryContext *pContext = (sBDPIRecordEntryContext *) fContextHash->GetItemData( inData->fInRecRef );
if ( pContext != NULL )
{
-#ifndef __OBJC__
+#if 1
if ( pContext->fVirtualNode->AllowChangesForAttribute(pContext->fRecord, CFSTR(kDSNAttrRecordName)) )
#else
if ( [pContext->fVirtualNode allowChanges: (NSDictionary *)pContext->fRecord forAttribute: @kDSNAttrRecordName] )
@@ -1903,7 +1903,7 @@
CFArrayRef cfValues = CFArrayCreate( kCFAllocatorDefault, (const void **) &cfValue, 1, &kCFTypeArrayCallBacks );
if ( cfValues != NULL )
{
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->RecordSetValuesForAttribute( pContext->fRecord, CFSTR(kDSNAttrRecordName), cfValues );
#else
siResult = [pContext->fVirtualNode record: (NSMutableDictionary *)pContext->fRecord setValues: (NSArray *) cfValues
@@ -1941,7 +1941,7 @@
sBDPIRecordEntryContext *pContext = (sBDPIRecordEntryContext *) fContextHash->GetItemData( inData->fInRecRef );
if ( pContext != NULL )
{
-#ifndef __OBJC__
+#if 1
pContext->fVirtualNode->RecordFlush( pContext->fRecord );
#else
[pContext->fVirtualNode recordFlush: (NSDictionary *)pContext->fRecord];
@@ -2043,7 +2043,7 @@
pAttribInfo->fAttributeValueCount = valueCount;
pAttribInfo->fAttributeDataSize = uiValueSize;
-#ifndef __OBJC__
+#if 1
pAttribInfo->fAttributeValueMaxSize = pRecordContext->fVirtualNode->MaximumSizeForAttribute( cfRecType, cfKey );
#else
pAttribInfo->fAttributeValueMaxSize = [pRecordContext->fVirtualNode maximumSize: (NSString *)cfRecType
@@ -2482,7 +2482,7 @@
if ( cfNewAttribute != NULL )
{
-#ifndef __OBJC__
+#if 1
if ( pContext->fVirtualNode->AllowChangesForAttribute(pContext->fRecord, cfNewAttribute) )
#else
if ( [pContext->fVirtualNode allowChanges: (NSDictionary *)pContext->fRecord forAttribute: (NSString *)cfNewAttribute] )
@@ -2522,7 +2522,7 @@
if ( cfNewValue != NULL )
{
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->RecordSetValuesForAttribute( pContext->fRecord, cfNewAttribute, cfNewValue );
#else
siResult = [pContext->fVirtualNode record: (NSMutableDictionary *)pContext->fRecord
@@ -2568,7 +2568,7 @@
if ( cfAttribName != NULL )
{
-#ifndef __OBJC__
+#if 1
if ( pContext->fVirtualNode->AllowChangesForAttribute(pContext->fRecord, cfAttribName) )
#else
if ( [pContext->fVirtualNode allowChanges: (NSDictionary *)pContext->fRecord forAttribute: (NSString *)cfAttribName] )
@@ -2577,7 +2577,7 @@
CFMutableArrayRef cfEmptyArray = CFArrayCreateMutable( kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks );
if ( cfEmptyArray != NULL )
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->RecordSetValuesForAttribute( pContext->fRecord, cfAttribName, cfEmptyArray );
#else
siResult = [pContext->fVirtualNode record: (NSMutableDictionary *)pContext->fRecord setValues: (NSArray *)cfEmptyArray
@@ -2620,7 +2620,7 @@
if ( cfAttribName != NULL )
{
-#ifndef __OBJC__
+#if 1
if ( pContext->fVirtualNode->AllowChangesForAttribute(pContext->fRecord, cfAttribName) )
#else
if ( [pContext->fVirtualNode allowChanges: (NSDictionary *)pContext->fRecord forAttribute:(NSString *)cfAttribName] )
@@ -2657,7 +2657,7 @@
if ( cfNewValues != NULL )
{
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->RecordAddValuesToAttribute( pContext->fRecord, cfAttribName, cfNewValues );
#else
siResult = [pContext->fVirtualNode record: (NSMutableDictionary *)pContext->fRecord
@@ -2732,7 +2732,7 @@
if ( CalcCRCWithLength(pValue, valueLen) == inData->fInAttrValueID )
{
-#ifndef __OBJC__
+#if 1
siResult = pContext->fVirtualNode->RecordRemoveValueFromAttribute( pContext->fRecord, cfAttribute, cfValue );
#else
siResult = [pContext->fVirtualNode record: (NSMutableDictionary *)pContext->fRecord
@@ -2778,7 +2778,7 @@
goto failure;
}
-#ifndef __OBJC__
+#if 1
if ( pContext->fVirtualNode->AllowChangesForAttribute(pContext->fRecord, cfAttribute) )
#else
if ( [pContext->fVirtualNode allowChanges: (NSDictionary *)pContext->fRecord forAttribute: (NSString *)cfAttribute] )
@@ -2870,7 +2870,7 @@
cfValues = (CFMutableArrayRef) CreateCFArrayFromList( ((sSetAttributeValues *)inData)->fInAttrValueList );
}
-#ifndef __OBJC__
+#if 1
if ( cfValues != NULL )
siResult = pContext->fVirtualNode->RecordSetValuesForAttribute( pContext->fRecord, cfAttribute, cfValues );
else
@@ -3117,7 +3117,7 @@
{
case kBDPIDirNode:
tmpNode = (sBDPINodeContext *) inContext;
-#ifndef __OBJC__
+#if 1
DSDelete( tmpNode->fVirtualNode );
#else
[tmpNode->fVirtualNode release];
diff -ru DirectoryService-514.25/PlugIns/Common/BaseDirectoryPluginTypes.h DirectoryService-514.25.pd1/PlugIns/Common/BaseDirectoryPluginTypes.h
--- DirectoryService-514.25/PlugIns/Common/BaseDirectoryPluginTypes.h 2007-02-07 08:25:43.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/Common/BaseDirectoryPluginTypes.h 2012-09-11 20:24:40.770707174 +0200
@@ -36,7 +36,7 @@
#define kBDPITypeKey CFSTR("Type")
#define kBDPIGUID CFSTR("GUID")
-#ifdef __OBJC__
+#if 0
#define kNSBDPINameKey (NSString*)kBDPINameKey
#define kNSBDPIDistinguishedKey (NSString*)kBDPIDistinguishedKey
#define kNSBDPIAttributeKey (NSString*)kBDPIAttributeKey
@@ -44,7 +44,7 @@
#define kNSBDPIGUID (NSString*)kBDPIGUID
#endif
-#ifndef __OBJC__
+#if 1
class BDPIVirtualNode;
#else
@class BDPIVirtualNode;
diff -ru DirectoryService-514.25/PlugIns/Common/BDPIVirtualNode.cpp DirectoryService-514.25.pd1/PlugIns/Common/BDPIVirtualNode.cpp
--- DirectoryService-514.25/PlugIns/Common/BDPIVirtualNode.cpp 2007-02-07 08:25:43.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/Common/BDPIVirtualNode.cpp 2012-09-11 20:24:38.722707215 +0200
@@ -24,7 +24,7 @@
#include "BDPIVirtualNode.h"
#include "BaseDirectoryPlugin.h"
-#ifdef __OBJC__
+#if 0
@implementation BDPIVirtualNode
diff -ru DirectoryService-514.25/PlugIns/Common/BDPIVirtualNode.h DirectoryService-514.25.pd1/PlugIns/Common/BDPIVirtualNode.h
--- DirectoryService-514.25/PlugIns/Common/BDPIVirtualNode.h 2007-02-07 16:25:34.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/Common/BDPIVirtualNode.h 2012-09-11 20:24:42.562707138 +0200
@@ -26,7 +26,7 @@
#include <DirectoryServiceCore/BaseDirectoryPluginTypes.h>
-#ifndef __OBJC__
+#if 1
// Virtual class for BaseDirectoryPlugInVirtualNode (BDPIVirtualNode)
class BDPIVirtualNode
diff -ru DirectoryService-514.25/PlugIns/LDAPv3/CLDAPv3Plugin.h DirectoryService-514.25.pd1/PlugIns/LDAPv3/CLDAPv3Plugin.h
--- DirectoryService-514.25/PlugIns/LDAPv3/CLDAPv3Plugin.h 2008-03-14 18:03:23.000000000 +0100
+++ DirectoryService-514.25.pd1/PlugIns/LDAPv3/CLDAPv3Plugin.h 2012-09-11 20:24:35.130707286 +0200
@@ -308,7 +308,7 @@
virtual bool CheckConfiguration ( const char *inData, UInt32 inLength );
virtual tDirStatus HandleCustomCall ( sBDPINodeContext *pContext, sDoPlugInCustomCall *inData );
virtual bool IsConfigureNodeName ( CFStringRef inNodeName );
-#ifndef __OBJC__
+#if 1
virtual BDPIVirtualNode *CreateNodeForPath ( CFStringRef inPath, uid_t inUID, uid_t inEffectiveUID );
#else
virtual id<BDPIVirtualNode> CreateNodeForPath ( CFStringRef inPath, uid_t inUID, uid_t inEffectiveUID );

63
patches/DirectoryService-514.25.rm_dslockstat.d.p1.patch Normal file
View File

@@ -0,0 +1,63 @@
diff -ru DirectoryService-514.25/DirectoryService.xcodeproj/project.pbxproj DirectoryService-514.25.pd1/DirectoryService.xcodeproj/project.pbxproj
--- DirectoryService-514.25/DirectoryService.xcodeproj/project.pbxproj 2008-03-14 18:03:23.000000000 +0100
+++ DirectoryService-514.25.pd1/DirectoryService.xcodeproj/project.pbxproj 2012-09-11 04:29:06.847846060 +0200
@@ -355,7 +355,6 @@
6B292623099BDFEF00AA8E0B /* DSlibinfoMIG_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B2925B2099BD2FF00AA8E0B /* DSlibinfoMIG_types.h */; settings = {ATTRIBUTES = (Private, ); }; };
6B292624099BDFF700AA8E0B /* DSlibinfoMIG.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6B2925B1099BD2FF00AA8E0B /* DSlibinfoMIG.defs */; };
6B36BCAB0B365AB40089A1A8 /* BSDPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B36BCA90B365AB40089A1A8 /* BSDPlugin.cpp */; };
- 6B3F5DA50C192AAA00F26BD9 /* dslockstat.d in Sources */ = {isa = PBXBuildFile; fileRef = 6BA60C320C191F53000F0DA7 /* dslockstat.d */; };
6B482D660B55F67A00520948 /* BDPIVirtualNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B482D640B55F67A00520948 /* BDPIVirtualNode.cpp */; };
6B482ECB0B56039F00520948 /* BDPIVirtualNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B482D630B55F67A00520948 /* BDPIVirtualNode.h */; };
6B57BB960C8877AD00DB71D1 /* _guest.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6B57BB950C88768300DB71D1 /* _guest.plist */; };
@@ -378,11 +377,9 @@
6B9D25520B34F172008B7C51 /* BaseDirectoryPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9D25500B34F172008B7C51 /* BaseDirectoryPlugin.h */; };
6B9D25530B34F172008B7C51 /* BaseDirectoryPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9D25510B34F172008B7C51 /* BaseDirectoryPlugin.cpp */; };
6B9D25820B34F462008B7C51 /* BaseDirectoryPluginTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9D25810B34F462008B7C51 /* BaseDirectoryPluginTypes.h */; };
- 6BA458810C19495B0099C94F /* dslockstat.d in Sources */ = {isa = PBXBuildFile; fileRef = 6BA60C320C191F53000F0DA7 /* dslockstat.d */; };
6BA4A83B0A2664C800545117 /* DSlibinfoMIGAsyncReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6BA4A83A0A2664C800545117 /* DSlibinfoMIGAsyncReply.defs */; };
6BA4A8440A266AE200545117 /* DSlibinfoMIGAsyncReply.defs in Sources */ = {isa = PBXBuildFile; fileRef = 6BA4A83A0A2664C800545117 /* DSlibinfoMIGAsyncReply.defs */; settings = {ATTRIBUTES = (Server, ); }; };
6BA5A61A0BCF446A009CBC16 /* CPlugInObjectRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BA5A6190BCF446A009CBC16 /* CPlugInObjectRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 6BA60CBB0C19279D000F0DA7 /* dslockstat.d in Sources */ = {isa = PBXBuildFile; fileRef = 6BA60C320C191F53000F0DA7 /* dslockstat.d */; };
6BB643600BC80CCF0073B0F5 /* DSSemaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB6435F0BC80CCF0073B0F5 /* DSSemaphore.cpp */; };
6BB8BEC10BD4390900A9EBE3 /* buffer_unpackers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAD4EEE906E687A000EDFAF8 /* buffer_unpackers.cpp */; };
6BB8BEC20BD4390900A9EBE3 /* chap_ms.c in Sources */ = {isa = PBXBuildFile; fileRef = AA80397506F0D70900506E10 /* chap_ms.c */; };
@@ -1177,7 +1174,6 @@
6B9D25810B34F462008B7C51 /* BaseDirectoryPluginTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BaseDirectoryPluginTypes.h; path = PlugIns/Common/BaseDirectoryPluginTypes.h; sourceTree = "<group>"; };
6BA4A83A0A2664C800545117 /* DSlibinfoMIGAsyncReply.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = DSlibinfoMIGAsyncReply.defs; sourceTree = "<group>"; };
6BA5A6190BCF446A009CBC16 /* CPlugInObjectRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CPlugInObjectRef.h; path = CoreFramework/Public/CPlugInObjectRef.h; sourceTree = "<group>"; };
- 6BA60C320C191F53000F0DA7 /* dslockstat.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; name = dslockstat.d; path = Threads/dslockstat.d; sourceTree = "<group>"; };
6BADB6A60B2E02810078E78B /* chap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = chap.h; path = PlugIns/Common/chap.h; sourceTree = "<group>"; };
6BB6435F0BC80CCF0073B0F5 /* DSSemaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DSSemaphore.cpp; path = Threads/DSSemaphore.cpp; sourceTree = "<group>"; };
6BC6450F0C309E17003833A7 /* CDSLocalConfigureNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDSLocalConfigureNode.h; path = PlugIns/Local/CDSLocalConfigureNode.h; sourceTree = "<group>"; };
@@ -1549,7 +1545,6 @@
004C967B00B0949D00DD2B59 /* Threads */ = {
isa = PBXGroup;
children = (
- 6BA60C320C191F53000F0DA7 /* dslockstat.d */,
004C967C00B0949D00DD2B59 /* Classes */,
004C968200B0949D00DD2B59 /* Headers */,
);
@@ -2767,7 +2762,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 6BA458810C19495B0099C94F /* dslockstat.d in Sources */,
6195741708D09447004DC9A3 /* CClientEndPoint.cpp in Sources */,
6195741808D09447004DC9A3 /* CMessaging.cpp in Sources */,
6195741908D09447004DC9A3 /* DirServices.cpp in Sources */,
@@ -2822,7 +2816,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 6B3F5DA50C192AAA00F26BD9 /* dslockstat.d in Sources */,
6195748D08D09447004DC9A3 /* CRCCalc.cpp in Sources */,
6195747C08D09447004DC9A3 /* CBuff.cpp in Sources */,
6195747D08D09447004DC9A3 /* CDataBuff.cpp in Sources */,
@@ -2852,7 +2845,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 6BA60CBB0C19279D000F0DA7 /* dslockstat.d in Sources */,
619574E008D09448004DC9A3 /* CHandlers.cpp in Sources */,
619574E108D09448004DC9A3 /* CLauncher.cpp in Sources */,
619574E208D09448004DC9A3 /* CMsgQueue.cpp in Sources */,

133
patches/DirectoryService-514.25.xcode-rm_FoundationFramework.p1.patch Normal file
View File

@@ -0,0 +1,133 @@
diff -ru DirectoryService-514.25.pd1/DirectoryService.xcodeproj/project.pbxproj DirectoryService-514.25.pd2/DirectoryService.xcodeproj/project.pbxproj
--- DirectoryService-514.25.pd1/DirectoryService.xcodeproj/project.pbxproj 2012-09-12 13:17:55.000000000 +0200
+++ DirectoryService-514.25.pd2/DirectoryService.xcodeproj/project.pbxproj 2012-09-12 13:38:11.000000000 +0200
@@ -506,7 +506,6 @@
6BE590840B780EC4008264A0 /* BaseDirectoryPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9D25510B34F172008B7C51 /* BaseDirectoryPlugin.cpp */; };
6BE590850B780EF2008264A0 /* BDPIVirtualNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B482D640B55F67A00520948 /* BDPIVirtualNode.cpp */; settings = {COMPILER_FLAGS = "-x objective-c++"; }; };
6BE590860B780EF2008264A0 /* BaseDirectoryPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9D25510B34F172008B7C51 /* BaseDirectoryPlugin.cpp */; settings = {COMPILER_FLAGS = "-x objective-c++"; }; };
- 6BEBFD5A09803D1D005D8C49 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BEBFD5909803D1D005D8C49 /* Foundation.framework */; };
6BF11E580766F94300C8E7C8 /* DirectoryServiceMIG_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BF11E570766F94300C8E7C8 /* DirectoryServiceMIG_types.h */; settings = {ATTRIBUTES = (Private, ); }; };
6BFAB43C0A26704D008BFAE6 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C3CDC4066D024A00C62A1E /* libresolv.dylib */; };
6BFDF260099BF32D0017FF47 /* com.apple.DirectoryServices.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6BFDF25F099BF3270017FF47 /* com.apple.DirectoryServices.plist */; };
@@ -518,7 +517,6 @@
AA6A27810B1E00500050ACA7 /* WorkstationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6A27800B1E00500050ACA7 /* WorkstationService.cpp */; };
AA6FECF70A1CDD4B004FB2AA /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0035DBFC00AC584500DD2B59 /* CoreFoundation.framework */; };
AA6FED400A1CDD4F004FB2AA /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0035DBFC00AC584500DD2B59 /* CoreFoundation.framework */; };
- AA9312050B6551A30040F800 /* libXSEventPort.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA9312040B6551A30040F800 /* libXSEventPort.a */; };
AA9C91DF0B7A90F200A52339 /* Mbrd_MembershipResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9C91DE0B7A90F200A52339 /* Mbrd_MembershipResolver.cpp */; };
AAC65FF90B1E58BF00AE7CF0 /* WorkstationService.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC65FF80B1E58BF00AE7CF0 /* WorkstationService.h */; };
AAC946AA0B55B6D500CD1895 /* DirServicesConstPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC946A90B55B6D500CD1895 /* DirServicesConstPriv.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -964,7 +962,7 @@
0E89C3050B0E407F005109F2 /* _mcxalr.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 4; path = _mcxalr.plist; sourceTree = "<group>"; };
0EB9F8000C4C5BE400556597 /* _lpadmin.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = _lpadmin.plist; sourceTree = "<group>"; };
0ECE34920C5031A9009E1E2E /* _atsserver.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = _atsserver.plist; sourceTree = "<group>"; };
- 0EF4C1C50BCD583100A7ED51 /* _devdocs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = _devdocs.plist; sourceTree = "<group>"; };
+ 0EF4C1C50BCD583100A7ED51 /* _devdocs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = _devdocs.plist; sourceTree = "<group>"; };
0EF4C1C80BCD58A100A7ED51 /* _devdocs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = _devdocs.plist; sourceTree = "<group>"; };
0EF4C1E40BCD5CC600A7ED51 /* _sandbox.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = _sandbox.plist; sourceTree = "<group>"; };
0EF4C1E60BCD5D0500A7ED51 /* _sandbox.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = _sandbox.plist; sourceTree = "<group>"; };
@@ -984,7 +982,7 @@
611F6C250428EFAC00DD2B5C /* DirectoryServicePriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryServicePriv.h; path = APIFramework/DirectoryServicePriv.h; sourceTree = "<group>"; };
611F6C260428F03500DD2B5C /* DirectoryServiceCorePriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryServiceCorePriv.h; path = CoreFramework/Private/DirectoryServiceCorePriv.h; sourceTree = "<group>"; };
611F6C270428F11500DD2B5C /* DirectoryServiceCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryServiceCore.h; path = CoreFramework/Public/DirectoryServiceCore.h; sourceTree = "<group>"; };
- 612D914409D1C58F0080682E /* com.apple.DirectoryServicesLocal.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = com.apple.DirectoryServicesLocal.plist; sourceTree = "<group>"; };
+ 612D914409D1C58F0080682E /* com.apple.DirectoryServicesLocal.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = com.apple.DirectoryServicesLocal.plist; sourceTree = "<group>"; };
613759AA0AA4F74F009E2A13 /* _installer.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = _installer.plist; sourceTree = "<group>"; };
613D2B5D06FB4B6C006321AB /* CDSPluginUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDSPluginUtils.h; path = PlugIns/Common/CDSPluginUtils.h; sourceTree = "<group>"; };
613D2B5E06FB4B6C006321AB /* CDSPluginUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CDSPluginUtils.cpp; path = PlugIns/Common/CDSPluginUtils.cpp; sourceTree = "<group>"; };
@@ -1001,14 +999,14 @@
618C1BD20906C15D00F2EDD8 /* CDSLocalPluginNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CDSLocalPluginNode.h; path = PlugIns/Local/CDSLocalPluginNode.h; sourceTree = "<group>"; };
618C1C1B0906C59E00F2EDD8 /* CDSLocalAuthHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CDSLocalAuthHelper.cpp; path = PlugIns/Local/CDSLocalAuthHelper.cpp; sourceTree = "<group>"; };
618C1C1C0906C59E00F2EDD8 /* CDSLocalAuthHelper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CDSLocalAuthHelper.h; path = PlugIns/Local/CDSLocalAuthHelper.h; sourceTree = "<group>"; };
- 618C1D590906EA6200F2EDD8 /* AttributeMappings.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = AttributeMappings.plist; path = PlugIns/Local/AttributeMappings.plist; sourceTree = "<group>"; };
- 618C1D5A0906EA6200F2EDD8 /* RecordMappings.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = RecordMappings.plist; path = PlugIns/Local/RecordMappings.plist; sourceTree = "<group>"; };
+ 618C1D590906EA6200F2EDD8 /* AttributeMappings.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = AttributeMappings.plist; path = PlugIns/Local/AttributeMappings.plist; sourceTree = "<group>"; };
+ 618C1D5A0906EA6200F2EDD8 /* RecordMappings.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = RecordMappings.plist; path = PlugIns/Local/RecordMappings.plist; sourceTree = "<group>"; };
619573F908D09447004DC9A3 /* libDSPlugInCommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDSPlugInCommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 6195743408D09447004DC9A3 /* Info-API_Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-API_Framework.plist"; sourceTree = "<group>"; };
+ 6195743408D09447004DC9A3 /* Info-API_Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-API_Framework.plist"; sourceTree = "<group>"; };
6195743508D09447004DC9A3 /* DirectoryService.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DirectoryService.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 6195745608D09447004DC9A3 /* Info-APIFrameworkDebug.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-APIFrameworkDebug.plist"; sourceTree = "<group>"; };
+ 6195745608D09447004DC9A3 /* Info-APIFrameworkDebug.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-APIFrameworkDebug.plist"; sourceTree = "<group>"; };
6195745708D09447004DC9A3 /* DirectoryServiceDebug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DirectoryServiceDebug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 6195749C08D09447004DC9A3 /* Info-Core_Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Core_Framework.plist"; sourceTree = "<group>"; };
+ 6195749C08D09447004DC9A3 /* Info-Core_Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Core_Framework.plist"; sourceTree = "<group>"; };
6195749D08D09448004DC9A3 /* DirectoryServiceCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DirectoryServiceCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6195752908D09448004DC9A3 /* DirectoryService */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DirectoryService; sourceTree = BUILT_PRODUCTS_DIR; };
6196B09B0AB88E3E00D6963F /* _cvs.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = _cvs.plist; sourceTree = "<group>"; };
@@ -1036,10 +1034,10 @@
61CC92E709240143009DB35F /* nobody.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = nobody.plist; sourceTree = "<group>"; };
61CC92E809240143009DB35F /* operator.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = operator.plist; sourceTree = "<group>"; };
61CC92E909240143009DB35F /* postmaster.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = postmaster.plist; sourceTree = "<group>"; };
- 61CC935209240173009DB35F /* broadcasthost.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = broadcasthost.plist; sourceTree = "<group>"; };
- 61CC935309240173009DB35F /* localhost.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = localhost.plist; sourceTree = "<group>"; };
- 61CC935609240183009DB35F /* loopback.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = loopback.plist; sourceTree = "<group>"; };
- 61DD988E0A8BA58500C3C878 /* com.apple.DirectoryServicesInstallDaemon.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = com.apple.DirectoryServicesInstallDaemon.plist; sourceTree = "<group>"; };
+ 61CC935209240173009DB35F /* broadcasthost.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = broadcasthost.plist; sourceTree = "<group>"; };
+ 61CC935309240173009DB35F /* localhost.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = localhost.plist; sourceTree = "<group>"; };
+ 61CC935609240183009DB35F /* loopback.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = loopback.plist; sourceTree = "<group>"; };
+ 61DD988E0A8BA58500C3C878 /* com.apple.DirectoryServicesInstallDaemon.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = com.apple.DirectoryServicesInstallDaemon.plist; sourceTree = "<group>"; };
61E189D30AE538050037D976 /* DSmemberdMIG.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = DSmemberdMIG.defs; sourceTree = "<group>"; };
61E189D40AE538050037D976 /* DSmemberdMIG_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DSmemberdMIG_types.h; sourceTree = "<group>"; };
61E9DB3F0AE59744004AE17B /* Mbrd_MembershipResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Mbrd_MembershipResolver.h; sourceTree = "<group>"; };
@@ -1049,9 +1047,9 @@
61E9DB520AE5B197004AE17B /* Mbrd_UserGroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Mbrd_UserGroup.h; sourceTree = "<group>"; };
61F085850AC19D4C00B9BAE0 /* _mdnsresponder.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = _mdnsresponder.plist; sourceTree = "<group>"; };
61F085880AC19D9F00B9BAE0 /* _mdnsresponder.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = _mdnsresponder.plist; sourceTree = "<group>"; };
- 61F119340ADDC92900DFF954 /* ActiveDirectory.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = ActiveDirectory.plist; path = PlugIns/LDAPv3/ActiveDirectory.plist; sourceTree = SOURCE_ROOT; };
- 61F119350ADDC92900DFF954 /* AppleOpenLDAP.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = AppleOpenLDAP.plist; path = PlugIns/LDAPv3/AppleOpenLDAP.plist; sourceTree = SOURCE_ROOT; };
- 61F119360ADDC92900DFF954 /* UnixRFC2307.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = UnixRFC2307.plist; path = PlugIns/LDAPv3/UnixRFC2307.plist; sourceTree = SOURCE_ROOT; };
+ 61F119340ADDC92900DFF954 /* ActiveDirectory.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = ActiveDirectory.plist; path = PlugIns/LDAPv3/ActiveDirectory.plist; sourceTree = SOURCE_ROOT; };
+ 61F119350ADDC92900DFF954 /* AppleOpenLDAP.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = AppleOpenLDAP.plist; path = PlugIns/LDAPv3/AppleOpenLDAP.plist; sourceTree = SOURCE_ROOT; };
+ 61F119360ADDC92900DFF954 /* UnixRFC2307.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = UnixRFC2307.plist; path = PlugIns/LDAPv3/UnixRFC2307.plist; sourceTree = SOURCE_ROOT; };
61F5A6B2040C23DB00DD2B5C /* DirectoryService.8 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DirectoryService.8; sourceTree = "<group>"; };
6910548D02EE3F5E0ADD2B8D /* LDAP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LDAP.framework; path = /System/Library/Frameworks/LDAP.framework; sourceTree = "<absolute>"; };
69CDD7AB01CEA0F60ADD2B8D /* DSEncryptedEndpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DSEncryptedEndpoint.cpp; path = Proxy/DSEncryptedEndpoint.cpp; sourceTree = "<group>"; };
@@ -1181,12 +1179,11 @@
6BD626CC073E705A00B918BB /* DirectoryService.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; name = DirectoryService.exp; path = APIFramework/DirectoryService.exp; sourceTree = "<group>"; };
6BD626CE073E709900B918BB /* DirectoryServiceDaemon.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = DirectoryServiceDaemon.exp; sourceTree = "<group>"; };
6BE590800B780E9E008264A0 /* libDSPlugInCommonObjc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDSPlugInCommonObjc.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 6BEBFD5909803D1D005D8C49 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
6BF11E570766F94300C8E7C8 /* DirectoryServiceMIG_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryServiceMIG_types.h; sourceTree = "<group>"; };
6BF3475F0AA398FF005871BF /* _update_sharing.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 4; path = _update_sharing.plist; sourceTree = "<group>"; };
- 6BFDF25F099BF3270017FF47 /* com.apple.DirectoryServices.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = com.apple.DirectoryServices.plist; sourceTree = "<group>"; };
- 6BFF21F50BEAC744008EE1E8 /* netaccounts.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = netaccounts.plist; sourceTree = "<group>"; };
- 6BFF22070BEAC854008EE1E8 /* localaccounts.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = localaccounts.plist; sourceTree = "<group>"; };
+ 6BFDF25F099BF3270017FF47 /* com.apple.DirectoryServices.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = com.apple.DirectoryServices.plist; sourceTree = "<group>"; };
+ 6BFF21F50BEAC744008EE1E8 /* netaccounts.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = netaccounts.plist; sourceTree = "<group>"; };
+ 6BFF22070BEAC854008EE1E8 /* localaccounts.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = localaccounts.plist; sourceTree = "<group>"; };
792C562204F720C1000BF6A8 /* DirectoryServiceDaemon.order */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = DirectoryServiceDaemon.order; sourceTree = "<group>"; };
847D67D204BCB59C00DF229F /* libsasl2.2.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsasl2.2.0.1.dylib; path = /usr/lib/libsasl2.2.0.1.dylib; sourceTree = "<absolute>"; };
9AAB84CB0B532987005DC78F /* _keytabusers.plist */ = {isa = PBXFileReference; explicitFileType = text.xml; fileEncoding = 30; path = _keytabusers.plist; sourceTree = "<group>"; };
@@ -1197,7 +1194,6 @@
AA6A27800B1E00500050ACA7 /* WorkstationService.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = WorkstationService.cpp; path = PlugIns/Common/WorkstationService.cpp; sourceTree = "<group>"; };
AA80397506F0D70900506E10 /* chap_ms.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = chap_ms.c; path = PlugIns/Common/chap_ms.c; sourceTree = "<group>"; };
AA80397D06F0D71300506E10 /* chap_ms.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = chap_ms.h; path = PlugIns/Common/chap_ms.h; sourceTree = "<group>"; };
- AA9312040B6551A30040F800 /* libXSEventPort.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libXSEventPort.a; path = /usr/local/lib/libXSEventPort.a; sourceTree = "<absolute>"; };
AA9C91DE0B7A90F200A52339 /* Mbrd_MembershipResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Mbrd_MembershipResolver.cpp; sourceTree = "<group>"; };
AAC65FF80B1E58BF00AE7CF0 /* WorkstationService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkstationService.h; path = PlugIns/Common/WorkstationService.h; sourceTree = "<group>"; };
AAC946A90B55B6D500CD1895 /* DirServicesConstPriv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirServicesConstPriv.h; path = APIFramework/DirServicesConstPriv.h; sourceTree = "<group>"; };
@@ -1285,10 +1281,8 @@
6195752108D09448004DC9A3 /* PasswordServer.framework in Frameworks */,
6195752208D09448004DC9A3 /* Kerberos.framework in Frameworks */,
6195752308D09448004DC9A3 /* libbsm.dylib in Frameworks */,
- 6BEBFD5A09803D1D005D8C49 /* Foundation.framework in Frameworks */,
610B870B0AC9E7FF0068C7A0 /* libsqlite3.dylib in Frameworks */,
AAE0BC6C0B5EB78200A599C4 /* libcrypto.dylib in Frameworks */,
- AA9312050B6551A30040F800 /* libXSEventPort.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1528,12 +1522,10 @@
0035DBFB00AC584500DD2B59 /* External Frameworks */ = {
isa = PBXGroup;
children = (
- 6BEBFD5909803D1D005D8C49 /* Foundation.framework */,
0035DBFC00AC584500DD2B59 /* CoreFoundation.framework */,
00CB9FE900B065BB00DD2B59 /* IOKit.framework */,
6B64B2140649630F00B26269 /* Kerberos.framework */,
6910548D02EE3F5E0ADD2B8D /* LDAP.framework */,
- AA9312040B6551A30040F800 /* libXSEventPort.a */,
AA42EF4306498B83008153D6 /* PasswordServer.framework */,
0059650C00B1D58400DD2B59 /* Security.framework */,
61ADDD2403F74F7A00BD54C7 /* System.framework */,

28
patches/IOAudioFamily-169.4.3.p1.patch.0 Normal file
View File

@@ -0,0 +1,28 @@
Only in IOAudioFamily-169.4.3.patch/: .nfs.20051027.b743
diff -ru IOAudioFamily-169.4.3/IOAudioEngineMixer.cpp IOAudioFamily-169.4.3.patch/IOAudioEngineMixer.cpp
--- IOAudioFamily-169.4.3/IOAudioEngineMixer.cpp 2006-06-01 23:22:47.000000000 +0200
+++ IOAudioFamily-169.4.3.patch/IOAudioEngineMixer.cpp 2009-07-22 00:00:35.000000000 +0200
@@ -49,7 +49,10 @@
__darwin_ptrdiff_t strideOne=1, strideTwo=1, resultStride=1;
- vDSP_vadd(floatSource1Buf, strideOne, floatSource2Buf, strideTwo, floatMixBuf, resultStride, numSamps);
+ //vDSP_vadd(floatSource1Buf, strideOne, floatSource2Buf, strideTwo, floatMixBuf, resultStride, numSamps);
+ for ( __darwin_size_t i=0; i < numSamps; i++ ) {
+ floatMixBuf[i] = floatSource1Buf[i] + floatSource2Buf[i];
+ }
result = kIOReturnSuccess;
}
diff -ru IOAudioFamily-169.4.3/Info-IOAudioFamily.plist IOAudioFamily-169.4.3.patch/Info-IOAudioFamily.plist
--- IOAudioFamily-169.4.3/Info-IOAudioFamily.plist 2009-03-19 00:36:55.000000000 +0100
+++ IOAudioFamily-169.4.3.patch/Info-IOAudioFamily.plist 2009-07-22 00:00:55.000000000 +0200
@@ -42,8 +42,6 @@
<string>9.0.0d1</string>
<key>com.apple.kpi.bsd</key>
<string>8.0</string>
- <key>com.apple.kext.OSvKernDSPLib</key>
- <string>1.0</string>
</dict>
<key>VBRSupported</key>
<string>YES</string>

11
patches/IOHIDFamily.IOHIDDeviceClass.cpp.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOHIDFamily-258.14/IOHIDLib/IOHIDDeviceClass.cpp.origin 2008-10-30 17:28:54.000000000 +0100
+++ IOHIDFamily-258.14/IOHIDLib/IOHIDDeviceClass.cpp 2008-10-30 17:29:01.000000000 +0100
@@ -42,6 +42,8 @@
#include <System/libkern/OSCrossEndian.h>
__END_DECLS
+#include <objc/objc.h>
+
#define connectCheck() do { \
if (!fConnection) \
return kIOReturnNoDevice; \

12
patches/IOHIDFamily.IOHIDEventDriver.cpp.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -ru IOHIDFamily-258.14/IOHIDFamily/IOHIDEventDriver.cpp IOHIDFamily-258.14.pd1/IOHIDFamily/IOHIDEventDriver.cpp
--- IOHIDFamily-258.14/IOHIDFamily/IOHIDEventDriver.cpp 2009-03-05 16:51:59.000000000 -0800
+++ IOHIDFamily-258.14.pd1/IOHIDFamily/IOHIDEventDriver.cpp 2012-09-08 19:31:03.000000000 -0700
@@ -549,8 +549,6 @@
AbsoluteTime elementTS;
AbsoluteTime reportTS;
- if (!readyForReports())
- return;
elements = GetElementArray(GetReportHandlerSlot(reportID), reportType);

11
patches/IOHIDFamily.IOHIDQueueClass.cpp.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOHIDFamily-258.14/IOHIDLib/IOHIDQueueClass.cpp.origin 2008-10-30 17:31:20.000000000 +0100
+++ IOHIDFamily-258.14/IOHIDLib/IOHIDQueueClass.cpp 2008-10-30 17:31:46.000000000 +0100
@@ -38,6 +38,8 @@
#include <System/libkern/OSCrossEndian.h>
__END_DECLS
+#include <objc/objc.h>
+
#define ownerCheck() do { \
if (!fOwningDevice) \
return kIOReturnNoDevice; \

13
patches/IOHIDFamily.IOHIDUPSClass.cpp.p1.patch Normal file
View File

@@ -0,0 +1,13 @@
--- IOHIDFamily-258.14/IOHIDLib/IOHIDUPSClass.cpp.origin 2008-10-30 17:34:56.000000000 +0100
+++ IOHIDFamily-258.14/IOHIDLib/IOHIDUPSClass.cpp 2008-10-30 17:35:26.000000000 +0100
@@ -35,6 +35,10 @@
#include <IOKit/IOMessage.h>
__END_DECLS
+#ifndef kNilOptions
+ #define kNilOptions 0
+#endif
+
#define UPSLog(fmt, args...)
#define kDefaultUPSName "UPS"

13
patches/IOHIDFamily.hidd.c.p1.patch Normal file
View File

@@ -0,0 +1,13 @@
Only in IOHIDFamily-258.14.pd1/: com.apple.Xcode.0
diff -ru IOHIDFamily-258.14/hidd/hidd.c IOHIDFamily-258.14.pd1/hidd/hidd.c
--- IOHIDFamily-258.14/hidd/hidd.c 2007-07-18 17:04:26.000000000 -0700
+++ IOHIDFamily-258.14.pd1/hidd/hidd.c 2012-09-08 18:57:44.000000000 -0700
@@ -23,6 +23,8 @@
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/hid/IOHIDEventSystem.h>
+typedef struct {} *IOHIDEventSystemRef;
+
int main (int argc, const char * argv[])
{
IOHIDEventSystemRef eventSystem = IOHIDEventSystemCreate(kCFAllocatorDefault);

11
patches/IOKitUser-388.2.1.IOAccelSurfaceControl.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/graphics.subproj/IOAccelSurfaceControl.c.origin 2008-11-04 14:48:29.000000000 +0100
+++ IOKitUser-388.2.1/graphics.subproj/IOAccelSurfaceControl.c 2008-11-04 14:49:13.000000000 +0100
@@ -21,6 +21,8 @@
*/
#include <CoreFoundation/CoreFoundation.h>
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <IOKit/IOKitLib.h>
#include <IOKit/graphics/IOAccelSurfaceControl.h>

11
patches/IOKitUser-388.2.1.IODisplayLib.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/graphics.subproj/IODisplayLib.c.origin 2008-11-04 14:58:02.000000000 +0100
+++ IOKitUser-388.2.1/graphics.subproj/IODisplayLib.c 2008-11-04 14:58:22.000000000 +0100
@@ -34,6 +34,8 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFBundlePriv.h>
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <IOKit/IOKitLib.h>
#include <libkern/OSByteOrder.h>

11
patches/IOKitUser-388.2.1.IOGraphicsLib.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/graphics.subproj/IOGraphicsLib.c.origin 2008-11-04 14:54:45.000000000 +0100
+++ IOKitUser-388.2.1/graphics.subproj/IOGraphicsLib.c 2008-11-04 14:55:15.000000000 +0100
@@ -31,6 +31,8 @@
#include <stdlib.h>
#include <CoreFoundation/CoreFoundation.h>
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <IOKit/IOKitLib.h>
#include <libkern/OSByteOrder.h>

8
patches/IOKitUser-388.2.1.IOHIDEventSystem.c.p1.patch Normal file
View File

@@ -0,0 +1,8 @@
--- IOKitUser-388.2.1/hid.subproj/IOHIDEventSystem.c.origin 2008-10-30 20:18:17.000000000 +0100
+++ IOKitUser-388.2.1/hid.subproj/IOHIDEventSystem.c 2008-10-30 20:18:59.000000000 +0100
@@ -0,0 +1,5 @@
+void IOHIDEventSystemOpen (void) {
+}
+
+void IOHIDEventSystemCreate (void) {
+}

12
patches/IOKitUser-388.2.1.IOPMAutoWake.c.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMAutoWake.c.origin 2008-11-04 15:20:48.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMAutoWake.c 2008-11-04 15:21:14.000000000 +0100
@@ -20,6 +20,9 @@
* @APPLE_LICENSE_HEADER_END@
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
+
#include <TargetConditionals.h>
#include <IOKit/pwr_mgt/IOPM.h>
#include "IOSystemConfiguration.h"

12
patches/IOKitUser-388.2.1.IOPMEnergyPrefs.c.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMEnergyPrefs.c.origin 2008-11-04 15:37:48.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMEnergyPrefs.c 2008-11-04 15:38:10.000000000 +0100
@@ -20,6 +20,9 @@
* @APPLE_LICENSE_HEADER_END@
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
+
#include <sys/cdefs.h>
#include <TargetConditionals.h>

11
patches/IOKitUser-388.2.1.IOPMLibPrivate.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMLibPrivate.c.origin 2008-11-04 15:35:28.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMLibPrivate.c 2008-11-04 15:36:03.000000000 +0100
@@ -19,6 +19,8 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <TargetConditionals.h>
#include <IOKit/IOKitLib.h>

13
patches/IOKitUser-388.2.1.IOPMPowerNotifications.c.p1.patch Normal file
View File

@@ -0,0 +1,13 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMPowerNotifications.c.origin 2008-11-04 15:14:37.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMPowerNotifications.c 2008-11-04 15:15:29.000000000 +0100
@@ -27,6 +27,10 @@
*/
#include <CoreFoundation/CoreFoundation.h>
+
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
+
#include <SystemConfiguration/SystemConfiguration.h>
#include <SystemConfiguration/SCPrivate.h>
#include <IOKit/IOReturn.h>

11
patches/IOKitUser-388.2.1.IOPMRepeatingPower.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMRepeatingPower.c.origin 2008-11-04 15:41:33.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMRepeatingPower.c 2008-11-04 15:41:44.000000000 +0100
@@ -19,6 +19,8 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include "IOSystemConfiguration.h"
#include <CoreFoundation/CoreFoundation.h>

11
patches/IOKitUser-388.2.1.IOPMUPSPrefs.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMUPSPrefs.c.origin 2008-11-04 15:42:15.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMUPSPrefs.c 2008-11-04 15:42:38.000000000 +0100
@@ -19,6 +19,8 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include "IOSystemConfiguration.h"
#include <CoreFoundation/CoreFoundation.h>

12
patches/IOKitUser-388.2.1.IOPowerSources.c.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
--- IOKitUser-388.2.1/ps.subproj/IOPowerSources.c.origin 2008-11-04 15:46:00.000000000 +0100
+++ IOKitUser-388.2.1/ps.subproj/IOPowerSources.c 2008-11-04 15:46:26.000000000 +0100
@@ -28,6 +28,9 @@
#include <sys/cdefs.h>
#include <CoreFoundation/CoreFoundation.h>
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
+
#include "IOSystemConfiguration.h"
#include "IOPSKeys.h"
#include "IOPowerSources.h"

12
patches/IOKitUser-388.2.1.IOPowerSourcesPrivate.c.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
--- IOKitUser-388.2.1/ps.subproj/IOPowerSourcesPrivate.c.origin 2008-11-04 15:44:08.000000000 +0100
+++ IOKitUser-388.2.1/ps.subproj/IOPowerSourcesPrivate.c 2008-11-04 15:44:24.000000000 +0100
@@ -21,6 +21,9 @@
*/
#include <CoreFoundation/CoreFoundation.h>
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
+
#include "IOSystemConfiguration.h"
#include <IOKit/pwr_mgt/IOPMLibPrivate.h>
#include "IOPowerSources.h"

8
patches/IOKitUser-388.2.1.IOSystemConfiguration.c.p1.patch Normal file
View File

@@ -0,0 +1,8 @@
--- IOKitUser-388.2.1/IOSystemConfiguration.c.origin 2008-11-04 15:48:44.000000000 +0100
+++ IOKitUser-388.2.1/IOSystemConfiguration.c 2008-11-04 15:49:01.000000000 +0100
@@ -1,3 +1,5 @@
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <TargetConditionals.h>
#include <libc.h>
#include <sys/stat.h>

63
patches/IOKitUser-388.2.1.PEFSupport.c.p1.patch Normal file
View File

@@ -0,0 +1,63 @@
--- IOKitUser-388.2.1/graphics.subproj/PEFSupport.c.origin 2008-11-04 14:25:38.000000000 +0100
+++ IOKitUser-388.2.1/graphics.subproj/PEFSupport.c 2008-11-04 14:27:15.000000000 +0100
@@ -28,6 +28,8 @@
Written by: Jeffrey Robbin
Copyright: © 1994, 1996 by Apple Computer, Inc., all rights reserved.
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h>
@@ -118,9 +120,9 @@
* UnpackPiData expands a compressed section into memory.
*******************************************************************************/
static OSErr UnpackPiData(
- LogicalAddress thePEFPtr,
+ void * thePEFPtr,
SectionHeaderPtr sectionHeaderPtr,
- LogicalAddress * theData)
+ void * * theData)
{
int cntX, cnt, rpt, dcnt, delta;
unsigned char op, b;
@@ -312,9 +314,9 @@
*******************************************************************************/
static OSStatus GetSymbolFromPEF(
char *inSymbolName,
- const LogicalAddress thePEFPtr,
- LogicalAddress theSymbolPtr,
- ByteCount theSymbolSize)
+ void * thePEFPtr,
+ void * theSymbolPtr,
+ void * theSymbolSize)
{
StringPtr theSymbolName = (StringPtr) inSymbolName;
ContainerHeaderPtr containerHeaderPtr; // Pointer to the Container Header
@@ -328,7 +330,7 @@
ExportSymbolEntryPtr exportSymbolEntryPtr;
LoaderExportChainEntryPtr exportChainEntryPtr;
StringPtr exportSymbolName;
- LogicalAddress expandedDataPtr;
+ void * expandedDataPtr;
unsigned char * sourceDataPtr;
unsigned char * destDataPtr;
@@ -451,7 +453,7 @@
/*******************************************************************************
*
*******************************************************************************/
-static IOByteCount GetPEFLen(LogicalAddress thePEFPtr)
+static IOByteCount GetPEFLen(void * thePEFPtr)
{
ContainerHeaderPtr containerHeaderPtr; // Pointer to the Container Header
SectionHeaderPtr sections;
@@ -642,7 +644,7 @@
{
curDesc = &_curDesc;
err = GetSymbolFromPEF(descripName,
- (const LogicalAddress)CFDataGetBytePtr(ndrv),
+ (const void *)CFDataGetBytePtr(ndrv),
curDesc, sizeof(DriverDescription));
}
if (err != noErr)

60
patches/IOKitUser-388.2.1.p1.patch Normal file
View File

@@ -0,0 +1,60 @@
diff -ru IOKitUser-388.2.1.origin/IOKitLib.h IOKitUser-388.2.1/IOKitLib.h
--- IOKitUser-388.2.1.origin/IOKitLib.h 2008-10-23 18:36:30.000000000 +0200
+++ IOKitUser-388.2.1/IOKitLib.h 2008-10-23 20:52:26.000000000 +0200
@@ -52,6 +52,10 @@
#include <AvailabilityMacros.h>
+#ifndef kNilOptions
+ #define kNilOptions 0
+#endif
+
__BEGIN_DECLS
/*! @header IOKitLib
diff -ru IOKitUser-388.2.1.origin/graphics.subproj/GetSymbolFromPEF.h IOKitUser-388.2.1/graphics.subproj/GetSymbolFromPEF.h
--- IOKitUser-388.2.1.origin/graphics.subproj/GetSymbolFromPEF.h 2008-10-23 18:36:30.000000000 +0200
+++ IOKitUser-388.2.1/graphics.subproj/GetSymbolFromPEF.h 2008-10-23 20:52:26.000000000 +0200
@@ -60,9 +60,8 @@
uint32_t oldImpVersion; // old implementation version number
uint32_t currentVersion; // current version number
uint16_t nbrOfSections; // nbr of sections (rel. 1)
- uint16_t loadableSections; // nbr of loadable sectionsfor execution
- // (= nbr of 1st non-loadable section)
- LogicalAddress memoryAddress; // location this container was last loaded
+ uint16_t loadableSections; // nbr of loadable sectionsfor execution // (= nbr of 1st non-loadable section)
+ //LogicalAddress memoryAddress; // location this container was last loaded
};
typedef struct ContainerHeader ContainerHeader, *ContainerHeaderPtr;
@@ -180,9 +179,9 @@
static OSStatus GetSymbolFromPEF(
char *theSymbolName,
- LogicalAddress thePEFPtr,
- LogicalAddress theSymbolPtr,
- ByteCount theSymbolSize);
+ void * thePEFPtr,
+ void * theSymbolPtr,
+ void * theSymbolSize);
static Boolean SymbolCompare(
StringPtr theLookedForSymbol,
@@ -190,9 +189,9 @@
uint32_t theExportSymbolLength);
static OSErr UnpackPiData(
- LogicalAddress thePEFPtr,
+ void * thePEFPtr,
SectionHeaderPtr sectionHeaderPtr,
- LogicalAddress * theData);
+ void * * theData);
static unsigned char PEFGetNextByte(
unsigned char ** rawBuffer,
diff -ru IOKitUser-388.2.1.origin/hid.subproj/IOHIDEventSystem.defs IOKitUser-388.2.1/hid.subproj/IOHIDEventSystem.defs
--- IOKitUser-388.2.1.origin/hid.subproj/IOHIDEventSystem.defs 2008-10-23 18:36:30.000000000 +0200
+++ IOKitUser-388.2.1/hid.subproj/IOHIDEventSystem.defs 2008-10-23 20:52:26.000000000 +0200
@@ -0,0 +1,2 @@
+subsystem IOHIDEventSystem 71000;
+

11
patches/IOKitUser-388.53.30.IOPMLibPrivate.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- IOKitUser-388.2.1/pwr_mgt.subproj/IOPMLibPrivate.c.origin 2008-11-04 15:35:28.000000000 +0100
+++ IOKitUser-388.2.1/pwr_mgt.subproj/IOPMLibPrivate.c 2008-11-04 15:36:03.000000000 +0100
@@ -19,6 +19,8 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
+#include <CarbonCore/MacTypes.h>
+#include <objc/objc.h>
#include <CoreFoundation/CoreFoundation.h>
#include <TargetConditionals.h>

39
patches/KerberosHelper-31.5.CorrecHeaders.p1.patch Normal file
View File

@@ -0,0 +1,39 @@
diff -ru KerberosHelper-31.5/Source/KerberosHelper.c KerberosHelper-31.5.pd1/Source/KerberosHelper.c
--- KerberosHelper-31.5/Source/KerberosHelper.c 2009-02-03 04:29:36.000000000 +0100
+++ KerberosHelper-31.5.pd1/Source/KerberosHelper.c 2012-09-13 17:11:46.000000000 +0200
@@ -35,7 +35,8 @@
#include "LKDCHelper.h"
-#include <Carbon/Carbon.h>
+//#include <Carbon/Carbon.h>
+#include <CarbonCore/MacErrors.h>
#include <Security/Security.h>
#include <Security/SecCertificatePriv.h>
#include <unistd.h>
diff -ru KerberosHelper-31.5/Source/lookupDSLocalKDC.c KerberosHelper-31.5.pd1/Source/lookupDSLocalKDC.c
--- KerberosHelper-31.5/Source/lookupDSLocalKDC.c 2007-09-12 04:56:28.000000000 +0200
+++ KerberosHelper-31.5.pd1/Source/lookupDSLocalKDC.c 2012-09-13 17:16:44.000000000 +0200
@@ -31,7 +31,8 @@
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-#include <Carbon/Carbon.h>
+//#include <Carbon/Carbon.h>
+#include <CarbonCore/MacErrors.h>
#include <OpenDirectory/OpenDirectory.h>
OSStatus DSCopyLocalKDC (CFStringRef *realm)
diff -ru KerberosHelper-31.5/Source/utils.c KerberosHelper-31.5.pd1/Source/utils.c
--- KerberosHelper-31.5/Source/utils.c 2007-05-08 03:30:32.000000000 +0200
+++ KerberosHelper-31.5.pd1/Source/utils.c 2012-09-13 17:12:33.000000000 +0200
@@ -28,7 +28,8 @@
#include "utils.h"
-#include <Carbon/Carbon.h>
+//#include <Carbon/Carbon.h>
+#include <CarbonCore/MacErrors.h>
OSStatus __KRBCreateUTF8StringFromCFString (CFStringRef inString, char **outString)
{

46
patches/Libc-498.1.7.removeDtraceSupport.p1.patch Normal file
View File

@@ -0,0 +1,46 @@
diff -ru Libc-498.1.7/Makefile.features Libc-498.1.7.pd1/Makefile.features
--- Libc-498.1.7/Makefile.features 2008-09-30 02:35:24.000000000 +0200
+++ Libc-498.1.7.pd1/Makefile.features 2012-09-10 00:42:19.885832606 +0200
@@ -78,7 +78,7 @@
@echo '/* #undef PR_5243343 */' >> ${.TARGET}
.endif
.ifdef FEATURE_PLOCKSTAT
- @echo '#define PLOCKSTAT 1' >> ${.TARGET}
+ @echo '/* #undef PLOCKSTAT */' >> ${.TARGET}
.else
@echo '/* #undef PLOCKSTAT */' >> ${.TARGET}
.endif
Seulement dans Libc-498.1.7.pd1: Makefile.features~
diff -ru Libc-498.1.7/pthreads/Makefile.inc Libc-498.1.7.pd1/pthreads/Makefile.inc
--- Libc-498.1.7/pthreads/Makefile.inc 2008-07-16 00:35:58.000000000 +0200
+++ Libc-498.1.7.pd1/pthreads/Makefile.inc 2012-09-10 00:38:55.737836662 +0200
@@ -7,15 +7,6 @@
MISRCS += pthread_cancelable.c pthread_cond.c pthread_tsd.c pthread.c \
pthread_mutex.c thread_setup.c stack.s pthread_rwlock.c
-.ifdef FEATURE_PLOCKSTAT
-${SYMROOTINC}/plockstat.h: ${.CURDIR}/pthreads/plockstat.d
- mkdir -p ${SYMROOTINC}
- dtrace -o ${.TARGET} -C -h -s ${.ALLSRC}
-
-.for _src in pthread_cond.c pthread_mutex.c pthread_rwlock.c
-${_src:R}.${OBJSUFFIX}: ${SYMROOTINC}/plockstat.h
-.endfor
-.endif # FEATURE_PLOCKSTAT
PTHREADS_INSTHDRS += pthread.h pthread_impl.h sched.h
PTHREADS_INSTHDRS := ${PTHREADS_INSTHDRS:S/^/${.CURDIR}\/pthreads\//}
Seulement dans Libc-498.1.7.pd1/pthreads: Makefile.inc~
diff -ru Libc-498.1.7/pthreads/pthread_mutex.c Libc-498.1.7.pd1/pthreads/pthread_mutex.c
--- Libc-498.1.7/pthreads/pthread_mutex.c 2008-07-16 00:35:58.000000000 +0200
+++ Libc-498.1.7.pd1/pthreads/pthread_mutex.c 2012-09-10 00:34:53.937841465 +0200
@@ -52,7 +52,8 @@
#include "pthread_internals.h"
-#ifdef PLOCKSTAT
+#if 0
+//#ifdef PLOCKSTAT
#include "plockstat.h"
#else /* !PLOCKSTAT */
#define PLOCKSTAT_MUTEX_SPIN(x)

15
patches/Libsystem-111.1.4.rm-quarantine-sandbox.p1.patch Normal file
View File

@@ -0,0 +1,15 @@
diff -ru Libsystem-111.1.4/Makefile Libsystem-111.1.4.pd1/Makefile
--- Libsystem-111.1.4/Makefile 2008-09-30 04:47:45.000000000 +0200
+++ Libsystem-111.1.4.pd1/Makefile 2012-09-10 01:28:52.813777126 +0200
@@ -21,8 +21,8 @@
LIBS = -lc -lcommonCrypto -ldyldapis\
-linfo -ldns_sd -lm -lmacho\
-lnotify -lkeymgr -llaunch \
- -lcopyfile -lsandbox -lremovefile
-CONDITIONALLIBS = unc quarantine
+ -lcopyfile -lremovefile
+CONDITIONALLIBS = unc
.for L in $(CONDITIONALLIBS)
# the following should be replaced with tconf when 5784037 is complete
.if exists($(LIBSYS)/lib$(L).a)
Seulement dans Libsystem-111.1.4.pd1: Makefile~

23
patches/OpenDirectory-39.CFOpendirectory.c.p1.patch Normal file
View File

@@ -0,0 +1,23 @@
diff -ru OpenDirectory-39/CFOpenDirectory.c OpenDirectory-39.pd1/CFOpenDirectory.c
--- OpenDirectory-39/CFOpenDirectory.c 2007-09-15 04:14:58.000000000 +0200
+++ OpenDirectory-39.pd1/CFOpenDirectory.c 2012-09-12 16:39:24.000000000 +0200
@@ -36,12 +36,18 @@
#include <objc/objc-runtime.h>
#include <membership.h>
#include <membershipPriv.h>
-#include <CoreFoundation/CFBridgingPriv.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFError.h>
#include <pwd.h>
#include <Kerberos/Kerberos.h>
#include <DirectoryServiceCore/CSharedData.h> // for custom call
+//http://darwinbuild.macosforge.org/trac/ticket/50
+#define CF_IS_OBJC(x,...) FALSE
+#define CF_OBJC_CALL(x,...) do { } while (0)
+#define CF_OBJC_VOIDCALL(x,...) do { } while (0)
+#define CF_OBJC_FUNCDISPATCH(x,...) do { } while (0)
+
#ifndef kDSConfigRecordsType
#define kDSConfigRecordsType "dsConfigType::RecordTypes"
#endif

157
patches/PowerManagement-158.10.9.IOSmbusController.p1.patch Normal file
View File

@@ -0,0 +1,157 @@
--- /dev/null 2012-09-22 08:48:37.128390912 +0200
+++ PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/IOSMBusController.h 2012-09-22 10:56:24.000000000 +0200
@@ -0,0 +1,154 @@
+/* IOSMBusController.h
+ */
+
+#ifndef __IOSMBusController__
+#define __IOSMBusController__
+
+#include <IOKit/IOService.h>
+#include <IOKit/acpi/IOACPIPlatformDevice.h>
+
+#if 0
+#define DEBUG_LOG(args...) IOLog(args)
+#else
+#define DEBUG_LOG(args...)
+#endif
+
+
+/*****************************/
+//from IOKitLib.h
+
+typedef void
+(*IOServiceMatchingCallback)(
+ void * refcon,
+ io_iterator_t iterator );
+#define kIOSMBusMaxDataCount 4 //? or 4
+
+//#define kIOMessageSMBusAlarm
+
+
+/*******************************/
+
+// Status Register (SMB_STS) Codes
+// See section 12.9.1.1 of ACPI 4.0a specification
+
+#define kIOSMBusStatusOK 0x00
+#define kIOSMBusStatusUnknownFailure 0x07
+#define kIOSMBusStatusDeviceAddressNotAcknowledged 0x10
+#define kIOSMBusStatusDeviceError 0x11
+#define kIOSMBusStatusDeviceCommandAccessDenied 0x12
+#define kIOSMBusStatusUnknownHostError 0x13
+#define kIOSMBusStatusDeviceAccessDenied 0x17
+#define kIOSMBusStatusTimeout 0x18
+#define kIOSMBusStatusHostUnsupportedProtocol 0x19
+#define kIOSMBusStatusBusy 0x1A
+#define kIOSMBusStatusPECError 0x1F
+
+// Protocol Register (SMB_PRTCL) Types
+// See section 12.9.1.2 of ACPI 4.0a specification
+
+#define kIOSMBusProtocolControllerNotInUse 0x00
+#define kIOSMBusProtocolReserved 0x01
+#define kIOSMBusProtocolWriteQuickCommand 0x02
+#define kIOSMBusProtocolReadQuickCommand 0x03
+#define kIOSMBusProtocolSendByte 0x04
+#define kIOSMBusProtocolReceiveByte 0x05
+#define kIOSMBusProtocolWriteByte 0x06
+#define kIOSMBusProtocolReadByte 0x07
+#define kIOSMBusProtocolWriteWord 0x08
+#define kIOSMBusProtocolReadWord 0x09
+#define kIOSMBusProtocolWriteBlock 0x0A
+#define kIOSMBusProtocolReadBlock 0x0B
+#define kIOSMBusProtocolProcessCall 0x0C
+#define kIOSMBusProtocolBlockWriteBlockReadProcessCall 0x0D
+
+// Same as above but with (P)acket (E)rror (C)hecking enabled
+
+#define kIOSMBusProtocolPECControllerNotInUse 0x80
+#define kIOSMBusProtocolPECReserved 0x81
+#define kIOSMBusProtocolPECWriteQuickCommand 0x82
+#define kIOSMBusProtocolPECReadQuickCommand 0x83
+#define kIOSMBusProtocolPECSendByte 0x84
+#define kIOSMBusProtocolPECReceiveByte 0x85
+#define kIOSMBusProtocolPECWriteByte 0x86
+#define kIOSMBusProtocolPECReadByte 0x87
+#define kIOSMBusProtocolPECWriteWord 0x88
+#define kIOSMBusProtocolPECReadWord 0x89
+#define kIOSMBusProtocolPECWriteBlock 0x8A
+#define kIOSMBusProtocolPECReadBlock 0x8B
+#define kIOSMBusProtocolPECProcessCall 0x8C
+#define kIOSMBusProtocolPECBlockWriteBlockReadProcessCall 0x8D
+
+typedef uint8_t IOSMBusStatus;
+
+// Maximum size of SMBus Data Register Array (SMB_DATA)
+// See section 12.9.1.5 of ACPI 4.0a specification
+
+#define kSMBusMaximumDataSize 32
+
+// Holds data related to a SMBus transaction
+
+typedef struct
+{
+ uint8_t status;
+ uint8_t protocol;
+ uint8_t address;
+ uint8_t command;
+ uint8_t sendDataCount;
+ uint8_t sendData[kSMBusMaximumDataSize];
+ uint8_t receiveDataCount;
+ uint8_t receiveData[kSMBusMaximumDataSize];
+} IOSMBusTransaction;
+
+// See section 12.9.1.7 of ACPI 4.0a specification
+
+#define kSMBusAlarmDataSize 2
+
+typedef struct
+{
+ uint8_t fromAddress;
+ uint8_t data[kSMBusAlarmDataSize];
+} IOSMBusAlarmMessage;
+
+typedef IOServiceMatchingCallback IOSMBusTransactionCompletion;
+
+class IOSMBusController : public IOService {
+
+ OSDeclareDefaultStructors(IOSMBusController)
+
+public:
+
+ virtual bool init(OSDictionary *dictionary = 0);
+ virtual void free(void);
+
+/*! @function start
+ @abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
+ @discussion The <code>start</code> method of an IOService instance is called by its provider when it has been selected (due to its probe score and match category) as the winning client. The client is already attached to the provider when <code>start</code> is called.<br>Implementations of <code>start</code> must call <code>start</code> on their superclass at an appropriate point. If an implementation of <code>start</code> has already called <code>super::start</code> but subsequently determines that it will fail, it must call <code>super::stop</code> to balance the prior call to <code>super::start</code> and prevent reference leaks.
+ @result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed). */
+
+ virtual bool start( IOService * provider );
+
+/*! @function stop
+ @abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
+ @discussion The termination process for an IOService (the provider) will call stop in each of its clients, after they have closed the provider if they had it open, or immediately on termination. */
+
+ virtual void stop( IOService * provider );
+
+
+ IOReturn performTransaction(IOSMBusTransaction * transaction,
+ IOSMBusTransactionCompletion completion = 0,
+ OSObject * target = 0,
+ void * reference = 0);
+protected:
+
+private:
+
+ IOACPIPlatformDevice *fProvider;
+
+ IOSMBusTransaction fTransaction;
+ IOSMBusTransactionCompletion fCompletion;
+ OSObject *fTarget;
+ void *fReference;
+
+};
+
+#endif /* ! __IOSMBusController__ */

113
patches/PowerManagement-158.10.9.p1.patch Normal file
View File

@@ -0,0 +1,113 @@
Seulement dans PowerManagement-158.10.9.pd1/AppleSmartBatteryManager: ._AppleSmartBattery.cpp
diff -ru PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBattery.cpp PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBattery.cpp
--- PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBattery.cpp 2009-08-07 22:00:52.000000000 +0200
+++ PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBattery.cpp 2012-09-22 11:10:13.000000000 +0200
@@ -597,7 +597,7 @@
uint32_t delay_for = 0;
IOSMBusStatus transaction_status = kIOSMBusStatusPECError;
bool transaction_needs_retry = false;
- char recv_str[kIOSMBusMaxDataCount+1];
+ char recv_str[kIOSMBusMaxDataCount+1];//32 ?
OSNumber *cell_volt_num = NULL;
OSNumber *pfstatus_num = NULL;
diff -ru PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBattery.h PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBattery.h
--- PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBattery.h 2008-10-03 02:58:59.000000000 +0200
+++ PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBattery.h 2012-09-22 11:17:00.549882370 +0200
@@ -26,7 +26,8 @@
#include <IOKit/IOService.h>
#include <IOKit/pwr_mgt/IOPMPowerSource.h>
-#include <IOKit/smbus/IOSMBusController.h>
+//#include <IOKit/smbus/IOSMBusController.h>
+#include "IOSMBusController.h"
#include <IOKit/acpi/IOACPIPlatformDevice.h>
#include "AppleSmartBatteryCommands.h"
Seulement dans PowerManagement-158.10.9.pd1/AppleSmartBatteryManager: ._AppleSmartBatteryManager.cpp
diff -ru PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBatteryManager.cpp PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBatteryManager.cpp
--- PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBatteryManager.cpp 2008-06-12 02:00:37.000000000 +0200
+++ PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBatteryManager.cpp 2012-09-22 10:57:46.000000000 +0200
@@ -26,6 +26,8 @@
#include "AppleSmartBatteryManager.h"
#include "AppleSmartBattery.h"
+#include <IOKit/IOCommandPool.h>
+
#define kMaxRetries 5
static uint8_t retryDelaysTable[kMaxRetries] =
@@ -384,7 +386,7 @@
poll of battery state. */
if(!alarm) return kIOReturnSuccess;
-
+#if 0
if( (kIOMessageSMBusAlarm == type)
&& (kSMBusManagerAddr == alarm->fromAddress)
&& fBatteryGate)
@@ -413,7 +415,7 @@
NULL, NULL, NULL, NULL);
}
}
-
+#endif
return kIOReturnSuccess;
}
diff -ru PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBatteryManager.h PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBatteryManager.h
--- PowerManagement-158.10.9/AppleSmartBatteryManager/AppleSmartBatteryManager.h 2008-06-12 02:00:37.000000000 +0200
+++ PowerManagement-158.10.9.pd1/AppleSmartBatteryManager/AppleSmartBatteryManager.h 2012-09-22 11:16:57.621882428 +0200
@@ -25,7 +25,8 @@
#define __AppleSmartBatteryManager__
#include <IOKit/IOService.h>
-#include <IOKit/smbus/IOSMBusController.h>
+//#include <IOKit/smbus/IOSMBusController.h>
+#include "IOSMBusController.h"
#include "AppleSmartBattery.h"
#include "AppleSmartBatteryManagerUserClient.h"
Seulement dans PowerManagement-158.10.9.pd1/AppleSmartBatteryManager: IOSMBusController.h
Seulement dans PowerManagement-158.10.9.pd1: build
Seulement dans PowerManagement-158.10.9.pd1: com.apple.Xcode.0
Seulement dans PowerManagement-158.10.9.pd1/pmconfigd: ._PrivateLib.h
diff -ru PowerManagement-158.10.9/pmconfigd/PrivateLib.h PowerManagement-158.10.9.pd1/pmconfigd/PrivateLib.h
--- PowerManagement-158.10.9/pmconfigd/PrivateLib.h 2009-08-07 22:00:52.000000000 +0200
+++ PowerManagement-158.10.9.pd1/pmconfigd/PrivateLib.h 2012-09-22 11:02:23.000000000 +0200
@@ -24,6 +24,7 @@
#define _privatelib_h_
#include <TargetConditionals.h>
+#include <CoreFoundation/CFUserNotification.h>
#if !TARGET_OS_EMBEDDED
#define HAVE_CF_USER_NOTIFICATION 1
diff -ru PowerManagement-158.10.9/pmconfigd/TTYKeepAwake.c PowerManagement-158.10.9.pd1/pmconfigd/TTYKeepAwake.c
--- PowerManagement-158.10.9/pmconfigd/TTYKeepAwake.c 2008-02-01 04:28:46.000000000 +0100
+++ PowerManagement-158.10.9.pd1/pmconfigd/TTYKeepAwake.c 2012-09-22 11:09:41.000000000 +0200
@@ -36,6 +36,10 @@
#include "TTYKeepAwake.h"
#include "PMSettings.h"
+#ifndef nil
+#define nil NULL
+#endif
+
#if !TARGET_OS_EMBEDDED
Seulement dans PowerManagement-158.10.9.pd1/PowerManagement.xcodeproj: kindred.mode1v3
Seulement dans PowerManagement-158.10.9.pd1/PowerManagement.xcodeproj: kindred.pbxuser
diff -ru PowerManagement-158.10.9/PowerManagement.xcodeproj/project.pbxproj PowerManagement-158.10.9.pd1/PowerManagement.xcodeproj/project.pbxproj
--- PowerManagement-158.10.9/PowerManagement.xcodeproj/project.pbxproj 2009-03-24 00:32:55.000000000 +0100
+++ PowerManagement-158.10.9.pd1/PowerManagement.xcodeproj/project.pbxproj 2012-09-22 11:10:13.000000000 +0200
@@ -373,7 +373,7 @@
72D0ECFE08F73FB600CCEA2F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = Info.plist; path = AppleSmartBatteryManager/Info.plist; sourceTree = "<group>"; };
72D984480B20BE7800D66087 /* TTYKeepAwake.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = TTYKeepAwake.c; sourceTree = "<group>"; };
72D984490B20BE7800D66087 /* TTYKeepAwake.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TTYKeepAwake.h; sourceTree = "<group>"; };
- 72E815720CFE470B00CF547E /* PowerManagement.bundle */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = PowerManagement.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+ 72E815720CFE470B00CF547E /* PowerManagement.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PowerManagement.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
72E815730CFE470B00CF547E /* Power Management Bundle-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Power Management Bundle-Info copy.plist"; sourceTree = "<group>"; };
72FE21330A0179A300885E24 /* BatteryFaker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BatteryFaker.app; sourceTree = BUILT_PRODUCTS_DIR; };
72FE21400A0179F400885E24 /* BatteryFaker.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BatteryFaker.kext; sourceTree = BUILT_PRODUCTS_DIR; };

30
patches/SQLite-46.1.WITHOUT_TCL.p1.patch Normal file
View File

@@ -0,0 +1,30 @@
diff -ru SQLite-46.1/Makefile SQLite-46.1.pd1/Makefile
--- SQLite-46.1/Makefile 2007-11-29 23:58:08.000000000 +0100
+++ SQLite-46.1.pd1/Makefile 2012-09-12 12:46:52.793536542 +0200
@@ -42,19 +42,19 @@
# remove static libraries and pkgconfig
${RM} -rf $(RC_Install_Prefix)/lib/*.*a $(RC_Install_Prefix)/lib/pkgconfig;
# fix the permissions on the tcl dylib
- ${CHMOD} 755 $(RC_Install_Prefix)/lib/sqlite3/libtclsqlite3.dylib;
+ #${CHMOD} 755 $(RC_Install_Prefix)/lib/sqlite3/libtclsqlite3.dylib;
# copy symbol-rich binary and libraries to SYMROOT
${CP} $(RC_Install_Prefix)/bin/sqlite3 $(SYMROOT)/sqlite3
${CP} $(RC_Install_Prefix)/lib/libsqlite3.0.dylib $(SYMROOT)/libsqlite3.0.dylib
- ${CP} $(RC_Install_Prefix)/lib/sqlite3/libtclsqlite3.dylib $(SYMROOT)/libtclsqlite3.dylib
+ #${CP} $(RC_Install_Prefix)/lib/sqlite3/libtclsqlite3.dylib $(SYMROOT)/libtclsqlite3.dylib
# create dSYM files
- ${DSYMUTIL} $(SYMROOT)/sqlite3
- ${DSYMUTIL} $(SYMROOT)/libsqlite3.0.dylib
- ${DSYMUTIL} $(SYMROOT)/libtclsqlite3.dylib
+ #${DSYMUTIL} $(SYMROOT)/sqlite3
+ #${DSYMUTIL} $(SYMROOT)/libsqlite3.0.dylib
+ #${DSYMUTIL} $(SYMROOT)/libtclsqlite3.dylib
# strip installed binaries
${STRIP} -S $(RC_Install_Prefix)/bin/sqlite3
${STRIP} -S $(RC_Install_Prefix)/lib/libsqlite3.0.dylib
- ${STRIP} -S $(RC_Install_Prefix)/lib/sqlite3/libtclsqlite3.dylib
+ #${STRIP} -S $(RC_Install_Prefix)/lib/sqlite3/libtclsqlite3.dylib
# setup man pages for installation
${MKDIR} $(RC_Install_Man)/man1;
${CP} $(Sources)/sqlite3.1 $(RC_Install_Man)/man1/sqlite3.1;
Seulement dans SQLite-46.1.pd1: Makefile~

422
patches/Security-36371.revert_generateErrStrings.p1.patch Normal file
View File

@@ -0,0 +1,422 @@
diff -ru Security-36371/lib/generateErrStrings.pl Security-36371.pd1/lib/generateErrStrings.pl
--- Security-36371/lib/generateErrStrings.pl 2008-06-10 05:46:36.000000000 +0200
+++ Security-36371.pd1/lib/generateErrStrings.pl 2012-09-12 10:08:38.313725143 +0200
@@ -21,62 +21,23 @@
#
# @APPLE_LICENSE_HEADER_END@
#
-# generateErrStrings.pl - create error strings files from the Security header files
+# generatorX.pl - create error strings files from the Security header files
#
-# Usage:
-#
-# perl generateErrStrings.pl <GENDEBUGSTRS?> <NAME_OF_STRINGS_FILE> <input files>
-#
-# Currently supported files are SecBase.h, SecureTransport.h,cssmapple.h,
-# cssmerr.h and Authorization.h. These are used by:
-#
-# void cssmPerror(const char *how, CSSM_RETURN error);
-#
-# which is in SecBase.cpp.
-#
-# Paths of input files:
+# John Hurley, Summer 2003. Based on generator.pl, Perry The Cynic, Fall 1999.
#
-# ./libsecurity_authorization/lib/Authorization.h
-# ./libsecurity_cssm/lib/cssmapple.h
-# ./libsecurity_cssm/lib/cssmerr.h
-# ./libsecurity_keychain/lib/SecBase.h
-# ./libsecurity_ssl/lib/SecureTransport.h
-#
-# Sample run:
-#
-# perl generateErrStrings.pl "YES" "SecErrorMessages.strings" Authorization.h SecBase.h \
-# cssmapple.h cssmerr.h SecureTransport.h
-#
-# Input to script: header file(s) containing enum declarations
-# Output: C++ program with one cout statement per decl
+# Usage:
+# perl generatorX.pl input-directory output-directory <files>
#
-# The input headers are scanned for enums containing error numbers and
-# optional comments. Only certain prefixes for the identifiers in the
-# enums are considered, to avoid non-error message type defines. See
-# the line in the file with CSSM_ERRCODE for acceptable prefixes.
+# Currently supported files are SecBase.h, SecureTransport.h and Authorization.h
#
-# There are three styles of comments that this script parses:
+# perl generatorX.pl `pwd` `pwd` SecBase2.h SecureTransport2.h Authorization.h
#
-# Style A [see /System/Library/Frameworks/Security.framework/Headers/SecBase.h]:
+# Input will be like:
#
# errSSLProtocol = -9800, /* SSL protocol error */
+# errSSLNegotiation = -9801, /* Cipher Suite negotiation failure */
#
-# Style B [see /System/Library/Frameworks/Security.framework/Headers/cssmapple.h]:
-#
-# /* a code signature match failed */
-# CSSMERR_CSP_APPLE_SIGNATURE_MISMATCH = CSSM_CSP_PRIVATE_ERROR + 2,
-#
-# Style C [see /System/Library/Frameworks/Security.framework/Headers/cssmerr.h]:
-#
-# CSSM_CSSM_BASE_CSSM_ERROR =
-# CSSM_CSSM_BASE_ERROR + CSSM_ERRORCODE_COMMON_EXTENT + 0x10,
-# CSSMERR_CSSM_SCOPE_NOT_SUPPORTED = CSSM_CSSM_BASE_CSSM_ERROR + 1,
-#
-# Style A has the comment after the comment. Style has the comment before the value,
-# and Style C has no comment. In cases where both Style A and B apply, the
-# comment at the end of the line is used.
-#
-# The final output after the generated Objective-C++ program is run looks like:
+# Output should be like (in Unicode):
#
# /* errSSLProtocol */
# "-9800" = "SSL protocol error";
@@ -84,268 +45,108 @@
# /* errSSLNegotiation */
# "-9801" = "Cipher Suite negotiation failure";
#
-# The appropriate byte order marker for UTF-16 is written to the start of the file.
-# Note that the list of errors must be numerically unique across all input files,
-# or the strings file will be invalid. Comments in "Style B" may span multiple lines.
-# C++ style comments are not supported. Any single or double quote in a comment is
-# converted to a "-" in the output.
-#
-# The English versions of the error messages can be seen with:
+# Note that the list of errors must be numerically unique across all input files, or the strings file
+# will be invalid.Comments that span multiple lines will be ignored, as will lines with no comment. C++
+# style comments are not supported.
#
-# cat /System/Library/Frameworks/Security.framework/Resources/English.lproj/SecErrorMessages.strings
-#
-# find -H -X -x . -name "*.h" -print0 2>/dev/null | xargs -0 grep -ri err
-# -----------------------------------------------------------------------------------
-# Style questions:
-# - what should I make PROGNAME?
-# - should I use a special call to make the temp file in the .mm file?
-#
+#for puredarin sept 2012
+#replacement for generateErrStrings from Security-36371 with Foundation dep.
+#based on perl script from Security-29000 series
#use strict;
-#use warnings;
+use Encode;
-die "Usage: $0 <gendebug> <tmpdir> <.strings file> <list of headers>\n" if ($#ARGV < 3);
-$GENDEBUGSTRINGS=$ARGV[0]; # If "YES", include all strings & don't localize
-$TMPDIR=$ARGV[1]; # temporary directory for program compile, link, run
-$TARGETSTR=$ARGV[2]; # path of .strings file, e.g.
- # ${DERIVED_SRC}/English.lproj/SecErrorMessages.strings
-@INPUTFILES=@ARGV[3 .. 9999]; # list of input files
+#GENDEBUGSTRINGS no implemented, for compatibility
+$GENDEBUGSTRINGS=$ARGV[0]; # If "YES", include all strings & don't localize
+
+$FRAMEWORK=$ARGV[1]; # directory containing Security.framework
+$TARGETFILE=$ARGV[2]; # where to put the output file
+
+@INPUTFILES=@ARGV[3 .. 9999]; # list of input files
$#INPUTFILES = $#ARGV - 3; # truncate to actual number of files
-print "gend: $GENDEBUGSTRINGS, tmpdir: $TMPDIR, targetstr: $TARGETSTR\n";
-$PROGNAME="${TMPDIR}/generateErrStrings.mm";
-open PROGRAM,"> $PROGNAME" or die "can't open $PROGNAME: $!";
-select PROGRAM;
-
-printAdditionalIncludes();
-printInputIncludes();
-printMainProgram();
+
+#my $INPUTFILE=$ARGV[3]; # list of input files
+
+my $tabs = "\t\t\t"; # argument indentation (noncritical)
+my $warning = "This file was automatically generated. Do not edit on penalty of futility!";
+
+#
+# Read error headers into memory (all just concatenated blindly)
+#
+#open(ERR, "$INPUTFILE") or die "Cannot open $INPUTFILE";
+#$/=undef; # big gulp mode
+#$_ = <ERR>;
+#close(ERR);
# -----------------------------------------------------------------------------------
# Parse error headers and build array of all relevant lines
open(ERR, "cat " . join(" ", @INPUTFILES) . "|") or die "Cannot open error header files";
$/="\};"; #We set the section termination string - very important
-processInput();
+$/=undef; # big gulp mode
+$_ = <ERR>;
close(ERR);
# -----------------------------------------------------------------------------------
-printTrailer();
-select STDOUT;
-close PROGRAM;
-
-compileLinkAndRun();
-
-# 4: Done!
-exit;
+#
+# Prepare output file
+#
+open(OUT, ">$TARGETFILE") or die "Cannot write $TARGETFILE: $^E";
+my $msg = "//\n// Security error code tables.\n// $warning\n//\n";
-# -----------------------------------------------------------------------------------
-# Subroutines
-# -----------------------------------------------------------------------------------
-sub processInput
-{
- # 3: Read input, process each line, output it.
- while ( $line = <ERR>)
- {
- ($enum) = ($line =~ /\n\s*enum\s*{\s*([^}]*)};/);
- while ($enum ne '') #basic filter for badly formed enums
- {
- #Drop leading whitespace
- $enum =~ s/^\s+//;
- # print "A:", $enum,"\n";
- ($leadingcomment) = ($enum =~ m%^(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)|(//.*)%);
- if ($leadingcomment ne '')
- {
- $enum = substr($enum, length($leadingcomment));
- $leadingcomment = substr($leadingcomment, 2); # drop leading "/*"
- $leadingcomment = substr($leadingcomment, 0, -2); # drop trailing "*/"
- $leadingcomment = cleanupComment($leadingcomment);
- }
- next if ($enum eq ''); #basic filter for badly formed enums
-
- # Check for C++ style comments at start of line
- if ($enum =~ /\s*(\/\/)/)
- {
- #Drop everything before the end of line
- $enum =~ s/[^\n]*[\n]*//;
- next;
- }
- ($identifier) = ($enum =~ /\s*([_A-Za-z][_A-Za-z0-9]*)/);
-
-# print "identifier: ", $identifier,"\n" if ($identifier ne '');
-
- #Drop everything before the comma
- $enum =~ s/[^,]*,//;
-
- # Now look for trailing comment. We only consider them
- # trailing if they come before the end of the line
- ($trailingcomment) = ($enum =~ /^[ \t]*\/\*((.)*)?\*\//);
- # ($trailingcomment) = ($enum =~ m%^(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/)|(//.*)%);
- $trailingcomment = cleanupComment($trailingcomment);
-
- #Drop everything before the end of line
- $enum =~ s/[^\n]*[\n]*//;
- # print "B:", $enum,"\n";
- # print "lc:$leadingcomment, id:$identifier, tc:$trailingcomment\n";
- # print "===========================================\n";
-
- writecomment($leadingcomment, $identifier, $trailingcomment);
- }
- }
-}
-
-sub writecomment
+#
+# Extract errors from accumulated header text. Format:
+# errBlahWhatever = number, /* text */
+#
+my @errorlines =
+ m{(?:^\s*)(err[Sec|Authorization|SSL]\w+)(?:\s*=\s*)(-?\d+)(?:\s*,?\s*)(?:/\*\s*)(.*)(?:\*/)(?:$\s*)}gm;
+while (my $errx = shift @errorlines)
{
- # Leading comment, id, trailing comment
- # To aid localizers, we will not output a line with no comment
- #
- # Output is e.g.
- # tmp << "/* errAuthorizationSuccess */\n\"" << errAuthorizationSuccess
- # << "\" = \"The operation completed successfully.\"\n" << endl;
-
- my($mylc,$myid,$mytc) = @_;
- if ($myid =~ /(CSSM_ERRCODE|CSSMERR_|errSec|errCS|errAuth|errSSL)[_A-Za-z][_A-Za-z0-9]*/)
- {
- $errormessage = '';
- if ($mytc ne '')
- { $errormessage = $mytc; }
- elsif ($mylc ne '')
- { $errormessage = $mylc; }
- elsif ($GENDEBUGSTRINGS eq "YES")
- { $errormessage = $myid; }
-
- if ($errormessage ne '')
- {
- print "\ttmp << \"/* ", $myid, " */\\n\\\"\" << ";
- print $myid, " << \"\\\" = \\\"";
- print $errormessage, "\\\";\\n\" << endl;\n";
- }
- }
+ my $value = shift @errorlines; # or die;
+ my $str = shift @errorlines; # or die;
+ $str =~ s/\s*$//; # drop trailing white space
+ if ( $value != 0) # can't output duplicate error codes
+ {
+ $msg = $msg . "\n/* $errx */\n\"$value\" = \"$str\";\n";
+ }
};
+$msg = $msg . "\n";
-
-sub printAdditionalIncludes
-{
- #This uses the "here" construct to dump out lines verbatim
- print <<"AdditionalIncludes";
-
-#include <iostream>
-#include <fstream>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Foundation/Foundation.h>
-
-using namespace std;
-AdditionalIncludes
-}
-
-sub printInputIncludes
-{
- #Now "#include" each of the input files
- print "\n#include \"$_\"" foreach @INPUTFILES;
- print "\n";
-}
-
-sub printMainProgram
-{
- #Output the main part of the program using the "here" construct
- print <<"MAINPROGRAM";
-
-void writeStrings(const char *stringsFileName);
-void createStringsTemp();
-
-int main (int argc, char * const argv[])
-{
- const char *stringsFileName = NULL;
-
- if (argc == 2)
- stringsFileName = argv[1];
- else
- if (argc == 1)
- stringsFileName = "SecErrorMessages.strings";
- else
- return -1;
-
- cout << "Strings file to create: " << stringsFileName << endl;
- createStringsTemp();
- writeStrings(stringsFileName);
-}
-void writeStrings(const char *stringsFileName)
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- NSFileHandle *fh = [NSFileHandle fileHandleForReadingAtPath:@"generateErrStrings.tmp"];
- NSData *rawstrings = [fh readDataToEndOfFile];
- UInt32 encoding = CFStringConvertEncodingToNSStringEncoding (kCFStringEncodingUTF8);
- NSString *instring = [[NSString alloc] initWithData:rawstrings encoding:(NSStringEncoding)encoding];
-
- /* temporary fix to avoid relocalization of two specific strings which have already been fixed in header files */
- if (instring)
- {
- instring = [instring stringByReplacingOccurrencesOfString:@"\\\"-2147408896\\\" = \\\"Host name mismatch\\\"" withString:@"\\\"-2147408896\\\" = \\\"mismatch between Cert-s common name and app-specified host name\\\""];
- instring = [instring stringByReplacingOccurrencesOfString:@"\\\"-2147408883\\\" = \\\"Cannot find appropriate CRL\\\"" withString:@"\\\"-2147408883\\\" = \\\"Can-t find appropriate CRL\\\""];
- }
-
-
- if (instring)
- {
- NSString *path = [NSString stringWithUTF8String:stringsFileName];
- NSFileManager *fm = [NSFileManager defaultManager];
- if ([fm fileExistsAtPath:path])
- [fm removeFileAtPath:path handler:nil];
- BOOL bx = [fm createFileAtPath:path contents:nil attributes:nil];
- NSFileHandle *fs = [NSFileHandle fileHandleForWritingAtPath:path];
- [fs writeData:[instring dataUsingEncoding:NSUnicodeStringEncoding]];
- }
-
- [pool release];
-}
-
-void createStringsTemp()
-{
- ofstream tmp("generateErrStrings.tmp") ;
-
-MAINPROGRAM
-}
-
-sub cleanupComment
-{
- my $comment = shift @_;
-# print "A:",$comment,"\n";
- if ($comment ne '')
- {
- $comment =~ s/\s\s+/ /g; # Squeeze multiple spaces to one
- $comment =~ s/^\s+//; # Drop leading whitespace
- $comment =~ s/\s+$//; # Drop trailing whitespace
- $comment =~ s/[\'\"]/-/g; # Replace quotes with -
- }
-# print "B:",$comment,"\n";
- $comment;
-}
+#
+# Extract errors from CSSM headers. Format:
+# CSSMERR_whatever = some compile-time C expression
+# [We just build a C program and running it. So sue us.]
+#
+my $PROG = "/tmp/cssmerrors.$$.c";
+my $PROGB = "/tmp/cssmerrors.$$";
-sub printTrailer
-{
- print " tmp.close();\n";
- print "}\n";
+open(PROG, ">$PROG") or die "Cannot open $PROG";
+print PROG <<END;
+#include <Security/cssmerr.h>
+#include <Security/cssmapple.h>
+#include <stdio.h>
+int main() {
+END
+@errorlines =
+ m{(?:^\s*)CSSMERR_([A-Z_]+)\s+=}gm;
+for my $error (@errorlines) {
+ print PROG "printf(\"\\n/* CSSMERR_$error */\\n\\\"%ld\\\" = \\\"$error\\\";\\n\", CSSMERR_$error);\n";
}
+print PROG "}\n";
+close(PROG);
-sub compileLinkAndRun
-{
- $status = system( <<"MAINPROGRAM");
-(cd ${TMPDIR} ; /usr/bin/cc -x objective-c++ -pipe -Wno-trigraphs -fpascal-strings -fasm-blocks -g -O0 -Wreturn-type -fmessage-length=0 -F$ENV{'BUILT_PRODUCTS_DIR'} -I$ENV{'BUILT_PRODUCTS_DIR'}/SecurityPieces/Headers -I$ENV{'BUILT_PRODUCTS_DIR'}/SecurityPieces/PrivateHeaders -c generateErrStrings.mm -o generateErrStrings.o)
-MAINPROGRAM
- die "$compile exited funny: $?" unless $status == 0;
-
- $status = system( <<"LINKERSTEP");
-(cd ${TMPDIR} ; /usr/bin/g++ -o generateErrStrings generateErrStrings.o -framework Foundation )
-LINKERSTEP
- die "$linker exited funny: $?" unless $status == 0;
-
- $status = system( <<"RUNSTEP");
-(cd ${TMPDIR} ; ./generateErrStrings $TARGETSTR )
-RUNSTEP
- die "$built program exited funny: $?" unless $status == 0;
-}
+system("cc", "-o", $PROGB, $PROG, "-I$FRAMEWORK/SecurityPieces/Headers") == 0 or die "cannot build CSSM collector";
+open(PROGR, "$PROGB|") or die "Cannot run CSSM collector";
+$msg .= <PROGR>;
+close(PROGR);
+#
+# Write output file and clean up
+#
+print OUT encode("UTF-16", $msg, Encode::FB_PERLQQ);
+close(OUT);

47
patches/Security-36371.xcode.p1.patch Normal file
View File

@@ -0,0 +1,47 @@
diff -ru Security-36371.pd1/Security.xcodeproj/project.pbxproj Security-36371.pd2/Security.xcodeproj/project.pbxproj
--- Security-36371.pd1/Security.xcodeproj/project.pbxproj 2009-02-22 03:17:54.000000000 +0100
+++ Security-36371.pd2/Security.xcodeproj/project.pbxproj 2012-09-12 07:29:28.977914831 +0200
@@ -1481,10 +1481,6 @@
OTHER_CPLUSPLUSFLAGS_normal = "-DNDEBUG $(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS_profile = "-DNDEBUG $(OTHER_CFLAGS) -pg";
OTHER_LDFLAGS = (
- "-framework",
- "\"security_comcryption\"",
- "-framework",
- "\"security_cryptkit\"",
"-L/usr/local/lib",
"-lantlr2c++",
);
@@ -1537,10 +1533,6 @@
OTHER_CPLUSPLUSFLAGS_normal = "-DNDEBUG $(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS_profile = "-DNDEBUG $(OTHER_CFLAGS) -pg";
OTHER_LDFLAGS = (
- "-framework",
- "\"security_comcryption\"",
- "-framework",
- "\"security_cryptkit\"",
"-L/usr/local/lib",
"-lantlr2c++",
);
@@ -1648,10 +1640,6 @@
OTHER_CPLUSPLUSFLAGS_normal = "$(OTHER_CFLAGS) -O0 -fno-inline";
OTHER_CPLUSPLUSFLAGS_profile = "-DNDEBUG $(OTHER_CFLAGS) -pg";
OTHER_LDFLAGS = (
- "-framework",
- "\"security_comcryption\"",
- "-framework",
- "\"security_cryptkit\"",
"-L/usr/local/lib",
"-lantlr2c++",
);
@@ -1702,10 +1690,6 @@
OTHER_CPLUSPLUSFLAGS_normal = "-DNDEBUG $(OTHER_CFLAGS)";
OTHER_CPLUSPLUSFLAGS_profile = "-DNDEBUG $(OTHER_CFLAGS) -pg";
OTHER_LDFLAGS = (
- "-framework",
- "\"security_comcryption\"",
- "-framework",
- "\"security_cryptkit\"",
"-L/usr/local/lib",
"-lantlr2c++",
);

167
patches/Tokend-35209.MacTypes.patch Normal file
View File

@@ -0,0 +1,167 @@
diff -ru ../Tokend-35209.orig/PIV/PIVDefines.h ./PIV/PIVDefines.h
--- ../Tokend-35209.orig/PIV/PIVDefines.h 2008-10-02 15:03:39.000000000 -0700
+++ ./PIV/PIVDefines.h 2009-05-18 14:18:32.000000000 -0700
@@ -29,6 +29,8 @@
#ifndef _PIVDEFINES_H_
#define _PIVDEFINES_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
+
/*
For the PIV tokend, refer to NIST Specical Publication 800-73-1, "Interfaces
for Personal Identity Verification". The define for CLA_STANDARD comes from 2.3.3.1.1. [SP800731]
diff -ru ../Tokend-35209.orig/PIV/byte_string.h ./PIV/byte_string.h
--- ../Tokend-35209.orig/PIV/byte_string.h 2008-10-02 15:03:39.000000000 -0700
+++ ./PIV/byte_string.h 2009-05-18 14:19:06.000000000 -0700
@@ -23,6 +23,8 @@
#ifndef BYTE_STRING
#define BYTE_STRING
+
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <vector>
/** Utility definition and additional operators to make working with
diff -ru ../Tokend-35209.orig/Tokend/Adornment.h ./Tokend/Adornment.h
--- ../Tokend-35209.orig/Tokend/Adornment.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/Adornment.h 2009-05-18 13:50:09.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_ADORNMENT_H_
#define _TOKEND_ADORNMENT_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_utilities/adornments.h>
#include <security_utilities/refcount.h>
#include <Security/SecCertificate.h>
diff -ru ../Tokend-35209.orig/Tokend/Attribute.h ./Tokend/Attribute.h
--- ../Tokend-35209.orig/Tokend/Attribute.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/Attribute.h 2009-05-18 13:50:09.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_ATTRIBUTE_H_
#define _TOKEND_ATTRIBUTE_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <Security/cssmtype.h>
#include <security_cdsa_utilities/cssmdb.h>
#include <string>
diff -ru ../Tokend-35209.orig/Tokend/AttributeCoder.h ./Tokend/AttributeCoder.h
--- ../Tokend-35209.orig/Tokend/AttributeCoder.h 2008-10-02 15:03:39.000000000 -0700
+++ ./Tokend/AttributeCoder.h 2009-05-18 13:56:14.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_ATTRIBUTECODER_H_
#define _TOKEND_ATTRIBUTECODER_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_utilities/utilities.h>
#include <Security/cssmtype.h>
diff -ru ../Tokend-35209.orig/Tokend/DbValue.h ./Tokend/DbValue.h
--- ../Tokend-35209.orig/Tokend/DbValue.h 2008-10-02 15:03:39.000000000 -0700
+++ ./Tokend/DbValue.h 2009-05-18 13:50:09.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_DBVALUE_H_
#define _TOKEND_DBVALUE_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_cdsa_utilities/cssmdata.h>
#include <security_cdsa_utilities/cssmdb.h>
#include <Security/cssmerr.h>
diff -ru ../Tokend-35209.orig/Tokend/MetaRecord.h ./Tokend/MetaRecord.h
--- ../Tokend-35209.orig/Tokend/MetaRecord.h 2008-10-02 15:03:39.000000000 -0700
+++ ./Tokend/MetaRecord.h 2009-05-18 13:50:09.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_METARECORD_H_
#define _TOKEND_METARECORD_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_cdsa_utilities/cssmdata.h>
#include <map>
#include <string>
diff -ru ../Tokend-35209.orig/Tokend/PKCS11Object.h ./Tokend/PKCS11Object.h
--- ../Tokend-35209.orig/Tokend/PKCS11Object.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/PKCS11Object.h 2009-05-18 13:57:46.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_PKCS11OBJECT_H_
#define _TOKEND_PKCS11OBJECT_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <stdint.h>
#include <map>
#include <security_utilities/debugging.h>
diff -ru ../Tokend-35209.orig/Tokend/Record.h ./Tokend/Record.h
--- ../Tokend-35209.orig/Tokend/Record.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/Record.h 2009-05-18 13:50:09.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_RECORD_H_
#define _TOKEND_RECORD_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include "AttributeCoder.h"
#include "MetaRecord.h"
#include "Attribute.h"
diff -ru ../Tokend-35209.orig/Tokend/RecordHandle.h ./Tokend/RecordHandle.h
--- ../Tokend-35209.orig/Tokend/RecordHandle.h 2008-10-02 15:03:39.000000000 -0700
+++ ./Tokend/RecordHandle.h 2009-05-18 13:50:09.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_RECORDHANDLE_H_
#define _TOKEND_RECORDHANDLE_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_cdsa_utilities/handleobject.h>
#include <security_utilities/refcount.h>
#include <security_cdsa_utilities/cssmaclpod.h>
diff -ru ../Tokend-35209.orig/Tokend/SCardError.h ./Tokend/SCardError.h
--- ../Tokend-35209.orig/Tokend/SCardError.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/SCardError.h 2009-05-18 13:49:37.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_SCARDERROR_H_
#define _TOKEND_SCARDERROR_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_utilities/debugging.h>
#include <security_utilities/errors.h>
diff -ru ../Tokend-35209.orig/Tokend/Schema.h ./Tokend/Schema.h
--- ../Tokend-35209.orig/Tokend/Schema.h 2008-10-02 15:03:39.000000000 -0700
+++ ./Tokend/Schema.h 2009-05-18 13:49:48.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_SCHEMA_H_
#define _TOKEND_SCHEMA_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_cdsa_utilities/cssmdata.h>
#include <security_cdsa_utilities/cssmdb.h>
#include <map>
diff -ru ../Tokend-35209.orig/Tokend/SelectionPredicate.h ./Tokend/SelectionPredicate.h
--- ../Tokend-35209.orig/Tokend/SelectionPredicate.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/SelectionPredicate.h 2009-05-18 13:49:59.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_SELECTIONPREDICATE_H_
#define _TOKEND_SELECTIONPREDICATE_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_cdsa_utilities/cssmdata.h>
namespace Tokend
diff -ru ../Tokend-35209.orig/Tokend/Token.h ./Tokend/Token.h
--- ../Tokend-35209.orig/Tokend/Token.h 2008-10-02 15:03:38.000000000 -0700
+++ ./Tokend/Token.h 2009-05-18 13:53:04.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_TOKEN_H_
#define _TOKEND_TOKEN_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <SecurityTokend/SecTokend.h>
#include <security_utilities/osxcode.h>
#include <security_cdsa_utilities/context.h>
diff -ru ../Tokend-35209.orig/Tokend/TokenContext.h ./Tokend/TokenContext.h
--- ../Tokend-35209.orig/Tokend/TokenContext.h 2008-10-02 15:03:39.000000000 -0700
+++ ./Tokend/TokenContext.h 2009-05-18 13:53:22.000000000 -0700
@@ -29,6 +29,7 @@
#ifndef _TOKEND_TOKENCONTEXT_H_
#define _TOKEND_TOKENCONTEXT_H_
+#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>
#include <security_utilities/utilities.h>
namespace Tokend

13
patches/at_cmds-54.OpenSource.p1.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -ru at_cmds-54/Makefile.preamble at_cmds-54.pd1/Makefile.preamble
--- at_cmds-54/Makefile.preamble 2005-08-15 22:11:23.000000000 +0200
+++ at_cmds-54.pd1/Makefile.preamble 2012-09-14 02:50:20.570815010 +0200
@@ -20,7 +20,7 @@
## (e.g. change -O to -O2), see Makefile.postamble.
# Flags passed to compiler (in addition to -g, -O, etc)
-OTHER_CFLAGS = -mdynamic-no-pic
+OTHER_CFLAGS = -mdynamic-no-pic -D_OPEN_SOURCE_
# Flags passed to ld (in addition to -ObjC, etc.)
OTHER_LDFLAGS =
# Flags passed to libtool when building libraries
Seulement dans at_cmds-54.pd1: Makefile.preamble~

14
patches/at_cmds-54.p1.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -ru at_cmds-54/appletalk.tproj/appletalk.c at_cmds-54.patch/appletalk.tproj/appletalk.c
--- at_cmds-54/appletalk.tproj/appletalk.c 2009-06-10 00:43:30.000000000 +0200
+++ at_cmds-54.patch/appletalk.tproj/appletalk.c 2009-06-10 00:44:53.000000000 +0200
@@ -40,6 +40,8 @@
#include <AppleTalk/at_proto.h>
#include <AppleTalk/at_paths.h>
+#define _OPEN_SOURCE_
+
#ifndef _OPEN_SOURCE_
#include <SystemIntegrity.h>
#endif
Only in at_cmds-54/appletalk.tproj: appletalk.c.orig
Only in at_cmds-54/appletalk.tproj: appletalk.c.rej

305
patches/autofs-109.8.rm_autoURL.p1.patch Normal file
View File

@@ -0,0 +1,305 @@
diff -ru autofs-109.8/autofs.xcode/project.pbxproj autofs-109.8.pd1/autofs.xcode/project.pbxproj
--- autofs-109.8/autofs.xcode/project.pbxproj 2007-09-28 22:24:14.000000000 +0200
+++ autofs-109.8.pd1/autofs.xcode/project.pbxproj 2012-09-22 14:50:27.000000000 +0200
@@ -19,7 +19,6 @@
EB275CF90A6879F30087A086 /* PBXTargetDependency */,
C1A6A8F105E2D22D0068CA07 /* PBXTargetDependency */,
C1A6A8F305E2D2420068CA07 /* PBXTargetDependency */,
- EB28ED930BDDBDB1009EDDD8 /* PBXTargetDependency */,
);
name = autofs;
productName = "autofs-package";
@@ -51,8 +50,6 @@
EB273B670A955D85003ACC92 /* autofs.conf in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBF697500A351CB200E846A0 /* autofs.conf */; };
EB273B700A955DB3003ACC92 /* auto_home in CopyFiles */ = {isa = PBXBuildFile; fileRef = EB273B640A955D2F003ACC92 /* auto_home */; };
EB275CF70A6879D10087A086 /* autofs.conf.5 in CopyFiles */ = {isa = PBXBuildFile; fileRef = EB275CEE0A6879690087A086 /* autofs.conf.5 */; };
- EB2F19090BDDAF6900E29EAE /* mount_url.c in Sources */ = {isa = PBXBuildFile; fileRef = EB2F19080BDDAF6900E29EAE /* mount_url.c */; };
- EB2F190E0BDDB02B00E29EAE /* mount_url.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = EB2F19070BDDAF6900E29EAE /* mount_url.8 */; };
EB439A6909EDF7830094B7DC /* mount.x in Sources */ = {isa = PBXBuildFile; fileRef = EB439A0509EDF46D0094B7DC /* mount.x */; };
EB5243CB09F5BFA80003D38E /* ns_files.c in Sources */ = {isa = PBXBuildFile; fileRef = EB5243C209F5BFA80003D38E /* ns_files.c */; };
EB5243CF09F5BFA80003D38E /* ns_generic.c in Sources */ = {isa = PBXBuildFile; fileRef = EB5243C709F5BFA80003D38E /* ns_generic.c */; };
@@ -70,7 +67,6 @@
EBB3D87C09DCDEB500176DBC /* autofs_prot.defs in Sources */ = {isa = PBXBuildFile; fileRef = EB0024CE0977617E002F9164 /* autofs_prot.defs */; };
EBB4C2B70BC5E58200FFAB32 /* com.apple.autofsd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBB4C2B60BC5E57000FFAB32 /* com.apple.autofsd.plist */; };
EBB4C2C40BC5E69300FFAB32 /* com.apple.automountd.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBB4C2C10BC5E66E00FFAB32 /* com.apple.automountd.plist */; };
- EBBBB7650BDDBE6F002F04E3 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EB9C62A80A6729630012D63F /* CoreFoundation.framework */; };
EBC735F10BC72328002AD444 /* automount.c in Sources */ = {isa = PBXBuildFile; fileRef = EBC735F00BC72328002AD444 /* automount.c */; };
EBC735F70BC72348002AD444 /* automount.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBC735EF0BC72328002AD444 /* automount.8 */; };
EBC9AC23082836F700B4E5DF /* mount_autofs.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = EBC9AC1E082836D400B4E5DF /* mount_autofs.8 */; };
@@ -84,7 +80,6 @@
EBD485520A27C66C005F12BF /* autofs_migtypes.h in Headers */ = {isa = PBXBuildFile; fileRef = EBD485500A27C66B005F12BF /* autofs_migtypes.h */; };
EBDAB3120B0D43AE00257263 /* ns_ds.c in Sources */ = {isa = PBXBuildFile; fileRef = EBDAB3100B0D438F00257263 /* ns_ds.c */; };
EBDAB3710B0D442300257263 /* DirectoryService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDAB3180B0D43F300257263 /* DirectoryService.framework */; };
- EBDB4B8D0BDDBC7F009FCE76 /* URLMount.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBA5F2A00A37DA4E0032E7C4 /* URLMount.framework */; };
EBDCE6280A671ED10058A293 /* autofsd.c in Sources */ = {isa = PBXBuildFile; fileRef = EBDCE6200A671E8D0058A293 /* autofsd.c */; };
EBDCE6530A671F3E0058A293 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDCE62F0A671F3E0058A293 /* SystemConfiguration.framework */; };
EBDFC4300978B2EC00096DCC /* autofs.h in Headers */ = {isa = PBXBuildFile; fileRef = EBDFC42F0978B2EC00096DCC /* autofs.h */; };
@@ -166,13 +161,6 @@
remoteGlobalIDString = EB275CF20A6879950087A086;
remoteInfo = files;
};
- EB28ED920BDDBDB1009EDDD8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = C10DA65B05E2C60D000E258E /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = EB2F18CB0BDDAEAD00E29EAE;
- remoteInfo = mount_url;
- };
EBB3D6E209DB43C300176DBC /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = C10DA65B05E2C60D000E258E /* Project object */;
@@ -230,16 +218,6 @@
);
runOnlyForDeploymentPostprocessing = 1;
};
- EB2F190D0BDDB01400E29EAE /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 8;
- dstPath = /usr/share/man/man8;
- dstSubfolderSpec = 0;
- files = (
- EB2F190E0BDDB02B00E29EAE /* mount_url.8 in CopyFiles */,
- );
- runOnlyForDeploymentPostprocessing = 1;
- };
EBB4C2BD0BC5E5DB00FFAB32 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 8;
@@ -307,7 +285,6 @@
EB273B640A955D2F003ACC92 /* auto_home */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = text; name = auto_home; path = files/auto_home; sourceTree = "<group>"; tabWidth = 8; };
EB275CEE0A6879690087A086 /* autofs.conf.5 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; indentWidth = 8; name = autofs.conf.5; path = files/autofs.conf.5; sourceTree = "<group>"; tabWidth = 8; };
EB2A681E0AA3C21B002DEECF /* auto_mntopts.h */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = sourcecode.c.h; name = auto_mntopts.h; path = headers/auto_mntopts.h; sourceTree = "<group>"; };
- EB2F18CC0BDDAEAD00E29EAE /* mount_url */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mount_url; sourceTree = BUILT_PRODUCTS_DIR; };
EB2F19070BDDAF6900E29EAE /* mount_url.8 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; indentWidth = 8; name = mount_url.8; path = mount_url/mount_url.8; sourceTree = "<group>"; tabWidth = 8; };
EB2F19080BDDAF6900E29EAE /* mount_url.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 8; lastKnownFileType = sourcecode.c.c; name = mount_url.c; path = mount_url/mount_url.c; sourceTree = "<group>"; tabWidth = 8; };
EB39DD470A645F7500A4B518 /* nfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nfs.h; path = headers/nfs.h; sourceTree = "<group>"; };
@@ -377,15 +354,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- EB2F18CA0BDDAEAD00E29EAE /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- EBBBB7650BDDBE6F002F04E3 /* CoreFoundation.framework in Frameworks */,
- EBDB4B8D0BDDBC7F009FCE76 /* URLMount.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
EB6CDC9509D9E59800EA0B49 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -432,7 +400,6 @@
C10DA6B905E2C766000E258E /* mount_autofs */,
C1CC68AE05E2CEA800D0D4A3 /* mount_autofs */,
EB2F18DA0BDDAF0D00E29EAE /* mount_url */,
- EB2F18CC0BDDAEAD00E29EAE /* mount_url */,
EB9C62A80A6729630012D63F /* CoreFoundation.framework */,
EBDAB3180B0D43F300257263 /* DirectoryService.framework */,
EBDCE62F0A671F3E0058A293 /* SystemConfiguration.framework */,
@@ -646,23 +613,6 @@
productReference = C1CC68AE05E2CEA800D0D4A3 /* mount_autofs */;
productType = "com.apple.product-type.tool";
};
- EB2F18CB0BDDAEAD00E29EAE /* mount_url */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = EB2F18D00BDDAED800E29EAE /* Build configuration list for PBXNativeTarget "mount_url" */;
- buildPhases = (
- EB2F18C90BDDAEAD00E29EAE /* Sources */,
- EB2F18CA0BDDAEAD00E29EAE /* Frameworks */,
- EB2F190D0BDDB01400E29EAE /* CopyFiles */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = mount_url;
- productName = mount_url;
- productReference = EB2F18CC0BDDAEAD00E29EAE /* mount_url */;
- productType = "com.apple.product-type.tool";
- };
EB6CDC9609D9E59800EA0B49 /* automountd */ = {
isa = PBXNativeTarget;
buildConfigurationList = EB6CDCDD09D9E73800EA0B49 /* Build configuration list for PBXNativeTarget "automountd" */;
@@ -738,7 +688,6 @@
EB275CF20A6879950087A086 /* files */,
C10DA70005E2C9FB000E258E /* kext */,
C10DA70E05E2C9FB000E258E /* mount_autofs */,
- EB2F18CB0BDDAEAD00E29EAE /* mount_url */,
);
};
/* End PBXProject section */
@@ -813,14 +762,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- EB2F18C90BDDAEAD00E29EAE /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- EB2F19090BDDAF6900E29EAE /* mount_url.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
EB6CDC9409D9E59800EA0B49 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -895,11 +836,6 @@
target = EB275CF20A6879950087A086 /* files */;
targetProxy = EB275CF80A6879F30087A086 /* PBXContainerItemProxy */;
};
- EB28ED930BDDBDB1009EDDD8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = EB2F18CB0BDDAEAD00E29EAE /* mount_url */;
- targetProxy = EB28ED920BDDBDB1009EDDD8 /* PBXContainerItemProxy */;
- };
EBB3D6E309DB43C300176DBC /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = EB6CDC9609D9E59800EA0B49 /* automountd */;
@@ -1171,128 +1107,6 @@
};
name = Default;
};
- EB2F18D10BDDAED800E29EAE /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
- );
- FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G4;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
- GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
- GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
- GCC_WARN_MISSING_PARENTHESES = YES;
- GCC_WARN_SHADOW = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VALUE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- INSTALL_PATH = /usr/libexec;
- OTHER_LDFLAGS = "-lutil";
- PREBINDING = YES;
- PRODUCT_NAME = mount_url;
- ZERO_LINK = NO;
- };
- name = Development;
- };
- EB2F18D20BDDAED800E29EAE /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = dwarf;
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
- );
- FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_TUNING = G4;
- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
- GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
- GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
- GCC_WARN_MISSING_PARENTHESES = YES;
- GCC_WARN_SHADOW = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = NO;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VALUE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- INSTALL_PATH = /usr/libexec;
- OTHER_LDFLAGS = "-lutil";
- PREBINDING = YES;
- PRODUCT_NAME = mount_url;
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- EB2F18D30BDDAED800E29EAE /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- FRAMEWORK_SEARCH_PATHS = (
- "$(inherited)",
- "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
- );
- FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G4;
- GCC_TREAT_WARNINGS_AS_ERRORS = YES;
- GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
- GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
- GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
- GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
- GCC_WARN_MISSING_PARENTHESES = YES;
- GCC_WARN_SHADOW = YES;
- GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_LABEL = YES;
- GCC_WARN_UNUSED_PARAMETER = YES;
- GCC_WARN_UNUSED_VALUE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- INSTALL_PATH = /usr/libexec;
- OTHER_LDFLAGS = "-lutil";
- PREBINDING = YES;
- PRODUCT_NAME = mount_url;
- ZERO_LINK = NO;
- };
- name = Default;
- };
EB6CDCDE09D9E73800EA0B49 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -1700,16 +1514,6 @@
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Default;
- };
- EB2F18D00BDDAED800E29EAE /* Build configuration list for PBXNativeTarget "mount_url" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- EB2F18D10BDDAED800E29EAE /* Development */,
- EB2F18D20BDDAED800E29EAE /* Deployment */,
- EB2F18D30BDDAED800E29EAE /* Default */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
};
EB6CDCDD09D9E73800EA0B49 /* Build configuration list for PBXNativeTarget "automountd" */ = {
isa = XCConfigurationList;

24
patches/bash-106.220.2.p1.patch Normal file
View File

@@ -0,0 +1,24 @@
--- bash-106.220.2/bash-3.2/shell.c 2016-02-17 10:58:32.000000000 -0500
+++ bash-106.220.2.mod/bash-3.2/shell.c 2019-09-19 16:32:28.000000000 -0400
@@ -45,7 +45,7 @@
#if defined(__APPLE__)
#include <get_compat.h>
-#include <rootless.h>
+/* #include <rootless.h> */
#endif /* __APPLE__ */
#include "bashintl.h"
@@ -489,10 +489,10 @@
if (-1 == setreuid(ruid, euid))
internal_error( _("setreuid(%u,%u) failed: %s"), ruid, euid, strerror(errno));
}
- int rootless = rootless_restricted_environment();
+ /* int rootless = rootless_restricted_environment();
if (-1 == rootless)
internal_error( _("Unable to determine rootless status: %s"), strerror(errno));
- running_setuid |= rootless;
+ running_setuid |= rootless; */
#else /* !__APPLE__ */
if (running_setuid && privileged_mode == 0)
disable_priv_mode ();

64
patches/bless-63.2.p1.patch Normal file
View File

@@ -0,0 +1,64 @@
diff -ru bless-63.2/bless.xcodeproj/project.pbxproj bless-63.2.patch/bless.xcodeproj/project.pbxproj
--- bless-63.2/bless.xcodeproj/project.pbxproj 2008-10-28 20:38:24.000000000 +0100
+++ bless-63.2.patch/bless.xcodeproj/project.pbxproj 2009-06-08 22:01:28.000000000 +0200
@@ -327,9 +327,7 @@
F50990500234418C01F502C1 /* BLLoadXCOFFLoader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = BLLoadXCOFFLoader.c; sourceTree = "<group>"; };
F5099052023441B901F502C1 /* BLBlockChecksum.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = BLBlockChecksum.c; sourceTree = "<group>"; };
F521EBA70228E90D01F502C1 /* BLGenerateOFLabel.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = BLGenerateOFLabel.c; sourceTree = "<group>"; };
- F521EBA90228ED9201F502C1 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
F523394A023432B001BB06B9 /* BLCopyFileFromCFData.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = BLCopyFileFromCFData.c; sourceTree = "<group>"; };
- F52AF8160278542701F502C1 /* MediaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaKit.framework; path = /System/Library/PrivateFrameworks/MediaKit.framework; sourceTree = "<absolute>"; };
F54EC307027E73AE01F502C1 /* BLLoadFile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = BLLoadFile.c; sourceTree = "<group>"; };
F5641E170227242C01F502C1 /* output.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = output.c; sourceTree = "<group>"; };
F58D19DC02A933D601000103 /* BLGetDiskSectorsForFile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = BLGetDiskSectorsForFile.c; sourceTree = "<group>"; };
@@ -642,8 +640,6 @@
C6DF0CE707B938FE00F5F2FA /* DiskArbitration.framework */,
F61E91F801A4B30C01F50364 /* CoreFoundation.framework */,
F61E91F901A4B30C01F50364 /* IOKit.framework */,
- F521EBA90228ED9201F502C1 /* ApplicationServices.framework */,
- F52AF8160278542701F502C1 /* MediaKit.framework */,
BA92249E03A7F27A000BA4D4 /* CoreServices.framework */,
);
name = Frameworks;
@@ -1274,11 +1270,7 @@
INSTALL_PATH = /usr/sbin;
OTHER_LDFLAGS = (
"-framework",
- ApplicationServices,
- "-framework",
DiskArbitration,
- "-framework",
- MediaKit,
);
PRODUCT_NAME = bless;
VALID_ARCHS = "ppc i386";
@@ -1315,8 +1307,6 @@
GCC_DYNAMIC_NO_PIC = YES;
INSTALL_PATH = /usr/local/bin;
OTHER_LDFLAGS = (
- "-framework",
- ApplicationServices,
);
PRODUCT_NAME = setOFLabel;
VALID_ARCHS = "ppc i386";
@@ -1389,11 +1379,7 @@
INSTALL_PATH = /usr/sbin;
OTHER_LDFLAGS = (
"-framework",
- ApplicationServices,
- "-framework",
DiskArbitration,
- "-framework",
- MediaKit,
);
PRODUCT_NAME = bless;
VALID_ARCHS = "ppc i386";
@@ -1430,8 +1416,6 @@
GCC_DYNAMIC_NO_PIC = YES;
INSTALL_PATH = /usr/local/bin;
OTHER_LDFLAGS = (
- "-framework",
- ApplicationServices,
);
PRODUCT_NAME = setOFLabel;
VALID_ARCHS = "ppc i386";

3974
patches/boot-132_dfe_r122.p0.patch Normal file
View File

File diff suppressed because it is too large Load Diff

11
patches/boot-132_dfe_r122_pd1.p0.patch Normal file
View File

@@ -0,0 +1,11 @@
--- ./Makefile 2008-05-29 14:26:43.000000000 +0200
+++ ./Makefile 2008-05-29 14:27:09.000000000 +0200
@@ -31,6 +31,8 @@
#
all tags clean debug install installhdrs: $(SYMROOT) $(OBJROOT)
+ # Fix "ld_classic: Undefined symbols" (patch cannot delete files)
+ rm ./i386/boot1u/asm.s ./i386/boot1u/bios.s;
@if [ -z "$(RC_ARCHS)" ]; then \
RC_ARCHS="i386"; \
fi; \

4897
patches/boot-132_dfe_r146.p0.patch Normal file
View File

File diff suppressed because it is too large Load Diff

13
patches/bootp-170.1.ipconfigd.c.p1.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -ru bootp-170.1/IPConfiguration.bproj/ipconfigd.c bootp-170.1.pd1/IPConfiguration.bproj/ipconfigd.c
--- bootp-170.1/IPConfiguration.bproj/ipconfigd.c 2007-09-14 23:45:31.000000000 +0200
+++ bootp-170.1.pd1/IPConfiguration.bproj/ipconfigd.c 2012-09-12 19:56:40.117024302 +0200
@@ -137,6 +137,9 @@
* - resolve the router's MAC address using ARP, and publish that
* information to the NetworkSignature in the IPv4 dict
*/
+
+ #include <CoreFoundation/CoreFoundation.h>
+ #include <CoreFoundation/CFUserNotification.h>
#include <stdlib.h>
#include <unistd.h>

15
patches/configd-212.2.SCDPrivate.c.p1.patch Normal file
View File

@@ -0,0 +1,15 @@
--- configd-212.2/SystemConfiguration.fproj/SCDPrivate.c.origin 2008-10-30 01:47:41.000000000 +0100
+++ configd-212.2/SystemConfiguration.fproj/SCDPrivate.c 2008-10-30 01:49:05.000000000 +0100
@@ -987,10 +987,10 @@
set);
newStr = CFStringCreateMutableCopy(NULL, 0, str);
CFStringNormalize(newStr, kCFStringNormalizationFormC);
- if (!CFStringTransform(newStr, NULL, transform, FALSE)) {
+ /*if (!CFStringTransform(newStr, NULL, transform, FALSE)) {
CFRelease(newStr);
newStr = NULL;
- }
+ }*/
CFRelease(transform);
done :

11
patches/configd-212.2.SCNetworkConnection.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- configd-212.2/SystemConfiguration.fproj/SCNetworkConnection.c.origin 2008-11-12 15:56:27.000000000 +0100
+++ configd-212.2/SystemConfiguration.fproj/SCNetworkConnection.c 2008-11-12 15:57:26.000000000 +0100
@@ -35,6 +35,8 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFRuntime.h>
+#include <CarbonCore/MacTypes.h>
+
#include <Security/Security.h>
#include "dy_framework.h"

24
patches/configd-212.2.SCNetworkConnectionPrivate.c.p1.patch Normal file
View File

@@ -0,0 +1,24 @@
--- configd-212.2/SystemConfiguration.fproj/SCNetworkConnectionPrivate.c.origin 2008-10-30 01:44:55.000000000 +0100
+++ configd-212.2/SystemConfiguration.fproj/SCNetworkConnectionPrivate.c 2008-10-30 01:46:56.000000000 +0100
@@ -207,9 +207,9 @@
{
Boolean ok;
- if (CFPreferencesAppValueIsForced(serviceID, USER_PREFERENCES_APPLICATION_ID)) {
+ /*if (CFPreferencesAppValueIsForced(serviceID, USER_PREFERENCES_APPLICATION_ID)) {
return FALSE;
- }
+ }*/
CFPreferencesSetValue(serviceID,
newPreferences,
@@ -352,7 +352,8 @@
return FALSE;
}
- return CFPreferencesAppValueIsForced(userPrivate->serviceID, USER_PREFERENCES_APPLICATION_ID);
+ //return CFPreferencesAppValueIsForced(userPrivate->serviceID, USER_PREFERENCES_APPLICATION_ID);
+ return;
}

11
patches/configd-212.2.SCPrivate.h.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- configd-212.2/SystemConfiguration.fproj/SCPrivate.h.origin 2008-11-12 15:49:23.000000000 +0100
+++ configd-212.2/SystemConfiguration.fproj/SCPrivate.h 2008-11-12 15:50:12.000000000 +0100
@@ -36,6 +36,8 @@
#include <SystemConfiguration/SCDynamicStoreCopySpecificPrivate.h>
#include <SystemConfiguration/SCDynamicStoreSetSpecificPrivate.h>
+#include <CarbonCore/MacTypes.h>
+
/* SCPreferences SPIs */
#include <SystemConfiguration/SCPreferencesPrivate.h>
#include <SystemConfiguration/SCPreferencesGetSpecificPrivate.h>

11
patches/configd-212.2.SystemConfiguration.h.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- configd-212.2/SystemConfiguration.fproj/SystemConfiguration.h.origin 2008-11-12 15:52:25.000000000 +0100
+++ configd-212.2/SystemConfiguration.fproj/SystemConfiguration.h 2008-11-12 15:53:08.000000000 +0100
@@ -109,6 +109,8 @@
#include <SystemConfiguration/SCDynamicStoreKey.h>
#include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
+#include <CarbonCore/MacTypes.h>
+
/* SCPreferences APIs */
#include <SystemConfiguration/SCPreferences.h>
#include <SystemConfiguration/SCPreferencesPath.h>

12
patches/configd-212.2.dy_framework.h.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
--- configd-212.2/SystemConfiguration.fproj/dy_framework.h.origin 2008-11-12 15:59:01.000000000 +0100
+++ configd-212.2/SystemConfiguration.fproj/dy_framework.h 2008-11-12 15:59:23.000000000 +0100
@@ -29,6 +29,9 @@
#include <mach/mach.h>
#include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h>
+
+#include <CarbonCore/MacTypes.h>
+
#include <Security/Security.h>
__BEGIN_DECLS

285
patches/configd-212.2.removeSCMonitor.p1.patch Normal file
View File

@@ -0,0 +1,285 @@
diff -ru configd-212.2/configd.xcodeproj/project.pbxproj configd-212.2.pd1/configd.xcodeproj/project.pbxproj
--- configd-212.2/configd.xcodeproj/project.pbxproj 2008-03-13 02:39:52.000000000 +0100
+++ configd-212.2.pd1/configd.xcodeproj/project.pbxproj 2012-09-10 03:55:05.000000000 +0200
@@ -16,7 +16,6 @@
1558480607550D470046C2E9 /* PBXTargetDependency */,
1558480807550D470046C2E9 /* PBXTargetDependency */,
1558480A07550D470046C2E9 /* PBXTargetDependency */,
- 150ECB3C0D0079280065E94D /* PBXTargetDependency */,
);
name = configd_executables;
productName = configd_executables;
@@ -79,7 +78,6 @@
1508E39F07552B6A0062B350 /* atconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53C707528B36004F8947 /* atconfig.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
1508E3A007552B6B0062B350 /* cfManager.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53C507528B36004F8947 /* cfManager.c */; };
1508E3A107552B720062B350 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 159D53CA07528B36004F8947 /* cache.c */; };
- 150D7E1E0D16DC6C00AF4BED /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
1520A3870846829A0010B584 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CB6A6F05C0722B0099E85F /* CoreFoundation.framework */; };
1520A3D0084682A30010B584 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15DAD6C807591A1A0084A6ED /* SystemConfiguration.framework */; };
1520A3DF0846B2DD0010B584 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1520A3DE0846B2DC0010B584 /* Security.framework */; };
@@ -321,11 +319,6 @@
15DAF2DC08466D4900D1B2BD /* SCHelper_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 15DAF2D808466D4900D1B2BD /* SCHelper_client.c */; };
15DAF2DF08466D4900D1B2BD /* helper_comm.h in Headers */ = {isa = PBXBuildFile; fileRef = 15DAF2D708466D4900D1B2BD /* helper_comm.h */; };
15DAF2E108466D4900D1B2BD /* SCHelper_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 15DAF2D908466D4900D1B2BD /* SCHelper_server.c */; };
- 15E517680CCFBCD0008FFE82 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15DAD6C807591A1A0084A6ED /* SystemConfiguration.framework */; };
- 15FC130B0CCEA59E0013872C /* monitor.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC130A0CCEA59E0013872C /* monitor.c */; };
- 15FC13180CCF74740013872C /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CB6A6F05C0722B0099E85F /* CoreFoundation.framework */; };
- 15FEE80E0CCFD341001312F9 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15FEE80D0CCFD341001312F9 /* ApplicationServices.framework */; };
- 15FEE81F0CD03E75001312F9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 15FEE8180CD03CBB001312F9 /* Localizable.strings */; };
F95B8A430B03E07A00993BA3 /* SCNetworkSignature.c in Sources */ = {isa = PBXBuildFile; fileRef = F95B8A420B03E07A00993BA3 /* SCNetworkSignature.c */; };
F95B8A460B03E09300993BA3 /* SCNetworkSignature.h in Headers */ = {isa = PBXBuildFile; fileRef = F95B8A440B03E09300993BA3 /* SCNetworkSignature.h */; settings = {ATTRIBUTES = (Private, ); }; };
F95B8A470B03E09300993BA3 /* SCNetworkSignaturePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F95B8A450B03E09300993BA3 /* SCNetworkSignaturePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -333,13 +326,6 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- 150ECB3B0D0079280065E94D /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 151F5D990CCE98E50093AC3B;
- remoteInfo = SCMonitor;
- };
1520A385084681350010B584 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15CB6A7705C0722B0099E85F /* Project object */;
@@ -552,7 +538,6 @@
1514D76D05C08A5F00757DC9 /* config_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config_types.h; path = SystemConfiguration.fproj/config_types.h; sourceTree = SOURCE_ROOT; };
151BDA2B05D9E28B00657BC7 /* SCPreferencesPathKey.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SCPreferencesPathKey.h; path = SystemConfiguration.fproj/SCPreferencesPathKey.h; sourceTree = SOURCE_ROOT; };
151BDA5D05D9E2ED00657BC7 /* SCPreferencesPathKey.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = SCPreferencesPathKey.c; path = SystemConfiguration.fproj/SCPreferencesPathKey.c; sourceTree = SOURCE_ROOT; };
- 151F5D9A0CCE98E50093AC3B /* SCMonitor.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SCMonitor.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
151F63EC09328A3C0096DCC9 /* genSCPreferences */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = genSCPreferences; sourceTree = BUILT_PRODUCTS_DIR; };
1520A3DE0846B2DC0010B584 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
1521FC5C060F296A003B28F5 /* dnsinfo_create.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dnsinfo_create.c; path = dnsinfo/dnsinfo_create.c; sourceTree = SOURCE_ROOT; };
@@ -560,7 +545,7 @@
152E68C00A2C89C70011FDA8 /* SCPreferencesKeychainPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCPreferencesKeychainPrivate.h; sourceTree = "<group>"; };
152E68C20A2C89E30011FDA8 /* SCPreferencesKeychainPrivate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = SCPreferencesKeychainPrivate.c; sourceTree = "<group>"; };
1532629006281C9D00B1C10C /* dnsinfo_create.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dnsinfo_create.h; path = dnsinfo/dnsinfo_create.h; sourceTree = "<group>"; };
- 1540E3600987DA9500157C07 /* com.apple.configd.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = com.apple.configd.plist; sourceTree = "<group>"; };
+ 1540E3600987DA9500157C07 /* com.apple.configd.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = com.apple.configd.plist; sourceTree = "<group>"; };
1543636A0752D03C00A8EC6C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
1547001D08455B98006787CE /* SCHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SCHelper; sourceTree = BUILT_PRODUCTS_DIR; };
154CF3F307E1EA4D00D8302E /* SCPreferencesGetSpecificPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCPreferencesGetSpecificPrivate.h; sourceTree = "<group>"; };
@@ -577,13 +562,13 @@
157A88880A470D0F003A4256 /* SCSchemaDefinitionsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCSchemaDefinitionsPrivate.h; sourceTree = "<group>"; };
15828AE70753B5F900AD4710 /* KernelEventMonitor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KernelEventMonitor.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
1587A31F0B6AACD70063104A /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
- 158AD85B0754E38F00124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
- 158AD8700754E3D400124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
- 158AD8C00754E3EF00124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
- 158AD9100754E40E00124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+ 158AD85B0754E38F00124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 158AD8700754E3D400124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 158AD8C00754E3EF00124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 158AD9100754E40E00124717 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
158AD9F80754EA2F00124717 /* AppleTalk.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleTalk.framework; path = /System/Library/Frameworks/AppleTalk.framework; sourceTree = "<absolute>"; };
159D53A707528B36004F8947 /* ip_plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.c; path = ip_plugin.c; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
- 159D53A807528B36004F8947 /* Resolvers.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Resolvers.plist; sourceTree = "<group>"; };
+ 159D53A807528B36004F8947 /* Resolvers.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Resolvers.plist; sourceTree = "<group>"; };
159D53AA07528B36004F8947 /* dns-configuration.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "dns-configuration.c"; sourceTree = "<group>"; };
159D53AB07528B36004F8947 /* set-hostname.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "set-hostname.c"; sourceTree = "<group>"; };
159D53AE07528B36004F8947 /* ifnamer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ifnamer.c; sourceTree = "<group>"; };
@@ -784,7 +769,7 @@
15DC346D0711D49400A3311C /* net_set.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = net_set.c; sourceTree = "<group>"; };
15DC346E0711D49400A3311C /* net_set.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = net_set.h; sourceTree = "<group>"; };
15FC12F20CCEA4F00013872C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SCMonitor/Info.plist; sourceTree = "<group>"; };
- 15FC130A0CCEA59E0013872C /* monitor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = monitor.c; path = SCMonitor/monitor.c; sourceTree = "<group>"; };
+ 15FC130A0CCEA59E0013872C /* monitor.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = monitor.c; path = SCMonitor/monitor.c; sourceTree = "<group>"; };
15FCAACF05FD0EBF00CB79E6 /* shared_dns_info_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = shared_dns_info_types.h; path = dnsinfo/shared_dns_info_types.h; sourceTree = SOURCE_ROOT; };
15FCAAD005FD0EBF00CB79E6 /* shared_dns_info.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; name = shared_dns_info.defs; path = dnsinfo/shared_dns_info.defs; sourceTree = "<group>"; };
15FD71090754D628001CC321 /* Kicker.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Kicker.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -794,9 +779,9 @@
15FD72C90754DA7E001CC321 /* PreferencesMonitor.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PreferencesMonitor.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
15FD73220754DB9F001CC321 /* ATconfig.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ATconfig.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
15FD73400754DBDA001CC321 /* libATconfig.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libATconfig.a; sourceTree = BUILT_PRODUCTS_DIR; };
- 15FD73970754DE49001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
- 15FD73EE0754DE62001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
- 15FD743E0754DE7A001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+ 15FD73970754DE49001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 15FD73EE0754DE62001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 15FD743E0754DE7A001CC321 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
15FEE80D0CCFD341001312F9 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
15FEE8160CD03CA3001312F9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = SCMonitor/English.lproj/Localizable.strings; sourceTree = "<group>"; };
23C1E2B4062DD2C700835B54 /* pppcontroller_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pppcontroller_types.h; path = /usr/local/include/ppp/pppcontroller_types.h; sourceTree = "<absolute>"; };
@@ -809,23 +794,12 @@
F95B8A440B03E09300993BA3 /* SCNetworkSignature.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCNetworkSignature.h; sourceTree = "<group>"; };
F95B8A450B03E09300993BA3 /* SCNetworkSignaturePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SCNetworkSignaturePrivate.h; sourceTree = "<group>"; };
F95B8A5F0B03F81400993BA3 /* libNetworkIdentification.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libNetworkIdentification.a; sourceTree = BUILT_PRODUCTS_DIR; };
- F95B8A670B03F97800993BA3 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+ F95B8A670B03F97800993BA3 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F95B8A680B03F97800993BA3 /* NetworkIdentification.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = NetworkIdentification.c; sourceTree = "<group>"; };
F95B8A700B03F9D100993BA3 /* NetworkIdentification.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NetworkIdentification.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
- 151F5D980CCE98E50093AC3B /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 15FC13180CCF74740013872C /* CoreFoundation.framework in Frameworks */,
- 15E517680CCFBCD0008FFE82 /* SystemConfiguration.framework in Frameworks */,
- 15FEE80E0CCFD341001312F9 /* ApplicationServices.framework in Frameworks */,
- 150D7E1E0D16DC6C00AF4BED /* Security.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
1547001B08455B98006787CE /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -1225,7 +1199,6 @@
15DAD6C807591A1A0084A6ED /* SystemConfiguration.framework */,
15DAD5EE075913CE0084A6ED /* libdnsinfo.a */,
1547001D08455B98006787CE /* SCHelper */,
- 151F5D9A0CCE98E50093AC3B /* SCMonitor.plugin */,
158ADCA60754ECC800124717 /* configd, scutil, scselect */,
158ADBFD0754ECB100124717 /* Plugins */,
151F63EC09328A3C0096DCC9 /* genSCPreferences */,
@@ -1733,23 +1706,6 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 151F5D990CCE98E50093AC3B /* SCMonitor */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 151F5D9F0CCE98E60093AC3B /* Build configuration list for PBXNativeTarget "SCMonitor" */;
- buildPhases = (
- 151F5D960CCE98E50093AC3B /* Resources */,
- 151F5D970CCE98E50093AC3B /* Sources */,
- 151F5D980CCE98E50093AC3B /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = SCMonitor;
- productName = SCMonitor;
- productReference = 151F5D9A0CCE98E50093AC3B /* SCMonitor.plugin */;
- productType = "com.apple.product-type.bundle";
- };
151F63DA09328A3C0096DCC9 /* Schema */ = {
isa = PBXNativeTarget;
buildConfigurationList = 151F63DC09328A3C0096DCC9 /* Build configuration list for PBXNativeTarget "Schema" */;
@@ -2172,7 +2128,6 @@
151F63DA09328A3C0096DCC9 /* Schema */,
15DAD63F07591A1A0084A6ED /* SystemConfiguration.framework */,
1547001808455B98006787CE /* SCHelper */,
- 151F5D990CCE98E50093AC3B /* SCMonitor */,
159D549F07529FFF004F8947 /* configd */,
1558481207550EC10046C2E9 /* scselect */,
155847430754FDCD0046C2E9 /* scutil */,
@@ -2197,14 +2152,6 @@
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
- 151F5D960CCE98E50093AC3B /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 15FEE81F0CD03E75001312F9 /* Localizable.strings in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
15828AE30753B5F900AD4710 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2388,14 +2335,6 @@
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
- 151F5D970CCE98E50093AC3B /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 15FC130B0CCEA59E0013872C /* monitor.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
1547001A08455B98006787CE /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -2632,11 +2571,6 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- 150ECB3C0D0079280065E94D /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 151F5D990CCE98E50093AC3B /* SCMonitor */;
- targetProxy = 150ECB3B0D0079280065E94D /* PBXContainerItemProxy */;
- };
1520A386084681350010B584 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1547001808455B98006787CE /* SCHelper */;
@@ -2782,57 +2716,6 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
- 151F5D9C0CCE98E60093AC3B /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- GCC_OPTIMIZATION_LEVEL = 0;
- INFOPLIST_FILE = "$(SRCROOT)/SCMonitor/Info.plist";
- INSTALL_MODE_FLAG = "a-w,a+rX";
- INSTALL_PATH = /System/Library/UserEventPlugins;
- PRODUCT_NAME = SCMonitor;
- WRAPPER_EXTENSION = plugin;
- ZERO_LINK = YES;
- };
- name = Development;
- };
- 151F5D9D0CCE98E60093AC3B /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_MODEL_TUNING = G5;
- INFOPLIST_FILE = "$(SRCROOT)/SCMonitor/Info.plist";
- INSTALL_MODE_FLAG = "a-w,a+rX";
- INSTALL_PATH = /System/Library/UserEventPlugins;
- PRODUCT_NAME = SCMonitor;
- WRAPPER_EXTENSION = plugin;
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- 151F5D9E0CCE98E60093AC3B /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(SYMROOT)";
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_MODEL_TUNING = G5;
- INFOPLIST_FILE = "$(SRCROOT)/SCMonitor/Info.plist";
- INSTALL_MODE_FLAG = "a-w,a+rX";
- INSTALL_PATH = /System/Library/UserEventPlugins;
- PRODUCT_NAME = SCMonitor;
- VALID_ARCHS = "i386 ppc";
- WRAPPER_EXTENSION = plugin;
- ZERO_LINK = YES;
- };
- name = Default;
- };
151F63DD09328A3C0096DCC9 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -4163,16 +4046,6 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 151F5D9F0CCE98E60093AC3B /* Build configuration list for PBXNativeTarget "SCMonitor" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 151F5D9C0CCE98E60093AC3B /* Development */,
- 151F5D9D0CCE98E60093AC3B /* Deployment */,
- 151F5D9E0CCE98E60093AC3B /* Default */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
- };
151F63DC09328A3C0096DCC9 /* Build configuration list for PBXNativeTarget "Schema" */ = {
isa = XCConfigurationList;
buildConfigurations = (

12
patches/configd-212.2.scutil-prefs.c.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -ru configd-212.2/scutil.tproj/prefs.c configd-212.2.pd1/scutil.tproj/prefs.c
--- configd-212.2/scutil.tproj/prefs.c 2008-03-13 02:39:52.000000000 +0100
+++ configd-212.2.pd1/scutil.tproj/prefs.c 2012-09-10 03:32:50.053629393 +0200
@@ -34,6 +34,8 @@
#include <sys/stat.h>
#include <dlfcn.h>
+#include <CarbonCore/MacTypes.h>
+
#include <SystemConfiguration/SCPreferencesSetSpecific.h>
#include <Security/Authorization.h>

13
patches/copyfile-42.noQuarantine.p1.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -ru copyfile-42/copyfile.c copyfile-42.pd1/copyfile.c
--- copyfile-42/copyfile.c 2008-01-03 23:23:43.000000000 +0100
+++ copyfile-42.pd1/copyfile.c 2012-09-10 01:42:55.257760393 +0200
@@ -44,7 +44,8 @@
#include <membership.h>
#include <TargetConditionals.h>
-#if !TARGET_OS_EMBEDDED
+#if 0
+//#if !TARGET_OS_EMBEDDED
#include <quarantine.h>
#define XATTR_QUARANTINE_NAME qtn_xattr_name

111
patches/dtrace-284.200.15.host-tools.p1.patch Normal file
View File

@@ -0,0 +1,111 @@
diff --git a/config/ctftools.xcconfig b/config/ctftools.xcconfig
index 88fc9e0..dea38cb 100644
--- a/config/ctftools.xcconfig
+++ b/config/ctftools.xcconfig
@@ -1,3 +1,6 @@
// On OSX, binaries are not built fat.
VALID_ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_64_BIT)
ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_64_BIT)
+
+HEADER_SEARCH_PATHS = head lib/libelf lib/libdwarf compat/opensolaris/sys
+USE_HEADERMAPS = NO
diff --git a/dtrace.xcodeproj/project.pbxproj b/dtrace.xcodeproj/project.pbxproj
index b123feb..46f7fcf 100644
--- a/dtrace.xcodeproj/project.pbxproj
+++ b/dtrace.xcodeproj/project.pbxproj
@@ -13767,6 +13767,7 @@
};
6EBC9778099BFB530001019C /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 45A48B3618194C410034E526 /* ctftools.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -13791,6 +13792,7 @@
};
6EBC9779099BFB530001019C /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 45A48B3618194C410034E526 /* ctftools.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -13814,6 +13816,7 @@
};
6EBC97E8099BFB850001019C /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 45A48B3618194C410034E526 /* ctftools.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -13836,6 +13839,7 @@
};
6EBC97E9099BFB850001019C /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 45A48B3618194C410034E526 /* ctftools.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -14037,7 +14041,6 @@
"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
"compat/opensolaris/**",
);
- INSTALL_PATH = "$(DT_TOOLCHAIN_DIR)/usr/local/bin";
OTHER_CFLAGS = (
"-D_INT64_TYPE",
"-D_LONGLONG_TYPE",
@@ -14072,7 +14075,6 @@
"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
"compat/opensolaris/**",
);
- INSTALL_PATH = "$(DT_TOOLCHAIN_DIR)/usr/local/bin";
OTHER_CFLAGS = (
"-D_INT64_TYPE",
"-D_LONGLONG_TYPE",
@@ -14109,7 +14111,6 @@
"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
"compat/opensolaris/**",
);
- INSTALL_PATH = "$(DT_TOOLCHAIN_DIR)/usr/local/bin";
OTHER_CFLAGS = (
"-D_INT64_TYPE",
"-D_LONGLONG_TYPE",
@@ -14143,7 +14144,6 @@
"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
"compat/opensolaris/**",
);
- INSTALL_PATH = "$(DT_TOOLCHAIN_DIR)/usr/local/bin";
OTHER_CFLAGS = (
"-D_INT64_TYPE",
"-D_LONGLONG_TYPE",
@@ -14163,6 +14163,7 @@
};
D2DF085F0A68400000384A72 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 45A48B3618194C410034E526 /* ctftools.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
@@ -14180,6 +14181,7 @@
};
D2DF08600A68400000384A72 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 45A48B3618194C410034E526 /* ctftools.xcconfig */;
buildSettings = {
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -14212,7 +14214,6 @@
"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
"compat/opensolaris/**",
);
- INSTALL_PATH = "$(DT_TOOLCHAIN_DIR)/usr/local/bin";
OTHER_CFLAGS = (
"-D_INT64_TYPE",
"-D_LONGLONG_TYPE",
@@ -14247,7 +14248,6 @@
"$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders",
"compat/opensolaris/**",
);
- INSTALL_PATH = "$(DT_TOOLCHAIN_DIR)/usr/local/bin";
OTHER_CFLAGS = (
"-D_INT64_TYPE",
"-D_LONGLONG_TYPE",

35
patches/dtrace-338.40.5.arm_compat.p1.patch Normal file
View File

@@ -0,0 +1,35 @@
diff --git a/lib/libproc/libproc.c b/lib/libproc/libproc.c
index e934cfe..70428b7 100644
--- a/lib/libproc/libproc.c
+++ b/lib/libproc/libproc.c
@@ -495,30 +495,6 @@ update_check_symbol_gen(struct ps_prochandle *P, CSSymbolRef symbol, bool err_on
}
#endif /* DTRACE_USE_CORESYMBOLICATION */
-#if defined(__arm__) || defined(__arm64__)
-static uint32_t
-get_arm_arch_subinfo(CSSymbolRef symbol)
-{
- assert(!CSIsNull(symbol));
- CSSymbolOwnerRef owner = CSSymbolGetSymbolOwner(symbol);
- CSArchitecture arch = CSSymbolOwnerGetArchitecture(owner);
-
- if (CSArchitectureMatchesArchitecture(arch, kCSArchitectureArm64_32)) {
- return FASTTRAP_FN_ARM64_32;
- }
- else if (CSArchitectureMatchesArchitecture(arch, kCSArchitectureArm64)) {
- return FASTTRAP_FN_ARM64;
- }
- else if (CSSymbolIsThumb(symbol)) {
- return FASTTRAP_FN_THUMB;
- }
- else if (CSSymbolIsArm(symbol)) {
- return FASTTRAP_FN_ARM;
- }
- return 0;
-}
-#endif
-
/*
* Search the process symbol tables looking for a symbol whose name matches the

168
patches/dtrace-338.40.5.dtrace_host.p1.patch Normal file
View File

@@ -0,0 +1,168 @@
commit b088c55968331bdd4da258e56d3efa0c97c7acd8
Author: William Kent <wjk011@gmail.com>
Date: Sun May 24 21:30:15 2020 -0400
Apply patch
diff --git a/config/base.xcconfig b/config/base.xcconfig
index 1952041..1f7ab2b 100644
--- a/config/base.xcconfig
+++ b/config/base.xcconfig
@@ -2,7 +2,6 @@ TEST_INSTALL_PATH = /AppleInternal/Tests/dtrace
COMMON_TEST_PATH = $(TEST_INSTALL_PATH)/common
I386_TEST_PATH = $(TEST_INSTALL_PATH)/i386
-SDKROOT = macosx.internal
DEAD_CODE_STRIPPING=YES
PREBINDING = NO;
diff --git a/config/ctftools.xcconfig b/config/ctftools.xcconfig
index a291e39..0995f99 100644
--- a/config/ctftools.xcconfig
+++ b/config/ctftools.xcconfig
@@ -2,7 +2,6 @@
// On OSX, binaries are not built fat.
VALID_ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_64_BIT)
ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_64_BIT)
-INSTALL_PATH = $(DT_TOOLCHAIN_DIR)/usr/local/bin
STRIP_STYLE = debugging
diff --git a/config/libdtrace.xcconfig b/config/libdtrace.xcconfig
index 2cbfc29..464d62c 100644
--- a/config/libdtrace.xcconfig
+++ b/config/libdtrace.xcconfig
@@ -10,8 +10,8 @@ MACH_O_TYPE_dtrace_host = staticlib
MACH_O_TYPE_ = mh_dylib
MACH_O_TYPE = $(MACH_O_TYPE_$(RC_ProjectName))
-OTHER_CFLAGS_dtrace = -DDTRACE_USE_CORESYMBOLICATION
-OTHER_CFLAGS_ = -DDTRACE_USE_CORESYMBOLICATION
+OTHER_CFLAGS_dtrace = -DDTRACE_USE_CORESYMBOLICATION=0
+OTHER_CFLAGS_ = -DDTRACE_USE_CORESYMBOLICATION=0
OTHER_CFLAGS_dtrace_host =
OTHER_CFLAGS = $(inherited) $(OTHER_CFLAGS_$(RC_ProjectName))
diff --git a/dtrace.xcodeproj/project.pbxproj b/dtrace.xcodeproj/project.pbxproj
index 64c2cff..d255fa0 100644
--- a/dtrace.xcodeproj/project.pbxproj
+++ b/dtrace.xcodeproj/project.pbxproj
@@ -12338,7 +12338,6 @@
baseConfigurationReference = 1849280F2200E0BD0086F741 /* usdtheadergen.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
};
name = Debug;
@@ -12348,7 +12347,6 @@
baseConfigurationReference = 1849280F2200E0BD0086F741 /* usdtheadergen.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "$(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
};
name = Release;
diff --git a/include/llvm-Support/PointerLikeTypeTraits.h b/include/llvm-Support/PointerLikeTypeTraits.h
index 1e7e5b5..c1e3b97 100644
--- a/include/llvm-Support/PointerLikeTypeTraits.h
+++ b/include/llvm-Support/PointerLikeTypeTraits.h
@@ -14,7 +14,6 @@
#ifndef LLVM_SUPPORT_POINTERLIKETYPETRAITS_H
#define LLVM_SUPPORT_POINTERLIKETYPETRAITS_H
-#include "llvm/Support/DataTypes.h"
#include <assert.h>
#include <type_traits>
diff --git a/lib/libdtrace/apple/dt_subr_apple.c b/lib/libdtrace/apple/dt_subr_apple.c
index cb615c2..7f5fbed 100644
--- a/lib/libdtrace/apple/dt_subr_apple.c
+++ b/lib/libdtrace/apple/dt_subr_apple.c
@@ -5,7 +5,6 @@
#include <string.h>
#include <sys/sysctl.h>
-#include <os/assumes.h>
#if TARGET_OS_IPHONE && (TARGET_OS_SIMULATOR || !TARGET_OS_IOS)
#define TARGET_SUPPORTS_NATIVE_SYSTEM 0
diff --git a/lib/libdtrace/common/dt_module.c b/lib/libdtrace/common/dt_module.c
index d2890cd..adc011a 100644
--- a/lib/libdtrace/common/dt_module.c
+++ b/lib/libdtrace/common/dt_module.c
@@ -48,8 +48,6 @@
#include <dtrace.h>
-#include <sys/kas_info.h>
-
#include <dt_strtab.h>
#include <dt_module.h>
#include <dt_impl.h>
@@ -498,6 +496,7 @@ dt_module_slide()
static pthread_mutex_t guard = PTHREAD_MUTEX_INITIALIZER;
static uint64_t kernel_slide = 0;
+#if 0
if (!initialized) {
pthread_mutex_lock(&guard);
if (!initialized) {
@@ -510,6 +509,7 @@ dt_module_slide()
}
pthread_mutex_unlock(&guard);
}
+#endif
return kernel_slide;
}
diff --git a/lib/libdtrace/common/dt_proc.c b/lib/libdtrace/common/dt_proc.c
index 93a11c8..583213f 100644
--- a/lib/libdtrace/common/dt_proc.c
+++ b/lib/libdtrace/common/dt_proc.c
@@ -769,6 +769,8 @@ dtrace_proc_grab(dtrace_hdl_t *dtp, pid_t pid, int flags)
return (P);
}
+extern int pid_resume(pid_t pid); // in libsystem_kernel
+
struct ps_prochandle *
dtrace_proc_waitfor(dtrace_hdl_t *dtp, char const *pname)
{
diff --git a/lib/libdtrace/common/dtrace.h b/lib/libdtrace/common/dtrace.h
index 2e475cc..4322082 100644
--- a/lib/libdtrace/common/dtrace.h
+++ b/lib/libdtrace/common/dtrace.h
@@ -89,12 +89,6 @@ typedef struct {
#include <TargetConditionals.h>
-#if TARGET_OS_OSX
-#define DTRACE_TARGET_APPLE_MAC 1
-#elif TARGET_OS_IPHONE
-#define DTRACE_TARGET_APPLE_EMBEDDED 1
-#endif
-
extern char* demangleSymbolCString(const char*);
extern char *ctf_type_name(ctf_file_t *, ctf_id_t, char *, size_t);
diff --git a/lib/libproc/libproc.c b/lib/libproc/libproc.c
index 20a2585..e934cfe 100644
--- a/lib/libproc/libproc.c
+++ b/lib/libproc/libproc.c
@@ -36,7 +36,6 @@
#include <sys/sysctl.h>
#include <sys/proc_info.h>
-#include <sys/codesign.h>
#include <sys/fasttrap_isa.h>
#if DTRACE_TARGET_APPLE_MAC
@@ -46,7 +45,6 @@
#include "libproc.h"
#include "libproc_apple.h"
-#include "libproc_internal.h"
#include <spawn.h>
#include <pthread.h>

326
patches/dtrace-48.dt_ld.m.p1.patch Normal file
View File

@@ -0,0 +1,326 @@
--- dtrace-48/libdtrace/dt_ld.m.origin 2008-11-09 18:27:35.000000000 +0100
+++ dtrace-48/libdtrace/dt_ld.m 2008-11-09 18:27:22.000000000 +0100
@@ -1,4 +1,5 @@
-#import <Foundation/Foundation.h>
+// Foundation is disabled because it doesn't belong to Darwin and is a blocker for PureDarwin
+//#import <Foundation/Foundation.h>
// This must be done *after* any references to Foundation.h!
#define uint_t __Solaris_uint_t
@@ -48,13 +49,24 @@
return results;
}
-static NSString* dt_ld_encode_nsstring(NSString* string)
+//static NSString* dt_ld_encode_nsstring(NSString* string)
+static char* dt_ld_encode_nsstring(char* string)
{
- char* results = dt_ld_encode_string((char*)[string UTF8String]);
+ /*char* results = dt_ld_encode_string((char*)[string UTF8String]);
NSString* value = [NSString stringWithUTF8String:results];
free(results);
- return value;
+ return value;*/
+ size_t input_length = strlen(string);
+ char* results = malloc(input_length * 2 + 1);
+ int i;
+ for (i=0; i<input_length; i++) {
+ sprintf(&results[i*2],"%02x", (unsigned int)string[i]);
+ }
+ results[input_length*2] = 0;
+
+ return results;
+
}
static char* dt_ld_decode_string(char* string)
@@ -72,13 +84,26 @@
return (char*)results;
}
-static NSString* dt_ld_decode_nsstring(NSString* string)
+//static NSString* dt_ld_decode_nsstring(NSString* string)
+static char* dt_ld_decode_nsstring(char* string)
{
- char* results = dt_ld_decode_string((char*)[string UTF8String]);
+ /*char* results = dt_ld_decode_string((char*)[string UTF8String]);
NSString* value = [NSString stringWithUTF8String:results];
free(results);
- return value;
+ return value;*/
+ size_t input_length = strlen(string) / 2;
+ unsigned char* results = malloc(input_length + 1);
+ int i;
+ for (i=0; i<input_length; i++) {
+ unsigned int value;
+ sscanf(&string[i*2],"%2x", &value);
+ results[i] = (unsigned char)value;
+ }
+ results[input_length] = 0;
+
+ return (char*)results;
+
}
#pragma mark -
@@ -155,9 +180,10 @@
};
}
-NSString* dt_ld_decode_stability_v1(NSArray* elements)
+//NSString* dt_ld_decode_stability_v1(NSArray* elements)
+char* dt_ld_decode_stability_v1(void* elements)
{
- NSString* provider = [elements objectAtIndex:1];
+ /*NSString* provider = [elements objectAtIndex:1];
NSScanner* scanner = [NSScanner scannerWithString:[elements objectAtIndex:3]];
[scanner setCharactersToBeSkipped:[NSCharacterSet characterSetWithCharactersInString:@"_"]];
NSMutableString* stability = [NSMutableString string];
@@ -188,12 +214,14 @@
class = dt_ld_decode_stability_v1_class([scanner scanInt:&value] == YES ? value : 255);
[stability appendFormat:@"#pragma D attributes %s/%s/%s provider %@ args\n", name, data, class, provider];
- return stability;
+ return stability;*/
+ return "";
}
-NSString* dt_ld_decode_stability(NSString* encoding)
+//NSString* dt_ld_decode_stability(NSString* encoding)
+char* dt_ld_decode_stability(char* encoding)
{
- NSArray* elements = [encoding componentsSeparatedByString:@dtrace_separator];
+ /*NSArray* elements = [encoding componentsSeparatedByString:@dtrace_separator];
NSString* version = [elements objectAtIndex:2];
@@ -201,7 +229,8 @@
return dt_ld_decode_stability_v1(elements);
// Wow, no good way to handle error conditions here.
- return [NSString stringWithFormat:@"Unhandled stability encoding version %@", version];
+ return [NSString stringWithFormat:@"Unhandled stability encoding version %@", version]; */
+ return "";
}
#pragma mark -
@@ -235,7 +264,7 @@
static int dt_ld_probe_encode_typedef_iter(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
{
- NSMutableDictionary* types = data;
+ //NSMutableDictionary* types = data;
dt_probe_t *probe = idp->di_data;
dt_node_t* node;
for (node = probe->pr_nargs; node != NULL; node = node->dn_list) {
@@ -245,10 +274,10 @@
ssize_t size = ctf_type_lname(node->dn_ctfp, stripped_of_pointers, NULL, 0) + 1;
char* buf = alloca(size);
ctf_type_lname(node->dn_ctfp, stripped_of_pointers, buf, size);
- NSString* typeKey = [NSString stringWithUTF8String:buf];
+ /*NSString* typeKey = [NSString stringWithUTF8String:buf];
if ([types objectForKey:typeKey] == nil) {
[types setObject:dt_ld_encode_nsstring(typeKey) forKey:typeKey];
- }
+ }*/
}
}
@@ -257,7 +286,7 @@
char* dt_ld_encode_typedefs(char* provider_name, dt_provider_t *provider)
{
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSMutableDictionary* types = [NSMutableDictionary dictionary];
dt_idhash_iter(provider->pv_probes, dt_ld_probe_encode_typedef_iter, types);
@@ -281,24 +310,28 @@
[pool drain];
- return value;
+ return value;*/
+ return "";
}
-NSString* dt_ld_decode_typedefs_v1(NSArray* typedefs)
+//NSString* dt_ld_decode_typedefs_v1(NSArray* typedefs)
+char* dt_ld_decode_typedefs_v1(void* typedefs)
{
- NSMutableString* decoded = [NSMutableString string];
+ /*NSMutableString* decoded = [NSMutableString string];
NSUInteger i, count = [typedefs count];
for (i=3; i<count; i++) {
[decoded appendFormat:@"typedef int %@;\n", dt_ld_decode_nsstring([typedefs objectAtIndex:i])];
}
- return decoded;
+ return decoded;*/
+ return "";
}
-NSString* dt_ld_decode_typedefs(NSString* encoding)
+//NSString* dt_ld_decode_typedefs(NSString* encoding)
+char* dt_ld_decode_typedefs(char* encoding)
{
- NSArray* elements = [encoding componentsSeparatedByString:@dtrace_separator];
+ /*NSArray* elements = [encoding componentsSeparatedByString:@dtrace_separator];
// Is anything actually encoded?
if ([elements count] > 3) {
@@ -310,9 +343,9 @@
// Wow, no good way to handle error conditions here.
return [NSString stringWithFormat:@"Unhandled typedefs encoding version %@", version];
}
- }
+ }*/
- return @"";
+ return "";
}
#pragma mark -
@@ -320,7 +353,7 @@
char* dt_ld_encode_probe(char* provider_name, char* probe_name, dt_probe_t* probe)
{
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSMutableString* string = [NSMutableString stringWithFormat:@"%s%s%s%s%s%s%s",
dtrace_probe_encoding_prefix,
@@ -347,12 +380,14 @@
[pool drain];
- return value;
+ return value;*/
+ return "";
}
-NSString* dt_ld_decode_probe_v1(NSArray* arguments)
+//NSString* dt_ld_decode_probe_v1(NSArray* arguments)
+char* dt_ld_decode_probe_v1(void* arguments)
{
- NSMutableString* decoded = [NSMutableString string];
+ /*NSMutableString* decoded = [NSMutableString string];
NSUInteger i, count = [arguments count];
for (i=4; i<count; i++) {
@@ -362,12 +397,14 @@
[decoded appendFormat:@"%@", dt_ld_decode_nsstring([arguments objectAtIndex:i])];
}
- return decoded;
+ return decoded; */
+ return "";
}
-NSString* dt_ld_decode_probe(NSString* encoding)
+//NSString* dt_ld_decode_probe(NSString* encoding)
+char* dt_ld_decode_probe(char* encoding)
{
- NSArray* elements = [encoding componentsSeparatedByString:@dtrace_separator];
+ /*NSArray* elements = [encoding componentsSeparatedByString:@dtrace_separator];
NSMutableString* probe = [NSMutableString stringWithFormat:@"\tprobe %@(", [elements objectAtIndex:2]];
@@ -384,7 +421,8 @@
[probe appendFormat:@");"];
- return probe;
+ return probe;*/
+ return "";
}
@@ -418,9 +456,10 @@
#pragma mark -
#pragma mark D Script regeneration
-NSString* dt_ld_decode_script(NSString* stability, NSString* typedefs, NSArray* probes)
+//NSString* dt_ld_decode_script(NSString* stability, NSString* typedefs, NSArray* probes)
+void* dt_ld_decode_script(char* stability, char* typedefs, void* probes)
{
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSString* decodedTypedefs = dt_ld_decode_typedefs(typedefs);
@@ -453,7 +492,7 @@
[pool drain];
- return [script autorelease];
+ return [script autorelease];*/
}
#pragma mark -
@@ -608,7 +647,7 @@
uint64_t offsetsInDOF[], // [allocated by linker, populated by DTrace] per-probe offset in the DOF
size_t* size) // [allocated by linker, populated by DTrace] size of the DOF)
{
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
int i, err;
const char* stability = NULL;
@@ -647,9 +686,9 @@
}
// Recreate the provider.d script
- NSMutableArray* probes = [NSMutableArray arrayWithCapacity:probeCount];
+ //NSMutableArray* probes = [NSMutableArray arrayWithCapacity:probeCount];
int is_enabled_probes = 0;
- for (i=0; i<probeCount; i++) {
+ /*for (i=0; i<probeCount; i++) {
if (strncmp(probeNames[i], dtrace_probe_decoding_prefix, sizeof(dtrace_probe_decoding_prefix)-1) == 0) {
// Assert this belongs to the correct provider!
[probes addObject:[NSString stringWithUTF8String:probeNames[i]]];
@@ -669,7 +708,7 @@
NSString* dscript = dt_ld_decode_script([NSString stringWithUTF8String:stability],
[NSString stringWithUTF8String:typedefs],
- probes);
+ probes); */
dtrace_hdl_t* dtp = dtrace_open(DTRACE_VERSION,
linker_flags(cpu),
@@ -682,7 +721,7 @@
set_options(dtp);
- dtrace_prog_t* program = dtrace_program_strcompile(dtp,
+ /*dtrace_prog_t* program = dtrace_program_strcompile(dtp,
[dscript UTF8String],
DTRACE_PROBESPEC_NONE,
0,
@@ -693,13 +732,13 @@
fprintf(stderr, "error: Could not compile reconstructed dtrace script:\n\n%s\n", [dscript UTF8String]);
return NULL;
}
-
+ */
if(register_probes(dtp, probeCount, probeNames, probeWithin)) {
fprintf(stderr, "error: Could not register probes\n");
return NULL;
}
- dof_hdr_t* dof = dtrace_dof_create(dtp, program, DTRACE_D_PROBES);
+ /*dof_hdr_t* dof = dtrace_dof_create(dtp, program, DTRACE_D_PROBES);
if(register_offsets(dof, probeCount, offsetsInDOF)) {
fprintf(stderr, "error: Could not register DOF offsets\n");
@@ -719,5 +758,6 @@
[pool drain];
- return return_data;
+ return return_data;*/
+
}

20
patches/dtrace-48.dt_pid_apple.m.p1.patch Normal file
View File

@@ -0,0 +1,20 @@
--- dtrace-48/libdtrace/dt_pid_apple.m.origin 2008-11-09 16:21:22.000000000 +0100
+++ dtrace-48/libdtrace/dt_pid_apple.m 2008-11-09 16:23:08.000000000 +0100
@@ -1,7 +1,8 @@
#if defined(__APPLE__)
-#import <Symbolication/Symbolication.h>
-#import <Symbolication/SymbolicationPrivate.h>
+// Symbolication is disabled because it doesn't belong to Darwin and is a blocker for PureDarwin
+//#import <Symbolication/Symbolication.h>
+//#import <Symbolication/SymbolicationPrivate.h>
// This must be done *after* any references to Foundation.h!
#define uint_t __Solaris_uint_t
@@ -118,4 +119,4 @@
return (ret);
}
-#endif /* __APPLE__ */
\ No newline at end of file
+#endif /* __APPLE__ */

10
patches/dtrace-48.dtrace_1.c.p1.patch Normal file
View File

@@ -0,0 +1,10 @@
--- dtrace-48/cmd/dtrace_1.c.origin 2008-11-09 18:42:12.000000000 +0100
+++ dtrace-48/cmd/dtrace_1.c 2008-11-09 18:42:08.000000000 +0100
@@ -27,6 +27,7 @@
#pragma ident "@(#)dtrace.c 1.24 06/02/08 SMI"
+#include "/System/Library/Frameworks/CoreFoundation.framework/Headers/CFString.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>

434
patches/dtrace-48.libproc.m.p1.patch Normal file
View File

@@ -0,0 +1,434 @@
--- dtrace-48/libproc/libproc.m.origin 2008-11-09 18:09:08.000000000 +0100
+++ dtrace-48/libproc/libproc.m 2008-11-09 18:09:03.000000000 +0100
@@ -7,8 +7,10 @@
// Copyright 2006 Apple Computer, Inc. All rights reserved.
//
-#import <Symbolication/Symbolication.h>
-#import <Symbolication/SymbolicationPrivate.h>
+// Symbolication is disabled because it doesn't belong to Darwin and is a blocker for PureDarwin
+//#import <Symbolication/Symbolication.h>
+//#import <Symbolication/SymbolicationPrivate.h>
+#import <objc/objc.h>
#import <mach/mach.h>
#include <mach/mach_error.h>
@@ -46,7 +48,7 @@
* of Symbolication.framework, and can easily break.
*/
-@interface VMUSymbolicator (ViolationOfGoodSenseAndEncapsulation)
+/*@interface VMUSymbolicator (ViolationOfGoodSenseAndEncapsulation)
// Copied from VMUSymbolicator (Internal)
- (VMUSymbolOwner*)faultLazySymbolOwnerAtIndex:(NSInteger)index;
@@ -88,7 +90,7 @@
return owners;
}
-@end
+@end*/
/*
* This is a helper method, it does extended lookups following roughly these rules
@@ -100,7 +102,7 @@
*
* You must have an autorelease pool when calling this method.
*/
-VMUSymbolOwner* symbolOwnerForName(VMUSymbolicator* symbolicator, NSString* name) {
+/*VMUSymbolOwner* symbolOwnerForName(VMUSymbolicator* symbolicator, NSString* name) {
// Check for a.out specifically
if ([name isEqualToString:@"a.out"]) {
NSArray* owners = [symbolicator symbolOwnersWithFlags:VMUSymbolOwnerIsAOut];
@@ -133,7 +135,7 @@
}
return nil;
-}
+}*/
#define APPLE_PCREATE_BAD_SYMBOLICATOR 0x0F000001
@@ -146,7 +148,7 @@
{
struct ps_prochandle* proc = NULL;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@try {
int pid;
@@ -163,7 +165,7 @@
*perr = posix_spawnp(&pid, file, NULL, &attr, argv, *_NSGetEnviron());
- unsetenv("DYLD_INSERT_LIBRARIES"); /* children must not have this present in their env */
+ unsetenv("DYLD_INSERT_LIBRARIES"); // children must not have this present in their env
destroy_attr:
posix_spawnattr_destroy(&attr);
@@ -203,7 +205,7 @@
}
}
- [pool drain];
+ [pool drain];*/
return proc;
}
@@ -280,7 +282,7 @@
struct ps_prochandle* proc = NULL;
if (flags & PGRAB_RDONLY || (0 == flags)) {
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
@try {
task_t task;
@@ -289,7 +291,7 @@
if (*perr == KERN_SUCCESS) {
if (0 == (flags & PGRAB_RDONLY))
(void)task_suspend(task);
- VMUSymbolicator* symbolicator = [VMUSymbolicator symbolicatorForTask:task];
+ //VMUSymbolicator* symbolicator = [VMUSymbolicator symbolicatorForTask:task];
if (symbolicator) {
proc = calloc(sizeof(struct ps_prochandle), 1);
@@ -319,7 +321,7 @@
}
}
- [pool drain];
+ [pool drain];*/
} else {
*perr = APPLE_PGRAB_UNSUPPORTED_FLAGS;
}
@@ -356,9 +358,9 @@
* We're ignoring most flags for now. They will eventually need to be honored.
*/
void Prelease(struct ps_prochandle *P, int flags) {
- NSCAssert(P != NULL, @"Should be a valid ps_prochandle");
+ //NSCAssert(P != NULL, @"Should be a valid ps_prochandle");
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
if (0 == flags) {
if (P->status.pr_flags & PR_KLC)
@@ -373,7 +375,7 @@
mach_port_deallocate(mach_task_self(), P->task);
P->task = MACH_PORT_NULL;
- if (P->symbolicator && (P->symbolicator != P->prev_symbolicator))
+ /* if (P->symbolicator && (P->symbolicator != P->prev_symbolicator))
[P->symbolicator release];
P->symbolicator = nil;
@@ -385,7 +387,7 @@
[P->prmap_dictionary release];
P->prmap_dictionary = nil;
- [pool drain];
+ [pool drain];*/
free(P);
}
@@ -431,17 +433,17 @@
}
int pr_open(struct ps_prochandle *P, const char *foo, int bar, mode_t baz) {
- NSLog(@"libProc.a UNIMPLEMENTED: pr_open()");
+ //NSLog(@"libProc.a UNIMPLEMENTED: pr_open()");
return 0;
}
int pr_close(struct ps_prochandle *P, int foo) {
- NSLog(@"libProc.a UNIMPLEMENTED: pr_close");
+ //NSLog(@"libProc.a UNIMPLEMENTED: pr_close");
return 0;
}
int pr_ioctl(struct ps_prochandle *P, int foo, int bar, void *baz, size_t blah) {
- NSLog(@"libProc.a UNIMPLEMENTED: pr_ioctl");
+ //NSLog(@"libProc.a UNIMPLEMENTED: pr_ioctl");
return 0;
}
@@ -470,12 +472,12 @@
{
int err = -1;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- VMUSymbol* symbol = nil;
+ //VMUSymbol* symbol = nil;
- if (oname != NULL) {
- VMUSymbolOwner* owner = symbolOwnerForName(P->symbolicator, [NSString stringWithUTF8String:oname]);
+ /*if (oname != NULL) {
+ //VMUSymbolOwner* owner = symbolOwnerForName(P->symbolicator, [NSString stringWithUTF8String:oname]);
NSArray* symbols = NULL;
if (_dtrace_mangled) {
symbols = [owner symbolsForMangledName:[NSString stringWithUTF8String:sname]];
@@ -504,7 +506,7 @@
err = 0;
if (symbol && symp) {
- VMURange addressRange = [symbol addressRange];
+ //VMURange addressRange = [symbol addressRange];
symp->st_name = 0;
symp->st_info = GELF_ST_INFO((STB_GLOBAL), (STT_FUNC));
@@ -518,7 +520,7 @@
sip->prs_lmid = LM_ID_BASE;
}
- [pool drain];
+ [pool drain];*/
return err;
}
@@ -552,16 +554,16 @@
{
int err = -1;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- VMUSymbol* symbol = [P->symbolicator symbolForAddress:addr];
+ //VMUSymbol* symbol = [P->symbolicator symbolForAddress:addr];
// See comments in Ppltdest()
// Filter out symbols we do not want to instrument
// if ([symbol isDyldStub]) symbol = nil;
// if (![symbol isFunction]) symbol = nil;
- if (symbol) {
+ /*if (symbol) {
if (_dtrace_mangled) {
const char *mangledName = [[symbol mangledName] UTF8String];
if (strlen(mangledName) >= 3 &&
@@ -578,7 +580,7 @@
err = 0;
if (symbolp) {
- VMURange addressRange = [symbol addressRange];
+ //VMURange addressRange = [symbol addressRange];
symbolp->st_name = 0;
symbolp->st_info = GELF_ST_INFO((STB_GLOBAL), (STT_FUNC));
@@ -589,7 +591,7 @@
}
if (sip) {
- VMUSymbolOwner* owner = [symbol owner];
+ //VMUSymbolOwner* owner = [symbol owner];
sip->prs_name = (bufsize == 0 ? NULL : sym_name_buffer);
if (owner) {
@@ -609,7 +611,7 @@
}
}
- [pool drain];
+ [pool drain];*/
return err;
}
@@ -649,9 +651,9 @@
int Pobject_iter(struct ps_prochandle *P, proc_map_f *func, void *cd) {
int err = 0;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- for (VMUSymbolOwner* owner in [P->symbolicator symbolOwners]) {
+ /*for (VMUSymbolOwner* owner in [P->symbolicator symbolOwners]) {
if ([owner isCommpage]) continue; // <rdar://problem/4877551>
prmap_t map;
@@ -676,9 +678,9 @@
if ((err = func(cd, &map, name)) != 0)
break;
- }
+ }*/
- [pool drain];
+ //[pool drain];
return err;
}
@@ -686,7 +688,7 @@
const prmap_t *Paddr_to_map(struct ps_prochandle *P, uint64_t addr) {
const prmap_t* map = NULL;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
VMUSymbolOwner* owner = [P->symbolicator symbolOwnerForAddress:addr];
@@ -709,7 +711,7 @@
map = [data bytes];
}
- [pool drain];
+ [pool drain];*/
return map;
}
@@ -756,11 +758,11 @@
else if (cname == PR_OBJ_EXEC)
cname = "a.out";
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSString* name = [NSString stringWithUTF8String:cname];
- VMUSymbolOwner* owner = symbolOwnerForName(P->symbolicator, name);
+ //VMUSymbolOwner* owner = symbolOwnerForName(P->symbolicator, name);
// <rdar://problem/4877551>
if (owner && ![owner isCommpage]) {
@@ -781,7 +783,7 @@
map = [data bytes];
}
- [pool drain];
+ [pool drain];*/
return map;
}
@@ -794,7 +796,7 @@
char *Pobjname(struct ps_prochandle *P, uint64_t addr, char *buffer, size_t bufsize) {
char *err = NULL;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
VMUSymbolOwner* owner = [P->symbolicator symbolOwnerForAddress:addr];
@@ -803,7 +805,7 @@
err = buffer;
}
- [pool drain];
+ [pool drain];*/
// ALWAYS! make certain buffer is null terminated
buffer[bufsize-1] = 0;
@@ -826,7 +828,7 @@
}
// A helper category to crack "-[Class method]" into "Class" "-method"
-@interface VMUSymbol (dtrace)
+/*@interface VMUSymbol (dtrace)
- (NSString*)dtraceClassName;
- (NSString*)dtraceMethodName;
@end
@@ -856,7 +858,7 @@
return [NSString stringWithFormat:@"%c%@", (char)[temp characterAtIndex:0], [temp substringWithRange:NSMakeRange(r.location, ([temp length] - 1) - r.location)]];
}
-@end
+@end*/
/*
* This is an Apple only proc method. It is used by the objc provider,
@@ -866,7 +868,7 @@
int Pobjc_method_iter(struct ps_prochandle *P, proc_objc_f *func, void *cd) {
int err = 0;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
for (VMUSymbolOwner* owner in [P->symbolicator symbolOwners]) {
for (VMUSymbol* symbol in [owner symbols]) {
@@ -890,12 +892,12 @@
}
}
- /* We need to propagate errors from the inner loop */
+ // We need to propagate errors from the inner loop
if (err != 0)
break;
}
- [pool drain];
+ [pool drain];*/
return err;
}
@@ -920,7 +922,7 @@
if (which != PR_SYMTAB)
return err;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSString* name = [NSString stringWithUTF8String:object_name];
@@ -964,7 +966,7 @@
err = -1;
}
- [pool drain];
+ [pool drain];*/
return err;
}
@@ -974,14 +976,14 @@
}
void Pmothball_syms(struct ps_prochandle *P) {
- if (P->prev_symbolicator)
+ /*if (P->prev_symbolicator)
[P->prev_symbolicator release];
- P->prev_symbolicator = P->symbolicator;
+ P->prev_symbolicator = P->symbolicator;*/
}
void Pupdate_syms(struct ps_prochandle *P) {
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
if (P->symbolicator && (P->symbolicator != P->prev_symbolicator))
[P->symbolicator release];
@@ -1008,7 +1010,7 @@
Prelease(P, PRELEASE_CLEAR);
}
- [pool drain];
+ [pool drain];*/
}
/*
@@ -1035,7 +1037,7 @@
const char *Ppltdest(struct ps_prochandle *P, uint64_t addr) {
const char* err = NULL;
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+ /*NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
VMUSymbol* symbol = [P->symbolicator symbolForAddress:addr];
@@ -1043,7 +1045,7 @@
if (symbol && ([symbol isDyldStub] || (![symbol isFunction]) || [[symbol owner] isCommpage]))
err = "Ppltdest is not implemented";
- [pool drain];
+ [pool drain];*/
return err;
}
@@ -1300,6 +1302,6 @@
//
int Pctlfd(struct ps_prochandle *ignore) {
- NSLog(@"libProc.a UNIMPLEMENTED: Pctlfd()");
+ //NSLog(@"libProc.a UNIMPLEMENTED: Pctlfd()");
return 0;
}

15
patches/dtrace-48.libproc_apple.h.p1.patch Normal file
View File

@@ -0,0 +1,15 @@
--- dtrace-48/libproc/libproc_apple.h.origin 2008-11-09 16:43:03.000000000 +0100
+++ dtrace-48/libproc/libproc_apple.h 2008-11-09 16:43:24.000000000 +0100
@@ -45,9 +45,9 @@
struct ps_prochandle {
task_t task;
pstatus_t status;
- VMUSymbolicator* symbolicator;
- VMUSymbolicator* prev_symbolicator;
- NSMutableDictionary* prmap_dictionary;
+ void** symbolicator; //VMUSymbolicator* symbolicator;
+ void** prev_symbolicator; //VMUSymbolicator* prev_symbolicator;
+ void** prmap_dictionary; //NSMutableDictionary* prmap_dictionary;
mach_port_t dtrace_dyld_port;
Phandler_func_t *activity_handler_func;
void *activity_handler_arg;

79
patches/dtrace-48.project.pbxproj.p1.patch Normal file
View File

@@ -0,0 +1,79 @@
--- dtrace-48/dtrace.xcodeproj/project.pbxproj.origin 2008-11-09 18:54:35.000000000 +0100
+++ dtrace-48/dtrace.xcodeproj/project.pbxproj 2008-11-09 18:53:47.000000000 +0100
@@ -45,9 +45,6 @@
1824E6620A9AD0CB00F794DD /* dis_tables.h in Headers */ = {isa = PBXBuildFile; fileRef = 1824E6560A9AD08100F794DD /* dis_tables.h */; };
1844A9CB0A111BB400F5B6A3 /* dtrace.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6A0FF2C0290799A04C91782 /* dtrace.1 */; };
185F56260A4230C90025BAD6 /* dt_pid.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EBC9816099BFBBF0001019C /* dt_pid.c */; };
- 185F56FF0A42314A0025BAD6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D24923CA09CF793F0037D9DB /* Foundation.framework */; };
- 185F57010A4231620025BAD6 /* Symbolication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 185F57000A4231620025BAD6 /* Symbolication.framework */; };
- 185F57050A4231660025BAD6 /* Symbolication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 185F57000A4231620025BAD6 /* Symbolication.framework */; };
1880D2970B49348A00A50B29 /* dt_ld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1880D2950B49348A00A50B29 /* dt_ld.h */; };
1880D2980B49348A00A50B29 /* dt_ld.m in Sources */ = {isa = PBXBuildFile; fileRef = 1880D2960B49348A00A50B29 /* dt_ld.m */; };
1892F8910A111CF9004957F8 /* errno.d in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6EBC9887099D415F0001019C /* errno.d */; };
@@ -321,7 +318,6 @@
D248894F0A2CE0CB000B141C /* stabs.c in Sources */ = {isa = PBXBuildFile; fileRef = D2E5F05109D0DC430035AE2D /* stabs.c */; };
D24889500A2CE0CC000B141C /* strtab.c in Sources */ = {isa = PBXBuildFile; fileRef = D2E5F05409D0DC430035AE2D /* strtab.c */; };
D24889690A2CE524000B141C /* barrier.c in Sources */ = {isa = PBXBuildFile; fileRef = D2E5F03E09D0DC430035AE2D /* barrier.c */; };
- D24923CB09CF793F0037D9DB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D24923CA09CF793F0037D9DB /* Foundation.framework */; };
D258E5250A2CAAC400B50A45 /* dump.c in Sources */ = {isa = PBXBuildFile; fileRef = D258E5240A2CAAC400B50A45 /* dump.c */; };
D258E5310A2CADA700B50A45 /* darwin_shim.c in Sources */ = {isa = PBXBuildFile; fileRef = 6EBC972D099BFA5D0001019C /* darwin_shim.c */; };
D258E5410A2CAE1800B50A45 /* symbol.c in Sources */ = {isa = PBXBuildFile; fileRef = D2E5F07B09D0DDB30035AE2D /* symbol.c */; };
@@ -755,7 +751,6 @@
1824E64B0A9ACFF400F794DD /* dis_tables.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dis_tables.c; path = disassembler/dis_tables.c; sourceTree = "<group>"; };
1824E6560A9AD08100F794DD /* dis_tables.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dis_tables.h; path = sys/dis_tables.h; sourceTree = "<group>"; };
185F562A0A4230FC0025BAD6 /* dt_pid_apple.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = dt_pid_apple.m; path = libdtrace/dt_pid_apple.m; sourceTree = "<group>"; };
- 185F57000A4231620025BAD6 /* Symbolication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Symbolication.framework; path = /System/Library/PrivateFrameworks/Symbolication.framework; sourceTree = "<absolute>"; };
1880D2950B49348A00A50B29 /* dt_ld.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dt_ld.h; path = libdtrace/dt_ld.h; sourceTree = "<group>"; };
1880D2960B49348A00A50B29 /* dt_ld.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = dt_ld.m; path = libdtrace/dt_ld.m; sourceTree = "<group>"; };
188A29690ADC36980039E7F8 /* procfs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = procfs.h; path = libproc/procfs.h; sourceTree = "<group>"; };
@@ -1009,7 +1004,6 @@
D22EF2510C20EEBD0018C136 /* seeksize_example.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = seeksize_example.txt; path = DTTk/Docs/Examples/seeksize_example.txt; sourceTree = "<group>"; };
D23B0E9D0BA8C6F500D5478F /* notify.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; name = notify.defs; path = libproc/notify.defs; sourceTree = "<group>"; };
D24889320A2CC091000B141C /* ctfmerge */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ctfmerge; sourceTree = BUILT_PRODUCTS_DIR; };
- D24923CA09CF793F0037D9DB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
D258E51D0A2CAA7A00B50A45 /* ctfdump */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ctfdump; sourceTree = BUILT_PRODUCTS_DIR; };
D258E5240A2CAAC400B50A45 /* dump.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dump.c; path = tools/ctfconvert/dump.c; sourceTree = "<group>"; };
D26C8C380BA6558D00179352 /* dt_proc_apple.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = dt_proc_apple.m; path = libdtrace/dt_proc_apple.m; sourceTree = "<group>"; };
@@ -1240,8 +1234,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 185F57050A4231660025BAD6 /* Symbolication.framework in Frameworks */,
- 185F56FF0A42314A0025BAD6 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1256,8 +1248,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- D24923CB09CF793F0037D9DB /* Foundation.framework in Frameworks */,
- 185F57010A4231620025BAD6 /* Symbolication.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1298,8 +1288,6 @@
D2FAD5960BCC593A00EDD5A2 /* DTrace.txt */,
D2FAD5950BCC593A00EDD5A2 /* DTrace.plist */,
18B54B660AF6772C00509A71 /* dtrace_dof.xcodeproj */,
- 185F57000A4231620025BAD6 /* Symbolication.framework */,
- D24923CA09CF793F0037D9DB /* Foundation.framework */,
08FB7795FE84155DC02AAC07 /* Source */,
C6A0FF2B0290797F04C91782 /* Documentation */,
1AB674ADFE9D54B511CA2CBB /* Products */,
@@ -2642,6 +2630,7 @@
"-ldtrace",
"-lSystem",
"-liberty",
+ "-framework CoreFoundation",
);
PRODUCT_NAME = dtrace;
VALID_ARCHS = "ppc i386";
@@ -2674,6 +2663,7 @@
"-ldtrace",
"-lSystem",
"-liberty",
+ "-framework CoreFoundation",
);
PRODUCT_NAME = dtrace;
VALID_ARCHS = "ppc i386";

46
patches/emacs-70.1.rm_App_and_undef_carbon.p1.patch Normal file
View File

@@ -0,0 +1,46 @@
Seulement dans emacs-70.1.pd1/emacs/src/s: ._darwin.h
diff -ru emacs-70.1/emacs/src/s/darwin.h emacs-70.1.pd1/emacs/src/s/darwin.h
--- emacs-70.1/emacs/src/s/darwin.h 2007-05-15 23:57:33.000000000 +0200
+++ emacs-70.1.pd1/emacs/src/s/darwin.h 2012-09-22 23:34:45.000000000 +0200
@@ -41,16 +41,17 @@
#if 0 /* Don't define DARWIN on Mac OS X because CoreFoundation.h uses
it to distinguish Mac OS X from bare Darwin. */
-#ifndef DARWIN
+//#ifndef DARWIN
#define DARWIN 1
-#endif
+//#endif
#endif
/* MAC_OS is used to conditionally compile code common to both MAC_OS8
and MAC_OSX. */
#ifdef MAC_OSX
#ifdef HAVE_CARBON
-#define MAC_OS
+//#define MAC_OS
+#undef HAVE_CARBON
#endif
#endif
diff -ru emacs-70.1/Makefile emacs-70.1.pd1/Makefile
--- emacs-70.1/Makefile 2008-02-09 02:28:25.000000000 +0100
+++ emacs-70.1.pd1/Makefile 2012-09-22 23:58:25.000000000 +0200
@@ -82,8 +82,6 @@
$(INSTALL) -s -o root -g wheel -m 4555 $(SYMROOT)/dumpemacs $(DSTROOT)/usr/libexec/dumpemacs
$(INSTALL) -s -o root -g wheel -m 555 $(SYMROOT)/emacswrapper $(DSTROOT)/usr/bin/emacs
#fixup Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings encoding
- iconv -f US-ASCII -t UTF-16 \
- $(SRCROOT)/emacs/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings > $(App_Dir)/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
build::
@echo "Bootstraping $(Project)..."
@@ -106,7 +104,6 @@
$(RM) "$(DSTROOT)/usr/bin/ctags" "$(DSTROOT)/usr/share/man/man1/ctags.1"
$(RM) -r "$(DSTROOT)/usr/var"
for f in $(EXTRAEL); do $(RM) -f "$(SRCROOT)/$$f"; done
- $(LN) -sf /usr/bin/emacs "$(App_Dir)/Emacs.app/Contents/MacOS/Emacs"
install-plist:
$(INSTALL) -d $(OSV)
Seulement dans emacs-70.1.pd1: ._Makefile

29
patches/gcc_select-66.no-dSYM.p1.patch Normal file
View File

@@ -0,0 +1,29 @@
diff -ru gcc_select-66/Makefile gcc_select-66.pd1/Makefile
--- gcc_select-66/Makefile 2007-05-12 03:16:25.000000000 +0200
+++ gcc_select-66.pd1/Makefile 2012-09-11 03:25:23.695922003 +0200
@@ -18,7 +18,7 @@
PROGS=gcc g++ gcov c++
-.PHONY: all install installhdrs installsrc installdoc clean mklinks installsym
+.PHONY: all install installhdrs installsrc installdoc clean mklinks
all: install
@@ -36,14 +36,12 @@
install: installhdrs
-install: installdoc mklinks $(OBJROOT)/c99 $(OBJROOT)/c89 installsym
+install: installdoc mklinks $(OBJROOT)/c99 $(OBJROOT)/c89
mkdir -p $(DSTROOT)/usr/bin
install -s -c -m 555 $(OBJROOT)/c99 $(DSTROOT)/usr/bin/c99
install -s -c -m 555 $(OBJROOT)/c89 $(DSTROOT)/usr/bin/c89
install -c -m 555 $(SRCROOT)/cpp $(DSTROOT)/usr/bin/cpp
-installsym: $(OBJROOT)/c99.dSYM $(OBJROOT)/c89.dSYM
- cp -rp $^ $(SYMROOT)
mklinks:
mkdir -p $(DSTROOT)/usr/bin
Seulement dans gcc_select-66.pd1: Makefile~

12
patches/gnutar-442.0.1.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -ru gnutar-442.0.1/gnutar/src/common.h gnutar-442.0.1.patch/gnutar/src/common.h
--- gnutar-442.0.1/gnutar/src/common.h 2008-09-18 22:50:06.000000000 +0200
+++ gnutar-442.0.1.patch/gnutar/src/common.h 2009-06-10 23:31:24.000000000 +0200
@@ -21,7 +21,7 @@
#include "tar.h"
#include <TargetConditionals.h>
-#define HAVE_QUARANTINE (!TARGET_OS_EMBEDDED)
+//#define HAVE_QUARANTINE (!TARGET_OS_EMBEDDED)
#if HAVE_QUARANTINE
#include <quarantine.h>

12
patches/iodbc-34.p1.patch Normal file
View File

@@ -0,0 +1,12 @@
Only in iodbc-34.patch/: .Makefile.swp
diff -ru iodbc-34/Makefile iodbc-34.patch/Makefile
--- iodbc-34/Makefile 2007-05-01 02:52:56.000000000 +0200
+++ iodbc-34.patch/Makefile 2009-06-10 23:26:03.000000000 +0200
@@ -26,7 +26,6 @@
Install_Target = install
Extra_Configure_Flags += --prefix=/usr --with-iodbc-inidir=/Library/ODBC --disable-gui TMPDIR=$(OBJROOT)
-CFLAGS += -Wl,-framework,CoreFoundation
tesLipo = $(eval "${LIPO} -verify_arch ppc64 $(RC_Install_Prefix)/bin/iodbctest")
fixup:

32
patches/ipv6configuration-27.p1.patch Normal file
View File

@@ -0,0 +1,32 @@
diff -ru ipv6configuration-27/libraries/service.c ipv6configuration-27.patch/libraries/service.c
--- ipv6configuration-27/libraries/service.c 2007-03-02 01:19:34.000000000 +0100
+++ ipv6configuration-27.patch/libraries/service.c 2009-06-11 00:58:58.000000000 +0200
@@ -798,6 +798,7 @@
*/
#ifndef NO_CFUserNotification
+/*
static void
user_confirm(CFUserNotificationRef userNotification, CFOptionFlags responseFlags)
{
@@ -886,7 +887,7 @@
my_CFRelease(&url);
return;
}
-
+*/
#else
static void
diff -ru ipv6configuration-27/libraries/service.c ipv6configuration-27.patch/libraries/service.c
--- ipv6configuration-27/libraries/service.c 2009-06-11 00:59:43.000000000 +0200
+++ ipv6configuration-27.patch/libraries/service.c 2009-06-11 01:04:00.000000000 +0200
@@ -805,7 +805,6 @@
int i;
int ifstate_count;
- /* clean-up the notification */
ifstate_count = dynarray_count(&G_ifstate_list);
for (i = 0; i < ifstate_count; i++) {
IFState_t * ifstate = dynarray_element(&G_ifstate_list, i);

130
patches/kext_tools-117.4.AllPatchesMerged.p1.patch Normal file
View File

@@ -0,0 +1,130 @@
diff -ru kext_tools-117.4/bootcaches.c kext_tools-117.4.pd1/bootcaches.c
--- kext_tools-117.4/bootcaches.c 2008-02-19 00:48:29.000000000 +0100
+++ kext_tools-117.4.pd1/bootcaches.c 2012-09-10 21:12:36.272366312 +0200
@@ -59,6 +59,9 @@
#include "safecalls.h"
#include "utility.h"
+#include <objc/objc.h>
+#include <CarbonCore/MacTypes.h>
+
static MkextCRCResult getMkextCRC(const char * file_path, uint32_t * crc_ptr);
diff -ru kext_tools-117.4/globals.h kext_tools-117.4.pd1/globals.h
--- kext_tools-117.4/globals.h 2008-05-04 08:12:42.000000000 +0200
+++ kext_tools-117.4.pd1/globals.h 2012-09-10 21:12:11.680366800 +0200
@@ -37,6 +37,9 @@
#define kKXDiskArbMaxRetries 10
+#include <CoreFoundation/CFUserNotification.h>
+
+
// in main.c
void kextd_handle_signal(int);
bool is_bootroot_active(void);
diff -ru kext_tools-117.4/kextd_main.c kext_tools-117.4.pd1/kextd_main.c
--- kext_tools-117.4/kextd_main.c 2007-09-08 00:11:46.000000000 +0200
+++ kext_tools-117.4.pd1/kextd_main.c 2012-09-10 21:11:38.304367462 +0200
@@ -59,6 +59,9 @@
#include "bootcaches.h"
#include "utility.h"
+#include <objc/objc.h>
+#include <CoreFoundation/CFNotificationCenter.h>
+
/*******************************************************************************
* Globals set from invocation arguments (XX could use fewer globals :?).
*******************************************************************************/
@@ -1209,6 +1212,7 @@
/* Watch for RAID changes so we can forcibly update their boot partitions.
*/
+/*
CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(),
NULL, // const void *observer
updateRAIDSet,
@@ -1216,6 +1220,7 @@
NULL, // const void *object
CFNotificationSuspensionBehaviorHold);
kern_result = AppleRAIDEnableNotifications();
+*/
if (kern_result != KERN_SUCCESS) {
kextd_error_log("couldn't register for RAID notifications");
}
diff -ru kext_tools-117.4/kext_tools.xcodeproj/project.pbxproj kext_tools-117.4.pd1/kext_tools.xcodeproj/project.pbxproj
--- kext_tools-117.4/kext_tools.xcodeproj/project.pbxproj 2008-05-02 00:28:10.000000000 +0200
+++ kext_tools-117.4.pd1/kext_tools.xcodeproj/project.pbxproj 2012-09-10 21:29:24.792346278 +0200
@@ -122,7 +122,6 @@
0CFB02460AB0FBAD003AC039 /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C31717C0AB0EDD800B8CA9A /* DiskArbitration.framework */; };
0CFB02590AB0FC3B003AC039 /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 1492D1A801E53D0502CA2A87 /* logging.c */; };
0CFB025A0AB0FC41003AC039 /* logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1492D1A901E53D0502CA2A87 /* logging.h */; };
- 0CFB025C0AB0FC75003AC039 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */; };
2459EC4309EB7B7E002EE862 /* kextfind_report.c in Sources */ = {isa = PBXBuildFile; fileRef = 2459EC4109EB7B7E002EE862 /* kextfind_report.c */; };
24B704C209E0C17B0091113C /* kextfind_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 24B704C009E0C17B0091113C /* kextfind_tables.c */; };
24B7FFCC09DF3F1E0091113C /* kextfind_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = 24B7FFCA09DF3F1E0091113C /* kextfind_commands.c */; };
@@ -473,7 +472,6 @@
0C3171920AB0EE0800B8CA9A /* libAppleRAID.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libAppleRAID.a; path = /usr/local/lib/libAppleRAID.a; sourceTree = "<absolute>"; };
0C31719F0AB0F80F00B8CA9A /* bootcaches.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = bootcaches.plist; sourceTree = "<group>"; };
0CF69C530C8CC127007E76E8 /* kextmanager_async.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = kextmanager_async.defs; sourceTree = "<group>"; };
- 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
1452E76F01F9032A02CA28EB /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.1.1.3.dylib; sourceTree = "<absolute>"; };
1452E77001F9032A02CA28EB /* libkld.dylib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libkld.dylib; path = /usr/local/lib/libkld.dylib; sourceTree = "<absolute>"; };
14597B28022D521B02CA29F8 /* kextmanager.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = kextmanager.defs; sourceTree = "<group>"; };
@@ -526,7 +524,6 @@
05097276094910D30034B52C /* CoreFoundation.framework in Frameworks */,
0C31717B0AB0EDBA00B8CA9A /* libbless.a in Frameworks */,
0CFB02460AB0FBAD003AC039 /* DiskArbitration.framework in Frameworks */,
- 0CFB025C0AB0FC75003AC039 /* ApplicationServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -627,8 +624,6 @@
0515F62C0AC1D3B800B291F3 /* Boot≠Root Support */ = {
isa = PBXGroup;
children = (
- 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */,
- 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */,
0C31717C0AB0EDD800B8CA9A /* DiskArbitration.framework */,
0C31717C0AB0EDD800B8CA9A /* DiskArbitration.framework */,
0C3171920AB0EE0800B8CA9A /* libAppleRAID.a */,
diff -ru kext_tools-117.4/prelink.c kext_tools-117.4.pd1/prelink.c
--- kext_tools-117.4/prelink.c 2007-02-22 22:49:55.000000000 +0100
+++ kext_tools-117.4.pd1/prelink.c 2012-09-10 21:09:32.984369951 +0200
@@ -47,6 +47,9 @@
#include <IOKit/IOCFSerialize.h>
#include <libkern/OSByteOrder.h>
+#include <objc/objc.h>
+#include <CarbonCore/MacTypes.h>
+
/*******************************************************************************
*******************************************************************************/
diff -ru kext_tools-117.4/update_boot.c kext_tools-117.4.pd1/update_boot.c
--- kext_tools-117.4/update_boot.c 2008-02-19 00:48:29.000000000 +0100
+++ kext_tools-117.4.pd1/update_boot.c 2012-09-10 21:07:06.728372858 +0200
@@ -55,6 +55,9 @@
#include "update_boot.h"
#include "utility.h" // g_verbose_level
+#include <objc/objc.h>
+
+
enum bootReversions {
nothingSerious = 0,
noLabels, // 1
diff -ru kext_tools-117.4/watchvol.h kext_tools-117.4.pd1/watchvol.h
--- kext_tools-117.4/watchvol.h 2007-09-08 00:13:21.000000000 +0200
+++ kext_tools-117.4.pd1/watchvol.h 2012-09-10 21:06:35.472373477 +0200
@@ -30,6 +30,9 @@
* $NoLog$
*/
+#include <CoreFoundation/CFNotificationCenter.h>
+#include <objc/objc.h>
+
// for kextd_main
int kextd_watch_volumes(int sourcePriority/*, CFRunLoopRef runloop*/);
int kextd_giveup_volwatch();

11
patches/kext_tools-117.bootcaches.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- kext_tools-117/bootcaches.c.origin 2008-10-30 13:20:51.000000000 +0100
+++ kext_tools-117/bootcaches.c 2008-10-30 13:21:22.000000000 +0100
@@ -56,6 +56,8 @@
#include "safecalls.h"
#include "utility.h"
+#include <objc/objc.h>
+#include <CarbonCore/MacTypes.h>
static MkextCRCResult getMkextCRC(const char * file_path, uint32_t * crc_ptr);

11
patches/kext_tools-117.globals.h.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- kext_tools-117/globals.h.origin 2008-10-30 13:27:09.000000000 +0100
+++ kext_tools-117/globals.h 2008-10-30 13:27:49.000000000 +0100
@@ -36,6 +36,8 @@
#define kKXDiskArbMaxRetries 10
+#include <CoreFoundation/CFUserNotification.h>
+
// in main.c
void kextd_handle_signal(int);
bool is_bootroot_active(void);

28
patches/kext_tools-117.kextd_main.c.p1.patch Normal file
View File

@@ -0,0 +1,28 @@
--- kext_tools-117/kextd_main.c.origin 2008-10-30 13:53:00.000000000 +0100
+++ kext_tools-117/kextd_main.c 2008-10-30 13:54:53.000000000 +0100
@@ -59,6 +59,9 @@
#include "bootcaches.h"
#include "utility.h"
+#include <objc/objc.h>
+#include <CoreFoundation/CFNotificationCenter.h>
+
/*******************************************************************************
* Globals set from invocation arguments (XX could use fewer globals :?).
*******************************************************************************/
@@ -1209,13 +1212,13 @@
/* Watch for RAID changes so we can forcibly update their boot partitions.
*/
- CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(),
+ /*CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(),
NULL, // const void *observer
updateRAIDSet,
CFSTR(kAppleRAIDNotificationSetChanged),
NULL, // const void *object
CFNotificationSuspensionBehaviorHold);
- kern_result = AppleRAIDEnableNotifications();
+ kern_result = AppleRAIDEnableNotifications();*/
if (kern_result != KERN_SUCCESS) {
kextd_error_log("couldn't register for RAID notifications");
}

11
patches/kext_tools-117.prelink.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- kext_tools-117/prelink.c.origin 2008-10-30 13:17:02.000000000 +0100
+++ kext_tools-117/prelink.c 2008-10-30 13:19:51.000000000 +0100
@@ -47,6 +47,8 @@
#include <IOKit/IOCFSerialize.h>
#include <libkern/OSByteOrder.h>
+#include <objc/objc.h>
+#include <CarbonCore/MacTypes.h>
/*******************************************************************************
*******************************************************************************/

40
patches/kext_tools-117.project.pbxproj.p1.patch Normal file
View File

@@ -0,0 +1,40 @@
--- kext_tools-117/kext_tools.xcodeproj/project.pbxproj.origin 2008-10-30 13:34:41.000000000 +0100
+++ kext_tools-117/kext_tools.xcodeproj/project.pbxproj 2008-10-30 13:35:51.000000000 +0100
@@ -102,7 +102,7 @@
0CFB02460AB0FBAD003AC039 /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C31717C0AB0EDD800B8CA9A /* DiskArbitration.framework */; };
0CFB02590AB0FC3B003AC039 /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 1492D1A801E53D0502CA2A87 /* logging.c */; };
0CFB025A0AB0FC41003AC039 /* logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1492D1A901E53D0502CA2A87 /* logging.h */; };
- 0CFB025C0AB0FC75003AC039 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */; };
+// 0CFB025C0AB0FC75003AC039 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */; };
2459EC4309EB7B7E002EE862 /* kextfind_report.c in Sources */ = {isa = PBXBuildFile; fileRef = 2459EC4109EB7B7E002EE862 /* kextfind_report.c */; };
24B704C209E0C17B0091113C /* kextfind_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 24B704C009E0C17B0091113C /* kextfind_tables.c */; };
24B7FFCC09DF3F1E0091113C /* kextfind_commands.c in Sources */ = {isa = PBXBuildFile; fileRef = 24B7FFCA09DF3F1E0091113C /* kextfind_commands.c */; };
@@ -316,7 +316,7 @@
0C3171920AB0EE0800B8CA9A /* libAppleRAID.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libAppleRAID.a; path = /usr/local/lib/libAppleRAID.a; sourceTree = "<absolute>"; };
0C31719F0AB0F80F00B8CA9A /* bootcaches.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = bootcaches.plist; sourceTree = "<group>"; };
0CF69C530C8CC127007E76E8 /* kextmanager_async.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = kextmanager_async.defs; sourceTree = "<group>"; };
- 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
+// 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
1452E76F01F9032A02CA28EB /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.1.1.3.dylib; sourceTree = "<absolute>"; };
1452E77001F9032A02CA28EB /* libkld.dylib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libkld.dylib; path = /usr/local/lib/libkld.dylib; sourceTree = "<absolute>"; };
14597B28022D521B02CA29F8 /* kextmanager.defs */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.mig; path = kextmanager.defs; sourceTree = "<group>"; };
@@ -367,7 +367,7 @@
05097276094910D30034B52C /* CoreFoundation.framework in Frameworks */,
0C31717B0AB0EDBA00B8CA9A /* libbless.a in Frameworks */,
0CFB02460AB0FBAD003AC039 /* DiskArbitration.framework in Frameworks */,
- 0CFB025C0AB0FC75003AC039 /* ApplicationServices.framework in Frameworks */,
+// 0CFB025C0AB0FC75003AC039 /* ApplicationServices.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -447,8 +447,8 @@
0515F62C0AC1D3B800B291F3 /* Boot≠Root Support */ = {
isa = PBXGroup;
children = (
- 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */,
- 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */,
+// 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */,
+// 0CFB025B0AB0FC75003AC039 /* ApplicationServices.framework */,
0C31717C0AB0EDD800B8CA9A /* DiskArbitration.framework */,
0C31717C0AB0EDD800B8CA9A /* DiskArbitration.framework */,
0C3171920AB0EE0800B8CA9A /* libAppleRAID.a */,

11
patches/kext_tools-117.update_boot.c.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- kext_tools-117/update_boot.c.origin 2008-10-30 13:30:13.000000000 +0100
+++ kext_tools-117/update_boot.c 2008-10-30 13:30:36.000000000 +0100
@@ -49,6 +49,8 @@
#include "update_boot.h"
#include "utility.h" // g_verbose_level
+#include <objc/objc.h>
+
enum bootReversions {
nothingSerious = 0,
noLabels, // 1

11
patches/kext_tools-117.watchvol.h.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- kext_tools-117/watchvol.h.origin 2008-10-30 13:45:19.000000000 +0100
+++ kext_tools-117/watchvol.h 2008-10-30 13:46:47.000000000 +0100
@@ -30,6 +30,8 @@
* $NoLog$
*/
+#include <CoreFoundation/CFNotificationCenter.h>
+#include <objc/objc.h>
// for kextd_main
int kextd_watch_volumes(int sourcePriority/*, CFRunLoopRef runloop*/);
int kextd_giveup_volwatch();

100
patches/launchd-258.1.p1.patch Normal file
View File

@@ -0,0 +1,100 @@
diff -ru launchd-258.1/launchd/src/launchd_core_logic.c launchd-258.1.pd1/launchd/src/launchd_core_logic.c
--- launchd-258.1/launchd/src/launchd_core_logic.c 2007-12-07 22:15:23.000000000 +0100
+++ launchd-258.1.pd1/launchd/src/launchd_core_logic.c 2008-08-27 19:47:55.000000000 +0200
@@ -338,8 +338,6 @@
unsigned int lastlookup_gennum;
char *seatbelt_profile;
uint64_t seatbelt_flags;
- void *quarantine_data;
- size_t quarantine_data_sz;
pid_t p;
int argc;
int last_exit_status;
@@ -868,9 +866,6 @@
if (j->seatbelt_profile) {
free(j->seatbelt_profile);
}
- if (j->quarantine_data) {
- free(j->quarantine_data);
- }
if (j->j_binpref) {
free(j->j_binpref);
}
@@ -1554,14 +1549,6 @@
switch (key[0]) {
case 'q':
case 'Q':
- if (strcasecmp(key, LAUNCH_JOBKEY_QUARANTINEDATA) == 0) {
- size_t tmpsz = launch_data_get_opaque_size(value);
-
- if (job_assumes(j, j->quarantine_data = malloc(tmpsz))) {
- memcpy(j->quarantine_data, launch_data_get_opaque(value), tmpsz);
- j->quarantine_data_sz = tmpsz;
- }
- }
break;
default:
break;
@@ -2680,16 +2667,6 @@
job_assumes(j, binpref_out_cnt == j->j_binpref_cnt);
}
- if (j->quarantine_data) {
- qtn_proc_t qp;
-
- if (job_assumes(j, qp = qtn_proc_alloc())) {
- if (job_assumes(j, qtn_proc_init_with_data(qp, j->quarantine_data, j->quarantine_data_sz) == 0)) {
- job_assumes(j, qtn_proc_apply_to_self(qp) == 0);
- }
- }
- }
-
if (j->seatbelt_profile) {
char *seatbelt_err_buf = NULL;
diff -ru launchd-258.1/launchd/src/liblaunch_private.h launchd-258.1.pd1/launchd/src/liblaunch_private.h
--- launchd-258.1/launchd/src/liblaunch_private.h 2007-12-07 22:15:23.000000000 +0100
+++ launchd-258.1.pd1/launchd/src/liblaunch_private.h 2008-08-27 19:48:31.000000000 +0200
@@ -24,7 +24,6 @@
#include <sys/types.h>
#include <launch.h>
#include <unistd.h>
-#include <quarantine.h>
#pragma GCC visibility push(default)
@@ -46,7 +45,6 @@
#define LAUNCH_KEY_BATCHCONTROL "BatchControl"
#define LAUNCH_KEY_BATCHQUERY "BatchQuery"
-#define LAUNCH_JOBKEY_QUARANTINEDATA "QuarantineData"
#define LAUNCH_JOBKEY_SANDBOXPROFILE "SandboxProfile"
#define LAUNCH_JOBKEY_SANDBOXFLAGS "SandboxFlags"
#define LAUNCH_JOBKEY_SANDBOX_NAMED "Named"
@@ -114,7 +112,6 @@
mach_port_t * spawn_observer_port;
const cpu_type_t * spawn_binpref;
size_t spawn_binpref_cnt;
- qtn_proc_t spawn_quarantine;
const char * spawn_seatbelt_profile;
const uint64_t * spawn_seatbelt_flags;
};
diff -ru launchd-258.1/launchd/src/libvproc.c launchd-258.1.pd1/launchd/src/libvproc.c
--- launchd-258.1/launchd/src/libvproc.c 2007-09-14 02:33:43.000000000 +0200
+++ launchd-258.1.pd1/launchd/src/libvproc.c 2008-08-27 19:49:17.000000000 +0200
@@ -201,15 +201,6 @@
if (spawn_attrs) switch (struct_version) {
case 2:
- if (spawn_attrs->spawn_quarantine) {
- char qbuf[QTN_SERIALIZED_DATA_MAX];
- size_t qbuf_sz = QTN_SERIALIZED_DATA_MAX;
-
- if (qtn_proc_to_data(spawn_attrs->spawn_quarantine, qbuf, &qbuf_sz) == 0) {
- tmp = launch_data_new_opaque(qbuf, qbuf_sz);
- launch_data_dict_insert(in_obj, tmp, LAUNCH_JOBKEY_QUARANTINEDATA);
- }
- }
if (spawn_attrs->spawn_seatbelt_profile) {
tmp = launch_data_new_string(spawn_attrs->spawn_seatbelt_profile);

11
patches/launchd-258.18.launchd.p1.patch Normal file
View File

@@ -0,0 +1,11 @@
--- launchd-258.18/launchd/src/launchd.c.origin 2008-10-26 20:16:15.000000000 +0100
+++ launchd-258.18/launchd/src/launchd.c 2008-10-26 20:16:47.000000000 +0100
@@ -288,7 +288,7 @@
#if HAVE_SECURITY
OSStatus (*sescr)(SessionCreationFlags flags, SessionAttributeBits attributes);
void *seclib;
-
+ OSStatus noErr=0;
if (launchd_assumes((seclib = dlopen(SECURITY_LIB, RTLD_LAZY)) != NULL)) {
if (launchd_assumes((sescr = dlsym(seclib, "SessionCreate")) != NULL)) {
launchd_assumes(sescr(0, 0) == noErr);

10
patches/launchd-258.18.launchproxy.p1.patch Normal file
View File

@@ -0,0 +1,10 @@
--- launchd-258.18/launchd/src/launchproxy.c.origin 2008-10-26 20:20:18.000000000 +0100
+++ launchd-258.18/launchd/src/launchproxy.c 2008-10-26 20:20:47.000000000 +0100
@@ -87,6 +87,7 @@
launch_data_t tmp, resp, msg = launch_data_alloc(LAUNCH_DATA_STRING);
const char *prog = argv[1];
bool w = false, dupstdout = true, dupstderr = true;
+ OSStatus noErr = SessionCreate(0, 0);
launch_data_set_string(msg, LAUNCH_KEY_CHECKIN);

31
patches/launchd-258.18.p1.patch Normal file
View File

@@ -0,0 +1,31 @@
diff -ru launchd-258.18.origin/launchd/src/SystemStarter.c launchd-258.18/launchd/src/SystemStarter.c
--- launchd-258.18.origin/launchd/src/SystemStarter.c 2008-10-24 02:49:29.000000000 +0200
+++ launchd-258.18/launchd/src/SystemStarter.c 2008-10-24 03:17:03.000000000 +0200
@@ -151,13 +151,13 @@
if (stat("/etc/rc.local", &sb) != -1) {
fwexec(_PATH_BSHELL, "/etc/rc.local", NULL);
}
-
+/*
CFNotificationCenterPostNotificationWithOptions(
CFNotificationCenterGetDistributedCenter(),
CFSTR("com.apple.startupitems.completed"),
NULL, NULL,
kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions);
-
+*/
r = kevent(kq, NULL, 0, &kev, 1, NULL);
assert(r != -1);
assert(kev.filter == EVFILT_SIGNAL && kev.ident == SIGTERM);
diff -ru launchd-258.18.origin/launchd/src/config.h.in launchd-258.18/launchd/src/config.h.in
--- launchd-258.18.origin/launchd/src/config.h.in 2008-10-24 02:49:29.000000000 +0200
+++ launchd-258.18/launchd/src/config.h.in 2008-10-24 03:17:02.000000000 +0200
@@ -90,7 +90,7 @@
#undef HAVE_PATHS_H
/* Define to 1 if you have the quarantine library */
-#undef HAVE_QUARANTINE
+//#undef HAVE_QUARANTINE
/* Define to 1 if you have the `realloc' function. */
#undef HAVE_REALLOC

14
patches/launchd-258.25.config.h-custom.p1.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -ru launchd-258.25.pd1/launchd/src/config.h launchd-258.25.pd2/launchd/src/config.h
--- launchd-258.25.pd1/launchd/src/config.h 2008-10-30 02:27:11.000000000 +0100
+++ launchd-258.25.pd2/launchd/src/config.h 2012-09-10 04:28:01.765563608 +0200
@@ -1,7 +1,7 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
#include <TargetConfig.h>
-#define HAVE_QUARANTINE TARGET_HAVE_QUARANTINE
-#define HAVE_SANDBOX TARGET_HAVE_SANDBOX
-#define HAVE_SECURITY !TARGET_HAVE_EMBEDDED_SECURITY
+#define HAVE_QUARANTINE 0
+#define HAVE_SANDBOX 0
+#define HAVE_SECURITY 0
#endif /* __CONFIG_H__ */

Some files were not shown because too many files have changed in this diff Show More