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

Package-Manager: portage-2.1.11.26/cvs/Linux x86_64

3 files changed, 288 insertions, 15 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index eaca0a3eea85..649deb095069 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.197 2012/07/22 19:47:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.198 2012/10/14 09:52:45 hwoarang Exp $
+
+*webmin-1.600 (14 Oct 2012)
+
+  14 Oct 2012; Markos Chandras <hwoarang@gentoo.org> +webmin-1.600.ebuild:
+  Version bump. Thanks to PhobosK <phobosk@fastmail.fm>. Bug #438182
 
   22 Jul 2012; Markos Chandras <hwoarang@gentoo.org> webmin-1.560-r1.ebuild,
   webmin-1.570-r1.ebuild, webmin-1.580.ebuild, webmin-1.590.ebuild:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 915a30adb27f..7d913c114fe4 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -11,26 +11,29 @@ DIST webmin-1.580-minimal.tar.gz 2039422 SHA256 efac413918559d097e82d7f376b741d1
 DIST webmin-1.580.tar.gz 16081299 SHA256 4f767c7e66defb4d1f102692a70752c558c8bf289e4e9980d82b1af86bd764e4 SHA512 5412a27555af84a24ddc8651e6f3107846519f4e9ddccfd3eac4f42fee7e09b955254f272d50a26bf3c55760c8db9fbf100874ab22c08b222d4e8dfd9dbab8ba WHIRLPOOL 5994559c6eb07c6f812c90906565c081d70adc09e2a4d33009548e8831c30677ba46065c306e2aa2a27e0bcb281e57c4acc478114b401caedf87962403004e6e
 DIST webmin-1.590-minimal.tar.gz 2412046 SHA256 b1f358d81a01e6041596250ad0a6bc078eac3e489c434127540dcca284fd539b SHA512 8b1c1d57356abdd41d602471a593e81639739ef6c11225fc6f127ee2d32caf786c1398965c85da40044c07c6ef91b39c0ac9d7246c1d80f0114d2e4295a4dce5 WHIRLPOOL 4099db5771318e5ecc87e3fff75c69c0b77622d4f7a2d6a25118855e552c64c4a5378abc9a0ebdaca0c7e7fc9a438d5d60cfdd1e87d0bfc2ca5670fc32312bf7
 DIST webmin-1.590.tar.gz 18976739 SHA256 07b06612a8bc864388d86b55ec9a9adba0fa71ec60cc66d87c0e58280264182d SHA512 f803e8cf17fba7c2b97983b70778e603e855c349ffd50e1e5873dc3bc12a31538f282e531e65f3bf176da620b6d052fd8b6b1a988e59812a34b80e5e092d40dd WHIRLPOOL 72be2393dea4a9bc1abea5e55bf7a2fd0eb164aedb11db0c288f020204b3a6aedc4a3145125a0313f15de0503cd8cdd59194ff5bea8cd146fa1be8d15d35caa1
