Merge pull request #7442 from nextcloud/backport/7423/stable-3.14

[stable-3.14] Fix code-signing issues for vendors with special chars
nextcloud · Nov 3, 2024 · 849969b · 849969b
2 parents ef70080 + 4d6f657
commit 849969b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,6 +60,10 @@ string(REPLACE "&" "&amp;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
 string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
 string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
 
+string(REPLACE "&" "&amp;" APPLICATION_VENDOR_XML_ESCAPED "${APPLICATION_VENDOR}")
+string(REPLACE "<" "&lt;" APPLICATION_VENDOR_XML_ESCAPED "${APPLICATION_VENDOR_XML_ESCAPED}")
+string(REPLACE ">" "&gt;" APPLICATION_VENDOR_XML_ESCAPED "${APPLICATION_VENDOR_XML_ESCAPED}")
+
 if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
     set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
 endif()

diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -29,7 +29,7 @@
         <key>CFBundleShortVersionString</key>
         <string>@MIRALL_VERSION_STRING@</string>
         <key>NSHumanReadableCopyright</key>
-        <string>(C) 2014-2022 @APPLICATION_VENDOR@</string>
+        <string>(C) 2014-2022 @APPLICATION_VENDOR_XML_ESCAPED@</string>
         <key>NSSupportsAutomaticGraphicsSwitching</key>
         <true/>
         <key>NSRequiresAquaSystemAppearance</key>