From 678702fe3634fa523090c8b04bbd859acd0fa373 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 12 Dec 2011 18:28:21 +0000 Subject: Version bump, security bug #394239 by Agostino Sarubbo. Install pietray.py, bug #393549 by Randy Barlow. Detect network with networkmanager-0.9, bug #392193 by Pacho Ramos. Package-Manager: portage-2.1.10.39/cvs/Linux x86_64 --- net-im/pidgin/ChangeLog | 8 +- net-im/pidgin/Manifest | 15 +- .../files/pidgin-2.10.0-networkmanager-0.9.patch | 51 +++++ net-im/pidgin/pidgin-2.10.1.ebuild | 229 +++++++++++++++++++++ 4 files changed, 296 insertions(+), 7 deletions(-) create mode 100644 net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch create mode 100644 net-im/pidgin/pidgin-2.10.1.ebuild (limited to 'net-im') diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index f94a242076ea..9642d00544b0 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.261 2011/10/27 08:28:21 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.262 2011/12/12 18:28:21 pva Exp $ + + 12 Dec 2011; Peter Volkov + +files/pidgin-2.10.0-networkmanager-0.9.patch: + Version bump, security bug #394239 by Agostino Sarubbo. Install pietray.py, + bug #393549 by Randy Barlow. Detect network with networkmanager-0.9, bug + #392193 by Pacho Ramos. *pidgin-2.10.0-r2 (27 Oct 2011) diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index accab92e93b0..6c9b2208058e 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,17 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb +AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 RMD160 76311be8823e809128e5862a2d4019682040b89d SHA1 7582f01f672117a094666c08d03fc114d1184eb6 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd +DIST pidgin-2.10.1.tar.bz2 9961580 RMD160 f73c5540fd01f62ae2a0ae236436f06770a896ef SHA1 045ed0fd7dfedada6e082e7a4564648b55950064 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8 EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 e0eb7612e05e70d960505982ee14bab749dd898c SHA1 ce6d9093e2ebbd053dece082b7ba5af04fc89f9d SHA256 f9e1b4c6fe5bb57d96c5b3cc4989f25b25fd79d9dfe4e4973a220ced955649be EBUILD pidgin-2.10.0-r2.ebuild 6887 RMD160 19d6014915ab90f8d4df5f402e0699d60729b5cc SHA1 d7def82ac3ec510c6a332b63f0f6a6a922182c6f SHA256 85e5e17f614d0fbf655925b5ac1b7d3c5d2e1234783e2920f4e80695ac198d63 -MISC ChangeLog 36940 RMD160 b15fe88be294942aa3bce24c2bf85c8c1ba7d227 SHA1 e5feee021afde48f6e9066daba1e470266d02fef SHA256 8f8088d80f6443d7ee654b98369ff6a454cd40249ca197c9db7a8bc14d62e6aa +EBUILD pidgin-2.10.1.ebuild 6982 RMD160 ab4a3b7b12a329ae5b3c175499554ae9d6bccef0 SHA1 264e5936e448e934fcd861de4702739320d32a0c SHA256 0ce3ce0c4a1d5bf8c0ea5d1f257ea3021861e447ffd5260a9b7b59b921be82dd +MISC ChangeLog 37213 RMD160 2a8086f5d6451e99d6eb68949afc8ffd88db800b SHA1 ca9418ba252b7a0d6742bb7d0169745b4fec920f SHA256 40ba84efe991a6b0c4ad3159c5fd30ff0b3cbdd1abf694f4fff83e94d1dd0282 MISC metadata.xml 1311 RMD160 b0374914c2205f8e96bbcaf82aa7669c0568a3c1 SHA1 4dfd73f2ce52af88aa122d170d97d1e41803f7c7 SHA256 a0253264c64bdd1a4623db7f223cae50450dc8577d74748c25974ca909b80875 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk6pFioACgkQgAnW8HDreRbRTgCgxEbyLodFh+T+CocJQA+Rwqig -jVAAmgPILjtLQaf29deUZbo+tFaEWb46 -=Juf/ +iF4EAREIAAYFAk7mR8UACgkQGrk+8vGYmwf8/gD6Ak6GuNBIqxNGKKysSXGS353R +z82PQekj731Fbmh2GX0BAPHjkgk+6Gxs5D8bWCM3nnlOrSlSX90E4i1HxZtXaz83 +=E2yP -----END PGP SIGNATURE----- diff --git a/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch b/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch new file mode 100644 index 000000000000..8b5c1a71d3aa --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.10.0-networkmanager-0.9.patch @@ -0,0 +1,51 @@ +http://developer.pidgin.im/ticket/13859 + +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 +@@ -833,8 +833,20 @@ purple_network_is_available(void) + purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); + } + +- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) +- return TRUE; ++ switch (nm_state) ++ { ++ case NM_STATE_UNKNOWN: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else ++ case NM_STATE_CONNECTED: ++#endif ++ return TRUE; ++ default: ++ break; ++ } + + return FALSE; + +@@ -1170,9 +1182,14 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); ++ /* NM 0.6 signal */ + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", + G_CALLBACK(nm_state_change_cb), NULL, NULL); ++ /* NM 0.7 and later signal */ ++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", ++ G_CALLBACK(nm_state_change_cb), NULL, NULL); + + dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, + DBUS_SERVICE_DBUS, +@@ -1207,6 +1224,7 @@ purple_network_uninit(void) + #ifdef HAVE_NETWORKMANAGER + if (nm_proxy) { + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); ++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); + g_object_unref(G_OBJECT(nm_proxy)); + } + if (dbus_proxy) { diff --git a/net-im/pidgin/pidgin-2.10.1.ebuild b/net-im/pidgin/pidgin-2.10.1.ebuild new file mode 100644 index 000000000000..8818847a6132 --- /dev/null +++ b/net-im/pidgin/pidgin-2.10.1.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.1.ebuild,v 1.1 2011/12/12 18:28:21 pva Exp $ + +EAPI=4 + +GENTOO_DEPEND_ON_PERL=no +inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="http://pidgin.im/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" +IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" +IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" + +# dbus requires python to generate C code for dbus bindings (thus DEPEND only). +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is +# no way to build dbus and avoid libgnt linkage with python. If you want this +# send patch upstream. +# purple-url-handler and purple-remote require dbus-python thus in reality we +# rdepend on python if dbus enabled. But it is possible to separate this dep. +RDEPEND=" + >=dev-libs/glib-2.16 + >=dev-libs/libxml2-2.6.18 + ncurses? ( sys-libs/ncurses[unicode] + dbus? ( =x11-libs/gtk+-2.10:2 + x11-libs/libSM + xscreensaver? ( x11-libs/libXScrnSaver ) + spell? ( >=app-text/gtkspell-2.0.2:2 ) + eds? ( gnome-extra/evolution-data-server ) + prediction? ( >=dev-db/sqlite-3.3:3 ) ) + gstreamer? ( =media-libs/gstreamer-0.10* + =media-libs/gst-plugins-good-0.10* + >=net-libs/farsight2-0.0.14 + media-plugins/gst-plugins-meta + media-plugins/gst-plugins-gconf ) + zeroconf? ( net-dns/avahi[dbus] ) + dbus? ( >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-0.90 + dev-python/dbus-python ) + perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) + gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] + >=net-libs/libgadu-1.11.0[-ssl] ) ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( >=dev-libs/nss-3.11 ) + meanwhile? ( net-libs/meanwhile ) + silc? ( >=net-im/silc-toolkit-1.0.1 ) + tcl? ( dev-lang/tcl ) + tk? ( dev-lang/tk ) + sasl? ( dev-libs/cyrus-sasl:2 ) + networkmanager? ( net-misc/networkmanager ) + idn? ( net-dns/libidn ) + ! python is enabled + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" + if use gtk && ! use nls; then + ewarn "gtk build => nls is enabled!" + fi + if use dbus && ! use python; then + elog "dbus is enabled, no way to disable linkage with python => python is enabled" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" + epatch "${FILESDIR}/${PN}-2.10.0-networkmanager-0.9.patch" +} + +src_configure() { + # Stabilize things, for your own good + strip-flags + replace-flags -O? -O2 + + local myconf + + if use gadu; then + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" + myconf="${myconf} --with-gadu-includes=." + myconf="${myconf} --with-gadu-libs=." + fi + + use silc && DYNAMIC_PRPLS+=",silc" + use meanwhile && DYNAMIC_PRPLS+=",sametime" + use zeroconf && DYNAMIC_PRPLS+=",bonjour" + use groupwise && DYNAMIC_PRPLS+=",novell" + use zephyr && DYNAMIC_PRPLS+=",zephyr" + + if use gnutls; then + einfo "Disabling NSS, using GnuTLS" + myconf+=" --enable-nss=no --enable-gnutls=yes" + myconf+=" --with-gnutls-includes=/usr/include/gnutls" + myconf+=" --with-gnutls-libs=/usr/$(get_libdir)" + else + einfo "Disabling GnuTLS, using NSS" + myconf+=" --enable-gnutls=no --enable-nss=yes" + fi + + if use dbus || { use ncurses && use python; }; then + myconf+=" --with-python=$(PYTHON)" + else + myconf+=" --without-python" + fi + + econf \ + --disable-silent-rules \ + $(use_enable ncurses consoleui) \ + $(use_enable gtk gtkui) \ + $(use_enable gtk sm) \ + $(use gtk || use_enable nls) \ + $(use gtk && echo "--enable-nls") \ + $(use gtk && use_enable xscreensaver screensaver) \ + $(use gtk && use_enable prediction cap) \ + $(use gtk && use_enable eds gevolution) \ + $(use gtk && use_enable spell gtkspell) \ + $(use_enable perl) \ + $(use_enable tk) \ + $(use_enable tcl) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable meanwhile) \ + $(use_enable gstreamer) \ + $(use_enable gstreamer farsight) \ + $(use_enable gstreamer vv) \ + $(use_enable sasl cyrus-sasl ) \ + $(use_enable doc doxygen) \ + $(use_enable networkmanager nm) \ + $(use_enable zeroconf avahi) \ + $(use_enable idn) \ + --with-system-ssl-certs="/etc/ssl/certs/" \ + --with-dynamic-prpls="${DYNAMIC_PRPLS}" \ + --disable-mono \ + --x-includes=/usr/include/X11 \ + ${myconf} + #$(use_enable mono) \ +} + +src_install() { + gnome2_src_install + if use gtk; then + # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other + # implementations that are not complient with new hicolor theme yet, #323355 + local pixmapdir + for d in 16 22 32 48; do + pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions + mkdir "${pixmapdir}" || die + pushd "${pixmapdir}" >/dev/null || die + for f in ../status/*; do + ln -s ${f} || die + done + popd >/dev/null + done + fi + use perl && fixlocalpod + + dodoc finch/plugins/pietray.py + docompress -x /usr/share/doc/${PF}/pietray.py + + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" +} -- cgit v1.2.3-65-gdbad