+DIST webmin-1.600-minimal.tar.gz 2432340 SHA256 6ffbd63da362638784b2b45ca2f3b46e89b78a868b8d0eb1c73499bcdb90207f SHA512 8fb4cbed2dcc85a0542ee5035637fe05abf45a90e53600112d31353725aef026f513063ea44341639d4d820e0f9336c58b955d490558927b999013b476710268 WHIRLPOOL 5c231e4cc28a985235b8eb8c62ec69e94e03797d9bb818e506c9f112bb1f7c8ff59dc28d10c43019b06f5ad214f30d05ccc967261274bc62a385ddea348ffff3
+DIST webmin-1.600.tar.gz 21397348 SHA256 a45ddad342e9a3b9263f45749ec1d440e0702645c6297310701e988f5f1c74a9 SHA512 bd73ba2ed6df9ed7c6e336ea07571ca17f552f1d41ffda2f78ea00f43e31e4652a9afc8877addc5cd2bdcfebae1d787294601f17cfc43db78c3682a6200fe0d6 WHIRLPOOL f27abf2ec43a9cc6f04ea4ab019628a83e3f305ebfa27a435787167289c92a4f4a0cf9464e7cdd18e37b59846fb10e8dd64dd46f318c3421369dd51e0b95c391
 EBUILD webmin-1.560-r1.ebuild 8986 SHA256 d53eb735646ddeb56d61877ab77597d3582d31c03d823871ddd2c637c647dc50 SHA512 b3104309ab4a70d8f58e04bbe4ba21d9ce23aeb8cd57a59171536b5cdf4771a723541fb08ccbac418f42147165f5be3d3577f5200b3f12994780337629479dfb WHIRLPOOL 01115cdcdb6f55b48a80b0960599bcd4082ff049d4ad5a0ebdba2e6d462dd3054ec70e4dad247ae4e4454ed34c1644ea226c64416397a8f28dbc7087f6892de8
 EBUILD webmin-1.570-r1.ebuild 8986 SHA256 95e6245a1ea29bdde4fa3f39422dd7e4c1b163e54daa81bd3b426959eb8bb0a5 SHA512 290ecc25eeaa2f4e800f14710397104ff97577528d73c1d1d3c95e9cb61f43a1bdbbcb4bd005e5c50bed4fb0becf7aaf97e9e41812eed4e97781246b83ae5d4a WHIRLPOOL 4aa2cb8eb753a2ea9670f36c8bde6c34b7a4f2b3df997f74ca3860f1325e7d7baf97f36029ce5a8a450bf6a5f2864a43a27cd82313f0ccf693f5bf901baff28a
 EBUILD webmin-1.580.ebuild 8983 SHA256 7b1c89bb151a5d8feadec560befd04de61e75907f0b4316441be86179957caba SHA512 c00417c2158dad1251ec374f0f933743107b525c5df2117bfcc934962f123eb7d03815639c9b51da5326990464f4c927f3c980df3d0acc5436d4166b8715aaa3 WHIRLPOOL 441e6ccb3531655a492275438f04959a517a3ed04ee4e680cbe6bc653f70a417ff1986ea89400edbd3812efb789b51a81e82bc35a59557f6c20e9a2766f3c097
 EBUILD webmin-1.590.ebuild 8983 SHA256 88363e28dbd1d7517148e68daec14cc771a578d2c2bf302506c13bae8621bd2d SHA512 2d1f27082d19f26f916d3a6157bdc80e57eab0805f3b93b0d2139f4c398803e79b2ab053c8f48c3f2aa20e170de47f828b7a9aad49b274ca0ef06097a89ef05a WHIRLPOOL dd9e75e721bc5ce50f3b54d7021531a25ff60a29c7da4b9299b595680c5fe9a3fce3fcc767fdefb48e97915bfdb69502eb8c7153b52b2eb6ba63de186d9c230a
-MISC ChangeLog 1834 SHA256 4977af11b8b85f9c2add1084a45c256f1932eb709676da1d37290332fe356d76 SHA512 13a5d1cfb4a4793f35163a78dcdb167f1dbf92282bd52beb573d553723ca66414c27a074e3bc225119697f6003b7fb5f27ef508b3a001b1509cc48813b5f6345 WHIRLPOOL aa1855e88cd8ee7e2c33a9e55d4e495ba9eb8da843e8ef7ccdeaea7b0ffc4ece2394bf40420fa0be3ab27e016b42d505bbd8476a064c3ba5cb5df4fa917704a1
+EBUILD webmin-1.600.ebuild 9026 SHA256 1c5dfd07366ba29e620a7c59ed934af6802448e4aa83043e48674e04cec15ff8 SHA512 cec9ca7dd5a6d734d65a56548bd711852dbcf319b2f64c0a671229ec6ba946ba5216ae41b8d25e6f81aa89ff72f64213d99fbecde75af2efb57d9bc88006a4d8 WHIRLPOOL 9743fe40251075c3686ee2fafcb53ba8625fc8e1545653c29373671a4d3a430704304bef39afcdf0a9eb356396da199f013cd4608a989ffa36d3a4c98a5493cc
+MISC ChangeLog 2008 SHA256 3cde2e49703676b60b4f3975498aad80713e565eb260f2d63779cd8eb9c9c9ff SHA512 b2fb8a83eb30a2c22a09f02c13165286e8fdff353017f165e6e9fd9c5fd9bb5982f2a18ffc41d727b97152efa1520fa924466fe184360491d5b071fc1136633f WHIRLPOOL 556618b24a0b655c5a9f8dfd8c6dd50987d0a7f41cdf39ff539e3a19baad16172aa34e7f09055e4d3cc40197d456c11ca7639b832968e5b3ce27504cdb6d56a8
 MISC metadata.xml 496 SHA256 ae874cee0c2bc4eb921cd7dfa1f9b3f390e86feaab5ffd5194283f89d2ded5e3 SHA512 78df915de2d5da5562f43b01653e1649d82eb5a526a7f8ac8bea5d5990a49af9dd52b1d15fd00b7f92ae679705c2c916c0f8da9b270023c5bab860aabe210336 WHIRLPOOL 8b25e2c8cf98ac8293fbdebaf50181194cae05042d5b89ce96edaa75a6ec4e1a107c0de921abfc7a8aef723c02f49737f43de2cf0f049d0bec1af661356df0d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQDFjWAAoJEPqDWhW0r/LCzOAP/jRSsn7K3qVSei3/h1nhpB9g
-GRZBEMTQ01sDk3v+hIq1lk9SgPTK+9gr7376JPMUUWERd2PZj4pqB+P6DTyUZr4/
-uw8TXVUhfOW5J1zMxaOpVoxMcYfwcq0XqD2JM6XE5bxKG4+PNhlhssoe3tz/C1kd
-Oj//NtQRqo6PxpBS9ix70TOuTPaG0Ovznw7yudwsLV0kFt3Ai3YjjACA1lEf/JoM
-yAOmaCJxKZomc4BxL1w1H5PzOuQD1WaxdR+dmejt/f1VQGsu/EJLzq3WZ6qMkfro
-bCUVd8sW6eIEk0F3MjrfHdOn3tbZfXLGa6NWBwDvoT+pcZJ+fQquNXLuj1K1Ongu
-8a66KvNkfsfeEZjZpIx0UgIZaEwPdy7RrcB/VHSvYfAP61+mMGsymjLVj6EYSPYu
-jdQBfYdCkJX7c08sTfFoO+U+NgYhzAZE09LuUtFcHeUMigGF9ZA2olRO1LtXVlOj
-wUJ3nLUd5xNDupLn21afK8MBliOS9RN7+L/G4ZUrbBePKDXtK0ZIY5fLpDX33RlA
-9XhBBvFzztrIJhv5n2s9eb6QFisKGhisGBYCIDERDC6nRrNYwIiZrUyWPmkI+vZJ
-b+1sBXfmSaKJZ0AZRjsDYjstf2aKhqCz8ft5blgRX3LiXkmXMuskxwqFkAPD9IHG
-QSHFOPPhQSgEnuYAHGBp
-=djZ4
+iQIcBAEBCAAGBQJQeotuAAoJEPqDWhW0r/LCMeEP/3mJuSDxO6+vYcm1tUwnXOCZ
+eAPH/SYS877ydZvaTIEjHMitBT1IqtQzGOHolv8Wfxah6XzC2n2fxXRoJzo8uUx6
+egLt4LJgdkk674bisGdc3/J0h08eGOafuWwNPFIO79wyEn1uNFlA/5oF7DP39GaY
+Zr51VNUZ+Dd7fYMMTYFyBzqed1goc7zVDxHasboq0fdhoRzlXrgQa+42M/C1f/G4
++Z2uvrk4+cIA1IpVju30IWT9DR4K2TWGDhJk+AgdQ93Q+uxPTnRZVKkyKfRXo3+Q
+uGY6bQ3HcnVt5jtNXB03d8iPqXlzd2B+UgFRpwEP5M2tA/NyNyHvO+h0fXWHTnNe
+74vKohb7Fykj2CUH/yKcwJnN47Jr7+VKZHOoEUDim3P+9PyX85hQOr9DFn6xBcae
+M4CUyxbQti7cs5RDnFqWKd5V7cAgn86thsto3uGspC29sXGIoUNW9AjDFIdhE/zl
+c/u9e+GGmHwFNZUjCSCaWTZQBmmSFbqpNTxORMsS/dkC2RYRP8wLYgtKa+9ZnyDc
+wrSyz8GidHOhEBkWzZOWJfbG/HF3US8LeF5URBr+a6WO4rFiJrIpj2JorDcT3tKA
+l6jnqSneFnKcUZ9jL39fo2PlGNGJsd9Be9DuxyScmbF8WuJgY46lhGxvYQBwziGw
+hLw/h1U7HTPYL5FtvkyI
+=BMfP
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/webmin-1.600.ebuild b/app-admin/webmin/webmin-1.600.ebuild
new file mode 100644
index 000000000000..b10f2b194bfa
--- /dev/null
+++ b/app-admin/webmin/webmin-1.600.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.600.ebuild,v 1.1 2012/10/14 09:52:45 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 GPL-2"
+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, ssl and dnssec-tools 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
+	>=net-dns/dnssec-tools-1.13
+	!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"
+}