From: Martin Willi <martin@revosec.ch>
Date: Fri, 3 May 2013 14:51:29 +0000 (+0200)
Subject: xpc: build with support for the keychain plugin
X-Git-Tag: 5.1.0rc1~25^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=501637039088ccc005153b3074b42b98461573bd;p=thirdparty%2Fstrongswan.git

xpc: build with support for the keychain plugin
---

diff --git a/src/frontends/osx/README.md b/src/frontends/osx/README.md
index 69ee460a15..62a0b2e0d6 100644
--- a/src/frontends/osx/README.md
+++ b/src/frontends/osx/README.md
@@ -28,7 +28,8 @@ CFLAGS="-I/usr/include -DOPENSSL_NO_CMS -O2 -Wall -Wno-format -Wno-pointer-sign"
   --enable-kernel-pfkey --enable-kernel-pfroute --enable-eap-mschapv2 \
   --enable-eap-identity --enable-monolithic --enable-nonce --enable-random \
   --enable-pkcs1 --enable-pem --enable-socket-default --enable-xauth-generic \
-  --enable-ikev1 --enable-ikev2 --enable-charon --disable-shared --enable-static
+  --enable-keychain --enable-ikev1 --enable-ikev2 --enable-charon \
+  --disable-shared --enable-static
 
 followed by calling make (no need to make install).
 
diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c
index 477e1e0c46..b4a3d58e1e 100644
--- a/src/frontends/osx/charon-xpc/charon-xpc.c
+++ b/src/frontends/osx/charon-xpc/charon-xpc.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
 	if (!charon->initialize(charon,
 			lib->settings->get_str(lib->settings, "charon-xpc.load",
 				"random nonce pem pkcs1 openssl kernel-pfkey kernel-pfroute "
-				"socket-default eap-identity eap-mschapv2")))
+				"keychain socket-default eap-identity eap-mschapv2")))
 	{
 		exit(SS_RC_INITIALIZATION_FAILED);
 	}
diff --git a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
index 8cf467a1e1..05e38d3623 100644
--- a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
+++ b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5B74984D172AA3550041971E /* xpc_dispatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 5B74984C172AA3550041971E /* xpc_dispatch.c */; };
 		5BD1CCD71726DB4000587077 /* charon-xpc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5BD1CCD61726DB4000587077 /* charon-xpc.c */; };
 		5BF60F31173405A000E5D608 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BD1CCD31726DB4000587077 /* CoreFoundation.framework */; };
 		5BF60F33173405AC00E5D608 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BD1CCF21727DE3E00587077 /* Security.framework */; };