bump to version 1.320 for bug # 157198, thanks to ConiKost for reporting

Package-Manager: portage-2.1.1-r2

4 files changed, 163 insertions, 15 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index da65db7306a6..44247cb83d99 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.136 2007/01/24 15:09:51 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.137 2007/01/27 18:46:29 antarus Exp $
+
+*webmin-1.320 (27 Jan 2007)
+
+  27 Jan 2007; Alec Warner <antarus@gentoo.org> +webmin-1.320.ebuild:
+  bump to version 1.320 for bug # 157198, thanks to ConiKost for reporting
 
   24 Jan 2007; Marius Mauch <genone@gentoo.org> webmin-1.290.ebuild,
   webmin-1.290-r1.ebuild, webmin-1.300.ebuild, webmin-1.300-r1.ebuild:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index a073de03501c..3a33c6d96c77 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init.d.webmin 859 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 SHA1 e6b36175db577c3878fb1357b453f9fba396db8f SHA256 8a96c59989ba2a3ae116b9155f72c058dc56be24da355ee1fae43588096520e8
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 RMD160 3b08582c897721d9511d2cdb34b259ade6bf8225 files/init.d.webmin 859
@@ -71,6 +68,8 @@ DIST webmin-1.290-minimal.tar.gz 1397131 RMD160 87d043f5a4aadd00066e6f9bb8d30073
 DIST webmin-1.290.tar.gz 10324511 RMD160 ecf80a2abf295ad9b3f05034da47a500202ee0e0 SHA1 4b1b1ab1da5d3a696c0ee0af9a9f858536ca1417 SHA256 98a547d1a1aeeca4fb71a529b55514e7a8b35471de884e169c549df65923d321
 DIST webmin-1.300-minimal.tar.gz 1404945 RMD160 cb5bab5a5f34b9bc256d7ed91677441018ef6d6a SHA1 d52acdc3ea67d6b15754dceb82fe99b8ac8c0e3e SHA256 29cc112d99995acc74a2dc69aaa6cf0eb2b1169307b0485d70661b7c03a40c98
 DIST webmin-1.300.tar.gz 10782513 RMD160 1259e16725ea7f2491dd91d2d6eef8e80f1240d8 SHA1 c510fce1bee04729bfa84a1fca975aa0a789f3bb SHA256 d5ce8bb7ef0c3e0d38ebd43e962aba984276dc6f23f8f913f712aaac2f17b1a4
+DIST webmin-1.320-minimal.tar.gz 1436590 RMD160 dd9294f2b59caf028beda03940b16bd0a79635ff SHA1 7133e745a2ce0ea289c7fd76df038f6b90efd2bb SHA256 0aaec93f46255d9b114f2854f6a13ad499596d8d015e7806b0283a6674f476b5
+DIST webmin-1.320.tar.gz 10756996 RMD160 7e1eae27c1656742630a24d99c1eb5e7f8adbe62 SHA1 015a99793ede00f7048c7b948b9fabfa75a8b4dd SHA256 2a4ec408d1644a00276809cb9468f9459e04e77452b46cf341068daa2facf392
 EBUILD webmin-1.290-r1.ebuild 4113 RMD160 19b3650af4dc67a90965acd55e7b02cfb6805f4c SHA1 f3654bc5eca64f7addee2574727117aa26a4b4e6 SHA256 2b5d5069126fe465bd29b2b540a71d711a65fe37d64f0082111f12a3fa01bed5
 MD5 ab43b3529431e3a59df730da8bbb2f53 webmin-1.290-r1.ebuild 4113
 RMD160 19b3650af4dc67a90965acd55e7b02cfb6805f4c webmin-1.290-r1.ebuild 4113
@@ -87,10 +86,14 @@ EBUILD webmin-1.300.ebuild 3912 RMD160 19005242dce49887bbb3201fe07a1be7f3c8f13b
 MD5 faa941083c52db9bef4bd10995f42102 webmin-1.300.ebuild 3912
 RMD160 19005242dce49887bbb3201fe07a1be7f3c8f13b webmin-1.300.ebuild 3912
 SHA256 14b9859a2e78325fe809e9d595e459f3ec1f8dd9fa48c1cb2c4eb4384e52e9d7 webmin-1.300.ebuild 3912
