[arch-commits] Commit in pidgin/trunk (2 files)
Date: Monday, February 3, 2014 @ 15:10:06
Author: foutrelis
Revision: 205034
upgpkg: pidgin 2.10.9-1
New upstream release.
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
+
PKGBUILD | 15 -
pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch | 145
--
2 files changed, 5 insertions(+), 155 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-03 12:57:40 UTC (rev 205033)
+++ PKGBUILD2014-02-03 14:10:06 UTC (rev 205034)
@@ -6,8 +6,8 @@
# Contributor: Lucien Immink
pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.8
-pkgrel=2
+pkgver=2.10.9
+pkgrel=1
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -14,17 +14,12 @@
makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc}
-pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch)
-sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
-'SKIP'
-'4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2')
+source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc})
+sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
+'SKIP')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # https://developer.pidgin.im/ticket/15879
- patch -Np1 -i
"$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch"
-
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
Deleted: pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
===
--- pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
2014-02-03 12:57:40 UTC (rev 205033)
+++ pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
2014-02-03 14:10:06 UTC (rev 205034)
@@ -1,145 +0,0 @@
-
-# HG changeset patch
-# User Mark Doliner
-# Date 1391153359 28800
-# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a
-# Parent e733020a9d3840275ffa931a9aeefe4d8befc08e
-Fix problems logging into some servers including jabber.org and
-chat.facebook.com.
-
-See my length comment in iq.c for details.
-
-diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
a/libpurple/protocols/jabber/iq.c
-+++ b/libpurple/protocols/jabber/iq.c
-@@ -283,6 +283,52 @@
- g_hash_table_remove(js->iq_callbacks, id);
- }
-
-+/**
-+ * Verify that the 'from' attribute of an IQ reply is a valid match for
-+ * a given IQ request. The expected behavior is outlined in section
-+ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to
-+ * be a valid match if any of the following is true:
-+ * - Request 'to' matches reply 'from' (including the case where
-+ * neither are set).
-+ * - Request 'to' was empty and reply 'from' is server JID.
-+ * - Request 'to' was empty and reply 'from' is my JID. The spec says
-+ * we should only allow bare JID, but we also allow full JID for
-+ * compatibility with some servers.
-+ *
-+ * These rules should allow valid IQ replies while preventing spoofed
-+ * ones.
-+ *
-+ * For more discussion see the "Spoofing of iq ids and misbehaving
-+ * servers" email thread from January 2014 on the jdev and security
-+ * mailing lists.
-+ *
-+ * @return TRUE if this reply is valid for the given request.
-+ */
-+static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID
*to, JabberID *from)
-+{
-+ if (jabber_id_equal(to, from)) {
-+ /* Request 'to' matches reply 'from' */
-+ return TRUE;
-+ }
-+
-+ if (!to && purple_strequal(from->domain, js->user->domain)) {
-+ /* Request 'to' is empty and reply 'from' domain matches our
domain */
-+
-+ if (!from->node && !from->resource) {
-+ /* Reply 'from' is server bare JID */
-+ return TRUE;
-+ }
-+
-+ if (purple_strequal(from->node, js->user->node)
-+ && (!from->resource ||
purple_strequal(from->resource, js->user->resource))) {
-+ /* Reply 'from' is my full or bare JID */
-+ return TRUE;
-+ }
-+ }
-+
-+ return FALSE;
-+}
-+
- void jabber_iq_parse(JabberStream *js, xmlnode *packet)
- {
- JabberIqCallbackData *jcd;
-@@ -377,8 +423,9 @@
-
- /* First, lets see if a special callback got register
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Friday, January 31, 2014 @ 13:35:03
Author: foutrelis
Revision: 204921
upgpkg: pidgin 2.10.8-2
Fix login issues with certain XMPP servers (upstream ticket #15879).
Added:
pidgin/trunk/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
Modified:
pidgin/trunk/PKGBUILD
+
PKGBUILD | 18 -
pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch | 145
++
2 files changed, 158 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-31 11:38:05 UTC (rev 204920)
+++ PKGBUILD2014-01-31 12:35:03 UTC (rev 204921)
@@ -7,7 +7,7 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.10.8
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -14,17 +14,25 @@
makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc})
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc}
+pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch)
sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
-'SKIP')
-
-build() {
+'SKIP'
+'4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2')
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
+ # https://developer.pidgin.im/ticket/15879
+ patch -Np1 -i
"$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch"
+
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
+}
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
Added: pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
===
--- pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
(rev 0)
+++ pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
2014-01-31 12:35:03 UTC (rev 204921)
@@ -0,0 +1,145 @@
+
+# HG changeset patch
+# User Mark Doliner
+# Date 1391153359 28800
+# Node ID b8e2a5fbffd3052ccba7160b56eac70f8e19c49a
+# Parent e733020a9d3840275ffa931a9aeefe4d8befc08e
+Fix problems logging into some servers including jabber.org and
+chat.facebook.com.
+
+See my length comment in iq.c for details.
+
+diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
+--- a/libpurple/protocols/jabber/iq.c
b/libpurple/protocols/jabber/iq.c
+@@ -283,6 +283,52 @@
+ g_hash_table_remove(js->iq_callbacks, id);
+ }
+
++/**
++ * Verify that the 'from' attribute of an IQ reply is a valid match for
++ * a given IQ request. The expected behavior is outlined in section
++ * 8.1.2.1 of the XMPP CORE spec (RFC 6120). We consider the reply to
++ * be a valid match if any of the following is true:
++ * - Request 'to' matches reply 'from' (including the case where
++ * neither are set).
++ * - Request 'to' was empty and reply 'from' is server JID.
++ * - Request 'to' was empty and reply 'from' is my JID. The spec says
++ * we should only allow bare JID, but we also allow full JID for
++ * compatibility with some servers.
++ *
++ * These rules should allow valid IQ replies while preventing spoofed
++ * ones.
++ *
++ * For more discussion see the "Spoofing of iq ids and misbehaving
++ * servers" email thread from January 2014 on the jdev and security
++ * mailing lists.
++ *
++ * @return TRUE if this reply is valid for the given request.
++ */
++static gboolean does_reply_from_match_request_to(JabberStream *js, JabberID
*to, JabberID *from)
++{
++ if (jabber_id_equal(to, from)) {
++ /* Request 'to' matches reply 'from' */
++ return TRUE;
++ }
++
++ if (!to && purple_strequal(from->domain, js->user->domain)) {
++ /* Request 'to' is empty and reply 'from' domain matches our
domain */
++
++ if (!from->node && !from->resource) {
++ /* Reply 'from' is server bare JID */
++ return TRUE;
++ }
++
++ if (purple_strequal(from->node, js->user->node)
++ && (!from->resource ||
purple_strequal(from->resource, js->user->resource))) {
++ /* Reply 'from' is my full or bare JID */
++ return TRUE;
++ }
++ }
++
++ return FALSE;
++}
++
+ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
+ {
+ JabberIqCallbackData *jcd;
+@@ -377,8 +423,9 @@
+
+ /* First, lets see if a special callba
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Tuesday, January 28, 2014 @ 16:36:09
Author: foutrelis
Revision: 204841
upgpkg: pidgin 2.10.8-1
New upstream release.
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/pidgin-2.10.7-link-libirc-to-libsasl2.patch
-+
PKGBUILD| 15 +--
pidgin-2.10.7-link-libirc-to-libsasl2.patch | 12
2 files changed, 5 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-28 15:18:04 UTC (rev 204840)
+++ PKGBUILD2014-01-28 15:36:09 UTC (rev 204841)
@@ -6,8 +6,8 @@
# Contributor: Lucien Immink
pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.7
-pkgrel=4
+pkgver=2.10.8
+pkgrel=1
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -14,18 +14,13 @@
makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
'tk' 'ca-certificates' 'intltool' 'networkmanager')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-pidgin-2.10.7-link-libirc-to-libsasl2.patch)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
-'063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2{,.asc})
+sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
+'SKIP')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # https://developer.pidgin.im/ticket/15517
- patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
- autoreconf -vi
-
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
Deleted: pidgin-2.10.7-link-libirc-to-libsasl2.patch
===
--- pidgin-2.10.7-link-libirc-to-libsasl2.patch 2014-01-28 15:18:04 UTC (rev
204840)
+++ pidgin-2.10.7-link-libirc-to-libsasl2.patch 2014-01-28 15:36:09 UTC (rev
204841)
@@ -1,12 +0,0 @@
-diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am
pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am 2013-02-14
02:44:47.0 +0200
-+++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am 2013-02-14
02:49:58.0 +0200
-@@ -27,7 +27,7 @@ else
- st =
- pkg_LTLIBRARIES = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD = $(GLIB_LIBS)
-+libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
-
- endif
-
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Thursday, February 14, 2013 @ 02:36:52
Author: foutrelis
Revision: 178039
upgpkg: pidgin 2.10.7-2
Fix IRC protocol plugin.
Added:
pidgin/trunk/pidgin-2.10.7-link-libirc-to-libsasl2.patch
Modified:
pidgin/trunk/PKGBUILD
-+
PKGBUILD| 12 +---
pidgin-2.10.7-link-libirc-to-libsasl2.patch | 12
2 files changed, 21 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-14 00:35:15 UTC (rev 178038)
+++ PKGBUILD2013-02-14 01:36:52 UTC (rev 178039)
@@ -7,7 +7,7 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.10.7
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -15,12 +15,18 @@
'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
'tk' 'ca-certificates' 'intltool' 'networkmanager')
options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+pidgin-2.10.7-link-libirc-to-libsasl2.patch)
+sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
+'063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # https://developer.pidgin.im/ticket/15517
+ patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
+ autoreconf -vi
+
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
Added: pidgin-2.10.7-link-libirc-to-libsasl2.patch
===
--- pidgin-2.10.7-link-libirc-to-libsasl2.patch (rev 0)
+++ pidgin-2.10.7-link-libirc-to-libsasl2.patch 2013-02-14 01:36:52 UTC (rev
178039)
@@ -0,0 +1,12 @@
+diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am
pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
+--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am 2013-02-14
02:44:47.0 +0200
pidgin-2.10.7/libpurple/protocols/irc/Makefile.am 2013-02-14
02:49:58.0 +0200
+@@ -27,7 +27,7 @@ else
+ st =
+ pkg_LTLIBRARIES = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD = $(GLIB_LIBS)
++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
+
+ endif
+
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Sunday, October 30, 2011 @ 12:50:29
Author: foutrelis
Revision: 141475
upgpkg: pidgin 2.10.0-3
Remove SILC support.
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/pidgin-2.10.0-silc-remote-crash-fix.diff
--+
PKGBUILD | 18 ++
pidgin-2.10.0-silc-remote-crash-fix.diff | 21 -
2 files changed, 6 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-30 15:39:03 UTC (rev 141474)
+++ PKGBUILD2011-10-30 16:50:29 UTC (rev 141475)
@@ -7,21 +7,19 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.10.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
- 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
+ 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10'
'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
'networkmanager')
options=('!libtool')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-nm09-more.patch
-pidgin-2.10.0-silc-remote-crash-fix.diff)
-sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
- '0676b26f092fac3ee4bbea2261042b3f433c7751'
- '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
+nm09-more.patch)
+sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd'
+'7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -30,10 +28,6 @@
# http://developer.pidgin.im/ticket/13859
patch -Np1 -i "$srcdir/nm09-more.patch"
- # Fix remote crash in SILC plugin
- # http://developer.pidgin.im/ticket/14636
- patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff"
-
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
@@ -80,7 +74,7 @@
package_libpurple(){
pkgdesc="IM library extracted from Pidgin"
- depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss')
+ depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss')
optdepends=('avahi: Bonjour protocol support'
'dbus-python: for purple-remote and purple-url-handler')
Deleted: pidgin-2.10.0-silc-remote-crash-fix.diff
===
--- pidgin-2.10.0-silc-remote-crash-fix.diff2011-10-30 15:39:03 UTC (rev
141474)
+++ pidgin-2.10.0-silc-remote-crash-fix.diff2011-10-30 16:50:29 UTC (rev
141475)
@@ -1,21 +0,0 @@
-
libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78
-+++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839
-@@ -408,9 +408,16 @@ silc_private_message(SilcClient client,
- }
-
- if (flags & SILC_MESSAGE_FLAG_UTF8) {
-- tmp = g_markup_escape_text((const char *)message, -1);
-+ const char *msg = (const char *)message;
-+ char *salvaged = NULL;
-+ if (!g_utf8_validate((const char *)message, -1, NULL)) {
-+ salvaged = purple_utf8_salvage((const char *)message);
-+ msg = salvaged;
-+ }
-+ tmp = g_markup_escape_text(msg, -1);
- /* Send to Purple */
- serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
-+ g_free(salvaged);
- g_free(tmp);
- }
- }
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Friday, September 30, 2011 @ 12:26:42
Author: foutrelis
Revision: 139166
upgpkg: pidgin 2.10.0-2
Fix remote crash in SILC plugin.
Added:
pidgin/trunk/pidgin-2.10.0-silc-remote-crash-fix.diff
Modified:
pidgin/trunk/PKGBUILD
--+
PKGBUILD | 14 ++
pidgin-2.10.0-silc-remote-crash-fix.diff | 21 +
2 files changed, 31 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-30 15:29:38 UTC (rev 139165)
+++ PKGBUILD2011-09-30 16:26:42 UTC (rev 139166)
@@ -7,7 +7,7 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.10.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -17,9 +17,11 @@
'networkmanager')
options=('!libtool')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-nm09-more.patch)
-md5sums=('e1453c9093c4f32beec19abd14069a3f'
- 'a673659d86c7a65aa710f7c8c7feda82')
+nm09-more.patch
+pidgin-2.10.0-silc-remote-crash-fix.diff)
+sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
+ '0676b26f092fac3ee4bbea2261042b3f433c7751'
+ '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -28,6 +30,10 @@
# http://developer.pidgin.im/ticket/13859
patch -Np1 -i "$srcdir/nm09-more.patch"
+ # Fix remote crash in SILC plugin
+ # http://developer.pidgin.im/ticket/14636
+ patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff"
+
# Use Python 2
sed -i 's/env python$/&2/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
Added: pidgin-2.10.0-silc-remote-crash-fix.diff
===
--- pidgin-2.10.0-silc-remote-crash-fix.diff(rev 0)
+++ pidgin-2.10.0-silc-remote-crash-fix.diff2011-09-30 16:26:42 UTC (rev
139166)
@@ -0,0 +1,21 @@
+
+--- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78
libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839
+@@ -408,9 +408,16 @@ silc_private_message(SilcClient client,
+ }
+
+ if (flags & SILC_MESSAGE_FLAG_UTF8) {
+- tmp = g_markup_escape_text((const char *)message, -1);
++ const char *msg = (const char *)message;
++ char *salvaged = NULL;
++ if (!g_utf8_validate((const char *)message, -1, NULL)) {
++ salvaged = purple_utf8_salvage((const char *)message);
++ msg = salvaged;
++ }
++ tmp = g_markup_escape_text(msg, -1);
+ /* Send to Purple */
+ serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
++ g_free(salvaged);
+ g_free(tmp);
+ }
+ }
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Saturday, August 20, 2011 @ 22:57:32
Author: foutrelis
Revision: 135966
upgpkg: pidgin 2.10.0-1
New upstream release.
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/ticket-14351-multiple-display-of-room-members.patch
-+
PKGBUILD| 16 +---
ticket-14351-multiple-display-of-room-members.patch | 17 -
2 files changed, 5 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 02:54:42 UTC (rev 135965)
+++ PKGBUILD2011-08-21 02:57:32 UTC (rev 135966)
@@ -6,8 +6,8 @@
# Contributor: Lucien Immink
pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.9.0
-pkgrel=3
+pkgver=2.10.0
+pkgrel=1
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -17,11 +17,9 @@
'networkmanager')
options=('!libtool')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-nm09-more.patch
-ticket-14351-multiple-display-of-room-members.patch)
-md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
- 'a673659d86c7a65aa710f7c8c7feda82'
- '47f16f838b741cfdeda18d7b08a7b816')
+nm09-more.patch)
+md5sums=('e1453c9093c4f32beec19abd14069a3f'
+ 'a673659d86c7a65aa710f7c8c7feda82')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -30,10 +28,6 @@
# http://developer.pidgin.im/ticket/13859
patch -Np1 -i "$srcdir/nm09-more.patch"
- # Fix upstream issue #14351: multiple display of room members
- # http://developer.pidgin.im/ticket/14351
- patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch"
-
# Use Python 2
sed -i 's/env python$/\02/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
Deleted: ticket-14351-multiple-display-of-room-members.patch
===
--- ticket-14351-multiple-display-of-room-members.patch 2011-08-21 02:54:42 UTC
(rev 135965)
+++ ticket-14351-multiple-display-of-room-members.patch 2011-08-21 02:57:32 UTC
(rev 135966)
@@ -1,17 +0,0 @@
-#
-#
-# patch "libpurple/conversation.c"
-# from [cd6817f4863abafef969359f65cc025f9483b401]
-#to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
-#
-
libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401
-+++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803
-@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
- }
-
- g_hash_table_remove_all(chat->users);
-- chat->users = NULL;
-
- g_list_free(users);
- chat->in_room = NULL;
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Saturday, August 13, 2011 @ 07:30:30
Author: foutrelis
Revision: 135431
upgpkg: pidgin 2.9.0-3
Fix upstream issue #14351: "multiple display of room members".
Added:
pidgin/trunk/ticket-14351-multiple-display-of-room-members.patch
Modified:
pidgin/trunk/PKGBUILD
-+
PKGBUILD| 14 ++
ticket-14351-multiple-display-of-room-members.patch | 17 +
2 files changed, 27 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-13 09:59:26 UTC (rev 135430)
+++ PKGBUILD2011-08-13 11:30:30 UTC (rev 135431)
@@ -7,7 +7,7 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.9.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -17,17 +17,23 @@
'networkmanager')
options=('!libtool')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-nm09-more.patch)
+nm09-more.patch
+ticket-14351-multiple-display-of-room-members.patch)
md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
- 'a673659d86c7a65aa710f7c8c7feda82')
+ 'a673659d86c7a65aa710f7c8c7feda82'
+ '47f16f838b741cfdeda18d7b08a7b816')
build() {
cd "$srcdir/$pkgname-$pkgver"
# Further fixes for NetworkManager 0.9
- # (http://developer.pidgin.im/ticket/13859)
+ # http://developer.pidgin.im/ticket/13859
patch -Np1 -i "$srcdir/nm09-more.patch"
+ # Fix upstream issue #14351: multiple display of room members
+ # http://developer.pidgin.im/ticket/14351
+ patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch"
+
# Use Python 2
sed -i 's/env python$/\02/' */plugins/*.py \
libpurple/purple-{remote,notifications-example,url-handler}
Added: ticket-14351-multiple-display-of-room-members.patch
===
--- ticket-14351-multiple-display-of-room-members.patch
(rev 0)
+++ ticket-14351-multiple-display-of-room-members.patch 2011-08-13 11:30:30 UTC
(rev 135431)
@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+# from [cd6817f4863abafef969359f65cc025f9483b401]
+#to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+
+--- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401
libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+ }
+
+ g_hash_table_remove_all(chat->users);
+- chat->users = NULL;
+
+ g_list_free(users);
+ chat->in_room = NULL;
[arch-commits] Commit in pidgin/trunk (2 files)
Date: Friday, July 16, 2010 @ 15:24:54
Author: ibiru
Revision: 85620
upgpkg: pidgin 2.7.1-2 fix security vulnerability in libpurple CVE-2010-2528
Added:
pidgin/trunk/oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
Modified:
pidgin/trunk/PKGBUILD
+
PKGBUILD | 40 +++
oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff | 84 +++
2 files changed, 105 insertions(+), 19 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-07-16 19:24:23 UTC (rev 85619)
+++ PKGBUILD2010-07-16 19:24:54 UTC (rev 85620)
@@ -7,7 +7,7 @@
pkgbase=('pidgin')
pkgname=('libpurple' 'pidgin' 'finch')
pkgver=2.7.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -16,14 +16,16 @@
'tk' 'ca-certificates' 'intltool' 'networkmanager')
options=('!libtool')
source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2
-icq_fix.patch)
-sha256sums=('f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1'
-'9f5de2d1441f8369f3f13733dc4ffe14e1be9395507b79703b1c849c02602f93')
+icq_fix.patch oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff)
+md5sums=('0dd2adb9e8214ac960f956823c84e7e2'
+ '2ce887cf36e698282b9241832850defd'
+ '29cb9bb0e74db8bf6c18c048e935a60a')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
-patch -Np0 -i "${srcdir}/icq_fix.patch" || return 1
+patch -Np0 -i "${srcdir}/icq_fix.patch"
+patch -Np0 -i
"${srcdir}/oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff"
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -34,8 +36,8 @@
--enable-cyrus-sasl \
--disable-doxygen \
--enable-nm \
---with-system-ssl-certs=/etc/ssl/certs || return 1
-make || return 1
+--with-system-ssl-certs=/etc/ssl/certs
+make
}
package_libpurple(){
pkgdesc="IM library extracted from Pidgin"
@@ -45,7 +47,7 @@
for dir in libpurple share/sounds share/ca-certs m4macros po
do
-make -C "${dir}" DESTDIR="${pkgdir}" install || return 1
+make -C "${dir}" DESTDIR="${pkgdir}" install
done
#rm -rf "$pkgdir/etc" || return 1
}
@@ -63,17 +65,17 @@
install=pidgin.install
cd "${srcdir}/${pkgbase}-${pkgver}"
#for linking
-make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES || return 1
+make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
-make -C pidgin DESTDIR="${pkgdir}" install || return 1
-make -C doc DESTDIR="${pkgdir}" install || return 1
+make -C pidgin DESTDIR="${pkgdir}" install
+make -C doc DESTDIR="${pkgdir}" install
#clean up libpurple
-make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES || return 1
+make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
-install -D -m 0644 pidgin.desktop
"${pkgdir}"/usr/share/applications/pidgin.desktop || return 1
+install -D -m 0644 pidgin.desktop
"${pkgdir}"/usr/share/applications/pidgin.desktop
-rm -f "${pkgdir}"/usr/share/man/man1/finch.1 || return 1
+rm -f "${pkgdir}"/usr/share/man/man1/finch.1
}
package_finch(){
pkgdesc="A ncurses-based messaging client"
@@ -84,12 +86,12 @@
cd "${srcdir}/${pkgbase}-${pkgver}"
#for linking
-make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES || return 1
+make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
-make -C finch DESTDIR="${pkgdir}" install || return 1
-make -C doc DESTDIR="${pkgdir}" install || return 1
+make -C finch DESTDIR="${pkgdir}" install
+make -C doc DESTDIR="${pkgdir}" install
#clean up libpurple
-make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES || return 1
-rm -f "${pkgdir}"/usr/share/man/man1/pidgin.1 || return 1
+make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
+rm -f "${pkgdir}"/usr/share/man/man1/pidgin.1
}
Added: oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
===
--- oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
(rev 0)
+++ oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff 2010-07-16
19:24:54 UTC (rev 85620)
@@ -0,0 +1,84 @@
+#
+# old_revision [915eb72db575b96b63275f0f1d857378adbf3420]
+#
+# patch "libpurple/protocols/oscar/family_icbm.c"
+# from [52688bc864209fd4471193bfce81c4547ba8ae51]
+#to [2a3a9ef76a6fd25b6e58b0e527df49bf8f83f2fb]
+#
+
+--- libpurple/protocols/oscar/family_icbm.c
52688bc864209fd4471193bfce81c4547ba8ae51
libpurple/protocols/oscar/family_icbm.c
2a3a9ef76a6fd25b6e58b0e527df49bf8f83f2fb
+@@ -2687,7
