/pidgin/main: eff00a0d44cd: I think this is a merge commit? It ...
Mark Doliner
mark at kingant.net
Mon Jan 14 02:03:08 EST 2013
Changeset: eff00a0d44cd1bf3fa913a30ea293a0a5b183371
Author: Mark Doliner <mark at kingant.net>
Date: 2013-01-13 23:02 -0800
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/eff00a0d44cd
Description:
I think this is a merge commit? It seems like hg is trying to be nice and
give me a chance to change things here, in case there compile problems or
something? I find it a little confusing. Like, I don't think there were
any merge conflicts.
diffstat:
.hgignore | 1 +
COPYRIGHT | 5 +
ChangeLog | 57 +++-
Makefile.am | 4 +-
Makefile.mingw | 41 ++-
configure.ac | 8 +-
libpurple/Makefile.mingw | 17 +
libpurple/log.c | 12 +-
libpurple/plugins/log_reader.c | 3 +-
libpurple/plugins/perl/common/Makefile.mingw | 2 +-
libpurple/plugins/tcl/signal-test.tcl | 2 +-
libpurple/plugins/tcl/tcl.c | 34 +-
libpurple/protocols/irc/Makefile.mingw | 7 +
libpurple/protocols/irc/irc.c | 32 ++-
libpurple/protocols/irc/irc.h | 19 +
libpurple/protocols/irc/msgs.c | 413 +++++++++++++++++++++++++++
libpurple/protocols/irc/parse.c | 15 +-
libpurple/protocols/jabber/Makefile.mingw | 17 -
libpurple/protocols/mxit/actions.c | 25 +
libpurple/protocols/mxit/markup.c | 10 +-
libpurple/protocols/mxit/profile.c | 36 ++
libpurple/protocols/mxit/profile.h | 14 +
libpurple/protocols/mxit/protocol.c | 52 +++-
libpurple/protocols/mxit/protocol.h | 13 +-
libpurple/protocols/mxit/roster.h | 1 +
libpurple/protocols/myspace/message.c | 14 +-
libpurple/protocols/oscar/oscar.c | 7 +-
libpurple/protocols/yahoo/libymsg.h | 1 +
libpurple/stringref.c | 4 +-
libpurple/upnp.c | 5 +-
libpurple/win32/global.mak | 19 +-
pidgin/Makefile.mingw | 4 +-
pidgin/gtkmain.c | 4 +-
pidgin/gtkutils.c | 4 +-
pidgin/pidginstock.c | 24 +-
pidgin/plugins/cap/cap.c | 6 +-
pidgin/plugins/notify.c | 12 +-
pidgin/plugins/perl/common/Makefile.mingw | 2 +-
pidgin/plugins/relnot.c | 2 +-
pidgin/win32/gtkwin32dep.c | 9 +-
pidgin/win32/nsis/generate_gtk_zip.sh | 89 ++++-
pidgin/win32/nsis/pidgin-installer.nsi | 96 ++++-
pidgin/win32/winpidgin.c | 48 +-
43 files changed, 999 insertions(+), 191 deletions(-)
diffs (truncated from 2284 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -10,6 +10,7 @@ syntax: regexp
.*/perl/common/MYMETA\.(json|yml)
.*~$
.*\.a$
+.*\.asc$
.*\.bak$
.*\.bs$
.*\.def$
diff --git a/COPYRIGHT b/COPYRIGHT
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -17,6 +17,7 @@ control system to see from where it came
Copyright (C) 1998-2012 by the following:
+Mark
Saleem Abdulrasool
Jakub Adam
Dave Ahlswede
@@ -73,6 +74,7 @@ Craig Boston
Éric Boumaour
Chris Boyle
Stanislav Brabec
+Bartosz Brachaczek
Quentin Brandon
Derrick J Brashear
Mauro Sérgio Ferreira Brasil
@@ -175,6 +177,7 @@ Jesse Farmer
Gavan Fantom (gavan)
Leonardo Fernandes
David Fiander
+Michael Fiedler
Ryan Flegel
Rob Flynn <gaim at robflynn.com>
Rob Foehl (rwf)
@@ -459,6 +462,7 @@ Sam S.
Thanumalayan S.
Jonathan Sailor
Elliott Sales de Andrade
+Catalin Salgau
Tomasz Sałaciński <tsalacinski at gmail.com>
Pradyumna Sampath
Arvind Samptur
@@ -511,6 +515,7 @@ Peter Speybrouck
Lex Spoon
Chris Stafford
Kevin Stange
+Ferdinand Stehle
Joshua Stein
Jakub Steiner
Richard Stellingwerff
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,21 +60,76 @@ version 2.10.7:
* Fix a crash at startup with large contact list. Avatar support for
buddies will be disabled till 3.0.0. (#15226, #14305)
+ General:
+ * The configure script will now exit with status 1 when specifying
+ invalid protocol plugins using the --with-static-prpls and
+ --with-dynamic-prpls arguments. (Michael Fiedler) (#15316)
+
+ libpurple:
+ * Don't link directly to libgcrypt when building with GnuTLS support.
+ (Bartosz Brachaczek) (#15329)
+ * Fix UPNP mappings on routers that return empty <URLBase/> elements
+ in their response. (Ferdinand Stehle) (#15373)
+ * Tcl plugin uses saner, race-free plugin loading.
+ * Fix the Tcl signals-test plugin for savedstatus-changed.
+ (Andrew Shadura) (#15443)
+
+ Pidgin:
+ * Make Pidgin more friendly to non-X11 GTK+, such as MacPorts' +no_x11
+ variant.
+
Gadu-Gadu:
* Fix a crash at startup with large contact list. Avatar support for
buddies will be disabled till 3.0.0. (#15226, #14305)
+ IRC:
+ * Support for SASL authentication. (Thijs Alkemade, Andy Spencer)
+ (#13270)
+ * Print topic setter information at channel join. (#13317)
+
MSN:
* Fix a crash when removing a user before its icon is loaded. (Mark
Barfield) (#15217)
+ MXit:
+ * Display farewell messages in a different colour to distinguish
+ them from normal messages.
+ * Add support for typing notification.
+ * Add support for the Relationship Status profile attribute.
+
Yahoo!:
* Fix a double-free in profile/picture loading code. (Mihai Serban)
(#15053)
+ * Fix retrieving server-side buddy aliases. (Catalin Salgu) (#15381)
Plugins:
* The Voice/Video Settings plugin supports using the sndio GStreamer
- backends. (Brad Smith) (#14414)
+ backends. (Brad Smith) (#14414)
+ * Fix a crash in the Contact Availability Detection plugin. (Mark)
+ (#15327)
+ * Make the Message Notification plugin more friendly to non-X11 GTK+,
+ such as MacPorts' +no_x11 variant.
+
+ Windows-Specific Changes:
+ * Compile with secure flags (#15290)
+ * Installer downloads GTK+ Runtime and Debug Symbols more securely.
+ (#15277)
+ * Updates to a number of dependencies, some of which have security
+ related fixes. (#14571, #15285, #15286)
+ * ATK 1.32.0-2
+ * Cyrus SASL 2.1.25
+ * expat 2.1.0-1
+ * freetype 2.4.10-1
+ * gettext 0.18.1.1-2
+ * Glib 2.28.8-1
+ * libpng 1.4.12-1
+ * libxml2 2.9.0-1
+ * NSS 3.13.6 and NSPR 4.9.2
+ * Pango 1.29.4-1
+ * SILC 1.1.10
+ * zlib 1.2.5-2
+ * Patch libmeanwhile (sametime library) to fix crash. (Jonathan Rice)
+ (#12637)
version 2.10.6 (07/06/2012):
Pidgin:
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,13 +54,13 @@ version-check:
# ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
test "x`hg st -mard`" = x
-packages:
+sign-packages: dist
gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz
gpg -ab pidgin-$(PACKAGE_VERSION).tar.bz2
gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
-release: commit-check version-check distcheck packages
+release: commit-check version-check distcheck sign-packages
if INSTALL_I18N
PO_DIR=po
diff --git a/Makefile.mingw b/Makefile.mingw
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -31,7 +31,16 @@ awk 'BEGIN {FS="."} { \
exit; \
}' VERSION)
-GTK_INSTALL_VERSION = 2.16.6.0
+GTK_INSTALL_VERSION = 2.16.6.1
+
+authenticode_sign = $(MONO_SIGNCODE) \
+ -spc "$(SIGNCODE_SPC)" -v "$(SIGNCODE_PVK)" \
+ -a sha1 -$$ commercial \
+ -n "$(2)" -i "https://pidgin.im" \
+ -t "http://timestamp.verisign.com/scripts/timstamp.dll" -tr 10 \
+ $(1)
+
+gpg_sign = $(GPG_SIGN) -ab $(1) && $(GPG_SIGN) --verify $(1).asc
STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin
DEBUG_SYMBOLS_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-dbgsym
@@ -55,6 +64,7 @@ EXTERNAL_DLLS = \
libplc4.dll \
libplds4.dll \
libsasl.dll \
+ libssp-0.dll \
libxml2-2.dll \
nss3.dll \
nssckbi.dll \
@@ -77,7 +87,7 @@ EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o
include $(PIDGIN_COMMON_RULES)
-.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT)
+.PHONY: all docs install installer installer_offline installer_zip debug_symbols_zip installers clean uninstall create_release_install_dir generate_installer_includes $(PIDGIN_REVISION_H) $(PIDGIN_REVISION_RAW_TXT) gtk_runtime_zip
all: $(PIDGIN_CONFIG_H) $(PIDGIN_REVISION_H)
$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
@@ -99,11 +109,12 @@ endif
cp $(ENCHANT_TOP)/bin/libenchant.dll $(PIDGIN_INSTALL_DIR)/spellcheck
cp -R $(ENCHANT_TOP)/lib/enchant/*.dll $(PIDGIN_INSTALL_DIR)/spellcheck/lib/enchant
cp $(WIN32_DEV_TOP)/pidgin-inst-deps-20100315/exchndl.dll $(PIDGIN_INSTALL_DIR)
+ cp $(GCC_SSP_TOP)/bin/libssp-0.dll $(PIDGIN_INSTALL_DIR)
-pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip:
- pidgin/win32/nsis/generate_gtk_zip.sh `pwd`
+gtk_runtime_zip:
+ pidgin/win32/nsis/generate_gtk_zip.sh "`pwd`" "$(GPG_SIGN)"
-generate_installer_includes: create_release_install_dir pidgin/win32/nsis/gtk-runtime-$(GTK_BUNDLE_VERSION).zip debug_symbols_zip $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/nsis_translations.desktop
+generate_installer_includes: create_release_install_dir gtk_runtime_zip debug_symbols_zip $(PIDGIN_TREE_TOP)/pidgin/win32/nsis/nsis_translations.desktop
rm -f pidgin/win32/nsis/pidgin-translations.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
find $(STRIPPED_RELEASE_DIR)/locale -maxdepth 1 -mindepth 1 \
-exec basename {} ';' \
@@ -137,18 +148,32 @@ create_release_install_dir: install
find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \
-exec $(STRIP) --strip-unneeded {} ';'
+ $(call authenticode_sign, $(STRIPPED_RELEASE_DIR)/pidgin.exe, "Pidgin $(PIDGIN_VERSION)")
installer: generate_installer_includes
- $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+ $(eval $@_DEBUG_SYMBOLS_SHA1SUM := $(shell sha1sum $(DEBUG_SYMBOLS_DIR).zip | sed -e "s/\ .*$$//"))
+ $(eval $@_GTK_SHA1SUM := $(shell sha1sum pidgin/win32/nsis/gtk-runtime-$(GTK_INSTALL_VERSION).zip | sed -e "s/\ .*$$//"))
+ $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" \
+ -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
+ -DDEBUG_SYMBOLS_SHA1SUM="$($@_DEBUG_SYMBOLS_SHA1SUM)" -DGTK_SHA1SUM="$($@_GTK_SHA1SUM)"\
+ pidgin/win32/nsis/pidgin-installer.nsi
+ $(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe, "Pidgin Installer")
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./
+ $(call gpg_sign, pidgin-$(PIDGIN_VERSION).exe)
installer_offline: generate_installer_includes
- $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DOFFLINE_INSTALLER -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+ $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" \
+ -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" \
+ -DOFFLINE_INSTALLER \
+ pidgin/win32/nsis/pidgin-installer.nsi
+ $(call authenticode_sign, pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe, "Pidgin Installer")
mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./
+ $(call gpg_sign, pidgin-$(PIDGIN_VERSION)-offline.exe)
installer_zip: create_release_install_dir
rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR)
+ $(call gpg_sign, pidgin-$(PIDGIN_VERSION)-win32-bin.zip)
debug_symbols_zip: install
rm -rf $(DEBUG_SYMBOLS_DIR) $(DEBUG_SYMBOLS_DIR).zip
@@ -156,7 +181,9 @@ debug_symbols_zip: install
tar -cf - `find $(PIDGIN_INSTALL_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -print` \
| tar --strip 2 --xform s/$$/.dbgsym/ -xC $(DEBUG_SYMBOLS_DIR) -f -
+ cp $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll.unstripped $(DEBUG_SYMBOLS_DIR)/libmeanwhile-1.dll.dbgsym
zip -9 -r $(DEBUG_SYMBOLS_DIR).zip $(DEBUG_SYMBOLS_DIR)
+ $(call gpg_sign, $(DEBUG_SYMBOLS_DIR).zip)
installers: installer installer_offline debug_symbols_zip installer_zip
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1326,7 +1326,7 @@ for i in $STATIC_PRPLS ; do
simple) static_simple=yes ;;
yahoo) static_yahoo=yes ;;
zephyr) static_zephyr=yes ;;
- *) echo "Invalid static protocol $i!!" ; exit ;;
+ *) echo "Invalid static protocol $i!!" ; exit 1 ;;
esac
done
AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
@@ -1380,7 +1380,7 @@ for i in $DYNAMIC_PRPLS ; do
simple) dynamic_simple=yes ;;
yahoo) dynamic_yahoo=yes ;;
zephyr) dynamic_zephyr=yes ;;
- *) echo "Invalid dynamic protocol $i!!" ; exit ;;
+ *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
esac
done
@@ -1908,7 +1908,7 @@ if test "x$enable_gnutls" != "xno"; then
AC_CACHE_CHECK([for GnuTLS libraries], ac_cv_gnutls_libs,
[
- LIBS="$LIBS $with_gnutls_libs -lgnutls -lgcrypt"
+ LIBS="$LIBS $with_gnutls_libs -lgnutls"
AC_TRY_LINK_FUNC(gnutls_init, ac_cv_gnutls_libs="yes", ac_cv_gnutls_libs="no")
LIBS="$LIBS_save"
])
@@ -1917,7 +1917,7 @@ if test "x$enable_gnutls" != "xno"; then
AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS])
AC_DEFINE(HAVE_SSL)
msg_gnutls="GnuTLS"
- GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt"
+ GNUTLS_LIBS="$with_gnutls_libs -lgnutls"
enable_gnutls="yes"
else
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -10,6 +10,19 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
TARGET = libpurple
NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2-2.dll
+ifeq ($(CYRUS_SASL), 1)
More information about the Commits
mailing list