[gentoo-commits] gentoo-x86 commit in net-im/gajim: metadata.xml ChangeLog gajim-0.15.2-r1.ebuild gajim-0.15.2.ebuild

[gentoo-commits] gentoo-x86 commit in net-im/gajim: metadata.xml ChangeLog gajim-0.15.2-r1.ebuild gajim-0.15.2.ebuild

[Justin Lecher (jlec)]

jlec        13/02/19 16:42:23

  Modified:             metadata.xml ChangeLog
  Added:                gajim-0.15.2-r1.ebuild
  Removed:              gajim-0.15.2.ebuild
  Log:
  net-im/gajim: Backport fix for CVE-2012-5524, #442860
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.11                 net-im/gajim/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/metadata.xml?r1=1.10&r2=1.11

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/gajim/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml	5 Nov 2012 07:48:35 -0000	1.10
+++ metadata.xml	19 Feb 2013 16:42:22 -0000	1.11
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+  <herd>net-im</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <longdescription>
     A fully featured and easy to use GTK+ Jabber client written in PyGTK.
   </longdescription>
-	<use>
-		<flag name="idle">Enable idle module</flag>
-		<flag name="srv">SRV capabilities</flag>
-		<flag name="xhtml">Enable XHTML support</flag>
-	</use>
+  <use>
+    <flag name="idle">Enable idle module</flag>
+    <flag name="srv">SRV capabilities</flag>
+    <flag name="xhtml">Enable XHTML support</flag>
+  </use>
 </pkgmetadata>



1.162                net-im/gajim/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/ChangeLog?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/ChangeLog?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/ChangeLog?r1=1.161&r2=1.162

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- ChangeLog	2 Feb 2013 23:01:13 -0000	1.161
+++ ChangeLog	19 Feb 2013 16:42:22 -0000	1.162
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.161 2013/02/02 23:01:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.162 2013/02/19 16:42:22 jlec Exp $
+
+*gajim-0.15.2-r1 (19 Feb 2013)
+
+  19 Feb 2013; Justin Lecher <jlec@gentoo.org> -gajim-0.15.2.ebuild,
+  +gajim-0.15.2-r1.ebuild, +files/gajim-0.15.2-CVE-2012-5524.patch,
+  metadata.xml:
+  Backport fix for CVE-2012-5524, #442860
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> gajim-0.15.2.ebuild:
   Add ~arm, wrt bug #449220



1.1                  net-im/gajim/gajim-0.15.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/gajim-0.15.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/gajim/gajim-0.15.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: gajim-0.15.2-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2-r1.ebuild,v 1.1 2013/02/19 16:42:22 jlec Exp $

EAPI=4

PYTHON_DEPEND="2"
PYTHON_USE_WITH="sqlite xml"

inherit autotools eutils python versionator

DESCRIPTION="Jabber client written in PyGTK"
HOMEPAGE="http://www.gajim.org/"
SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"

LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv X xhtml"

REQUIRED_USE="
	libnotify? ( dbus )
	avahi? ( dbus )"

COMMON_DEPEND="
	dev-python/pygtk:2
	x11-libs/gtk+:2"
DEPEND="${COMMON_DEPEND}
	>=dev-util/intltool-0.40.1
	virtual/pkgconfig
	>=sys-devel/gettext-0.17-r1"
RDEPEND="${COMMON_DEPEND}
	dev-python/pyasn1
	dev-python/pyopenssl
	crypt? (
		app-crypt/gnupg
		dev-python/pycrypto
		)
	dbus? (
		dev-python/dbus-python
		dev-libs/dbus-glib
		libnotify? ( dev-python/notify-python )
		avahi? ( net-dns/avahi[dbus,gtk,python] )
		)
	gnome? (
		dev-python/libgnome-python
		dev-python/gnome-keyring-python
		dev-python/egg-python
		)
	idle? ( x11-libs/libXScrnSaver )
	jingle? ( net-libs/farstream:0.1[python] )
	kde? ( kde-base/kwallet )
	networkmanager? (
			dev-python/dbus-python
			net-misc/networkmanager
		)
	spell? ( app-text/gtkspell:2 )
	srv? (
		|| (
			dev-python/libasyncns-python
			net-dns/bind-tools )
		)
	xhtml? ( dev-python/docutils )"

pkg_setup() {
	python_set_active_version 2
	python_pkg_setup
}

src_prepare() {
	echo "src/command_system/mapping.py" >> po/POTFILES.in
	epatch \
		"${FILESDIR}"/0.14-python-version.patch \
		"${FILESDIR}"/0.14.1-testing.patch \
		"${FILESDIR}"/${P}-CVE-2012-5524.patch
	echo '#!/bin/sh' > config/py-compile
	eautoreconf
}

src_configure() {
	econf \
		$(use_enable nls) \
		$(use_with X x) \
		--docdir="/usr/share/doc/${PF}" \
		--libdir="$(python_get_sitedir)" \
		--enable-site-packages
}

src_install() {
	default

	rm "${D}/usr/share/doc/${PF}/README.html" || die
	dohtml README.html
}

pkg_postinst() {
	python_mod_optimize ${PN}
}

pkg_postrm() {
	python_mod_cleanup ${PN}
}