Merge pull request #21843 from cfergeau/entitlements

Add missing vfkit entitlement
containers · Feb 27, 2024 · abd681a · abd681a
2 parents 19d3329 + 9f5c20f
commit abd681a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/contrib/pkginstaller/Makefile b/contrib/pkginstaller/Makefile
@@ -40,7 +40,7 @@ packagedir: podman_version package_root Distribution welcome.html
 	../../test/version/version > $(PACKAGE_DIR)/VERSION
 	echo -n $(ARCH) > $(PACKAGE_DIR)/ARCH
 	cp ../../LICENSE $(PACKAGE_DIR)/Resources/LICENSE.txt
-	cp hvf.entitlements $(PACKAGE_DIR)/
+	cp vfkit.entitlements $(PACKAGE_DIR)/
 
 package_root: clean-pkgroot $(TMP_DOWNLOAD)/gvproxy $(TMP_DOWNLOAD)/vfkit
 	mkdir -p $(PACKAGE_ROOT)/podman/bin

diff --git a/contrib/pkginstaller/package.sh b/contrib/pkginstaller/package.sh
@@ -4,7 +4,7 @@ set -euxo pipefail
 
 BASEDIR=$(dirname "$0")
 OUTPUT=$1
-CODESIGN_IDENTITY=${CODESIGN_IDENTITY:-mock}
+CODESIGN_IDENTITY=${CODESIGN_IDENTITY:--}
 PRODUCTSIGN_IDENTITY=${PRODUCTSIGN_IDENTITY:-mock}
 NO_CODESIGN=${NO_CODESIGN:-0}
 HELPER_BINARIES_DIR="/opt/podman/bin"
@@ -25,9 +25,6 @@ function build_podman() {
 }
 
 function sign() {
-  if [ "${NO_CODESIGN}" -eq "1" ]; then
-    return
-  fi
   local opts=""
   entitlements="${BASEDIR}/$(basename "$1").entitlements"
   if [ -f "${entitlements}" ]; then

diff --git a/contrib/pkginstaller/hvf.entitlements → contrib/pkginstaller/vfkit.entitlements b/contrib/pkginstaller/hvf.entitlements → contrib/pkginstaller/vfkit.entitlements
@@ -2,7 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.hypervisor</key>
-    <true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.virtualization</key>
+	<true/>
 </dict>
 </plist>