[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:24:16 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fe2ced4c0d05a6262ac1b9b4446d4c01e26fe301
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 27 23:38:03 2004 +0000
Fixed: <rdar://problem/3536624>: Webkit 1.2 links against SecurityNssAsn1.framework
Reviewed by Darin.
* WebCoreSupport.subproj/WebKeyGeneration.h: Set DISABLE_WEB_KEY_GENERATION on Merlot for now.
Then don't include anything if that's set.
* WebCoreSupport.subproj/WebKeyGeneration.cpp: Don't compile anything if DISABLE_WEB_KEY_GENERATION
is set.
* WebCoreSupport.subproj/WebKeyGenerator.m:
(-[WebKeyGenerator signedPublicKeyAndChallengeStringWithStrengthIndex:challenge:pageURL:]):
Always return nil if DISABLE_WEB_KEY_GENERATION is set.
(-[WebKeyGenerator addCertificatesToKeychainFromData:]): Always return failure if
DISABLE_WEB_KEY_GENERATION is set.
* WebKit.pbproj/project.pbxproj: Added shell build step to make library with security
libraries in it. On Merlot, makes empty library. Also added library to link options.
* WebKitSecurityDummy.c: Added. Used to make empty version of library for build on Merlot.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5992 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 83e6933..09e878c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2004-01-27 Chris Blumenberg <cblu at apple.com>
+
+ Fixed: <rdar://problem/3536624>: Webkit 1.2 links against SecurityNssAsn1.framework
+
+ Reviewed by Darin.
+
+ * WebCoreSupport.subproj/WebKeyGeneration.h: Set DISABLE_WEB_KEY_GENERATION on Merlot for now.
+ Then don't include anything if that's set.
+ * WebCoreSupport.subproj/WebKeyGeneration.cpp: Don't compile anything if DISABLE_WEB_KEY_GENERATION
+ is set.
+ * WebCoreSupport.subproj/WebKeyGenerator.m:
+ (-[WebKeyGenerator signedPublicKeyAndChallengeStringWithStrengthIndex:challenge:pageURL:]):
+ Always return nil if DISABLE_WEB_KEY_GENERATION is set.
+ (-[WebKeyGenerator addCertificatesToKeychainFromData:]): Always return failure if
+ DISABLE_WEB_KEY_GENERATION is set.
+
+ * WebKit.pbproj/project.pbxproj: Added shell build step to make library with security
+ libraries in it. On Merlot, makes empty library. Also added library to link options.
+ * WebKitSecurityDummy.c: Added. Used to make empty version of library for build on Merlot.
+
2004-01-26 Darin Adler <darin at apple.com>
* Makefile.am: Switch from pbxbuild to xcodebuild.
diff --git a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
index 2f46c1a..6bf0630 100644
--- a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
+++ b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.cpp
@@ -9,6 +9,8 @@
#import <WebKit/WebKeyGeneration.h>
+#ifndef DISABLE_WEB_KEY_GENERATION
+
#import <WebKit/WebAssertions.h>
#include <Security/cuCdsaUtils.h> /* private libCdsaUtils.a */
@@ -680,3 +682,5 @@ WebCertificateParseResult addCertificatesToKeychainFromData(const void *bytes, u
return result;
}
+
+#endif /* DISABLE_WEB_KEY_GENERATION */
diff --git a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.h b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.h
index 94d4b77..7ae8405 100644
--- a/WebKit/WebCoreSupport.subproj/WebKeyGeneration.h
+++ b/WebKit/WebCoreSupport.subproj/WebKeyGeneration.h
@@ -7,8 +7,14 @@
*
*/
-#ifndef _WEB_KEY_GENERATION_
-#define _WEB_KEY_GENERATION_
+#ifndef WEB_KEY_GENERATION_H
+#define WEB_KEY_GENERATION_H
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+#define DISABLE_WEB_KEY_GENERATION
+#endif
+
+#ifndef DISABLE_WEB_KEY_GENERATION
#import <WebKit/WebKeyGenerator.h>
@@ -78,4 +84,6 @@ extern "C" {
}
#endif
-#endif /* _WEB_KEY_GENERATION_ */
+#endif /* DISABLE_WEB_KEY_GENERATION */
+
+#endif /* WEB_KEY_GENERATION_H */
diff --git a/WebKit/WebCoreSupport.subproj/WebKeyGenerator.m b/WebKit/WebCoreSupport.subproj/WebKeyGenerator.m
index beeae19..41523cc 100644
--- a/WebKit/WebCoreSupport.subproj/WebKeyGenerator.m
+++ b/WebKit/WebCoreSupport.subproj/WebKeyGenerator.m
@@ -42,7 +42,7 @@
- (NSString *)signedPublicKeyAndChallengeStringWithStrengthIndex:(unsigned)index challenge:(NSString *)challenge pageURL:(NSURL *)pageURL
{
// This switch statement must always be synced with the UI strings returned by strengthMenuItemTitles.
- uint32 keySize;
+ UInt32 keySize;
switch (index) {
case 0:
keySize = 2048;
@@ -57,13 +57,21 @@
return nil;
}
- NSString *keyDescription = [NSString stringWithFormat:UI_STRING("Key from %@", "name of keychain key generated by the KEYGEN tag"), [pageURL host]];
+#ifdef DISABLE_WEB_KEY_GENERATION
+ return nil;
+#else
+ NSString *keyDescription = [NSString stringWithFormat:UI_STRING("Key from %@", "name of keychain key generated by the KEYGEN tag"), [pageURL host]];
return [(NSString *)signedPublicKeyAndChallengeString(keySize, (CFStringRef)challenge, (CFStringRef)keyDescription) autorelease];
+#endif
}
-- (WebCertificateParseResult)addCertificatesToKeychainFromData:(NSData *)data;
+- (WebCertificateParseResult)addCertificatesToKeychainFromData:(NSData *)data
{
+#ifdef DISABLE_WEB_KEY_GENERATION
+ return WebCertificateParseResultFailed;
+#else
return addCertificatesToKeychainFromData([data bytes], [data length]);
+#endif
}
@end
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 17a3f58..f1e516c 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -143,6 +143,7 @@
};
0867D69CFE84028FC02AAC07 = {
buildPhases = (
+ 84AF355005C724FA00C5ACD9,
0867D69DFE84028FC02AAC07,
0867D69EFE84028FC02AAC07,
0867D69FFE84028FC02AAC07,
@@ -152,7 +153,7 @@
6566F34204C12D14008B3232,
);
buildSettings = {
- COMMON_LDFLAGS = "-lnssasn1 -lCdsaUtils -no-c++filt";
+ COMMON_LDFLAGS = "-no-c++filt WebKitSecurity.a";
COPY_PHASE_STRIP = NO;
DEBUG_CFLAGS = "-DNDEBUG";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -162,7 +163,7 @@
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = /System/Library/Frameworks;
- LIBRARY_SEARCH_PATHS = "";
+ LIBRARY_SEARCH_PATHS = "\"$OBJECT_FILE_DIR\"";
LOCAL_SEG1_ADDR = 0x7000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
OPTIMIZATION_CFLAGS = "-Os";
@@ -2238,6 +2239,19 @@
refType = 4;
sourceTree = "<group>";
};
+ 84AF355005C724FA00C5ACD9 = {
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "if [ -f /usr/local/lib/libnssasn1.a ]\nthen if [ /usr/local/lib/libnssasn1.a -nt \"$OBJECT_FILE_DIR/WebKitSecurity.a\" -o /usr/local/lib/libCdsaUtils.a -nt \"$OBJECT_FILE_DIR/WebKitSecurity.a\" ]\n then mkdir -p \"$OBJECT_FILE_DIR\"\n libtool -static -o \"$OBJECT_FILE_DIR/WebKitSecurity.a\" /usr/local/lib/libnssasn1.a /usr/local/lib/libCdsaUtils.a\n\tfi\nelse if [ ! -f \"$OBJECT_FILE_DIR/WebKitSecurity.a\" ]\n then gcc -c \"$SRCROOT/WebKitSecurityDummy.c\" -o \"$TEMP_DIR/WebKitSecurityDummy.o\"\n mkdir -p \"$OBJECT_FILE_DIR\"\n libtool -static -o \"$OBJECT_FILE_DIR/WebKitSecurity.a\" \"$TEMP_DIR/WebKitSecurityDummy.o\"\n fi\nfi";
+ };
84CA5F7E042685E800CA2ACA = {
fileEncoding = 4;
isa = PBXFileReference;
diff --git a/WebKit/WebKitSecurityDummy.c b/WebKit/WebKitSecurityDummy.c
new file mode 100644
index 0000000..03b4830
--- /dev/null
+++ b/WebKit/WebKitSecurityDummy.c
@@ -0,0 +1 @@
+void bogusFunction() { }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list