Version bump to 1.600, remove old; fixes security bug #511626.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

7 files changed, 10 insertions, 442 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 01f4dd7acd34..faeb023feba8 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/usermin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.160 2014/03/17 23:56:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.161 2014/05/28 00:35:35 tomwij Exp $
+
+*usermin-1.600 (28 May 2014)
+
+  28 May 2014; Tom Wijsman <TomWij@gentoo.org> +usermin-1.600.ebuild,
+  -usermin-1.430.ebuild, -usermin-1.530.ebuild, -usermin-1.540-r1.ebuild,
+  -usermin-1.540.ebuild, -usermin-1.570.ebuild, -usermin-1.590.ebuild:
+  Version bump to 1.600, remove old; fixes security bug #511626.
 
 *usermin-1.590 (17 Mar 2014)
 
diff --git a/app-admin/usermin/usermin-1.430.ebuild b/app-admin/usermin/usermin-1.430.ebuild
deleted file mode 100644
index 4d26a8fe97bf..000000000000
--- a/app-admin/usermin/usermin-1.430.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.430.ebuild,v 1.3 2013/05/10 06:13:37 patrick Exp $
-
-IUSE="ssl"
-
-inherit eutils pam user
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	sys-process/lsof
-	ssl? ( dev-perl/Net-SSLeay )"
-
-#	 pam? ( dev-perl/Authen-PAM )
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -pR * "${D}"/usr/libexec/usermin
-
-	newinitd "${FILESDIR}"/init.d.usermin usermin
-
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/usermin/setup.sh > "${T}"/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
-	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	elog "Point your web browser to https://localhost:20000 to use usermin."
-}
diff --git a/app-admin/usermin/usermin-1.530.ebuild b/app-admin/usermin/usermin-1.530.ebuild
deleted file mode 100644
index f4a0649e9607..000000000000
--- a/app-admin/usermin/usermin-1.530.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.530.ebuild,v 1.1 2013/01/30 04:13:29 patrick Exp $
-
-IUSE="ssl"
-
-inherit eutils pam
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	sys-process/lsof
-	ssl? ( dev-perl/Net-SSLeay )"
-
-#	 pam? ( dev-perl/Authen-PAM )
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -pR * "${D}"/usr/libexec/usermin
-
-	newinitd "${FILESDIR}"/init.d.usermin usermin
-
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/usermin/setup.sh > "${T}"/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
-	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	elog "Point your web browser to https://localhost:20000 to use usermin."
-}
diff --git a/app-admin/usermin/usermin-1.540-r1.ebuild b/app-admin/usermin/usermin-1.540-r1.ebuild
deleted file mode 100644
index 1fb267ad08da..000000000000
--- a/app-admin/usermin/usermin-1.540-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540-r1.ebuild,v 1.2 2014/01/08 06:45:26 vapier Exp $
-
-EAPI="5"
-
-inherit eutils pam user
-
-DESCRIPTION="A web-based user administration interface."
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ldap pam ssl syslog zlib"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	|| ( virtual/perl-Digest-MD5 dev-perl/MD5 )
-	dev-perl/Digest-SHA1
-	dev-perl/Net-HTTP
-	sys-process/lsof
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	ipv6? ( dev-perl/Socket6 )
-	ldap? ( dev-perl/perl-ldap )
-	pam? ( dev-perl/Authen-PAM )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	zlib? ( virtual/perl-Compress-Raw-Zlib )"
-
-pkg_setup() {
-	enewuser ${PN} -1 /bin/bash
-}
-
-src_prepare() {
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/${PN}.pid:" etc/${PN}/miniserv.conf
-	find etc/${PN} -type f | xargs sed -i -e "s:${D}:/:g"
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	dodir /usr/libexec/${PN}
-	cp -pR * "${D}"/usr/libexec/${PN}
-
-	newinitd "${FILESDIR}"/${PF}.init ${PN}
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	dodir /etc/${PN}
-	dodir /var/log/${PN}
-
-	# Fix ownership
-	chown -R ${PN} "${ED}"
-
-	config_dir=${D}/etc/${PN}
-	var_dir=${D}/var/log/${PN}
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/${PN}/setup.sh > "${T}"/${PN}-setup.out 2>&1 || die "Failed to create initial ${PN} configuration."
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/${PN}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	elog "To make ${PN} start at boot time, run: 'rc-update add ${PN} default'."
-	elog "Point your web browser to https://localhost:20000 to use ${PN}."
-}
diff --git a/app-admin/usermin/usermin-1.540.ebuild b/app-admin/usermin/usermin-1.540.ebuild
deleted file mode 100644
index 6da81a215922..000000000000
--- a/app-admin/usermin/usermin-1.540.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540.ebuild,v 1.2 2013/04/03 02:24:22 tomwij Exp $
-
-EAPI="5"
-
-IUSE="ssl"
-
-inherit eutils pam
-
-DESCRIPTION="A web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	sys-process/lsof
-	ssl? ( dev-perl/Net-SSLeay )"
-
-#	 pam? ( dev-perl/Authen-PAM )
-
-src_prepare() {
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	dodir /usr/libexec/usermin
-	cp -pR * "${D}"/usr/libexec/usermin
-
-	newinitd "${FILESDIR}"/init.d.usermin usermin
-
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	# Fix ownership
-	chown -R root:0 "${D}"
-
-	dodir /etc/usermin
-	dodir /var/log/usermin
-
-	config_dir=${D}/etc/usermin
-	var_dir=${D}/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/usermin/setup.sh > "${T}"/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/usermin.pid:" "${D}"/etc/usermin/miniserv.conf
-	find "${D}"/etc/usermin -type f | xargs sed -i -e "s:${D}:/:g"
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/usermin
-	keepdir /var/log/usermin/
-}
-
-pkg_postinst() {
-	elog "To make usermin start at boot time, run: 'rc-update add usermin default'."
-	elog "Point your web browser to https://localhost:20000 to use usermin."
-}
diff --git a/app-admin/usermin/usermin-1.570.ebuild b/app-admin/usermin/usermin-1.570.ebuild
deleted file mode 100644
index c2fbba58aea6..000000000000
--- a/app-admin/usermin/usermin-1.570.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.570.ebuild,v 1.2 2014/01/08 06:45:26 vapier Exp $
-
-EAPI="5"
-
-inherit eutils pam user
-
-DESCRIPTION="A web-based user administration interface."
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 ldap pam ssl syslog zlib"
-
-DEPEND="dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	|| ( virtual/perl-Digest-MD5 dev-perl/MD5 )
-	dev-perl/Digest-SHA1
-	dev-perl/Net-HTTP
-	sys-process/lsof
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	ipv6? ( dev-perl/Socket6 )
-	ldap? ( dev-perl/perl-ldap )
-	pam? ( dev-perl/Authen-PAM )
-	ssl? ( dev-perl/Net-SSLeay )
-	syslog? ( virtual/perl-Sys-Syslog )
-	zlib? ( virtual/perl-Compress-Raw-Zlib )"
-
-pkg_setup() {
-	enewuser ${PN} -1 /bin/bash
-}
-
-src_prepare() {
-	# Point to the correct mysql location
-	sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config
-
-	# Change /usr/local/bin/perl references
-	find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=/var/run/${PN}.pid:" etc/${PN}/miniserv.conf
-	find etc/${PN} -type f | xargs sed -i -e "s:${D}:/:g"
-
-	epatch "${FILESDIR}"/${PN}-1.080-safestop.patch
-	epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch
-}
-
-src_install() {
-	dodir /usr/libexec/${PN}
-	cp -pR * "${D}"/usr/libexec/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-1.540-r1.init ${PN}
-	newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN}
-
-	dodir /etc/${PN}
-	dodir /var/log/${PN}
-
-	# Fix ownership
-	chown -R ${PN} "${ED}"
-
-	config_dir=${D}/etc/${PN}
-	var_dir=${D}/var/log/${PN}
-	perl=/usr/bin/perl
-	autoos=1
-	port=20000
-	login=root
-	crypt="XXX"
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	tempdir="${T}"
-	export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
-	"${D}"/usr/libexec/${PN}/setup.sh > "${T}"/${PN}-setup.out 2>&1 || die "Failed to create initial ${PN} configuration."
-
-	# Cleanup from the config script
-	rm -rf "${D}"/var/log/${PN}
-	keepdir /var/log/${PN}
-}
-
-pkg_postinst() {
-	elog "To make ${PN} start at boot time, run: 'rc-update add ${PN} default'."
-	elog "Point your web browser to https://localhost:20000 to use ${PN}."
-}
diff --git a/app-admin/usermin/usermin-1.590.ebuild b/app-admin/usermin/usermin-1.600.ebuild
index 3d1f8229b4ca..053edeb49743 100644
--- a/app-admin/usermin/usermin-1.590.ebuild
+++ b/app-admin/usermin/usermin-1.600.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.590.ebuild,v 1.1 2014/03/17 23:56:41 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.600.ebuild,v 1.1 2014/05/28 00:35:35 tomwij Exp $
 
 EAPI="5"
 
 inherit eutils pam user
 
-DESCRIPTION="A web-based user administration interface."
+DESCRIPTION="A web-based user administration interface"
 HOMEPAGE="http://www.webmin.com/index6.html"
 SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"