Version bump. Bug #386063. Thanks to PhobosK <phobosk@fastmail.fm>

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 287 insertions, 15 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 269120775eb0..26d68a96455d 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.191 2011/09/18 09:56:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.192 2011/10/12 21:10:27 hwoarang Exp $
+
+*webmin-1.570 (12 Oct 2011)
+
+  12 Oct 2011; Markos Chandras <hwoarang@gentoo.org> +webmin-1.570.ebuild:
+  Version bump. Bug #386063. Thanks to PhobosK <phobosk@fastmail.fm>
 
 *webmin-1.560 (18 Sep 2011)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index b25ca6cd82eb..79a7a1687989 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -5,23 +5,26 @@ AUX gentoo-setup 11154 RMD160 2ec596c45e052a075b18d8c977e6e92ae177fc5f SHA1 9d70
 AUX init.d.webmin 2307 RMD160 ca520b1dd4ff2da32bfc37645bddf215b56f18c7 SHA1 f9761880e4edb4372edb3ad2aca22724743e1d94 SHA256 139f4271e5be956693ccdacfad3c6a972b136dd105f9fe8535e1845308a9a7a4
 DIST webmin-1.560-minimal.tar.gz 1856121 RMD160 83df64d056952fef757ba4e7ef3b470636f45b02 SHA1 40315e666eacb00bf85df93e22ba5597536c5e0a SHA256 9957928222547a62a05d6c03b6c571e91c53a5ee55552b0960af431d5e8a6df7
 DIST webmin-1.560.tar.gz 15152937 RMD160 1ee7c172baffc6e13a213a7bd61fa8ddc7814d54 SHA1 02ae664b0f01a8214aac018c74fd34447336ed5d SHA256 4370abe32f04012328e2afa93e1c00fd1353963a34d8f644604f9e36d00b6e55
+DIST webmin-1.570-minimal.tar.gz 1873041 RMD160 95fc2bca6b7132179cbe23c2007e2f0eaa5b67df SHA1 a4c89e452aff56ac7ee4e4ecdd04279d98b33213 SHA256 898c03f136ddc63f6486f287ec38bf2ce8773109e80d1e8a6566fa11381d855e
+DIST webmin-1.570.tar.gz 15200156 RMD160 13f61f03c1aa5b2a47aa8bf37ffdb0b754d0002a SHA1 b4728a2c74ca81973064f7801566ba09ef9ff717 SHA256 3b8ad51dee0e61e330c8137b3d8cff91a00cf31d710b68e272fe02db25baaf54
 EBUILD webmin-1.560.ebuild 8977 RMD160 c8c00fb32d1b38457868647d8d9e8bc26a12dccf SHA1 8fec30dc0cfad44d4018122a43f40e437007a3a9 SHA256 9487336079c00fa57dc215b4a179717dc2db8510b6f4ac288a070782ecbfc3eb
-MISC ChangeLog 526 RMD160 699e3232a5fce07c8dcd82a0f0a24b82be5f316c SHA1 f5f200c0e70d75b5fca6436628abf20cb0606f0b SHA256 b8ca37f4887f86c9676af53bf33d2b81a284628abd801d43d0613a13c640a366
+EBUILD webmin-1.570.ebuild 8977 RMD160 ccdb92e102408cd6aa53bad1c743aa668308f4f8 SHA1 296cc2327806024b43067916a9a87ca7e6cfbe80 SHA256 eb60a2b11924ef702c80cdc10d8404f82c81c93aba55fea26e4728879c6732d7
+MISC ChangeLog 700 RMD160 a3d6b4abfd269723b176cf28dc77779621f838d9 SHA1 51b5a7da2151af3c3927f84b6776b724c478ed73 SHA256 0aa41f8410c878f5eb6bc5c67ea9fe4aa563f4475cee9532430eeb77a59d2eec
 MISC metadata.xml 496 RMD160 1d3e1e14cb2ef169f8899df66e3ebdf8d5e43a5c SHA1 5accb49047740e0374c3e9a3309f08dbde96632d SHA256 ae874cee0c2bc4eb921cd7dfa1f9b3f390e86feaab5ffd5194283f89d2ded5e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdcArAAoJEPqDWhW0r/LCsKwQAK6JaQbRZwv4Atw62GuDV6UE
