Version bump. Clean up old revisions.

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

12 files changed, 180 insertions, 300 deletions

diff --git a/app-admin/system-tools-backends/ChangeLog b/app-admin/system-tools-backends/ChangeLog
index 60edaa3e2340..9fec752d8eab 100644
--- a/app-admin/system-tools-backends/ChangeLog
+++ b/app-admin/system-tools-backends/ChangeLog
@@ -1,6 +1,23 @@
 # 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.51 2009/07/23 22:13:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.52 2009/12/17 23:17:01 eva Exp $
+
+*system-tools-backends-2.8.3 (17 Dec 2009)
+
+  17 Dec 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -system-tools-backends-1.4.2-r1.ebuild,
+  -files/system-tools-backends-2.4.1-baselayout2.patch,
+  -system-tools-backends-2.4.2.ebuild,
+  -system-tools-backends-2.6.0-r1.ebuild,
+  -system-tools-backends-2.6.0-r2.ebuild,
+  -files/system-tools-backends-2.6.0-gcc43.patch,
+  -system-tools-backends-2.6.1.ebuild,
+  +files/system-tools-backends-2.8.2-1ubuntu1.1.patch,
+  +files/system-tools-backends-2.8.2-automagic-polkit.patch,
+  +files/system-tools-backends-2.8.2-cve-2008-4311.patch,
+  +files/system-tools-backends-2.8.2-default-permissions.patch,
+  +system-tools-backends-2.8.3.ebuild:
+  Version bump. Clean up old revisions.
 
 *system-tools-backends-2.6.1-r1 (23 Jul 2009)
 
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.4.1-baselayout2.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.4.1-baselayout2.patch
deleted file mode 100644
index e6846700bde3..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.4.1-baselayout2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur system-tools-backends-2.4.1/Init/Services.pm system-tools-backends-2.4.1.new/Init/Services.pm
---- Init/Services.pm	2007-09-26 05:13:27.000000000 +0530
-+++ Init/Services.pm	2007-11-06 05:19:51.000000000 +0530
-@@ -647,7 +647,7 @@
- 
- sub get_gentoo_runlevels
- {
--  my($raw_output) = Utils::File::run_backtick("rc-status -nc -l");
-+  my($raw_output) = Utils::File::run_backtick("rc-status --nocolor -l");
-   my(@runlevels);
- 
-   return undef if (!$raw_output);
-@@ -659,7 +659,7 @@
- sub get_gentoo_services_for_runlevel
- {
-   my($runlevel) = @_;
--  my($raw_output) = Utils::File::run_backtick("rc-status -nc $runlevel");
-+  my($raw_output) = Utils::File::run_backtick("rc-status --nocolor $runlevel");
-   my(@raw_lines) = split(/\n/,$raw_output);
-   my($line, $service);
-   my(%services);
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-gcc43.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-gcc43.patch
deleted file mode 100644
index 084c45f42ffc..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-gcc43.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/dispatcher/main.c b/dispatcher/main.c
-index 8088bd0..0448b5e 100644
---- a/dispatcher/main.c
-+++ b/dispatcher/main.c
-@@ -47,7 +47,9 @@ daemonize (void)
- 
-   setsid ();
- 
--  if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1)
-+  if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid",
-+                          O_CREAT | O_WRONLY,
-+                          S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) != -1)
-     {
-       str = g_strdup_printf ("%d", getpid ());
-       write (pidfile_fd, str, strlen (str));
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-1ubuntu1.1.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-1ubuntu1.1.patch
new file mode 100644
index 000000000000..7135f527843f
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-1ubuntu1.1.patch
@@ -0,0 +1,30 @@
+From 109407f04879ae997801ca0514c814d874ae4970 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:39:15 +0100
+Subject: [PATCH 4/4] Gentoo: add ubuntu patch for sha512 compatibility
+
+  * 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
+---
+ Users/Users.pm |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Users/Users.pm b/Users/Users.pm
+index 2ec852d..578ad7e 100644
+--- a/Users/Users.pm
++++ b/Users/Users.pm
+@@ -293,6 +293,7 @@ sub do_get_use_md5
+       foreach $i (@line)
+       {
+         $use_md5 = 1 if ($i eq "md5");
++        $use_md5 = 1 if ($i =~ /^sha\d+/);
+       }
+     }
+   }
+-- 
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch
new file mode 100644
index 000000000000..edc8f93ec481
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch
@@ -0,0 +1,46 @@
+From 6e46c905acbef72af0083abeff5b4cd5e522824f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:34:40 +0100
+Subject: [PATCH 1/4] Gentoo: fix automagic policykit dependency
+
+---
+ configure.in |   18 ++++++++++++------
+ 1 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index d196049..aa31a8e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.52)
++AC_PREREQ(2.60)
+ dnl ==============================================================
+ dnl Process this file with autoconf to produce a configure script.
+ dnl ==============================================================
+@@ -123,12 +123,18 @@ AC_SUBST(DISPATCHER_LIBS)
+ AC_SUBST(DISPATCHER_CFLAGS)
+ 
+ dnl check for PolicyKit
+-PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLICYKIT_REQUIRED, have_polkit=yes, have_polkit=no)
+-
+-if test "$have_polkit" = "yes"; then
+-  AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
+-fi
+ 
++have_polkit=no
++AC_ARG_ENABLE(polkit,
++	AS_HELP_STRING([--enable-polkit],[Enable policykit support]))
++AS_IF(["$enable_polkit" = "yes"], [
++	PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, [
++		have_polkit=yes
++		AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
++	], [
++		AC_MSG_ERROR([policykit support requested but not found])
++	])
++])
+ AC_SUBST(POLKIT_LIBS)
+ AC_SUBST(POLKIT_CFLAGS)
+ AM_CONDITIONAL(HAVE_POLKIT, test x$have_polkit = xyes)
+-- 
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch
new file mode 100644
index 000000000000..47f93da74f16
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-cve-2008-4311.patch
@@ -0,0 +1,47 @@
+From 544d679c2796602ff277e78e238abd56d30ad633 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:37:58 +0100
+Subject: [PATCH 3/4] Gentoo: fix CVE-2008-4311
+
+commit fd648907e46017d46c367f59c62d0b0395830903
+Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
+Date:   2009-01-04 19:35:51 +0000
+
+    Allow root to send messages to all the system tools backends, so
+    they work even when CVE-2008-4311 has been fixed.
+
+    Also disallow normal user access by destination, not by
+    interface (fd.o #18961).
+---
+ org.freedesktop.SystemToolsBackends.conf |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/org.freedesktop.SystemToolsBackends.conf b/org.freedesktop.SystemToolsBackends.conf
+index 58972ee..537ef73 100644
+--- a/org.freedesktop.SystemToolsBackends.conf
++++ b/org.freedesktop.SystemToolsBackends.conf
+@@ -22,8 +22,10 @@
+     <allow send_interface="org.freedesktop.SystemToolsBackends.Platform" send_member="getPlatform"/>
+     -->
+ 
+-    <!-- Only allow talking to the dispatcher -->
+-    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
++    <!-- configuration modules can't be accessed directly... -->
++    <deny send_destination="org.freedesktop.SystemToolsBackends"/>
++    <deny send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
++    <deny send_destination="org.freedesktop.SystemToolsBackends"/>
+   </policy>
+ 
+   <policy user="0">
+@@ -45,8 +47,6 @@
+ 
+     <!-- be able to speak to configuration modules,
+          so any message to them has to go through the dispatcher -->
+-    <allow send_interface="org.freedesktop.SystemToolsBackends"/>
+-    <allow send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends.GroupsConfig"/>
+-- 
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch
new file mode 100644
index 000000000000..bc58ba4fb1f9
--- /dev/null
+++ b/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-default-permissions.patch
@@ -0,0 +1,25 @@
+From ea88120dac8ba2c2dabf4c393c283f69b3d33b5a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 14 Dec 2009 20:37:15 +0100
+Subject: [PATCH 2/4] Gentoo: restrict access to stb to users in stb-admin group
+
+---
+ org.freedesktop.SystemToolsBackends.conf |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/org.freedesktop.SystemToolsBackends.conf b/org.freedesktop.SystemToolsBackends.conf
+index d031525..58972ee 100644
+--- a/org.freedesktop.SystemToolsBackends.conf
++++ b/org.freedesktop.SystemToolsBackends.conf
+@@ -60,4 +60,8 @@
+     <allow send_destination="org.freedesktop.SystemToolsBackends.UserConfig"/>
+     <allow send_destination="org.freedesktop.SystemToolsBackends.UsersConfig"/>
+   </policy>
++  <policy group="stb-admin">
++    <!-- be able to speak to the dispatcher -->
++    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
++  </policy>
+ </busconfig>
+-- 
+1.6.5.4
+
diff --git a/app-admin/system-tools-backends/system-tools-backends-1.4.2-r1.ebuild b/app-admin/system-tools-backends/system-tools-backends-1.4.2-r1.ebuild
deleted file mode 100644
index 9de0f8e5a3ba..000000000000
--- a/app-admin/system-tools-backends/system-tools-backends-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 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-1.4.2-r1.ebuild,v 1.10 2007/05/21 10:26:25 armin76 Exp $
-
-inherit 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="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="net-misc/openssh
-	userland_GNU? ( sys-apps/shadow )
-	>=dev-libs/libxml2-2.4.12
-	!<app-admin/gnome-system-tools-1.1.91
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	enewgroup stb-admin || die "failed to create stb-admin group"
-}
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.4.2.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.4.2.ebuild
deleted file mode 100644
index ba95e0e55824..000000000000
--- a/app-admin/system-tools-backends/system-tools-backends-2.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 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.4.2.ebuild,v 1.1 2008/01/24 23:05:37 eva Exp $
-
-inherit gnome2 eutils
-
-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=""
-
-RDEPEND="!<app-admin/gnome-system-tools-1.1.91
-		>=dev-libs/glib-2.4
-		>=dev-libs/dbus-glib-0.71
-		>=dev-perl/Net-DBus-0.33.4
-		dev-lang/perl
-		userland_GNU? ( sys-apps/shadow )"
-
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	enewgroup stb-admin || die "Failed to create stb-admin group"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Fix baselayout-2 problems with services-admin
-	epatch "${FILESDIR}"/${PN}-2.4.1-baselayout2.patch
-}
-
-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
-}
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.6.0-r1.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.6.0-r1.ebuild
deleted file mode 100644
index 7b68d46a183d..000000000000
--- a/app-admin/system-tools-backends/system-tools-backends-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 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.0-r1.ebuild,v 1.1 2008/10/13 21:27:11 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"
-
-# FIXME: policykit is optional but doesn't have a configure switch ?
-#
-# status:
-#  * users-admin: can't create new users
-#  * services: not handled correctly
-
-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.29"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING 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}/${P}-services.patch"
-
-	# Fix a distro detection in users to use proper variant
-	# of useradd
-	epatch "${FILESDIR}/${P}-users.patch"
-
-	# Fix automagic policykit dependency
-	epatch "${FILESDIR}/${P}-automagic-polkit.patch"
-
-	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
-}
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.6.0-r2.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.6.0-r2.ebuild
deleted file mode 100644
index 5db89a08e114..000000000000
--- a/app-admin/system-tools-backends/system-tools-backends-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.0-r2.ebuild,v 1.1 2009/04/09 22:45:30 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"
-
-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}/${P}-services.patch"
-
-	# Fix a distro detection in users to use proper variant
-	# of useradd
-	epatch "${FILESDIR}/${P}-users.patch"
-
-	# Fix automagic policykit dependency
-	epatch "${FILESDIR}/${P}-automagic-polkit.patch"
-
-	# Fix service handling
-	epatch "${FILESDIR}/${P}-handle-services.patch"
-
-	# Clean up pid file
-	epatch "${FILESDIR}/${P}-cleanup-pid-file.patch"
-
-	# Change default permission, only people in stb-admin is allowed
-	# to speak to the dispatcher.
-	epatch "${FILESDIR}/${P}-default-permissions.patch"
-
-	# Apply fix from ubuntu for CVE 2008 4311
-	epatch "${FILESDIR}/${P}-cve-2008-4311.patch"
-
-	# Fix for gcc 4.3
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	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
-}
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.6.1.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild
index 248970ea2887..afb49746cc8d 100644
--- a/app-admin/system-tools-backends/system-tools-backends-2.6.1.ebuild
+++ b/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild
@@ -1,6 +1,9 @@
 # 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.ebuild,v 1.1 2009/04/16 22:13:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild,v 1.1 2009/12/17 23:17:01 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2
 
