[tor-commits] [tor-messenger-build/master] Add support for copying cert_override.txt to new profiles

[sukhbir at torproject.org]

commit a7841ba7454b0899cae7059f6695e5073381ff0f
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Dec 17 22:00:40 2014 +0530

    Add support for copying cert_override.txt to new profiles
---
 projects/instantbird/build             |    1 +
 projects/instantbird/cert_override.txt |    3 +++
 projects/instantbird/config            |    2 ++
 projects/instantbird/installer.patch   |   41 ++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index 0a6dbe3..c1e3147 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -38,6 +38,7 @@ do
   patch -p1 < $patch
 done
 cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+cp ../cert_override.txt im/app/profile
 cd mozilla
 if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1
 then
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 2a479cb..f592e96 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -68,6 +68,8 @@ input_files:
   - filename: links.patch
   - filename: picture.patch
   - filename: trafficinfo.patch
+  - filename: installer.patch
+  - filename: cert_override.txt
   - filename: fix-mingw-build.nsprpatch
     enable: '[% c("var/windows") %]'
   - filename: fix-mingw-build.patch
diff --git a/projects/instantbird/installer.patch b/projects/instantbird/installer.patch
new file mode 100644
index 0000000..8fca9bd
--- /dev/null
+++ b/projects/instantbird/installer.patch
@@ -0,0 +1,41 @@
+diff --git a/im/app/profile/Makefile.in b/im/app/profile/Makefile.in
+index 6de1a3d..ee71ede 100644
+--- a/im/app/profile/Makefile.in
++++ b/im/app/profile/Makefile.in
+@@ -14,7 +14,8 @@ include $(topsrcdir)/config/rules.mk
+ 
+ FILES := \
+ 	mimeTypes.rdf \
+-    localstore.rdf \
++	localstore.rdf \
++	cert_override.txt \
+ 	$(NULL)
+ 
+ libs:: $(FILES)
+diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in
+index 396d5f8..deca57e 100644
+--- a/im/installer/Makefile.in
++++ b/im/installer/Makefile.in
+@@ -109,7 +109,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 bda87fa..dfdd2d1 100644
+--- a/im/installer/package-manifest.in
++++ b/im/installer/package-manifest.in
+@@ -156,6 +156,7 @@
+ @RESPATH@/defaults/profile/localstore.rdf
+ @RESPATH@/defaults/profile/prefs.js
+ @RESPATH@/defaults/profile/mimeTypes.rdf
++ at RESPATH@/defaults/profile/cert_override.txt
+ 
+ #ifdef XP_MACOSX
+ @RESPATH@/components/ibDockBadge.js