Bug 1433517 - Prevent illegal characters in MOZ_MACBUNDLE_ID r=glandium
authorteor <teor2345@gmail.com>
Mon, 05 Feb 2018 10:31:00 +0200
changeset 402600 a7f88998e959dd94f9050371824b1e9a379cc705
parent 402599 bd385579481b516dbb640159e7499a6e36e41bfe
child 402601 66a85897ecb2d7b1a8b533a657b6767b117a262e
push id33393
push userrgurzau@mozilla.com
push dateTue, 06 Feb 2018 21:54:26 +0000
treeherdermozilla-central@0790ec12200d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1433517
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1433517 - Prevent illegal characters in MOZ_MACBUNDLE_ID r=glandium CFBundleIdentifiers can only contain [A-Za-z.-], and by convention the app component is lowercase and does not contain '.'. Make configure delete all characters other than [a-z-] when generating MOZ_MACBUNDLE_ID from MOZ_APP_DISPLAYNAME.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -4299,17 +4299,17 @@ else
   MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
 fi
 AC_SUBST(MOZ_MACBUNDLE_NAME)
 
 dnl Mac bundle identifier (based on MOZ_APP_DISPLAYNAME)
 # If the MOZ_MACBUNDLE_ID is defined in the configure.sh, use it
 # Otherwise, use MOZ_APP_DISPLAYNAME
 if test -z "$MOZ_MACBUNDLE_ID"; then
-   MOZ_MACBUNDLE_ID=`echo $MOZ_APP_DISPLAYNAME | tr 'A-Z' 'a-z' | tr -d '[[:blank:]]'`
+   MOZ_MACBUNDLE_ID=`echo $MOZ_APP_DISPLAYNAME | tr 'A-Z' 'a-z' | tr -dc 'a-z-'`
 fi
 MOZ_MACBUNDLE_ID=${MOZ_DISTRIBUTION_ID}.${MOZ_MACBUNDLE_ID}
 if test "$MOZ_DEBUG"; then
   MOZ_MACBUNDLE_ID=${MOZ_MACBUNDLE_ID}debug
 fi
 
 AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID)
 AC_SUBST(MOZ_MACBUNDLE_ID)