Skip to content

Commit a5b6df9

Browse files
authored
Merge pull request #7423 from nextcloud/bugfix/escaped-infoplist-xml-appvendor
Fix code-signing issues for vendors with special chars
2 parents 569a694 + a57eb77 commit a5b6df9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ string(REPLACE "&" "&" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME}")
6060
string(REPLACE "<" "&lt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
6161
string(REPLACE ">" "&gt;" APPLICATION_NAME_XML_ESCAPED "${APPLICATION_NAME_XML_ESCAPED}")
6262

63+
string(REPLACE "&" "&amp;" APPLICATION_VENDOR_XML_ESCAPED "${APPLICATION_VENDOR}")
64+
string(REPLACE "<" "&lt;" APPLICATION_VENDOR_XML_ESCAPED "${APPLICATION_VENDOR_XML_ESCAPED}")
65+
string(REPLACE ">" "&gt;" APPLICATION_VENDOR_XML_ESCAPED "${APPLICATION_VENDOR_XML_ESCAPED}")
66+
6367
if (NOT DEFINED LINUX_PACKAGE_SHORTNAME)
6468
set(LINUX_PACKAGE_SHORTNAME "${APPLICATION_SHORTNAME}")
6569
endif()

cmake/modules/MacOSXBundleInfo.plist.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<key>CFBundleShortVersionString</key>
3030
<string>@MIRALL_VERSION_STRING@</string>
3131
<key>NSHumanReadableCopyright</key>
32-
<string>(C) 2014-2022 @APPLICATION_VENDOR@</string>
32+
<string>(C) 2014-2022 @APPLICATION_VENDOR_XML_ESCAPED@</string>
3333
<key>NSSupportsAutomaticGraphicsSwitching</key>
3434
<true/>
3535
<key>NSRequiresAquaSystemAppearance</key>

0 commit comments

Comments
 (0)