summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-06-20 05:34:06 +0000
committerPeter Volkov <pva@gentoo.org>2011-06-20 05:34:06 +0000
commit69e1a5963c6759c7bf51251e3ab2a8219522dea9 (patch)
treef52d4318a64a538792389c2db89b3b5b33e8517b /net-im
parentFixes privilege escalation with sudo (CVE-2011-1760), bug #366699 thank Tim S... (diff)
downloadhistorical-69e1a5963c6759c7bf51251e3ab2a8219522dea9.tar.gz
historical-69e1a5963c6759c7bf51251e3ab2a8219522dea9.tar.bz2
historical-69e1a5963c6759c7bf51251e3ab2a8219522dea9.zip
Allow pidgin be built against net-libs/libgadu[-ssl], bug 372075 thank Bartosz Brachaczek for report.
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/pidgin/ChangeLog6
-rw-r--r--net-im/pidgin/Manifest4
-rw-r--r--net-im/pidgin/pidgin-2.8.0-r1.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 8d9d99193d9f..270fb33618f5 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
# 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.236 2011/06/19 08:49:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.237 2011/06/20 05:34:06 pva Exp $
+
+ 20 Jun 2011; Peter Volkov <pva@gentoo.org> pidgin-2.8.0-r1.ebuild:
+ Allow pidgin be built against net-libs/libgadu[-ssl], bug 372075 thank
+ Bartosz Brachaczek for report.
*pidgin-2.8.0-r1 (19 Jun 2011)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 3b084e8c4490..72e484c2bb2d 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -4,7 +4,7 @@ AUX pidgin-2.8.0-finch-icq.patch 602 RMD160 7aa3168c557985ef2f6f4381ff0b60d3bd9c
DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
EBUILD pidgin-2.7.11.ebuild 6450 RMD160 15df33bfd9e0a4875a1206fe43cd54843104df69 SHA1 936ed58367c33e4df403d7764ecb7d51d2d6b9b6 SHA256 804438aedd0fd8b309c7291b60978b5cbad4acdc8c65e9fcf23722b978a4fa08
-EBUILD pidgin-2.8.0-r1.ebuild 6881 RMD160 cf2dd4af9c4129f57249d5db932c265bf46ab32b SHA1 b56c3160d72aa1182ef0f02ccebca7cc3eceda2d SHA256 c24b72880aff6cc5a74f677741347e35634cf891e890c41779f910b942c30997
+EBUILD pidgin-2.8.0-r1.ebuild 6922 RMD160 d8ef43aa08c040fef51a39ec480a686a11c73f1b SHA1 590acac68022bf4f7a9617b03a1eb658414f8f78 SHA256 4e794fe3fdb55ecb1236a9c64acd592f313cb2bb6af34605ff1b4c74580d09e9
EBUILD pidgin-2.8.0.ebuild 6835 RMD160 10c655434d6590a442b4cabfa9e0847c76fedfac SHA1 85783e1161b006f05d5bcf18a01053c5259e109f SHA256 6db41d97437a296141ae1234bd50d73e9808d28984f11d49d812eecbae5c38b9
-MISC ChangeLog 33311 RMD160 755daf057d45517ae8e6aa2435ccbe054cace47c SHA1 4e2443a687a9789d18fa01bdb92c9763ad8dde33 SHA256 5dc27a45d8b22d408acbe2900eccd408c22271b34ccc0a67664d28c801ac3e26
+MISC ChangeLog 33487 RMD160 0576bc96e373ee08f9a191c09b2e5d523f30ba79 SHA1 99a21f0eb6b932b6e7153361d4bcf026c430c1a1 SHA256 2346eeb9d51f00e7e2431587b76db6131d72c36bb20cf09ea9587e45f5ed9cba
MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba
diff --git a/net-im/pidgin/pidgin-2.8.0-r1.ebuild b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
index 49b567d4e983..88aba45efe05 100644
--- a/net-im/pidgin/pidgin-2.8.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.8.0-r1.ebuild
@@ -1,6 +1,6 @@
# 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.8.0-r1.ebuild,v 1.1 2011/06/19 08:49:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.8.0-r1.ebuild,v 1.2 2011/06/20 05:34:06 pva Exp $
EAPI=3
@@ -47,7 +47,8 @@ RDEPEND="
>=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] )
+ 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 )