Use sed -i -e instead of just sed -i, changed a find loop into an xargs sed call, fixed root:root chown, use newinitd/newpamd to install init.d and pam.d files, add dependency over virtual/pam.

(Portage version: 2.0.51.22-r1)

4 files changed, 157 insertions, 10 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 28153ef78f16..c7b4f6376dc6 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/webmin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.86 2005/04/23 23:08:21 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.87 2005/06/19 23:29:47 flameeyes Exp $
+
+*webmin-1.200-r1 (19 Jun 2005)
+
+  19 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +webmin-1.200-r1.ebuild:
+  Use sed -i -e instead of just sed -i, changed a find loop into an xargs sed
+  call, fixed root:root chown, use newinitd/newpamd to install init.d and
+  pam.d files, add dependency over virtual/pam.
 
   24 Apr 2005; Guy Martin <gmsoft@gentoo.org> webmin-1.200.ebuild:
   Stable on hppa.
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index ad9999bf6414..3f248cfc63ba 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,20 +1,22 @@
 MD5 37f93462a22f0bdae81b8e80d6474e8d ChangeLog 883
-MD5 416cafa8e535089fc1064454241e0346 webmin-1.170-r3.ebuild 3715
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 f8e5d72eb3c26fae697123be63aa66a4 webmin-1.200.ebuild 3834
 MD5 e626ba52c08958842e196639ca78255e webmin-1.160.ebuild 2689
+MD5 416cafa8e535089fc1064454241e0346 webmin-1.170-r3.ebuild 3715
+MD5 f8e5d72eb3c26fae697123be63aa66a4 webmin-1.200.ebuild 3834
+MD5 37091edfd870c167372ba01bc2e07e4c webmin-1.200-r1.ebuild 3785
+MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
+MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
+MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
-MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
-MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209
-MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209
-MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
-MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250
-MD5 17e9cccc95647ba080bd69785db85ac1 files/digest-webmin-1.160 137
-MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
 MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
 MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 1073
 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579
+MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
+MD5 395e49092aa7b9e808d3e9d723508884 files/webmin-1.140-apache2.patch 1250
 MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868
 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
+MD5 e7e3780c0bf03968b380535064c54213 files/webmin-gentoo-init 859
+MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
+MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200-r1 209
diff --git a/app-admin/webmin/files/digest-webmin-1.200-r1 b/app-admin/webmin/files/digest-webmin-1.200-r1
new file mode 100644
index 000000000000..889e1cb9dd6e
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.200-r1
@@ -0,0 +1,3 @@
+MD5 4df07c16715458f9873f07ec92fbbbda webmin-1.200-minimal.tar.gz 1077249
+MD5 371711be0c2bf0ff30c1c01192425b3c webmin-1.200.tar.gz 7835665
+MD5 956142bcbe1d50896d9a22411c05e918 virtual-server-2.50.wbm.gz 247382
diff --git a/app-admin/webmin/webmin-1.200-r1.ebuild b/app-admin/webmin/webmin-1.200-r1.ebuild
new file mode 100644
index 000000000000..c54f977bf7ea
--- /dev/null
+++ b/app-admin/webmin/webmin-1.200-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.200-r1.ebuild,v 1.1 2005/06/19 23:29:47 flameeyes Exp $
+
+IUSE="apache2 postgres ssl webmin-minimal"
+
+inherit eutils pam
+
+VM_V="2.50"
+
+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}.wbm.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+# ~mips and ~s390 removed because of broken deps. Bug #86085
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	virtual/pam
+	 ssl? ( dev-perl/Net-SSLeay )
+	 postgres? ( dev-perl/DBD-Pg )
+	 dev-perl/XML-Generator"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# in webmin-minimal webalizer and apache2 are not present
+	if ! use webmin-minimal ; then
+		# Bug #47020
+		epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
+
+		# Bug #50810, #51943
+		if use apache2; then
+			epatch ${FILESDIR}/${PN}-1.140-apache2.patch
+		fi
+
+		# Postfix should modify the last entry of the maps file
+		epatch ${FILESDIR}/${PN}-1.170-postfix.patch
+
+		mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar
+		tar -xf ${T}/vs.tar
+
+		# Don't create ${HOME}/cgi-bin on new accounts
+		epatch ${FILESDIR}/virtual-server-2.31-nocgibin.patch
+
+		# Check if a newly added IP is already active
+		epatch ${FILESDIR}/virtual-server-2.31-checkip.patch
+
+		# Verify Postgres usernames
+		epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch
+
+		# Fix some all name virtual items
+		epatch ${FILESDIR}/virtual-server-2.31-namevirtual.patch
+	fi
+
+	epatch ${FILESDIR}/${PN}-1.170-setup-nocheck.patch
+}
+
+src_install() {
+	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=/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/
+}
+
+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'."
+	einfo "Point your web browser to http://localhost:10000 to use webmin."
+}
+
+pkg_prerm() {
+	${ROOT}/etc/init.d/webmin stop >& /dev/null
+}