/pidgin/main: fb9baad00cbd: installer: remove Baltimore_CyberTru...

[Daniel Atallah]

Changeset: fb9baad00cbde0a519b6699c6e92493379b4ed64
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-02-13 22:44 -0500
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/fb9baad00cbd

Description:

installer: remove Baltimore_CyberTrust_Root.pem, ValiCert_Class_2_VA.pem when uninstalling

 * Also delete stray backup files created by mono signcode

diffstat:

 Makefile.mingw                         |  2 +-
 pidgin/win32/nsis/pidgin-installer.nsi |  3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (32 lines):

diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -38,7 +38,7 @@ authenticode_sign = $(MONO_SIGNCODE) \
 		    -a sha1 -$$ commercial \
 		    -n "$(2)" -i "https://pidgin.im" \
 		    -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
-		    $(1)
+		    $(1) && rm -f $(1).bak
 
 gpg_sign = $(GPG_SIGN) -ab $(1) && $(GPG_SIGN) --verify $(1).asc
 
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -532,6 +532,7 @@ Section Uninstall
     Delete "$INSTDIR\ca-certs\AddTrust_External_Root.pem"
     Delete "$INSTDIR\ca-certs\America_Online_Root_Certification_Authority_1.pem"
     Delete "$INSTDIR\ca-certs\AOL_Member_CA.pem"
+    Delete "$INSTDIR\ca-certs\Baltimore_CyberTrust_Root.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Class3.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Root.pem"
     Delete "$INSTDIR\ca-certs\Deutsche_Telekom_Root_CA_2.pem"
@@ -549,7 +550,7 @@ Section Uninstall
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
     Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem"
     Delete "$INSTDIR\ca-certs\Thawte_Primary_Root_CA.pem"
-    Delete "$INSTDIR\ca-certs\ValiCert_Class_2_VA.crt"
+    Delete "$INSTDIR\ca-certs\ValiCert_Class_2_VA.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem"