Version bump wrt security bug 181385, remove old, and fix init script, bug 174503

(Portage version: 2.1.2.9)

14 files changed, 24 insertions, 602 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 590645a5546d..02dd62d4e1a6 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.145 2007/04/18 15:42:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.146 2007/06/09 14:25:50 armin76 Exp $
+
+*webmin-1.350 (09 Jun 2007)
+
+  09 Jun 2007; Raúl Porcel <armin76@gentoo.org> files/init.d.webmin,
+  metadata.xml, -webmin-1.290.ebuild, -webmin-1.290-r1.ebuild,
+  -webmin-1.300.ebuild, -webmin-1.300-r1.ebuild, -webmin-1.320.ebuild,
+  +webmin-1.350.ebuild:
+  Version bump wrt security bug 181385, remove old, and fix init script, bug
+  174503
 
   18 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> webmin-1.340.ebuild:
   ppc stable, bug #168878
diff --git a/app-admin/webmin/files/digest-webmin-1.290 b/app-admin/webmin/files/digest-webmin-1.290
deleted file mode 100644
index 7109d2ac3c80..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.290
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 aa7274ebecc8d0df6704546ed13709d6 virtual-server-2.611.wbm.gz 283217
-RMD160 bbcee33f9398a78d7e8a68168316f011d2cf391d virtual-server-2.611.wbm.gz 283217
-SHA256 f7579da94a6b356ce4548a0ed8fcc366e1d8e7e7199e5337e8d703bf4f92090a virtual-server-2.611.wbm.gz 283217
-MD5 668883b2dd72cb0935c4191d59d8c439 webmin-1.290-minimal.tar.gz 1397131
-RMD160 87d043f5a4aadd00066e6f9bb8d300732e340a4f webmin-1.290-minimal.tar.gz 1397131
-SHA256 e9f7afdc67ab3f96ac9fe8cdeed986e98c25de7c9d55c6b90b8617e90a078614 webmin-1.290-minimal.tar.gz 1397131
-MD5 2e15ce21f6d459f16d21595225a7d4ee webmin-1.290.tar.gz 10324511
-RMD160 ecf80a2abf295ad9b3f05034da47a500202ee0e0 webmin-1.290.tar.gz 10324511
-SHA256 98a547d1a1aeeca4fb71a529b55514e7a8b35471de884e169c549df65923d321 webmin-1.290.tar.gz 10324511
diff --git a/app-admin/webmin/files/digest-webmin-1.290-r1 b/app-admin/webmin/files/digest-webmin-1.290-r1
deleted file mode 100644
index 7109d2ac3c80..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.290-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 aa7274ebecc8d0df6704546ed13709d6 virtual-server-2.611.wbm.gz 283217
-RMD160 bbcee33f9398a78d7e8a68168316f011d2cf391d virtual-server-2.611.wbm.gz 283217
-SHA256 f7579da94a6b356ce4548a0ed8fcc366e1d8e7e7199e5337e8d703bf4f92090a virtual-server-2.611.wbm.gz 283217
-MD5 668883b2dd72cb0935c4191d59d8c439 webmin-1.290-minimal.tar.gz 1397131
-RMD160 87d043f5a4aadd00066e6f9bb8d300732e340a4f webmin-1.290-minimal.tar.gz 1397131
-SHA256 e9f7afdc67ab3f96ac9fe8cdeed986e98c25de7c9d55c6b90b8617e90a078614 webmin-1.290-minimal.tar.gz 1397131
-MD5 2e15ce21f6d459f16d21595225a7d4ee webmin-1.290.tar.gz 10324511
-RMD160 ecf80a2abf295ad9b3f05034da47a500202ee0e0 webmin-1.290.tar.gz 10324511
-SHA256 98a547d1a1aeeca4fb71a529b55514e7a8b35471de884e169c549df65923d321 webmin-1.290.tar.gz 10324511
diff --git a/app-admin/webmin/files/digest-webmin-1.300 b/app-admin/webmin/files/digest-webmin-1.300
deleted file mode 100644
index bd5a7c8ef3f1..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.300
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 f74d252d7fa9c736895fb3a257dd3edc virtual-server-3.23.gpl.wbm.gz 379417
-RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d virtual-server-3.23.gpl.wbm.gz 379417
-SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 virtual-server-3.23.gpl.wbm.gz 379417
-MD5 5d232a887529aa0376fe281d9027f9a5 webmin-1.300-minimal.tar.gz 1404945
-RMD160 cb5bab5a5f34b9bc256d7ed91677441018ef6d6a webmin-1.300-minimal.tar.gz 1404945
-SHA256 29cc112d99995acc74a2dc69aaa6cf0eb2b1169307b0485d70661b7c03a40c98 webmin-1.300-minimal.tar.gz 1404945
-MD5 b1c170a8e62705ba7a376a8bff90c422 webmin-1.300.tar.gz 10782513
-RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 webmin-1.300.tar.gz 10782513
-SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4 webmin-1.300.tar.gz 10782513
diff --git a/app-admin/webmin/files/digest-webmin-1.300-r1 b/app-admin/webmin/files/digest-webmin-1.300-r1
deleted file mode 100644
index bd5a7c8ef3f1..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.300-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 f74d252d7fa9c736895fb3a257dd3edc virtual-server-3.23.gpl.wbm.gz 379417
-RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d virtual-server-3.23.gpl.wbm.gz 379417
-SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 virtual-server-3.23.gpl.wbm.gz 379417
-MD5 5d232a887529aa0376fe281d9027f9a5 webmin-1.300-minimal.tar.gz 1404945
-RMD160 cb5bab5a5f34b9bc256d7ed91677441018ef6d6a webmin-1.300-minimal.tar.gz 1404945
-SHA256 29cc112d99995acc74a2dc69aaa6cf0eb2b1169307b0485d70661b7c03a40c98 webmin-1.300-minimal.tar.gz 1404945
-MD5 b1c170a8e62705ba7a376a8bff90c422 webmin-1.300.tar.gz 10782513
-RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 webmin-1.300.tar.gz 10782513
-SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4 webmin-1.300.tar.gz 10782513
diff --git a/app-admin/webmin/files/digest-webmin-1.320 b/app-admin/webmin/files/digest-webmin-1.320
deleted file mode 100644
index 04a0a8e09b8e..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.320
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 f74d252d7fa9c736895fb3a257dd3edc virtual-server-3.23.gpl.wbm.gz 379417
-RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d virtual-server-3.23.gpl.wbm.gz 379417
-SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 virtual-server-3.23.gpl.wbm.gz 379417
-MD5 5fe11a43e02e3a04bb6f5f0a4e756e41 webmin-1.320-minimal.tar.gz 1436590
-RMD160 dd9294f2b59caf028beda03940b16bd0a79635ff webmin-1.320-minimal.tar.gz 1436590
-SHA256 0aaec93f46255d9b114f2854f6a13ad499596d8d015e7806b0283a6674f476b5 webmin-1.320-minimal.tar.gz 1436590
-MD5 36dd2fa62a99ef91ef866b6b3ebfd980 webmin-1.320.tar.gz 10756996
-RMD160 7e1eae27c1656742630a24d99c1eb5e7f8adbe62 webmin-1.320.tar.gz 10756996
-SHA256 2a4ec408d1644a00276809cb9468f9459e04e77452b46cf341068daa2facf392 webmin-1.320.tar.gz 10756996
diff --git a/app-admin/webmin/files/digest-webmin-1.350 b/app-admin/webmin/files/digest-webmin-1.350
new file mode 100644
index 000000000000..3c3ff1d250c9
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.350
@@ -0,0 +1,9 @@
+MD5 f74d252d7fa9c736895fb3a257dd3edc virtual-server-3.23.gpl.wbm.gz 379417
+RMD160 912ba4ff66b7644f05e7e5b52286b5a41cf7163d virtual-server-3.23.gpl.wbm.gz 379417
+SHA256 c5631f73921058df40a08b0d248bad1acf1dd5b7ded451c7c6f9fff1d923a360 virtual-server-3.23.gpl.wbm.gz 379417
+MD5 550783dad161c91376a8f30e05d689f1 webmin-1.350-minimal.tar.gz 1418154
+RMD160 8478c31358b290438be7ca5c7219ab448ffb47a8 webmin-1.350-minimal.tar.gz 1418154
+SHA256 0d2909161f256d8a7a552ef6224ff1ee2b77118c0fa07ca7e29a59e5f2ed3cab webmin-1.350-minimal.tar.gz 1418154
+MD5 601e58ee7dab4a819dd351ec5f18486a webmin-1.350.tar.gz 12832134
+RMD160 a2bb929f3ee67a8240697f82a86595d6b415d067 webmin-1.350.tar.gz 12832134
+SHA256 1941e2cbbd6af6b1d82d046b61a93b6df8ed100b6b0ebf54e6be8f46b7ecbe22 webmin-1.350.tar.gz 12832134
diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
index 2d0248be5462..832976c9a2e3 100644
--- a/app-admin/webmin/files/init.d.webmin
+++ b/app-admin/webmin/files/init.d.webmin
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.4 2004/12/28 17:09:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/init.d.webmin,v 1.5 2007/06/09 14:25:50 armin76 Exp $
 
 depend() {
 	use net logger
@@ -27,7 +27,7 @@ start() { # copied from /etc/usermin/start
 
 	unset PERLIO
 	export PERLIO
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start --quiet --name webmin --oknodo \
 		--exec /usr/libexec/webmin/miniserv.pl /etc/webmin/miniserv.conf
 	eend $?
 }
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index 74016fd64cf9..73420b6cf0f0 100644
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>beu@gentoo.org</email>
+  <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/webmin/webmin-1.290-r1.ebuild b/app-admin/webmin/webmin-1.290-r1.ebuild
deleted file mode 100644
index c605fa653982..000000000000
--- a/app-admin/webmin/webmin-1.290-r1.ebuild
+++ /dev/null
@@ -1,141 +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/webmin/webmin-1.290-r1.ebuild,v 1.2 2007/01/24 15:09:51 genone Exp $
-
-inherit eutils pam
-
-VM_V="2.611"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 pam? ( dev-perl/Authen-PAM )
-	 dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.170-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-2.60-nocgibin.patch
-
-		# Check if a newly added IP is already active
-		epatch "${FILESDIR}"/virtual-server-2.610-checkip.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-2.31-pgsql.patch
-
-		# Fix some all name virtual items
-		epatch "${FILESDIR}"/virtual-server-2.31-namevirtual.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
-	autoos=1
-	port=10000
-	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/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-	elog "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && elog "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || elog "Point your web browser to http://localhost:10000 to use webmin."
-}
-
-pkg_prerm() {
-	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.290.ebuild b/app-admin/webmin/webmin-1.290.ebuild
deleted file mode 100644
index a60999d5bda5..000000000000
--- a/app-admin/webmin/webmin-1.290.ebuild
+++ /dev/null
@@ -1,141 +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/webmin/webmin-1.290.ebuild,v 1.11 2007/01/24 15:09:51 genone Exp $
-
-inherit eutils pam
-
-VM_V="2.611"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 pam? ( dev-perl/Authen-PAM )
-	 dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.170-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-2.60-nocgibin.patch
-
-		# Check if a newly added IP is already active
-		epatch "${FILESDIR}"/virtual-server-2.610-checkip.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-2.31-pgsql.patch
-
-		# Fix some all name virtual items
-		epatch "${FILESDIR}"/virtual-server-2.31-namevirtual.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
-	autoos=1
-	port=10000
-	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/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-	elog "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && elog "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || elog "Point your web browser to http://localhost:10000 to use webmin."
-}
-
-pkg_prerm() {
-	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.300-r1.ebuild b/app-admin/webmin/webmin-1.300-r1.ebuild
deleted file mode 100644
index 015ab37872ef..000000000000
--- a/app-admin/webmin/webmin-1.300-r1.ebuild
+++ /dev/null
@@ -1,135 +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/webmin/webmin-1.300-r1.ebuild,v 1.2 2007/01/24 15:09:51 genone Exp $
-
-inherit eutils pam
-
-VM_V="3.23"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 pam? ( dev-perl/Authen-PAM )
-	 dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
-	autoos=1
-	port=10000
-	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/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-	elog "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && elog "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || elog "Point your web browser to http://localhost:10000 to use webmin."
-}
-
-pkg_prerm() {
-	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.300.ebuild b/app-admin/webmin/webmin-1.300.ebuild
deleted file mode 100644
index 7d60aebca553..000000000000
--- a/app-admin/webmin/webmin-1.300.ebuild
+++ /dev/null
@@ -1,135 +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/webmin/webmin-1.300.ebuild,v 1.9 2007/01/24 15:09:51 genone Exp $
-
-inherit eutils pam
-
-VM_V="3.23"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
-	                   http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
-
-LICENSE="BSD"
-SLOT="0"
-# ~mips removed because of broken deps. Bug #86085
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 pam postgres ssl webmin-minimal"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	 ssl? ( dev-perl/Net-SSLeay )
-	 postgres? ( dev-perl/DBD-Pg )
-	 pam? ( dev-perl/Authen-PAM )
-	 dev-perl/XML-Generator"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# in webmin-minimal apache2 are not present
-	if ! use webmin-minimal ; then
-		# Bug #50810, #51943
-		if use apache2; then
-			epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
-		fi
-
-		# Correct ldapness
-		epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
-
-		# Postfix should modify the last entry of the maps file
-		epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
-
-		mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
-		tar -xf ${T}/vs.tar
-
-		# Don't create ${HOME}/cgi-bin on new accounts
-		epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
-
-		# Verify Postgres usernames
-		epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
-}
-
-src_install() {
-	# Bug #97212
-	addpredict /var/lib/rpm
-
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /var
-
-	cp -rp * ${D}/usr/libexec/webmin
-
-	# in webmin-minimal openslp is not present
-	if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
-		cp ${D}/usr/libexec/webmin/openslp/config \
-			${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	fi
-
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-
-	newpamd "${FILESDIR}"/webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	# Fix ownership
-	chown -R root:0 ${D}
-
-	dodir /etc/webmin
-	dodir /var/log/webmin
-
-	config_dir=${D}/etc/webmin
-	var_dir=${D}/var/log/webmin
-	perl=${ROOT}/usr/bin/perl
-	autoos=1
-	port=10000
-	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/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
-
-	# Fixup the config files to use their real locations
-	sed -i -e "s:^pidfile=.*$:pidfile=${ROOT}/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
-	find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g"
-
-	# Cleanup from the config script
-	rm -rf ${D}/var/log/webmin
-	keepdir /var/log/webmin/
-
-	# Get rid of this crap...
-	rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
-	rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
-}
-
-pkg_postinst() {
-	local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-	crypt=${crypt//\\/\\\\}
-	crypt=${crypt//\//\\\/}
-	sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users
-
-	elog "To make webmin start at boot time, run: 'rc-update add webmin default'."
-	use ssl && elog "Point your web browser to https://localhost:10000 to use webmin."
-	use ssl || elog "Point your web browser to http://localhost:10000 to use webmin."
-}
-
-pkg_prerm() {
-	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
-}
diff --git a/app-admin/webmin/webmin-1.320.ebuild b/app-admin/webmin/webmin-1.350.ebuild
index 48557d8fb624..51b23a3fc4d3 100644
--- a/app-admin/webmin/webmin-1.320.ebuild
+++ b/app-admin/webmin/webmin-1.350.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.320.ebuild,v 1.1 2007/01/27 18:46:29 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.350.ebuild,v 1.1 2007/06/09 14:25:50 armin76 Exp $
 
 inherit eutils pam
 
@@ -131,5 +131,6 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
+	# XXX: this is wrong ... prerm is called during upgrades as well
 	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
 }