-UPTEXkIA1YlqlQbMhaFQvLanrVzTmGI8xTVG3rN+rs7/BdtwtYUcNdeF2co1iqjI
-fhgano4/Kd7MS96Mx9XXyOvnTG8bHLRAgpr+CFk/NIHJEqNGBIagbjA0lABaycUy
-u2CEPqZcfPGNJvkTwPj2uYGvT4PP3LfVqXV+vr+JZDeiRl6qLziiWU700o+Ho+f4
-2vBwOVZOnksk0+GFCaQw32qR0522n5irnN45Yo96iDiIPDB4vKbZrAOdxW/iXLe/
-WZTjPxZedA225THkGu5Vj4jHQFMdQayObOfNMK2fzCazWbF9M004A+3k7v/ilbqn
-S9bIMnHdpT9kZ6jrYta8dGf+p1cgnAiQ/48Gj3jQqx/kDBd0LnJ18lHefgJLbBIN
-cHrq5tiCHpaov+mJgTbeKPfnEEdwRyL4t5j5pyVwr2YvqhRD3QAxgUL2VkiVPW4m
-JV3vLVBh6tzg3r6ANjl7nnjkvBF1qgOiiivQqNw7w9B4qa+G+GvVvNFj+q2TqxtH
-jYkzg1SOk79L0+dEL4t4eWT0U8jz676g5/JJtvSbOXPvU+Qp1CgJrVoNF7rsdNh0
-dCf48NKMsELGNxBHJReLsdUBDhWR3vHhiKmhX6UkJJ6uymQWaaQIznhDpUjaScPZ
-wQ/3ejDU/Ubxw3HXGyt1
-=LnIc
+iQIcBAEBCgAGBQJOlgJHAAoJEPqDWhW0r/LCs2AP/2HDY10I2u/D7oiQIF1F/f3N
+0E5LZXlplvpmKZRNET3yu9re8/s72Bq6xCATHZH8PQKZd93NC5bZiw5+IxwF1xn8
+z6FJIaNjzFVYeBD7XWwc/BncdzgA7tF/aQWZSJD3/QMkvCKBzBHd1kbXNz2WJT/x
+5e+9Tk4Sr1TpXsUjFW1mA/9rijGmhzD5krBtHBCJGjAtioVp/VDYx1znL9OZO2+p
+754cRsgR6T0wlX27/FdOUI/uZR9Jr4q+ac43MCyKVLJLlXJkqKS+h9hdXd3HPZBN
+1bKwXJqza06hQGvRGB5AFsibTR0OJt1M5Em4NtPiBP5HEJu4M6db/Lm3ERKN/od8
+hzulsdYzN1+gIaRVM9mP4YycEFj7hK5xATQsUd8EBhYbGzYphihBhOwjOeAsstdz
+0fJ4+oKpCROkCCzNd2nlfiWEY3/36H41uezgbIMKS3VyqnRx7NZ5p5czSQfLWCgq
+DhR3hxdkyQvLsJkeOfXij4OxTmg4kZPu56aIPsb11Uh2Ine1tBtckLAkVcepFE2D
+0Rs5rPFx56fVxD40bAYGxotijCrmqEQzugBnT8rjTteYAiExp28O94HZDWFCyK2I
+ASuT6b9rXiH79hBCAQcrG+F4+YpnlhrnCVPRwwDAmz0uG1oKDcrdVyiYKtGQDft3
+REKF1CJt/mJ6+WgSxBTR
+=DUAy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.570.ebuild b/app-admin/webmin/webmin-1.570.ebuild
new file mode 100644
index 000000000000..f9f1e6873632
--- /dev/null
+++ b/app-admin/webmin/webmin-1.570.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.570.ebuild,v 1.1 2011/10/12 21:10:27 hwoarang Exp $
+
+EAPI="3"
+
+inherit eutils pam ssl-cert
+
+DESCRIPTION="A web-based Unix systems 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"
+
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
+# because openssl is forced by dev-perl/Net-SSLeay
+IUSE="minimal +ssl mysql postgres ldap"
+
+# All the required perl modules can be found easily using (in Webmin's root src dir):
+# find . -name cpan_modules.pl -exec grep "::" {} \;
+# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
+# to install them using the in-built cpan module, and this will mess up perl on the system
+# That's why some modules are forced without a use flag
+# NOTE: pam and ssl deps are forced for security and Gentoo compliance installation reasons
+DEPEND="virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	virtual/perl-Time-Local
+	dev-perl/Authen-Libwrap
+	dev-perl/IO-Tty
+	dev-perl/MD5
+	dev-perl/Net-SSLeay
+	dev-perl/Authen-PAM
+	dev-perl/Sys-Hostname-Long
+	!minimal? (
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		ldap? ( dev-perl/perl-ldap )
+		dev-perl/XML-Generator
+		dev-perl/XML-Parser
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local perl="$( which perl )"
+
+	# Remove the unnecessary and incompatible files
+	rm -rf acl/Authen-SolarisRBAC-0.1*
+	if ! use minimal ; then
+		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
+		rm -f mount/{free,net,open}bsd-mounts*
+		rm -f mount/macos-mounts*
+	fi
+
+	# For security reasons remove the SSL certificate that comes with Webmin
+	# We will create our own later
+	rm -f miniserv.pem
+
+	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
+	# We will use our own later
+	rm -f setup.{sh,pl}
+
+	# Fix the permissions of the install files
+	chmod -R og-w "${S}"
+
+	# Since we should not modify any files after install
+	# we set the perl path in all cgi and pl files here using Webmin's routines
+	# The pl file is Prefix safe and works only on provided input, no other filesystem files
+	ebegin "Fixing perl path in source files"
+	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
+	eend $?
+}
+
+src_install() {
+	# Create config dir and keep
+	diropts -m0755
+	dodir /etc/webmin
+	keepdir /etc/webmin
+
+	# Create install dir
+	# Third party modules installed through Webmin go here too, so keep
+	dodir /usr/libexec/webmin
+	keepdir /usr/libexec/webmin
+
+	# Copy our own setup script to installation folder
+	insinto /usr/libexec/webmin
+	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
+	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
+
+	# This is here if we ever want in future ebuilds to add some specific
+	# config values in the /etc/webmin/miniserv.conf
+	# The format of this file should be the same as the one of miniserv.conf:
+	# var=value
+	#
+	# Uncomment it if you use such file. Before that check if upstream
+	# has this file in root dir too.
+	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
+
+	# Create the log dir and keep
+	diropts -m0700
+	dodir /var/log/webmin
+	keepdir /var/log/webmin
+
+	# Create the init.d file and put the neccessary variables there
+	newinitd "${FILESDIR}"/init.d.webmin webmin
+	sed -i \
+		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
+		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
+		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
+		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
+		"${ED}etc/init.d/webmin" \
+		|| die "Failed to patch the webmin init file"
+
+	# Setup pam
+	pamd_mimic system-auth webmin auth account session
+
+	# Copy files to installation folder
+	ebegin "Copying install files to destination"
+	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
+	eend $?
+}
+
+pkg_preinst() {
+	# First stop service if running so Webmin to not messup our config
+	ebegin "Stopping any running Webmin instance prior merging"
+	rc-service --ifexists -- webmin --ifstarted stop
+	eend $?
+}
+
+pkg_postinst() {
+	# Run pkg_config phase first - non interactively
+	export INTERACTIVE="no"
+	pkg_config
+	# Every next time pkg_config should be interactive
+	INTERACTIVE="yes"
+
+	ewarn
+	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
+	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
+	ewarn "To avoid problems, please before using any module, look at its configuration options first."
+	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
+	ewarn
+	elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
+	elog "- The default URL to connect to Webmin is: https://localhost:10000"
+	elog "- The default user that can login is: root"
+	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
+}
+
+pkg_prerm() {
+	# First stop service if running - we do not want Webmin to mess up config
+	ebegin "Stopping any running Webmin instance prior unmerging"
+	rc-service --ifexists -- webmin --ifstarted stop
+	eend $?
+}
+
+pkg_postrm() {
+	ewarn
+	ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
+	ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
+	ewarn "To fix this just disable them if you intend to use Webmin again,"
+	ewarn "OR delete them if not."
+	ewarn
+}
+
+pkg_config(){
+	# First stop service if running
+	ebegin "Stopping any running Webmin instance"
+	rc-service --ifexists -- webmin --ifstarted stop
+	eend $?
+
+	# Next set the default reset variable to 'none'
+	# reset/_reset can be:
+	# 'none' - does not reset anything, just upgrades if a conf is present
+	#		   OR installs new conf if a conf is missing
+	# 'soft' - deletes only $config_dir/config file and thus resetting most
+	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
+	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
+	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
+	local _reset="none"
+
+	# If in interactive mode ask user what should we do
+	if [[ "${INTERACTIVE}" = "yes" ]]; then
+		einfo
+		einfo "Please enter the number of the action you would like to perform?"
+		einfo
+		einfo "1. Update configuration"
+		einfo "   (keeps old config options and adds the new ones)"
+		einfo "2. Soft reset configuration"
+		einfo "   (keeps some old config options, the other options are set to default)"
+		ewarn "   All Webmin users will be reset"
+		einfo "3. Hard reset configuration"
+		einfo "   (all options including module options are set to default)"
+		ewarn "   You will lose all Webmin configuration options you have done till now"
+		einfo "4. Exit this configuration utility (default)"
+		while [ "$correct" != "true" ] ; do
+			read answer
+			if [[ "$answer" = "1" ]] ; then
+				_reset="none"
+				correct="true"
+			elif [[ "$answer" = "2" ]] ; then
+				_reset="soft"
+				correct="true"
+			elif  [[ "$answer" = "3" ]] ; then
+				_reset="hard"
+				correct="true"
+			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
+				die "User aborted configuration."
+			else
+				echo "Answer not recognized. Enter a number from 1 to 4"
+			fi
+		done
+
+		if [[ "$_reset" = "hard" ]]; then
+			while [ "$sure" != "true" ] ; do
+				ewarn "You will lose all Webmin configuration options you have done till now."
+				ewarn "Are you sure you want to do this? (y/n)"
+				read answer
+				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+					sure="true"
+				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+					die "User aborted configuration."
+				else
+					echo "Answer not recognized. Enter 'y' or 'n'"
+				fi
+			done
+		fi
+	fi
+
+	export reset=$_reset
+
+	# Create ssl certificate for Webmin if there is not one in the proper place
+	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
+		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
+		install_cert "${EROOT}/etc/ssl/webmin/server"
+	fi
+
+	# Ensure all paths passed to the setup script use EROOT
+	export wadir="${EROOT}usr/libexec/webmin"
+	export config_dir="${EROOT}etc/webmin"
+	export var_dir="${EROOT}var/log/webmin"
+	export tempdir="${T}"
+	export pidfile="${EROOT}var/run/webmin.pid"
+	export perl="$( which perl )"
+	export os_type='gentoo-linux'
+	export os_version='*'
+	export real_os_type='Gentoo Linux'
+	export real_os_version='Any version'
+	# Forcing 'ssl' and 'ssl_redirect' for tightening security
+	export ssl=1
+	export ssl_redirect=1
+	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
+	export port=10000
+
+	export atboot=0
+
+	einfo "Executing Webmin's configure script"
+	$wadir/gentoo-setup.sh
+
+	einfo "Configuration of Webmin done"
+}