Clean up old revisions.

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

11 files changed, 14 insertions, 305 deletions

diff --git a/app-admin/system-tools-backends/ChangeLog b/app-admin/system-tools-backends/ChangeLog
index a3cb8ab97e20..4444d0597b43 100644
--- a/app-admin/system-tools-backends/ChangeLog
+++ b/app-admin/system-tools-backends/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-admin/system-tools-backends
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.54 2010/05/22 15:55:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.55 2010/05/31 21:10:54 eva Exp $
+
+  31 May 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/system-tools-backends-2.6.0-1ubuntu1.1.patch,
+  -files/system-tools-backends-2.6.0-automagic-polkit.patch,
+  -files/system-tools-backends-2.6.0-cleanup-pid-file.patch,
+  -files/system-tools-backends-2.6.0-cve-2008-4311.patch,
+  -files/system-tools-backends-2.6.0-default-permissions.patch,
+  -files/system-tools-backends-2.6.0-handle-services.patch,
+  -files/system-tools-backends-2.6.0-services.patch,
+  -files/system-tools-backends-2.6.0-users.patch,
+  -system-tools-backends-2.6.1-r1.ebuild,
+  -files/system-tools-backends-2.6.1-gettext.patch:
+  Clean up old revisions.
 
   22 May 2010; Raúl Porcel <armin76@gentoo.org>
   system-tools-backends-2.8.3.ebuild:
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
deleted file mode 100644
index b86aee91eb71..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-1ubuntu1.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-  * 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.0-automagic-polkit.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch
deleted file mode 100644
index 92a54f71a826..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-automagic-polkit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.in.old	2008-10-13 22:48:51.000000000 +0200
-+++ configure.in	2008-10-13 22:53:59.000000000 +0200
-@@ -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 ==============================================================
-@@ -122,10 +122,19 @@
- AC_SUBST(DISPATCHER_CFLAGS)
- 
- dnl check for PolicyKit
--PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes, have_polkit=no)
- 
--if test "$have_polkit" = "yes"; then
--  AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
-+have_polkit=no
-+AC_ARG_ENABLE(polkit,
-+	AS_HELP_STRING([--enable-polkit],[Enable policykit support]))
-+
-+if test "x$enable_polkit" = "xyes"; then
-+	PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLICYKIT_REQUIRED, have_polkit=yes)
-+
-+	if test "$have_polkit" = "yes"; then
-+		AC_DEFINE(HAVE_POLKIT, [1], [whether PolicyKit was found])
-+	else
-+		AC_MSG_ERROR([policykit support requested but not found])
-+	fi
- fi
- 
- AC_SUBST(POLKIT_LIBS)
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-cleanup-pid-file.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-cleanup-pid-file.patch
deleted file mode 100644
index 6ec22b9f0645..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-cleanup-pid-file.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/system-tools-backends/+bug/298777
-# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=18625
-# Description: Patch to make S-T-B delete it's PID file when terminated
-#
-Index: system-tools-backends-2.6.0/dispatcher/main.c
-===================================================================
---- system-tools-backends-2.6.0.orig/dispatcher/main.c	2008-11-16 17:25:20.000000000 +0000
-+++ system-tools-backends-2.6.0/dispatcher/main.c	2008-11-16 17:25:30.000000000 +0000
-@@ -59,6 +59,12 @@
-   close (dev_null_fd);
- }
- 
-+static void
-+remove_pidfile (void)
-+{
-+  unlink (LOCALSTATEDIR "/run/system-tools-backends.pid");
-+}
-+
- void
- signal_received (gint signal)
- {
-@@ -67,6 +73,7 @@
-     case SIGTERM:
-     case SIGABRT:
-       g_object_unref (dispatcher);
-+      remove_pidfile ();
-       exit (0);
-       break;
-     default:
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-cve-2008-4311.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-cve-2008-4311.patch
deleted file mode 100644
index 924b57b906cc..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-cve-2008-4311.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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).
-
-diff --git a/system-tools-backends.conf b/system-tools-backends.conf
-index 00d6d58..537ef73 100644
---- a/system-tools-backends.conf
-+++ b/system-tools-backends.conf
-@@ -23,8 +23,8 @@
-     -->
- 
-     <!-- configuration modules can't be accessed directly... -->
--    <deny send_interface="org.freedesktop.SystemToolsBackends"/>
--    <deny send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
-+    <deny send_destination="org.freedesktop.SystemToolsBackends"/>
-+    <deny send_destination="org.freedesktop.SystemToolsBackends.Platform"/>
-     <deny send_destination="org.freedesktop.SystemToolsBackends"/>
-   </policy>
- 
-@@ -47,9 +47,18 @@
- 
-     <!-- 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"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.HostsConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.IfacesConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.NFSConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.NTPConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.ServicesConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.SMBConfig"/>
-+    <allow send_destination="org.freedesktop.SystemToolsBackends.TimeConfig"/>
-+    <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 -->
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-default-permissions.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-default-permissions.patch
deleted file mode 100644
index 4712182cf7d6..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-default-permissions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/system-tools-backends.conf.orig	2008-05-28 13:20:52.246850438 +0200
-+++ b/system-tools-backends.conf	2008-05-28 13:24:07.867969323 +0200
-@@ -25,9 +25,7 @@
-     <!-- configuration modules can't be accessed directly... -->
-     <deny send_interface="org.freedesktop.SystemToolsBackends"/>
-     <deny send_interface="org.freedesktop.SystemToolsBackends.Platform"/>
--
--    <!-- ...so petitions go through the dispatcher instead -->
--    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
-+    <deny send_destination="org.freedesktop.SystemToolsBackends"/>
-   </policy>
- 
-   <policy user="0">
-@@ -51,5 +49,10 @@
-          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"/>
-+  </policy>
-+  <policy group="stb-admin">
-+    <!-- be able to speak to the dispatcher -->
-+    <allow send_destination="org.freedesktop.SystemToolsBackends"/>
-   </policy>
- </busconfig>
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-handle-services.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-handle-services.patch
deleted file mode 100644
index c8f8f96cc043..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-handle-services.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git Init/Services.pm Init/Services.pm
-index c1d2620..07ed2cd 100644
---- Init/Services.pm
-+++ Init/Services.pm
-@@ -802,7 +802,7 @@ sub set_gentoo_service_status
- 
-   return if ($status == $old_status);
- 
--  if ($action == $SERVICE_START)
-+  if ($status == $SERVICE_START)
-   {
-     &Utils::File::run ("rc-update add $script $rl");
-     &run_gentoo_script ($script, "start");
diff --git a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch
deleted file mode 100644
index c1653f342dd1..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-services.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git Init/Services.pm Init/Services.pm
-index c1d2620..a76f5dc 100644
---- Init/Services.pm
-+++ Init/Services.pm
-@@ -659,7 +659,7 @@ sub get_gentoo_runlevels
- sub get_gentoo_services_for_runlevel
- {
-   my($runlevel) = @_;
--  my($raw_output) = Utils::File::run_backtick("rc-status -nocolor $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-users.patch b/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch
deleted file mode 100644
index 5d9bf83c4f55..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.0-users.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git Users/Users.pm Users/Users.pm
-index 6703d0f..bd0603a 100644
---- Users/Users.pm
-+++ Users/Users.pm
-@@ -591,7 +591,8 @@ sub add_user
-     if ($cmd_adduser &&
-         $Utils::Backend::tool{"platform"} !~ /^slackware/ &&
-         $Utils::Backend::tool{"platform"} !~ /^archlinux/ &&
--        $Utils::Backend::tool{"platform"} !~ /^redhat/)
-+        $Utils::Backend::tool{"platform"} !~ /^redhat/ &&
-+        $Utils::Backend::tool{"platform"} !~ /^gentoo/)
-     {
-       # use adduser if available and valid (slackware one is b0rk)
-       # set empty gecos fields and password, they will be filled out later
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
deleted file mode 100644
index 4443fb091b06..000000000000
--- a/app-admin/system-tools-backends/files/system-tools-backends-2.6.1-gettext.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index da4bc4fbbd83..000000000000
--- a/app-admin/system-tools-backends/system-tools-backends-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,89 +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.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
-}