From 65ab25776b29db8df8fdca6630971023aaeafdb8 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Tue, 9 Apr 2013 17:57:38 +0000
Subject: [PATCH] ipsec-164.10.tar.gz

---
 ipsec-tools/racoon/isakmp_frag.h |  2 +-
 ipsec-tools/racoon/remoteconf.c  |  2 +-
 ipsec.xcodeproj/project.pbxproj  | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ipsec-tools/racoon/isakmp_frag.h b/ipsec-tools/racoon/isakmp_frag.h
index f6c920a..0ddab52 100644
--- a/ipsec-tools/racoon/isakmp_frag.h
+++ b/ipsec-tools/racoon/isakmp_frag.h
@@ -36,7 +36,7 @@
 
 /* These are the values from parsing "remote {}"
    block of the config file. */
-#define ISAKMP_FRAG_OFF		FLASE   /* = 0 */
+#define ISAKMP_FRAG_OFF		FALSE   /* = 0 */
 #define ISAKMP_FRAG_ON		TRUE    /* = 1 */
 #define ISAKMP_FRAG_FORCE	2
 
diff --git a/ipsec-tools/racoon/remoteconf.c b/ipsec-tools/racoon/remoteconf.c
index 0a0d277..7e97356 100644
--- a/ipsec-tools/racoon/remoteconf.c
+++ b/ipsec-tools/racoon/remoteconf.c
@@ -314,7 +314,7 @@ newrmconf()
 	new->idvl_p = genlist_init();
 	new->nonce_size = DEFAULT_NONCE_SIZE;
 	new->passive = FALSE;
-	new->ike_frag = ISAKMP_FRAG_FORCE;
+	new->ike_frag = ISAKMP_FRAG_ON;
 	new->esp_frag = IP_MAXPACKET;
 	new->ini_contact = TRUE;
 	new->mode_cfg = FALSE;
diff --git a/ipsec.xcodeproj/project.pbxproj b/ipsec.xcodeproj/project.pbxproj
index 9f7530d..3243a0c 100644
--- a/ipsec.xcodeproj/project.pbxproj
+++ b/ipsec.xcodeproj/project.pbxproj
@@ -2378,6 +2378,7 @@
 				ADDITIONAL_SDKS = "";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				OTHER_CFLAGS = "";
@@ -2400,6 +2401,7 @@
 				ADDITIONAL_SDKS = "";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				OTHER_CFLAGS = "";
@@ -2423,6 +2425,7 @@
 				ARCHS = "";
 				"ARCHS[arch=*]" = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				OTHER_CFLAGS = "";
@@ -2448,6 +2451,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
 				CODE_SIGN_IDENTITY = "-";
@@ -2511,6 +2515,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
 				CODE_SIGN_IDENTITY = "-";
@@ -2571,6 +2576,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/entitlements.plist";
 				CODE_SIGN_IDENTITY = "-";
@@ -2631,6 +2637,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2672,6 +2679,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2713,6 +2721,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G5;
@@ -2795,6 +2804,7 @@
 			buildSettings = {
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2838,6 +2848,7 @@
 			buildSettings = {
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2880,6 +2891,7 @@
 			buildSettings = {
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_MODEL_TUNING = G5;
@@ -2923,6 +2935,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
@@ -2964,6 +2977,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
@@ -3002,6 +3016,7 @@
 				ALTERNATE_OWNER = "$(inherited)";
 				ARCHS = (
 					armv7,
+					armv7s,
 				);
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
-- 
2.45.2