-MISC ChangeLog 19099 RMD160 3afaa5cc7153c7f51e5f5c861de8c96964c18049 SHA1 35296192bb7d181c84bed181b651cf18180696ab SHA256 1609db2681c3566c078a21a59dc2f6582c90f672f96a17d2c1e71acafb2122b8
-MD5 435bb09e9ba561ca276d8b7cb8078fdc ChangeLog 19099
-RMD160 3afaa5cc7153c7f51e5f5c861de8c96964c18049 ChangeLog 19099
-SHA256 1609db2681c3566c078a21a59dc2f6582c90f672f96a17d2c1e71acafb2122b8 ChangeLog 19099
+EBUILD webmin-1.320.ebuild 3926 RMD160 bb9b9426826c2462319d034058474824eb0e5d95 SHA1 a7590ae1f0a19fb9d361209e3a64a1a2f9a9455f SHA256 f1c8171565bf1a03f182f1c1e348e21c1c43f1b6306ce17afad6d30b8b87054e
+MD5 2bb0bc14131be44885bff4048d13137d webmin-1.320.ebuild 3926
+RMD160 bb9b9426826c2462319d034058474824eb0e5d95 webmin-1.320.ebuild 3926
+SHA256 f1c8171565bf1a03f182f1c1e348e21c1c43f1b6306ce17afad6d30b8b87054e webmin-1.320.ebuild 3926
+MISC ChangeLog 19275 RMD160 2dc495739052f262b9c381e617290ef144aa71dd SHA1 98080299ba5cd3875af2e63e6f95e7a031b06592 SHA256 c8363edc89b4bcb4ba1b9e03abdbadf46020a21a4fd09bed0f9f37be777d395a
+MD5 f6f2bf269df425aa0f32ceaac6394fbf ChangeLog 19275
+RMD160 2dc495739052f262b9c381e617290ef144aa71dd ChangeLog 19275
+SHA256 c8363edc89b4bcb4ba1b9e03abdbadf46020a21a4fd09bed0f9f37be777d395a ChangeLog 19275
 MISC metadata.xml 219 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 SHA1 06fba309d7f5cc3fce67ad01b88cde3a8de44876 SHA256 cbaa8798606262e312a9367341221d7816ad29d8fd446baab796f519b7c30437
 MD5 1f90ee0a7bcf20ac86ec307846fb298e metadata.xml 219
 RMD160 d143b9bfc730a60b09531271e6fba3ed40f71245 metadata.xml 219
@@ -107,10 +110,6 @@ SHA256 9e1e25b807367456f797f4d6c2ec9e232ae5f33dc614c141c4c816caf4a23a10 files/di
 MD5 8e53e5db8ddeba481c2e756abd1894b9 files/digest-webmin-1.300-r1 780
 RMD160 cd43f9975c8658e11059ab77ba1303c5201579be files/digest-webmin-1.300-r1 780
 SHA256 9e1e25b807367456f797f4d6c2ec9e232ae5f33dc614c141c4c816caf4a23a10 files/digest-webmin-1.300-r1 780
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFt3lf6J2i8a8J4okRAkXgAJ9lJixF4OZAQctA0gD4nFaqRk2EHwCdGnat
-Tyr6ti2HroVGEXqjOVhZg5E=
-=EVCG
------END PGP SIGNATURE-----
+MD5 589ed660270383d0890d265f481010c8 files/digest-webmin-1.320 780
+RMD160 3a15bcf8a42ecbc583af905ec7725aba440dbb66 files/digest-webmin-1.320 780
+SHA256 3805b7fcb6d50a4849b4bbca24bf54c1cfba337636c085cd74eabccbd2c0246b files/digest-webmin-1.320 780
diff --git a/app-admin/webmin/files/digest-webmin-1.320 b/app-admin/webmin/files/digest-webmin-1.320
new file mode 100644
index 000000000000..04a0a8e09b8e
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.320
@@ -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 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/webmin-1.320.ebuild b/app-admin/webmin/webmin-1.320.ebuild
new file mode 100644
index 000000000000..48557d8fb624
--- /dev/null
+++ b/app-admin/webmin/webmin-1.320.ebuild
@@ -0,0 +1,135 @@
+# 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 $
+
+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
+
+	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."
+}
+
+pkg_prerm() {
+	"${ROOT}"/etc/init.d/webmin stop >& /dev/null
+}