diff options
author | Pacho Ramos <pacho@gentoo.org> | 2010-09-06 12:31:14 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2010-09-06 12:31:14 +0000 |
commit | 6f33db1b6844829eff913846074cb8ee43bb207f (patch) | |
tree | 38930d415dfe2a513ddf221e65d2305f2f75fe56 /app-admin | |
parent | Version bump. (diff) | |
download | gentoo-2-6f33db1b6844829eff913846074cb8ee43bb207f.tar.gz gentoo-2-6f33db1b6844829eff913846074cb8ee43bb207f.tar.bz2 gentoo-2-6f33db1b6844829eff913846074cb8ee43bb207f.zip |
Remove old.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
5 files changed, 7 insertions, 154 deletions
diff --git a/app-admin/system-tools-backends/ChangeLog b/app-admin/system-tools-backends/ChangeLog index 6af085c5351c..6536fe95e5ca 100644 --- a/app-admin/system-tools-backends/ChangeLog +++ b/app-admin/system-tools-backends/ChangeLog @@ -1,6 +1,12 @@ # 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.60 2010/08/11 16:04:34 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/system-tools-backends/ChangeLog,v 1.61 2010/09/06 12:31:14 pacho Exp $ + + 06 Sep 2010; Pacho Ramos <pacho@gentoo.org> + -files/system-tools-backends-2.8.2-1ubuntu1.1.patch, + -files/system-tools-backends-2.8.2-automagic-polkit.patch, + -system-tools-backends-2.8.3.ebuild, metadata.xml: + Remove old. 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> system-tools-backends-2.8.3.ebuild, system-tools-backends-2.10.0.ebuild: 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 deleted file mode 100644 index 7135f527843f..000000000000 --- a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-1ubuntu1.1.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 9c45182578e1..000000000000 --- a/app-admin/system-tools-backends/files/system-tools-backends-2.8.2-automagic-polkit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 978778deb06cd2080d2190410842d2b83139f856 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 5f9bbaf..98e18a9 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([test "$enable_polkit" = "yes"], [ -+ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $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.6 - diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml index 70398bc93cc3..013e6579a275 100644 --- a/app-admin/system-tools-backends/metadata.xml +++ b/app-admin/system-tools-backends/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> -<use> - <flag name='policykit'>Use <pkg>sys-auth/policykit</pkg> to gain privileges to change - configuration files</flag> -</use> <longdescription lang="en"> The System Tools Backends are a set of cross-platform modules for Linux, FreeBSD, Solaris and other Unix systems. The backends provide an common DBus diff --git a/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild deleted file mode 100644 index e00963b73fb9..000000000000 --- a/app-admin/system-tools-backends/system-tools-backends-2.8.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2010 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.8.3.ebuild,v 1.4 2010/08/11 16:04:34 josejx Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -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="~alpha ~amd64 ~ia64 ~ppc ~sparc ~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/polkit-0.92 ) - 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) - --localstatedir=/var" - - enewgroup stb-admin || die "Failed to create stb-admin group" -} - -src_prepare() { - gnome2_src_prepare - - # 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.8.2-default-permissions.patch" - - # Apply fix from ubuntu for CVE 2008 4311 - 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 -} - -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 -} |