commit 90ff8bcebb83b1ba7522a2f47010f3ca7554d2a2 Author: Sukhbir Singh sukhbir@torproject.org Date: Tue Jul 14 14:48:36 2015 -0400

Add cert_override hack for OS X --- projects/instantbird/build | 4 +++ projects/instantbird/cert-installer.patch | 39 +++++++++++++++++++++++++++++ projects/instantbird/cert_override.txt | 3 +++ projects/instantbird/config | 4 +++ 4 files changed, 50 insertions(+)

diff --git a/projects/instantbird/build b/projects/instantbird/build index cb3a5b5..a422cce 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -50,6 +50,10 @@ do done cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt

+[% IF c("var/osx") -%] +cp ../cert_override.txt im/app/profile +[% END -%] + cp ../xmppRegister* im/content/

cp ../branding/default*.png im/branding/messenger/gtk/ diff --git a/projects/instantbird/cert-installer.patch b/projects/instantbird/cert-installer.patch new file mode 100644 index 0000000..3ba7e32 --- /dev/null +++ b/projects/instantbird/cert-installer.patch @@ -0,0 +1,39 @@ +diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in +index 4f48e97..4e02fdf 100644 +--- a/im/app/profile/Makefile.in ++++ b/im/app/profile/Makefile.in +@@ -15,6 +15,7 @@ include $(topsrcdir)/config/rules.mk + FILES := \ + mimeTypes.rdf \ + localstore.rdf \ ++ cert_override.txt \ + $(NULL) + + libs:: $(FILES) +diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in +index 0234b21..5d20e62 100644 +--- a/im/installer/Makefile.in ++++ b/im/installer/Makefile.in +@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns + MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " + endif + +-NON_OMNIJAR_FILES = ++NON_OMNIJAR_FILES = \ ++ defaults/profile/cert_override.txt \ ++ $(NULL) + + ifndef LIBXUL_SDK + INSTALL_SDK = 1 +diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in +index edf01b1..78db5e4 100644 +--- a/im/installer/package-manifest.in ++++ b/im/installer/package-manifest.in +@@ -155,6 +155,7 @@ + @RESPATH@/defaults/profile/localstore.rdf + @RESPATH@/defaults/profile/prefs.js + @RESPATH@/defaults/profile/mimeTypes.rdf ++@RESPATH@/defaults/profile/cert_override.txt + + #ifdef XP_MACOSX + @RESPATH@/components/ibDockBadge.js diff --git a/projects/instantbird/cert_override.txt b/projects/instantbird/cert_override.txt new file mode 100644 index 0000000..fbe9a6f --- /dev/null +++ b/projects/instantbird/cert_override.txt @@ -0,0 +1,3 @@ +# PSM Certificate Override Settings file +# This is a generated file! Do not edit. +jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 U AAAAAAAAAAAAAAADAAAAew308jB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw== diff --git a/projects/instantbird/config b/projects/instantbird/config index 8b80890..c17676a 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -108,6 +108,10 @@ input_files: enable: '[% c("var/osx") %]' - filename: osx-saved-application-state.patch enable: '[% c("var/osx") %]' + - filename: cert-installer.patch + enable: '[% c("var/osx") %]' + - filename: cert_override.txt + enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: f2e7cea9bc6a-bug-1150967.patch