diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2010-03-01 03:36:48 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2010-03-01 03:36:48 +0000 |
| commit | 94d1ccdc8fbe0cb2c20dfc206e7f9eecaf8a7ab9 (patch) | |
| tree | 9e31f68c392e7143efa237848b789362f047880b | |
| parent | 2de703ada0edcb9e9745e38051093aa4b81ea5e9 (diff) | |
| download | pidgin-94d1ccdc8fbe0cb2c20dfc206e7f9eecaf8a7ab9.tar.gz | |
Update NSS/NSPR to 3.12.5/4.8.2 (self-built). Big thanks goes to Berke Viktor for doing this.
| -rw-r--r-- | ChangeLog.win32 | 1 | ||||
| -rw-r--r-- | Makefile.mingw | 8 | ||||
| -rw-r--r-- | libpurple/plugins/ssl/Makefile.mingw | 18 | ||||
| -rw-r--r-- | libpurple/win32/global.mak | 3 | ||||
| -rw-r--r-- | pidgin/win32/nsis/pidgin-installer.nsi | 8 |
5 files changed, 21 insertions, 17 deletions
diff --git a/ChangeLog.win32 b/ChangeLog.win32 index 3a0c406640..092aa40271 100644 --- a/ChangeLog.win32 +++ b/ChangeLog.win32 @@ -4,6 +4,7 @@ version 2.7.0 (??/??/????): * Win9x no longer supported. * Crash Report files (pidgin.RPT) are now generated in the ~/.purple directory instead of the installation directory. + * NSS SSL Library upgraded to 3.12.5 (thanks to Berke Viktor) version 2.6.6 (02/18/2010): * Installer translations for: Norwegian nynorsk diff --git a/Makefile.mingw b/Makefile.mingw index 20abdcea1b..84ddbc5dcd 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -50,13 +50,14 @@ EXTERNAL_DLLS = \ krb5_32.dll \ libgtkspell.dll \ libmeanwhile-1.dll \ + libnspr4.dll \ + libplc4.dll \ + libplds4.dll \ libsasl.dll \ libxml2.dll \ - nspr4.dll \ nss3.dll \ nssckbi.dll \ - plc4.dll \ - plds4.dll \ + nssutil3.dll \ saslANONYMOUS.dll \ saslCRAMMD5.dll \ saslDIGESTMD5.dll \ @@ -67,6 +68,7 @@ EXTERNAL_DLLS = \ libsilcclient-1-1-2.dll \ smime3.dll \ softokn3.dll \ + sqlite3.dll \ ssl3.dll #build an expression for `find` to use to ignore the above files diff --git a/libpurple/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw index 11948c2b17..e8a419a64d 100644 --- a/libpurple/plugins/ssl/Makefile.mingw +++ b/libpurple/plugins/ssl/Makefile.mingw @@ -15,14 +15,16 @@ TARGET_NSS = ssl-nss NEEDED_DLLS = \ $(NSS_TOP)/lib/freebl3.dll \ + $(NSS_TOP)/lib/libnspr4.dll \ + $(NSS_TOP)/lib/libplc4.dll \ + $(NSS_TOP)/lib/libplds4.dll \ $(NSS_TOP)/lib/nss3.dll \ $(NSS_TOP)/lib/nssckbi.dll \ - $(NSS_TOP)/lib/softokn3.dll \ + $(NSS_TOP)/lib/nssutil3.dll \ $(NSS_TOP)/lib/smime3.dll \ - $(NSS_TOP)/lib/ssl3.dll \ - $(NSPR_TOP)/lib/nspr4.dll \ - $(NSPR_TOP)/lib/plc4.dll \ - $(NSPR_TOP)/lib/plds4.dll + $(NSS_TOP)/lib/softokn3.dll \ + $(NSS_TOP)/lib/sqlite3.dll \ + $(NSS_TOP)/lib/ssl3.dll ## ## INCLUDE PATHS @@ -34,13 +36,11 @@ INCLUDE_PATHS += -I. \ -I$(PURPLE_TOP) \ -I$(PURPLE_TOP)/win32 \ -I$(PIDGIN_TREE_TOP) \ - -I$(NSS_TOP)/include \ - -I$(NSPR_TOP)/include + -I$(NSS_TOP)/include LIB_PATHS += -L$(GTK_TOP)/lib \ -L$(PURPLE_TOP) \ - -L$(NSS_TOP)/lib \ - -L$(NSPR_TOP)/lib + -L$(NSS_TOP)/lib ## ## SOURCES, OBJECTS diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak index b5e19369db..19f1081624 100644 --- a/libpurple/win32/global.mak +++ b/libpurple/win32/global.mak @@ -17,8 +17,7 @@ GTK_BIN ?= $(GTK_TOP)/bin BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.7.4 MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa2 -NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4 -NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4 +NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.12.5-nspr-4.8.2 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0 SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.8 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5 diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi index 262c0c2c37..65a9617b57 100644 --- a/pidgin/win32/nsis/pidgin-installer.nsi +++ b/pidgin/win32/nsis/pidgin-installer.nsi @@ -773,23 +773,25 @@ Section Uninstall Delete "$INSTDIR\idletrack.dll" Delete "$INSTDIR\libgtkspell.dll" Delete "$INSTDIR\libjabber.dll" + Delete "$INSTDIR\libnspr4.dll" Delete "$INSTDIR\libmeanwhile-1.dll" Delete "$INSTDIR\liboscar.dll" + Delete "$INSTDIR\libplc4.dll" + Delete "$INSTDIR\libplds4.dll" Delete "$INSTDIR\libpurple.dll" Delete "$INSTDIR\libsasl.dll" Delete "$INSTDIR\libsilc-1-1-2.dll" Delete "$INSTDIR\libsilcclient-1-1-2.dll" Delete "$INSTDIR\libxml2-2.dll" Delete "$INSTDIR\libymsg.dll" - Delete "$INSTDIR\nspr4.dll" Delete "$INSTDIR\nss3.dll" + Delete "$INSTDIR\nssutil3.dll" Delete "$INSTDIR\nssckbi.dll" Delete "$INSTDIR\pidgin.dll" Delete "$INSTDIR\pidgin.exe" - Delete "$INSTDIR\plc4.dll" - Delete "$INSTDIR\plds4.dll" Delete "$INSTDIR\smime3.dll" Delete "$INSTDIR\softokn3.dll" + Delete "$INSTDIR\sqlite3.dll" Delete "$INSTDIR\ssl3.dll" Delete "$INSTDIR\${PIDGIN_UNINST_EXE}" Delete "$INSTDIR\exchndl.dll" |