@@ -18,7 +21,7 @@ RDEPEND="!<app-admin/gnome-system-tools-1.1.91
 	>=dev-libs/glib-2.15.2
 	>=dev-perl/Net-DBus-0.33.4
 	dev-lang/perl
-	policykit? ( >=sys-auth/policykit-0.5 )
+	policykit? ( >=sys-auth/polkit-0.92 )
 	userland_GNU? ( sys-apps/shadow )"
 
 DEPEND="${RDEPEND}
@@ -33,31 +36,21 @@ pkg_setup() {
 	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"
+src_prepare() {
+	gnome2_src_prepare
 
-	# 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"
+	# Fix automagic polkit dependency
+	epatch "${FILESDIR}/${PN}-2.8.2-automagic-polkit.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"
+	epatch "${FILESDIR}/${PN}-2.8.2-default-permissions.patch"
 
 	# Apply fix from ubuntu for CVE 2008 4311
-	epatch "${FILESDIR}/${PN}-2.6.0-cve-2008-4311.patch"
+	epatch "${FILESDIR}/${PN}-2.8.2-cve-2008-4311.patch"
+
+	# Apply fix from ubuntu for CVE 2008 6792, bug #270326
+	epatch "${FILESDIR}/${PN}-2.8.2-1ubuntu1.1.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf