Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5abbab62f8edcad236b1d365a54ed1c567c486fa
commit 5abbab62f8edcad236b1d365a54ed1c567c486fa Author: kikadf <[email protected]> Date: Tue Oct 28 09:31:33 2014 +0100 pidgin-2.10.10-1-x86_64 * version bump * Fix CVE-2014-3694, CVE-2014-3695, CVE-2014-3696, CVE-2014-3698 diff --git a/source/xapps/pidgin/CVE-2014-3775.patch b/source/xapps/pidgin/CVE-2014-3775.patch deleted file mode 100644 index 33ffe66..0000000 --- a/source/xapps/pidgin/CVE-2014-3775.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: fix memory corruption via crafted message from file relay server -Origin: upstream, https://github.com/wojtekka/libgadu/commit/f45ff34dfe2edab54d6fa185e8b87246ab100bd4 -Origin: upstream, https://github.com/wojtekka/libgadu/commit/0db17ad635b07566d4e53a773919c16472341966 - -Index: pidgin-2.10.9/libpurple/protocols/gg/lib/dcc7.c -=================================================================== ---- pidgin-2.10.9.orig/libpurple/protocols/gg/lib/dcc7.c 2014-05-20 11:05:51.421162211 -0400 -+++ pidgin-2.10.9/libpurple/protocols/gg/lib/dcc7.c 2014-05-20 11:05:51.421162211 -0400 -@@ -1426,6 +1426,7 @@ - char buf[256]; - struct gg_dcc7_relay_reply *pkt; - struct gg_dcc7_relay_reply_server srv; -+ size_t max_relay_count = (sizeof(buf) - sizeof(*pkt)) / sizeof(srv); - int res; - int i; - -@@ -1442,7 +1443,7 @@ - - pkt = (struct gg_dcc7_relay_reply*) buf; - -- if (gg_fix32(pkt->magic) != GG_DCC7_RELAY_REPLY || gg_fix32(pkt->rcount) < 1 || gg_fix32(pkt->rcount > 256) || gg_fix32(pkt->len) < sizeof(*pkt) + gg_fix32(pkt->rcount) * sizeof(srv)) { -+ if (gg_fix32(pkt->magic) != GG_DCC7_RELAY_REPLY || gg_fix32(pkt->rcount) < 1 || gg_fix32(pkt->rcount) > 256 || gg_fix32(pkt->len) < sizeof(*pkt) + gg_fix32(pkt->rcount) * sizeof(srv)) { - gg_debug_dcc(dcc, GG_DEBUG_MISC, "// gg_dcc7_wathc_fd() invalid reply\n"); - errno = EINVAL; - e->type = GG_EVENT_DCC7_ERROR; -@@ -1457,6 +1458,18 @@ - - dcc->relay_index = 0; - dcc->relay_count = gg_fix32(pkt->rcount); -+ -+ if (dcc->relay_count > 0xffff || -+ (size_t)dcc->relay_count > max_relay_count) -+ { -+ gg_debug_dcc(dcc, GG_DEBUG_MISC, -+ "// gg_dcc7_watch_fd() relay_count out " -+ "of bounds (%d)\n", dcc->relay_count); -+ dcc->relay_count = 0; -+ free(e); -+ return NULL; -+ } -+ - dcc->relay_list = malloc(dcc->relay_count * sizeof(gg_dcc7_relay_t)); - - if (dcc->relay_list == NULL) { diff --git a/source/xapps/pidgin/FrugalBuild b/source/xapps/pidgin/FrugalBuild index 4d9a7b8..fbf20f6 100644 --- a/source/xapps/pidgin/FrugalBuild +++ b/source/xapps/pidgin/FrugalBuild @@ -5,8 +5,8 @@ options+=('asneeded') pkgname=pidgin -pkgver=2.10.9 -pkgrel=4 +pkgver=2.10.10 +pkgrel=1 pkgdesc="A multi-protocol instant messaging (IM) client" depends=('gtk+2>=2.20.0-2' 'startup-notification>=0.9-3' \ 'libxscrnsaver>=1.1.3' 'dbus-x11>=1.2.14') @@ -29,8 +29,8 @@ _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude sourceforge gnome-scriptlet url="http://www.pidgin.im/" -up2date="Flasttar http://pidgin.im/download/source/" -sha1sums=('f3de8fd94dba1f4c98d5402a02430f9f323e665a') +#up2date="Flasttar http://pidgin.im/download/source/" +sha1sums=('81267c35c8d27f2c62320b564fc11af2cc1f3a4a') subpkgs=("${subpkgs[@]}" "libpurple") subdescs=("${subdescs[@]}" "Library intended to be used by programmers seeking to write an IM client that connects to many IM networks.") @@ -50,15 +50,10 @@ subgroups=("${subgroups[@]}" 'xapps') subarchs=("${subarchs[@]}" 'i686 x86_64 arm') -# FSA fix *** -source=(${source[@]} CVE-2014-3775.patch) -sha1sums=(${sha1sums[@]} 'b664ae1023a9fe01b5c91ce0817c1266d47b31ad') -# *********** - - build() { if [ "$CARCH" != "arm" ]; then Fconfopts+=" --enable-gstreamer --enable-vv" + CFLAGS="$CFLAGS -I/usr/include/gtkspell-2.0" else Fconfopts+=" --disable-gtkspell --disable-gstreamer --disable-vv --disable-avahi" fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
