Here is an update to Pidgin 2.6.5..
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile 5 Jan 2010 07:19:49 -0000 1.58
+++ Makefile 8 Jan 2010 22:48:18 -0000
@@ -6,9 +6,9 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.6.4
+VERSION= 2.6.5
DISTNAME= pidgin-${VERSION}
-PKGNAME-main= pidgin-${VERSION}p0
+PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
FULLPKGNAME-libpurple= libpurple-${VERSION}p0
CATEGORIES= net
@@ -75,8 +75,7 @@ USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
-# Should be 2.64
-AUTOCONF_VERSION= 2.62
+AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --disable-avahi \
--disable-cap \
--disable-doxygen \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 7 Dec 2009 06:27:59 -0000 1.25
+++ distinfo 8 Jan 2010 22:27:38 -0000
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.6.4.tar.gz) = gay31+Sl0huoO1sAz7YKxQ==
-RMD160 (pidgin-2.6.4.tar.gz) = zaAtcbYO4ffxm/qw5L8RwuZUBpU=
-SHA1 (pidgin-2.6.4.tar.gz) = fq+mWz02bnwP/qpMCySEGesRgAM=
-SHA256 (pidgin-2.6.4.tar.gz) = TuYCTGtdoalMmTe9kNIo+Lh3O24l2luyrZ6h9WkiJgQ=
-SIZE (pidgin-2.6.4.tar.gz) = 13149647
+MD5 (pidgin-2.6.5.tar.gz) = kzBrHv83H8KK9YCi3JZ55g==
+RMD160 (pidgin-2.6.5.tar.gz) = +3NGfEWLHPBl5yKVa38FRiZV4SA=
+SHA1 (pidgin-2.6.5.tar.gz) = Nc8eptajztpI1GOeMN3FgNEBNV4=
+SHA256 (pidgin-2.6.5.tar.gz) = xm48Bc+kjwV6PleKI2kn6wj/ZvuFzDitH8ocM5JT5BU=
+SIZE (pidgin-2.6.5.tar.gz) = 13243148
Index: patches/patch-libpurple_plugins_ssl_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in,v
retrieving revision 1.19
diff -u -p -r1.19 patch-libpurple_plugins_ssl_Makefile_in
--- patches/patch-libpurple_plugins_ssl_Makefile_in 7 Dec 2009 06:27:59
-0000 1.19
+++ patches/patch-libpurple_plugins_ssl_Makefile_in 8 Jan 2010 22:45:06
-0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.19 2009/12/07 06:27:59
steven Exp $
---- libpurple/plugins/ssl/Makefile.in.orig Sun Nov 29 23:12:18 2009
-+++ libpurple/plugins/ssl/Makefile.in Sun Dec 6 13:05:09 2009
-@@ -70,6 +70,12 @@ am__base_list = \
- am__installdirs = "$(DESTDIR)$(plugindir)"
+--- libpurple/plugins/ssl/Makefile.in.orig Fri Jan 8 14:15:19 2010
++++ libpurple/plugins/ssl/Makefile.in Fri Jan 8 17:28:23 2010
+@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
+...@plugins_true@ssl_openssl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -14,8 +14,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
@plugins_t...@ssl_gnutls_la_dependencies = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
-@@ -131,7 +137,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO
- $(LDFLAGS) -o $@
+@@ -107,7 +113,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CF
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
$(ssl_la_SOURCES)
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
@@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
-@@ -198,6 +204,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
+@@ -199,6 +205,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
GNT_VERSION = @GNT_VERSION@
@@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
-@@ -387,6 +395,7 @@ EXTRA_DIST = \
+@@ -457,6 +465,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@use_nss_fa...@plugin_ltlibraries = \
-@@ -400,19 +409,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
+@@ -470,19 +479,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@@ -66,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
@plugins_t...@ssl_gnutls_la_libadd = $(GLIB_LIBS) $(GNUTLS_LIBS)
@plugins_t...@ssl_nss_la_libadd = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
-@@ -424,6 +439,7 @@ AM_CPPFLAGS = \
+@@ -494,6 +509,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@@ -74,16 +74,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
-@@ -491,6 +507,8 @@ clean-pluginLTLIBRARIES:
+@@ -556,6 +572,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES)
+ $(LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_LDFLAGS)
$(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
- $(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath)
$(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
+ $(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS)
$(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
-@@ -505,6 +523,7 @@ distclean-compile:
+@@ -570,6 +588,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/ssl....@am__quote@
Index: patches/patch-libpurple_protocols_msn_slp_c
===================================================================
RCS file: patches/patch-libpurple_protocols_msn_slp_c
diff -N patches/patch-libpurple_protocols_msn_slp_c
--- patches/patch-libpurple_protocols_msn_slp_c 5 Jan 2010 07:19:49 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,133 +0,0 @@
-$OpenBSD: patch-libpurple_protocols_msn_slp_c,v 1.1 2010/01/05 07:19:49 jasper
Exp $
-
-Security fix for SA37953:
-Pidgin MSN Custom Smileys File Disclosure Vulnerability
-
-Patch from upstream revisions:
-4be2df4f72bd8a55cdae7f2554b73342a497c92f
-3d02401cf232459fc80c0837d31e05fae7ae5467
-c64a1adc8bda2b4aeaae1f273541afbc4f71b810
-
---- libpurple/protocols/msn/slp.c.orig Mon Jan 4 16:31:26 2010
-+++ libpurple/protocols/msn/slp.c Mon Jan 4 16:43:37 2010
-@@ -238,6 +238,38 @@ send_decline(MsnSlpCall *slpcall, const char *branch,
- msn_slplink_queue_slpmsg(slplink, slpmsg);
- }
-
-+/* XXX: this could be improved if we tracked custom smileys
-+ * per-protocol, per-account, per-session or (ideally) per-conversation
-+ */
-+static PurpleStoredImage *
-+find_valid_emoticon(PurpleAccount *account, const char *path)
-+{
-+ GList *smileys;
-+
-+ if (!purple_account_get_bool(account, "custom_smileys", TRUE))
-+ return NULL;
-+
-+ smileys = purple_smileys_get_all();
-+
-+ for (; smileys; smileys = g_list_delete_link(smileys, smileys)) {
-+ PurpleSmiley *smiley;
-+ PurpleStoredImage *img;
-+
-+ smiley = smileys->data;
-+ img = purple_smiley_get_stored_image(smiley);
-+
-+ if (purple_strequal(path, purple_imgstore_get_filename(img))) {
-+ g_list_free(smileys);
-+ return img;
-+ }
-+
-+ purple_imgstore_unref(img);
-+ }
-+
-+ purple_debug_error("msn", "Received illegal request for file %s\n",
path);
-+ return NULL;
-+}
-+
- #define MAX_FILE_NAME_LEN 0x226
-
- static void
-@@ -255,7 +287,7 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch
- MsnSlpMessage *slpmsg;
- MsnObject *obj;
- char *msnobj_data;
-- PurpleStoredImage *img;
-+ PurpleStoredImage *img = NULL;
- int type;
-
- /* Send Ok */
-@@ -274,50 +306,38 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch
- type = msn_object_get_type(obj);
- g_free(msnobj_data);
-
-- if ((type != MSN_OBJECT_USERTILE) && (type !=
MSN_OBJECT_EMOTICON))
-- {
-- purple_debug_error("msn", "Wrong object?\n");
-- msn_object_destroy(obj);
-- g_return_if_reached();
-- }
--
- if (type == MSN_OBJECT_EMOTICON) {
-- char *path;
-- path =
g_build_filename(purple_smileys_get_storing_dir(),
-- obj->location, NULL);
-- img = purple_imgstore_new_from_file(path);
-- g_free(path);
-- } else {
-+ img = find_valid_emoticon(slplink->session->account,
obj->location);
-+ } else if (type == MSN_OBJECT_USERTILE) {
- img = msn_object_get_image(obj);
- if (img)
- purple_imgstore_ref(img);
- }
- msn_object_destroy(obj);
-
-- if (img == NULL)
-- {
-+ if (img != NULL) {
-+ /* DATA PREP */
-+ slpmsg = msn_slpmsg_new(slplink);
-+ slpmsg->slpcall = slpcall;
-+ slpmsg->session_id = slpcall->session_id;
-+ msn_slpmsg_set_body(slpmsg, NULL, 4);
-+ slpmsg->info = "SLP DATA PREP";
-+ msn_slplink_queue_slpmsg(slplink, slpmsg);
-+
-+ /* DATA */
-+ slpmsg = msn_slpmsg_new(slplink);
-+ slpmsg->slpcall = slpcall;
-+ slpmsg->flags = 0x20;
-+ slpmsg->info = "SLP DATA";
-+ msn_slpmsg_set_image(slpmsg, img);
-+ msn_slplink_queue_slpmsg(slplink, slpmsg);
-+ purple_imgstore_unref(img);
-+
-+ accepted = TRUE;
-+ } else {
- purple_debug_error("msn", "Wrong object.\n");
-- g_return_if_reached();
- }
-
-- /* DATA PREP */
-- slpmsg = msn_slpmsg_new(slplink);
-- slpmsg->slpcall = slpcall;
-- slpmsg->session_id = slpcall->session_id;
-- msn_slpmsg_set_body(slpmsg, NULL, 4);
-- slpmsg->info = "SLP DATA PREP";
-- msn_slplink_queue_slpmsg(slplink, slpmsg);
--
-- /* DATA */
-- slpmsg = msn_slpmsg_new(slplink);
-- slpmsg->slpcall = slpcall;
-- slpmsg->flags = 0x20;
-- slpmsg->info = "SLP DATA";
-- msn_slpmsg_set_image(slpmsg, img);
-- msn_slplink_queue_slpmsg(slplink, slpmsg);
-- purple_imgstore_unref(img);
--
-- accepted = TRUE;
- }
-
- else if (!strcmp(euf_guid, MSN_FT_GUID))
Index: patches/patch-libpurple_protocols_yahoo_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_yahoo_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libpurple_protocols_yahoo_Makefile_in
--- patches/patch-libpurple_protocols_yahoo_Makefile_in 7 Dec 2009 06:27:59
-0000 1.2
+++ patches/patch-libpurple_protocols_yahoo_Makefile_in 8 Jan 2010 22:45:06
-0000
@@ -1,19 +1,16 @@
$OpenBSD: patch-libpurple_protocols_yahoo_Makefile_in,v 1.2 2009/12/07
06:27:59 steven Exp $
---- libpurple/protocols/yahoo/Makefile.in.orig Sun Nov 29 23:12:20 2009
-+++ libpurple/protocols/yahoo/Makefile.in Sun Dec 6 13:08:43 2009
-@@ -76,7 +76,7 @@ libyahoo_la_OBJECTS = $(am_libyahoo_la_OBJECTS)
- libyahoo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libyahoo_la_LDFLAGS) $(LDFLAGS) -o $@
+--- libpurple/protocols/yahoo/Makefile.in.orig Fri Jan 8 14:15:34 2010
++++ libpurple/protocols/yahoo/Makefile.in Fri Jan 8 17:44:41 2010
+@@ -60,12 +60,12 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES)
+ am__libyahoo_la_SOURCES_DIST = libyahoo.c
+ @static_yahoo_fa...@am_libyahoo_la_objects = libyahoo.lo
+ libyahoo_la_OBJECTS = $(am_libyahoo_la_OBJECTS)
-...@static_yahoo_false@am_libyahoo_la_rpath = -rpath $(pkgdir)
+...@static_yahoo_false@am_libyahoo_la_rpath = -rpath $(pkgdir)
-Wl,-rpath,$(pkgdir)
@static_yahoo_fa...@libyahoojp_la_dependencies = libymsg.la
am__libyahoojp_la_SOURCES_DIST = libyahoojp.c
@static_yahoo_fa...@am_libyahoojp_la_objects = libyahoojp.lo
-@@ -84,7 +84,7 @@ libyahoojp_la_OBJECTS = $(am_libyahoojp_la_OBJECTS)
- libyahoojp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libyahoojp_la_LDFLAGS) $(LDFLAGS) -o $@
+ libyahoojp_la_OBJECTS = $(am_libyahoojp_la_OBJECTS)
-...@static_yahoo_false@am_libyahoojp_la_rpath = -rpath $(pkgdir)
+...@static_yahoo_false@am_libyahoojp_la_rpath = -rpath $(pkgdir)
-Wl,-rpath,$(pkgdir)
am__DEPENDENCIES_1 =
Index: patches/patch-pidgin_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-pidgin_Makefile_in
--- patches/patch-pidgin_Makefile_in 7 Dec 2009 06:27:59 -0000 1.10
+++ patches/patch-pidgin_Makefile_in 8 Jan 2010 22:45:30 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.10 2009/12/07 06:27:59 steven Exp $
---- pidgin/Makefile.in.orig Sun Nov 29 23:12:21 2009
-+++ pidgin/Makefile.in Sun Dec 6 13:06:29 2009
-@@ -118,7 +118,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- pidgin/Makefile.in.orig Fri Jan 8 14:15:38 2010
++++ pidgin/Makefile.in Fri Jan 8 17:40:37 2010
+@@ -116,7 +116,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
+CCLD = $(CXX)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(pidgin_SOURCES)
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
