Bump for #316481

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 128 insertions, 12 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index e1763334fbc5..ca07b12f72c3 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.188 2010/01/08 17:50:14 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.189 2010/06/10 14:22:22 patrick Exp $
+
+*webmin-1.510 (10 Jun 2010)
+
+  10 Jun 2010; Patrick Lauer <patrick@gentoo.org> +webmin-1.510.ebuild:
+  Bump for #316481
 
   08 Jan 2010; Alex Legler <a3li@gentoo.org> -webmin-1.490.ebuild:
   Non-maintainer commit: Removing vulnerable ebuild, bug 300208.
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index bf661aec5c9c..5ce9ec3ec407 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init.d.webmin 880 RMD160 9aab2eb11c28dfde803f5e5913ed7003fb2e8e0e SHA1 02d0708fc712b3f1c6702a0b4a26472b2878d8ca SHA256 aa09a0e8810611146f35f7c954f5c72449c7ea14b9d4b19d0591560a7a2d95de
 AUX webmin-1.170-setup-nocheck.patch 943 RMD160 a6fdb34184261c63ed738f9435c4a31f4d988cff SHA1 216b214a5d4042af7fe293a6ee4191d5de70bf73 SHA256 5bb71c9a5eb76d98757b2892cd3a0b656593f5136d5109f49bc7191b9a7f3aa1
 AUX webmin-pam 128 RMD160 ee4f2cd70ed2bcaa7e4865fae26ac5c14c36c620 SHA1 91b34c1424bf69a1f8e292193e1a5e2add814a97 SHA256 fcb5cc28ad0db83e96652241621b27782fa71aeea5576cb67f2c7f5ccfaed4af
 DIST webmin-1.500-minimal.tar.gz 1700236 RMD160 7b41c7b610c1d10af4488638786d238a9f72b980 SHA1 ee7e71b703038cd0631b0bc1d87ddb64eccdd794 SHA256 bcf6b7f2cae0a53d36eede7c41d5e125fd8675edcc8c667f7770e507c71196a1
 DIST webmin-1.500.tar.gz 14750045 RMD160 ed37dfc44b71ef84b5eb254f15e31851b354c3d2 SHA1 4d430b363eafa98b383670d0dc5475bd9a47eaeb SHA256 150fa74717087c41cf0447c46d9826bf3f383a480372b8706f54ef2d89f0afd2
+DIST webmin-1.510-minimal.tar.gz 1703326 RMD160 23986b606094c616c8cc1ddf1bf303c4237d3840 SHA1 b75c0c7e3d1742f0a3195e950641eb4151b2c3aa SHA256 31775b943bddd7ec924b6d1e332a58cdd6291a396e763e17894b9db620688cde
+DIST webmin-1.510.tar.gz 14841163 RMD160 abb75b21849473cd0f8287fcfadd2ed4f0789893 SHA1 53587ec6555e448c5aa3719bd50a855204a4c38c SHA256 92c6ebff7c6bd5d12031f799146e4a919c0fccdd117eef6c5a7447f313703900
 EBUILD webmin-1.500.ebuild 3617 RMD160 5fc37789d34667bb4b4b238390fa4ac0015dcdbb SHA1 6b1fb1bd0f17fec7c829a0401a910763f9695592 SHA256 c0dd89c06a3140979b8b75562d59511ec5534241950d2d67f0c922d985bb3b5f
-MISC ChangeLog 26401 RMD160 e5d995cad879b6ababc908c294448b869bb809ec SHA1 ce74497525b9060eb52fcc7652c9631a1184ac6e SHA256 9f2733896da1c99d17c6a98d9b8652cb12d2ffb7b17437c360490d3e06880e04
+EBUILD webmin-1.510.ebuild 3617 RMD160 1c8608d6b1d5eb1f7e76a27a34f6999297934c2b SHA1 3d2b19a1bdae0d69f043dc3d14b241a4ff7d6108 SHA256 7cc37d105f893fd0ed96fabe8d5c9810edbfc320efc66c7eed3fd0fabd0cc767
+MISC ChangeLog 26525 RMD160 28c517316bf5bf0b246154483e99bb9eb1541abb SHA1 cdaad9455c496b25931d89f1954c4463fae83881 SHA256 1af90a3b979f2fa3bf14fe10ede5b97ce8bb561aa5ac24078c5f09df9dcfd696
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAktHcGIACgkQTEkQYPgooqGXQgCgrFw14wIdl25U3Qp4tbh3m3+C
-nSgAoNQsgeGWLUuNgkP3ribtonHTBuZQ
-=k+g1
------END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.510.ebuild b/app-admin/webmin/webmin-1.510.ebuild
new file mode 100644
index 000000000000..416fb019434e
--- /dev/null
+++ b/app-admin/webmin/webmin-1.510.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.510.ebuild,v 1.1 2010/06/10 14:22:22 patrick Exp $
+
+inherit eutils pam
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+HOMEPAGE="http://www.webmin.com/"
+SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
+	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+# ~mips removed because of broken deps. Bug #86085
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="apache2 mysql pam postgres ssl minimal"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	ssl? ( dev-perl/Net-SSLeay )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	pam? ( dev-perl/Authen-PAM )
+	dev-perl/XML-Generator
+	virtual/logger"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
+}
+
+src_install() {
+	# Bug #97212
+	addpredict /var/lib/rpm
+	# Bug #249904
+	addpredict /dev/mapper/control
+	addpredict /etc/lvm/cache
+	# Bug #194305
+	addpredict /var/spool/cron/crontabs
+	# Bug 267996
+	addpredict /lib/modules/$(uname -r)/kernel/net
+
+	rm -f mount/freebsd-mounts*
+	rm -f mount/netbsd-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=/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=/var/run/webmin.pid:" "${D}"/etc/webmin/miniserv.conf
+	find "${D}"/etc/webmin -type f | xargs sed -i -e "s:${D}:/: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}/" "${ROOT}/etc/webmin/miniserv.users"
+
+	einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
+	use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
+	use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
+
+	einfo "NOTE: virtual-server has been removed from this ebuild."
+	elog "To create a login account for webmin named \"admin\", execute the "
+	elog "following command:"
+	elog "/usr/libexec/webmin/changepass.pl /etc/webmin admin <new_password>"
+}