Version bump. Add ubuntu fix for CVE 2008-6792, bug #270326. Set GETTEXT_PACKAGE variable, bug #270338.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 145 insertions, 1 deletions

diff --git a/app-admin/system-tools-backends/ChangeLog b/app-admin/system-tools-backends/ChangeLog
index 4eb96deaddcc..60edaa3e2340 100644
--- a/app-admin/system-tools-backends/ChangeLog
+++ b/app-admin/system-tools-backends/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/system-tools-backends
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.50 2009/04/16 22:13:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.51 2009/07/23 22:13:12 eva Exp $
+
+*system-tools-backends-2.6.1-r1 (23 Jul 2009)
+
+  23 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/system-tools-backends-2.6.0-1ubuntu1.1.patch,
+  +system-tools-backends-2.6.1-r1.ebuild,
+  +files/system-tools-backends-2.6.1-gettext.patch:
+  Version bump. Add ubuntu fix for CVE 2008-6792, bug #270326. Set
+  GETTEXT_PACKAGE variable, bug #270338.
 
 *system-tools-backends-2.6.1 (16 Apr 2009)
 
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-1ubuntu1.1.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-1ubuntu1.1.patch
new file mode 100644
index 000000000000..b86aee91eb71
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-1ubuntu1.1.patch
@@ -0,0 +1,16 @@
+  * Tell liboobs to use md5 if pam the pam config specifies sha* as well
+    as if it specifies md5. If we don't do this then the switch to sha512
+    means that adding a users with system-tools-backends gives them a 3DES
+    password. (LP: #287134)
+
+ -- James Westby <james.westby@canonical.com>  Tue, 28 Oct 2008 21:06:26 +0000
+--- a/Users/Users.pm
++++ b/Users/Users.pm
+@@ -293,6 +293,7 @@
+       foreach $i (@line)
+       {
+         $use_md5 = 1 if ($i eq "md5");
++        $use_md5 = 1 if ($i =~ /^sha\d+/);
+       }
+     }
+   }
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.1-gettext.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.1-gettext.patch
new file mode 100644
index 000000000000..4443fb091b06
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.6.1-gettext.patch
@@ -0,0 +1,30 @@
+From a490e24165814fb43601f1a4b4a4c21fa148a50b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 23 Jul 2009 23:52:32 +0200
+Subject: [PATCH] Define GETTEXT_PACKAGE
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=270338
+---
+ configure.in |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 49e537f..3f7da10 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,12 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ AC_PROG_LIBTOOL
+ IT_PROG_INTLTOOL([0.40.0])
+ 
++AM_GLIB_GNU_GETTEXT
++
++GETTEXT_PACKAGE=system-tools-backends
++AC_SUBST(GETTEXT_PACKAGE)
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
++
+ DBUS_REQUIRED=1.1.2
+ DBUS_GLIB_REQUIRED=0.74
+ GLIB_REQUIRED=2.4.0
+-- 
+1.6.3.3
+
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.6.1-r1.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..da4bc4fbbd83
--- /dev/null
+++ b/app-admin/system-tools-backends/system-tools-backends-2.6.1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/system-tools-backends-2.6.1-r1.ebuild,v 1.1 2009/07/23 22:13:12 eva Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
+HOMEPAGE="http://www.gnome.org/projects/gst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="policykit"
+
+RDEPEND="!<app-admin/gnome-system-tools-1.1.91
+	>=sys-apps/dbus-1.1.2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.15.2
+	>=dev-perl/Net-DBus-0.33.4
+	dev-lang/perl
+	policykit? ( >=sys-auth/policykit-0.5 )
+	userland_GNU? ( sys-apps/shadow )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable policykit polkit)"
+
+	enewgroup stb-admin || die "Failed to create stb-admin group"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix a typo in services
+	epatch "${FILESDIR}/${PN}-2.6.0-services.patch"
+
+	# Fix a distro detection in users to use proper variant
+	# of useradd
+	epatch "${FILESDIR}/${PN}-2.6.0-users.patch"
+
+	# Fix automagic policykit dependency
+	epatch "${FILESDIR}/${PN}-2.6.0-automagic-polkit.patch"
+
+	# Fix service handling
+	epatch "${FILESDIR}/${PN}-2.6.0-handle-services.patch"
+
+	# Clean up pid file
+	epatch "${FILESDIR}/${PN}-2.6.0-cleanup-pid-file.patch"
+
+	# Change default permission, only people in stb-admin is allowed
+	# to speak to the dispatcher.
+	epatch "${FILESDIR}/${PN}-2.6.0-default-permissions.patch"
+
+	# Apply fix from ubuntu for CVE 2008 4311
+	epatch "${FILESDIR}/${PN}-2.6.0-cve-2008-4311.patch"
+
+	# Apply fix from ubuntu for CVE 2008 6792, bug #270326
+	epatch "${FILESDIR}/${PN}-2.6.0-1ubuntu1.1.patch"
+
+	# Set GETTEXT_PACKAGE, bug #270338
+	epatch "${FILESDIR}/${PN}-2.6.1-gettext.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_compile() {
+	# Autotools insanity, localstatedir gets set to /usr/local/var by default
+	gnome2_src_compile --localstatedir="${ROOT}"/var
+}
+
+src_install() {
+	gnome2_src_install
+	newinitd "${FILESDIR}"/stb.rc system-tools-backends
+}
+
+pkg_postinst() {
+	echo
+	elog "You need to add yourself to the group stb-admin and"
+	elog "add system-tools-backends to the default runlevel."
+	elog "You can do this as root like so:"
+	elog "  # rc-update add system-tools-backends default"
+	echo
+}