More graceful shutdown allowing openconnect to run vpnc

rrva · Feb 5, 2024 · bedf8e6 · bedf8e6
1 parent fa43bd0
commit bedf8e6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/OpenConnectUI2.xcodeproj/project.pbxproj b/OpenConnectUI2.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				CURRENT_PROJECT_VERSION = 782;
+				CURRENT_PROJECT_VERSION = 783;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 3563RJWBQP;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -402,7 +402,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				CREATE_INFOPLIST_SECTION_IN_BINARY = YES;
-				CURRENT_PROJECT_VERSION = 782;
+				CURRENT_PROJECT_VERSION = 783;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 3563RJWBQP;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -556,7 +556,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 782;
+				CURRENT_PROJECT_VERSION = 783;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 3563RJWBQP;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -590,7 +590,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 782;
+				CURRENT_PROJECT_VERSION = 783;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 3563RJWBQP;
 				ENABLE_HARDENED_RUNTIME = YES;

diff --git a/OpenConnectUI2/Info-Debug.plist b/OpenConnectUI2/Info-Debug.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>"1.782"</string>
+	<string>"1.783"</string>
 	<key>CFBundleVersion</key>
-	<string>782</string>
+	<string>783</string>
 	<key>LSUIElement</key>
 	<true/>
 	<key>SMPrivilegedExecutables</key>

diff --git a/OpenConnectUI2/Info.plist b/OpenConnectUI2/Info.plist
@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>"1.782"</string>
+	<string>"1.783"</string>
 	<key>CFBundleVersion</key>
-	<string>782</string>
+	<string>783</string>
 	<key>LSUIElement</key>
 	<true/>
 	<key>SMPrivilegedExecutables</key>

diff --git a/ToolX/Info-Debug.plist b/ToolX/Info-Debug.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleName</key>
 	<string>ToolX</string>
 	<key>CFBundleShortVersionString</key>
-	<string>"1.782"</string>
+	<string>"1.783"</string>
 	<key>CFBundleVersion</key>
-	<string>782</string>
+	<string>783</string>
 	<key>SMAuthorizedClients</key>
 	<array>
 		<string>identifier "se.rrva.OpenConnectUI2" and anchor apple generic and certificate leaf[subject.CN] = "Apple Development: Ragnar Rova (U34QC433V8)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>

diff --git a/ToolX/Info.plist b/ToolX/Info.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleName</key>
 	<string>ToolX</string>
 	<key>CFBundleShortVersionString</key>
-	<string>"1.782"</string>
+	<string>"1.783"</string>
 	<key>CFBundleVersion</key>
-	<string>782</string>
+	<string>783</string>
 	<key>SMAuthorizedClients</key>
 	<array>
 		<string>anchor apple generic and identifier "se.rrva.OpenConnectUI2" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "3563RJWBQP")</string>

diff --git a/ToolX/stopOpenConnect.swift b/ToolX/stopOpenConnect.swift
@@ -3,7 +3,7 @@ import Foundation
 func doStopOpenConnect(_ reply: (String) -> Void) {
   do {
     let pipe = Pipe()
-    let task = try safeShell("pkill openconnect", pipe: pipe)
+    let task = try safeShell("pkill -INT openconnect", pipe: pipe)
     pipe.fileHandleForReading.readabilityHandler = { pipe in
       if let line = String(data: pipe.availableData, encoding: String.Encoding.utf8) {
         NSLog(line)