Bump to 1.480, fixes #274845

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

3 files changed, 123 insertions, 2 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 291b671933ad..a6bdcc7ba6c4 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.177 2009/04/23 16:53:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.178 2009/06/23 11:06:02 patrick Exp $
+
+*webmin-1.480 (23 Jun 2009)
+
+  23 Jun 2009; Patrick Lauer <patrick@gentoo.org> +webmin-1.480.ebuild:
+  Bump to 1.480, fixes #274845
 
 *webmin-1.470 (23 Apr 2009)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index b5f7c2d8f764..e23e31542c9e 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -14,8 +14,11 @@ DIST webmin-1.441-minimal.tar.gz 1666306 RMD160 d12294598ae46578bdaaca610ff3b0e5
 DIST webmin-1.441.tar.gz 13881278 RMD160 46b47a76f42ddc96321a8b3e3cbba7ad615c984a SHA1 ddbd07c8f534c25a16e95a9567eb210a5ef5a906 SHA256 be55e70611776654400209e0e9379219dbb17eabce53cdb0a15f4f024495a737
 DIST webmin-1.470-minimal.tar.gz 1731418 RMD160 ed86a6f315c83e36e2740cf722697ba01a6dc6fa SHA1 9f917d0d1d16fd3ea94794d2cd4cde25f5ec8adf SHA256 72941bf717b1d1ae415c131745d595ab51675d014a984fef5b3c40e0aa6e49d1
 DIST webmin-1.470.tar.gz 14105863 RMD160 58acf6703c6469850837796b2e0cbcdb258cf07f SHA1 ace7931c33495fb9a1c76500060feb7019d6acbf SHA256 bbc8ca430f31696eb4d923ba6fb1d25df625df64635382a3664e0a5aac4441da
+DIST webmin-1.480-minimal.tar.gz 1764694 RMD160 7fe06b28a7e91f77b7505bbc2f018c2ea3fc1d8e SHA1 a02ff34568eb4b4354248b75f8d2216cf0e6d6e8 SHA256 5c94782abc4dac6c890a69ed8fb1b0b94ac38a15a7fb0cad781096b88389cbce
+DIST webmin-1.480.tar.gz 14464160 RMD160 d2239786f7ffc5ab5b870b8e84fd9b2d707e750d SHA1 620703ed8a5587bfed498d651ca93f50996dfa52 SHA256 d677b0919ac60ea3f49a2adf877b09e809a7bbe4d852fdcd290ecde22648f6a3
 EBUILD webmin-1.400-r1.ebuild 3791 RMD160 603d69ed61e6182e4d0e501dc2d72557718b7a4d SHA1 10dd433948204d77840acfb7c56e54cac46f5791 SHA256 d666157a8c06d4df3621d3ac2f61286cee34c242eff8fad066593e74bb8d58bc
 EBUILD webmin-1.441.ebuild 3432 RMD160 b1e98ae4a07bebab39ca55e523b6bcced901c4a7 SHA1 5e2fae26b04421b5dee3f0f106c81a736ef45ca7 SHA256 1861614cc5527d6998936f023b1ffb98d7fbd4a6140a54f84f1639a864b66c8e
 EBUILD webmin-1.470.ebuild 3431 RMD160 964fa03c1b2be154a22e1e2443f416b3d4b7d543 SHA1 388110ae0f1185c92f026d3e19e9dd37602415f8 SHA256 0b108403b033f719bdb19064cfe57428eae444623836e8a96efb33904c6fc092
-MISC ChangeLog 24996 RMD160 47edcf1fc4783ead0af4c46ed3083c390ad84724 SHA1 41faba01b6b35269b689455a0473d6d2640c40a5 SHA256 cc93105bac88ac05da8ec826f2d4a0408c0a8182008fb8aec61f2015e0e0127f
+EBUILD webmin-1.480.ebuild 3431 RMD160 9acd27d3726a2a2e4bb9a710ed59b48fe93b4248 SHA1 627a1092435767701ffa786947ac1ff9153afe35 SHA256 26b9210a26168066b349272977d1ac96598fad5113570fd2cb6fd9fc91e14cf8
+MISC ChangeLog 25129 RMD160 c6c9575e71be64351852b2f66111ea7040f44bc3 SHA1 5a203b06d867047277ebf903a1636d2430c8c3a7 SHA256 db6eff81e70e38f3a2f20240c265517f413c2d9a437ecacbaf32f53e74df1a09
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
diff --git a/app-admin/webmin/webmin-1.480.ebuild b/app-admin/webmin/webmin-1.480.ebuild
new file mode 100644
index 000000000000..31e4b336cbd8
--- /dev/null
+++ b/app-admin/webmin/webmin-1.480.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.480.ebuild,v 1.1 2009/06/23 11:06:02 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
+
+	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>"
+}