/pidgin/main: 7db4c37e259c: Update Cyrus SASL to 2.1.26 for the ...

[Daniel Atallah]

Changeset: 7db4c37e259ccf055334cf6a0aafedaae5e45998
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2015-01-01 15:00 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/7db4c37e259c

Description:

Update Cyrus SASL to 2.1.26 for the windows build

diffstat:

 ChangeLog                                 |   1 +
 Makefile.mingw                            |  20 +++++++-------------
 libpurple/Makefile.mingw                  |  12 +++++-------
 libpurple/protocols/irc/Makefile.mingw    |   4 ++--
 libpurple/protocols/jabber/Makefile.mingw |   4 ++--
 libpurple/win32/global.mak                |   2 +-
 pidgin/win32/nsis/pidgin-installer.nsi    |   8 ++++++--
 7 files changed, 24 insertions(+), 27 deletions(-)

diffs (143 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Pidgin and Finch: The Pimpin' Penguin IM
 version 2.10.12 (MM/DD/YY):
 	Windows-Specific Changes:
 	* Updates to dependencies:
+	        * Cyrus SASL 2.1.26
 		* NSS 3.17.3 and NSPR 4.10.7
 		* SILC 1.1.12
 
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -59,12 +59,8 @@ PIDGIN_INST_DEP_DIR="$(WIN32_DEV_TOP)/pi
 # Any *.dll or *.exe files included in win32-install-dir that we don't compile
 # should be included in this list so they don't get stripped
 EXTERNAL_DLLS = \
-	comerr32.dll \
 	exchndl.dll \
 	freebl3.dll \
-	gssapi32.dll \
-	k5sprt32.dll \
-	krb5_32.dll \
 	libenchant.dll \
 	libenchant_ispell.dll \
 	libenchant_myspell.dll \
@@ -73,19 +69,17 @@ EXTERNAL_DLLS = \
 	libnspr4.dll \
 	libplc4.dll \
 	libplds4.dll \
-	libsasl.dll \
+	libsasl2-3.dll \
 	libssp-0.dll \
 	libxml2-2.dll \
 	nss3.dll \
 	nssutil3.dll \
-	saslANONYMOUS.dll \
-	saslCRAMMD5.dll \
-	saslDIGESTMD5.dll \
-	saslGSSAPI.dll \
-	saslLOGIN.dll \
-	saslPLAIN.dll \
-	libsilc-1-1-2.dll \
-	libsilcclient-1-1-3.dll \
+	libanonymous-3.dll \
+	libcrammd5-3.dll \
+	libdigestmd5-3.dll \
+	libplain-3.dll \
+	libsilc-1-1-4.dll \
+	libsilcclient-1-1-4.dll \
 	smime3.dll \
 	softokn3.dll \
 	sqlite3.dll \
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -11,15 +11,13 @@ TARGET = libpurple
 NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2-2.dll
 
 ifeq ($(CYRUS_SASL), 1)
-NEEDED_DLLS += $(CYRUS_SASL_TOP)/bin/libsasl.dll
+NEEDED_DLLS += $(CYRUS_SASL_TOP)/bin/libsasl2-3.dll
 
 CYRUS_SASL_PLUGINS = \
-                        $(CYRUS_SASL_TOP)/bin/sasl2/saslANONYMOUS.dll \
-                        $(CYRUS_SASL_TOP)/bin/sasl2/saslCRAMMD5.dll \
-                        $(CYRUS_SASL_TOP)/bin/sasl2/saslDIGESTMD5.dll \
-                        $(CYRUS_SASL_TOP)/bin/sasl2/saslGSSAPI.dll \
-                        $(CYRUS_SASL_TOP)/bin/sasl2/saslLOGIN.dll \
-                        $(CYRUS_SASL_TOP)/bin/sasl2/saslPLAIN.dll
+                        $(CYRUS_SASL_TOP)/lib/sasl2/libanonymous-3.dll \
+                        $(CYRUS_SASL_TOP)/lib/sasl2/libcrammd5-3.dll \
+                        $(CYRUS_SASL_TOP)/lib/sasl2/libdigestmd5-3.dll \
+                        $(CYRUS_SASL_TOP)/lib/sasl2/libplain-3.dll
 
 endif
 
diff --git a/libpurple/protocols/irc/Makefile.mingw b/libpurple/protocols/irc/Makefile.mingw
--- a/libpurple/protocols/irc/Makefile.mingw
+++ b/libpurple/protocols/irc/Makefile.mingw
@@ -57,8 +57,8 @@ LIBS =	\
 
 ifeq ($(CYRUS_SASL), 1)
 INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
-LIB_PATHS += -L$(CYRUS_SASL_TOP)/bin
-LIBS += -llibsasl
+LIB_PATHS += -L$(CYRUS_SASL_TOP)/lib
+LIBS += -llibsasl2
 endif
 
 include $(PIDGIN_COMMON_RULES)
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -107,8 +107,8 @@ LIBS = \
 
 ifeq ($(CYRUS_SASL), 1)
 INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
-LIB_PATHS += -L$(CYRUS_SASL_TOP)/bin
-LIBS += -llibsasl
+LIB_PATHS += -L$(CYRUS_SASL_TOP)/lib
+LIBS += -llibsasl2
 endif
 
 include $(PIDGIN_COMMON_RULES)
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -22,7 +22,7 @@ SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-to
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
 GCC_SSP_TOP ?= $(shell dirname $(shell which $(CC)))
-CYRUS_SASL_TOP ?= $(WIN32_DEV_TOP)/cyrus-sasl-2.1.25
+CYRUS_SASL_TOP ?= $(WIN32_DEV_TOP)/cyrus-sasl-2.1.26_daa1
 
 # Where we installing this stuff to?
 PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
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
@@ -616,7 +616,11 @@ Section Uninstall
     Delete "$INSTDIR\plugins\xmppdisco.dll"
     RMDir /r "$INSTDIR\plugins\perl"
     RMDir "$INSTDIR\plugins"
-    RMDir /r "$INSTDIR\sasl2"
+    Delete "$INSTDIR\sasl2\libanonymous-3.dll"
+    Delete "$INSTDIR\sasl2\libcrammd5-3.dll"
+    Delete "$INSTDIR\sasl2\libdigestmd5-3.dll"
+    Delete "$INSTDIR\sasl2\libplain-3.dll"
+    RMDir "$INSTDIR\sasl2"
     Delete "$INSTDIR\sounds\purple\alert.wav"
     Delete "$INSTDIR\sounds\purple\login.wav"
     Delete "$INSTDIR\sounds\purple\logout.wav"
@@ -640,7 +644,7 @@ Section Uninstall
     Delete "$INSTDIR\libplc4.dll"
     Delete "$INSTDIR\libplds4.dll"
     Delete "$INSTDIR\libpurple.dll"
-    Delete "$INSTDIR\libsasl.dll"
+    Delete "$INSTDIR\libsasl2-3.dll"
     Delete "$INSTDIR\libsilc-1-1-4.dll"
     Delete "$INSTDIR\libsilcclient-1-1-4.dll"
     Delete "$INSTDIR\libssp-0.dll"