update to 2.10.6 change: fix for buffer overflow in MXit protocol (CVE-2012-3374)diff -r1.43 -r1.44 pkgsrc/chat/libpurple/Makefile
(drochner)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.43 2012/06/14 07:43:40 sbd Exp $ | 1 | # $NetBSD: Makefile,v 1.44 2012/08/01 15:23:45 drochner Exp $ | |
2 | 2 | |||
3 | PKGNAME= libpurple-${PIDGIN_VERSION} | 3 | PKGNAME= libpurple-${PIDGIN_VERSION} | |
4 | PKGREVISION= 1 | |||
5 | 4 | |||
6 | COMMENT= Multi-protocol Instant Messaging client backend | 5 | COMMENT= Multi-protocol Instant Messaging client backend | |
7 | 6 | |||
8 | PKG_DESTDIR_SUPPORT= user-destdir | 7 | PKG_DESTDIR_SUPPORT= user-destdir | |
9 | 8 | |||
10 | .include "../../chat/libpurple/Makefile.common" | 9 | .include "../../chat/libpurple/Makefile.common" | |
11 | 10 | |||
12 | USE_TOOLS+= msgfmt intltool | 11 | USE_TOOLS+= msgfmt intltool | |
13 | CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ | 12 | CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ | |
14 | MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ | 13 | MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ | |
15 | 14 | |||
16 | PKGCONFIG_OVERRIDE+= gaim.pc.in | 15 | PKGCONFIG_OVERRIDE+= gaim.pc.in | |
17 | PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in | 16 | PKGCONFIG_OVERRIDE+= libpurple/purple.pc.in |
@@ -1,43 +1,43 @@ | @@ -1,43 +1,43 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.38 2012/05/15 13:07:28 obache Exp $ | 1 | # $NetBSD: Makefile.common,v 1.39 2012/08/01 15:23:45 drochner Exp $ | |
2 | # | 2 | # | |
3 | # used by chat/finch/Makefile | 3 | # used by chat/finch/Makefile | |
4 | # used by chat/libpurple/Makefile | 4 | # used by chat/libpurple/Makefile | |
5 | # used by chat/pidgin/Makefile | 5 | # used by chat/pidgin/Makefile | |
6 | # used by chat/pidgin-sametime/Makefile | 6 | # used by chat/pidgin-sametime/Makefile | |
7 | # used by chat/pidgin-silc/Makefile | 7 | # used by chat/pidgin-silc/Makefile | |
8 | 8 | |||
9 | PIDGIN_VERSION= 2.10.4 | 9 | PIDGIN_VERSION= 2.10.6 | |
10 | DISTNAME= pidgin-${PIDGIN_VERSION} | 10 | DISTNAME= pidgin-${PIDGIN_VERSION} | |
11 | CATEGORIES= chat | 11 | CATEGORIES= chat | |
12 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} | 12 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} | |
13 | EXTRACT_SUFX= .tar.bz2 | 13 | EXTRACT_SUFX= .tar.bz2 | |
14 | 14 | |||
15 | MAINTAINER= pkgsrc-users@NetBSD.org | 15 | MAINTAINER= pkgsrc-users@NetBSD.org | |
16 | HOMEPAGE= http://www.pidgin.im/ | 16 | HOMEPAGE= http://www.pidgin.im/ | |
17 | LICENSE= gnu-gpl-v2 | 17 | LICENSE= gnu-gpl-v2 | |
18 | 18 | |||
19 | USE_LIBTOOL= yes | 19 | USE_LIBTOOL= yes | |
20 | USE_PKGLOCALEDIR= yes | 20 | USE_PKGLOCALEDIR= yes | |
21 | USE_TOOLS+= pkg-config gmake | 21 | USE_TOOLS+= pkg-config gmake | |
22 | GNU_CONFIGURE= yes | 22 | GNU_CONFIGURE= yes | |
23 | 23 | |||
24 | PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches | 24 | PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches | |
25 | DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo | 25 | DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo | |
26 | 26 | |||
27 | CONFIGURE_ARGS+= --disable-gevolution | 27 | CONFIGURE_ARGS+= --disable-gevolution | |
28 | CONFIGURE_ARGS+= --disable-gtkui | 28 | CONFIGURE_ARGS+= --disable-gtkui | |
29 | CONFIGURE_ARGS+= --disable-consoleui | 29 | CONFIGURE_ARGS+= --disable-consoleui | |
30 | CONFIGURE_ARGS+= --disable-meanwhile | 30 | CONFIGURE_ARGS+= --disable-meanwhile | |
31 | CONFIGURE_ARGS+= --disable-farsight | 31 | CONFIGURE_ARGS+= --disable-farstream | |
32 | CONFIGURE_ARGS+= --disable-gstreamer | 32 | CONFIGURE_ARGS+= --disable-gstreamer | |
33 | CONFIGURE_ARGS+= --disable-avahi | 33 | CONFIGURE_ARGS+= --disable-avahi | |
34 | CONFIGURE_ARGS+= --disable-perl | 34 | CONFIGURE_ARGS+= --disable-perl | |
35 | CONFIGURE_ARGS+= --disable-tcl | 35 | CONFIGURE_ARGS+= --disable-tcl | |
36 | CONFIGURE_ARGS+= --disable-tk | 36 | CONFIGURE_ARGS+= --disable-tk | |
37 | CONFIGURE_ARGS+= --disable-gnutls | 37 | CONFIGURE_ARGS+= --disable-gnutls | |
38 | CONFIGURE_ARGS+= --disable-nss | 38 | CONFIGURE_ARGS+= --disable-nss | |
39 | CONFIGURE_ARGS+= --disable-dbus | 39 | CONFIGURE_ARGS+= --disable-dbus | |
40 | CONFIGURE_ARGS+= --disable-cyrus-sasl | 40 | CONFIGURE_ARGS+= --disable-cyrus-sasl | |
41 | CONFIGURE_ARGS+= --disable-debug | 41 | CONFIGURE_ARGS+= --disable-debug | |
42 | CONFIGURE_ARGS+= --disable-nm | 42 | CONFIGURE_ARGS+= --disable-nm | |
43 | CONFIGURE_ARGS+= --disable-vv | 43 | CONFIGURE_ARGS+= --disable-vv |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.35 2012/05/15 13:07:28 obache Exp $ | 1 | $NetBSD: distinfo,v 1.36 2012/08/01 15:23:46 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (pidgin-2.10.4.tar.bz2) = f9ce34e69f97bcd1bb216aefb6d687b5b47f0796 | 3 | SHA1 (pidgin-2.10.6.tar.bz2) = a0532e7ba2acd205d6a5a4e3624156a980fe3d43 | |
4 | RMD160 (pidgin-2.10.4.tar.bz2) = 5193a7f5dbd122198d474bd7e11dc9bf307befb3 | 4 | RMD160 (pidgin-2.10.6.tar.bz2) = 507d64cb719129196c887953edef552db326e805 | |
5 | Size (pidgin-2.10.4.tar.bz2) = 9970850 bytes | 5 | Size (pidgin-2.10.6.tar.bz2) = 10007092 bytes | |
6 | SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29 | 6 | SHA1 (patch-aa) = a41353bbcb742b4127a33b3026f87a79f406da29 | |
7 | SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6 | 7 | SHA1 (patch-libpurple_protocols_gg_lib_libgadu.h) = 5756134e17ae2ce28d3555cd40354245e22a5bd6 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: options.mk,v 1.20 2012/04/25 16:27:50 drochner Exp $ | 1 | # $NetBSD: options.mk,v 1.21 2012/08/01 15:23:46 drochner Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple | |
4 | PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls | 4 | PKG_SUPPORTED_OPTIONS+= avahi dbus debug farsight gnome gnutls | |
5 | PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl | 5 | PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl | |
6 | PKG_SUGGESTED_OPTIONS+= dbus farsight gnome gnutls gstreamer | 6 | PKG_SUGGESTED_OPTIONS+= dbus farsight gnome gnutls gstreamer | |
7 | 7 | |||
8 | .include "../../mk/bsd.options.mk" | 8 | .include "../../mk/bsd.options.mk" | |
9 | 9 | |||
10 | PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl | 10 | PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl | |
11 | 11 | |||
12 | .if !empty(PKG_OPTIONS:Mavahi) | 12 | .if !empty(PKG_OPTIONS:Mavahi) | |
13 | PLIST.avahi= yes | 13 | PLIST.avahi= yes | |
14 | CONFIGURE_ARGS+= --enable-avahi | 14 | CONFIGURE_ARGS+= --enable-avahi | |
@@ -74,22 +74,22 @@ CONFIGURE_ARGS+= --enable-debug | @@ -74,22 +74,22 @@ CONFIGURE_ARGS+= --enable-debug | |||
74 | 74 | |||
75 | .if !empty(PKG_OPTIONS:Msasl) | 75 | .if !empty(PKG_OPTIONS:Msasl) | |
76 | CONFIGURE_ARGS+= --enable-cyrus-sasl | 76 | CONFIGURE_ARGS+= --enable-cyrus-sasl | |
77 | . include "../../security/cyrus-sasl/buildlink3.mk" | 77 | . include "../../security/cyrus-sasl/buildlink3.mk" | |
78 | .endif | 78 | .endif | |
79 | 79 | |||
80 | # voice/video support requires both farsight and gstreamer | 80 | # voice/video support requires both farsight and gstreamer | |
81 | .if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer) | 81 | .if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer) | |
82 | CONFIGURE_ARGS+= --enable-vv | 82 | CONFIGURE_ARGS+= --enable-vv | |
83 | PLIST.vv= yes | 83 | PLIST.vv= yes | |
84 | .endif | 84 | .endif | |
85 | 85 | |||
86 | .if !empty(PKG_OPTIONS:Mfarsight) | 86 | .if !empty(PKG_OPTIONS:Mfarsight) | |
87 | CONFIGURE_ARGS+= --enable-farsight | 87 | CONFIGURE_ARGS+= --enable-farstream | |
88 | . include "../../multimedia/farsight2/buildlink3.mk" | 88 | . include "../../multimedia/farsight2/buildlink3.mk" | |
89 | .endif | 89 | .endif | |
90 | 90 | |||
91 | .if !empty(PKG_OPTIONS:Mgstreamer) | 91 | .if !empty(PKG_OPTIONS:Mgstreamer) | |
92 | CONFIGURE_ARGS+= --enable-gstreamer | 92 | CONFIGURE_ARGS+= --enable-gstreamer | |
93 | . include "../../multimedia/gstreamer0.10/buildlink3.mk" | 93 | . include "../../multimedia/gstreamer0.10/buildlink3.mk" | |
94 | . include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" | 94 | . include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" | |
95 | .endif | 95 | .endif |