USE=ssl support in config generation. log dir moved to /var/log/webmin. init script updated.

5 files changed, 119 insertions, 9 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index cae70ca120c4..ae3eb48b973a 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.41 2004/04/23 00:28:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.42 2004/04/23 00:56:48 eradicator Exp $
+
+*webmin-1.140-r1 (22 Apr 2004)
+
+  22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  webmin-1.140-r1.ebuild, files/webmin-gentoo-init:
+  USE=ssl support in config generation.  log dir moved to /var/log/webmin.
 
   22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> webmin-1.121.ebuild,
   webmin-1.130.ebuild:
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 25cf7fcab9d7..93fae154787b 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -2,12 +2,14 @@ MD5 0f65bf15f4b028483180906cd8f47edc webmin-1.140.ebuild 2021
 MD5 e1448effc29a46897c48b774ec52a127 webmin-1.080.ebuild 1760
 MD5 f5f16f198582b89165595878bb861c64 webmin-1.130-r1.ebuild 1980
 MD5 871a442fb0428ebaeb78601de262b8b5 webmin-1.110.ebuild 1869
-MD5 c3f781a56c5516f9037767dc8db93a58 ChangeLog 6180
+MD5 2ec05a4ceff6a96667f9e74d25db52aa webmin-1.140-r1.ebuild 2071
+MD5 28241d2d40fbacf6617cfbee3c42feb8 ChangeLog 6397
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 1071b40773837a19b08616b12ce1c932 files/webmin-gentoo-init 413
+MD5 6827881d5fce9438ffaf6485fc02d718 files/webmin-gentoo-init 859
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 c2e70e10958f50cd84c377b5963a8ced files/digest-webmin-1.080 65
 MD5 7f0f3de1fc4601b588dc143645df86b7 files/digest-webmin-1.110 65
 MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140 65
 MD5 cadb87585ab39215aea085411ba590af files/webmin-1.130-webalizer.patch 595
 MD5 45eacf952391438a2db6170312783f32 files/digest-webmin-1.130-r1 65
+MD5 764bde81bfa9cb97e455324ea0033759 files/digest-webmin-1.140-r1 65
diff --git a/app-admin/webmin/files/digest-webmin-1.140-r1 b/app-admin/webmin/files/digest-webmin-1.140-r1
new file mode 100644
index 000000000000..3fd54bfe7b2a
--- /dev/null
+++ b/app-admin/webmin/files/digest-webmin-1.140-r1
@@ -0,0 +1 @@
+MD5 462b1db35e3e6eb6b29d6c658184af4f webmin-1.140.tar.gz 7006739
diff --git a/app-admin/webmin/files/webmin-gentoo-init b/app-admin/webmin/files/webmin-gentoo-init
index 2fee83a8488e..75dc5eb68de2 100644
--- a/app-admin/webmin/files/webmin-gentoo-init
+++ b/app-admin/webmin/files/webmin-gentoo-init
@@ -1,20 +1,37 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/webmin-gentoo-init,v 1.2 2004/02/13 19:10:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/files/webmin-gentoo-init,v 1.3 2004/04/23 00:56:48 eradicator Exp $
 
 depend() {
 	need net logger
 }
 
-start() {
-	ebegin "Starting webmin"
-	/etc/webmin/start
+checkconfig() {
+	if [ -f /etc/webmin/config ]; then
+		return 0;
+	else
+		eerror "Error starting webmin.  Have you run '/usr/libexec/webmin/setup.sh'?"
+		return 1;
+	fi
+}
+
+start() { # copied from /etc/webmin/start
+	checkconfig || return 1
+	ebegin "Starting Webmin"
+
+	LANG=
+	export LANG
+
+	unset PERLIO
+	export PERLIO
+	start-stop-daemon --start --pidfile /var/run/webmin.pid --make-pidfile --quiet \
+		--exec /usr/libexec/webmin/miniserv.pl /etc/webmin/miniserv.conf
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping webmin"
-	/etc/webmin/stop
+	ebegin "Stopping Webmin"
+	start-stop-daemon --stop --pidfile /var/run/webmin.pid --quiet
 	eend $?
 }
diff --git a/app-admin/webmin/webmin-1.140-r1.ebuild b/app-admin/webmin/webmin-1.140-r1.ebuild
new file mode 100644
index 000000000000..54d918c28c04
--- /dev/null
+++ b/app-admin/webmin/webmin-1.140-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.140-r1.ebuild,v 1.1 2004/04/23 00:56:48 eradicator Exp $
+
+inherit eutils
+
+IUSE="ssl"
+
+DESCRIPTION="Webmin, a web-based system administration interface"
+SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://www.webmin.com/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 s390"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	ssl? ( dev-perl/Net-SSLeay )
+	dev-perl/XML-Generator"
+
+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 /etc/init.d
+	dodir /var
+	dodir /etc/pam.d
+	cp -rp * ${D}/usr/libexec/webmin
+	mv ${D}/usr/libexec/webmin/openslp/config \
+		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
+
+	# Bug #47020
+	pushd ${D}/usr/libexec/webmin/webalizer
+	epatch ${FILESDIR}/${PN}-1.130-webalizer.patch
+	popd
+
+	exeinto /etc/init.d
+	newexe webmin-gentoo-init webmin
+
+	insinto /etc/pam.d/
+	newins webmin-pam webmin
+	echo gentoo > ${D}/usr/libexec/webmin/install-type
+
+	exeinto /etc/webmin
+	doexe ${FILESDIR}/uninstall.sh
+	use ssl && sed -i 's:ssl=$ssl:ssl=1:' setup.sh
+}
+
+pkg_postinst() {
+	/etc/init.d/webmin stop >/dev/null 2>&1
+	stopstatus=$?
+	cd /usr/libexec/webmin
+	config_dir=/etc/webmin
+	var_dir=/var/log/webmin
+	perl=/usr/bin/perl
+	autoos=1
+	port=10000
+	login=root
+	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+	host=`hostname`
+	use ssl && ssl=1 || ssl=0
+	atboot=0
+	nostart=1
+	nochown=1
+	autothird=1
+	nouninstall=1
+	noperlpath=1
+	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
+	perl /usr/libexec/webmin/maketemp.pl
+	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
+
+	if [ "$stopstatus" = "0" ]; then
+		# Start if it was running before
+		/etc/init.d/webmin start
+	fi
+}
+
+pkg_prerm() {
+	/etc/init.d/usermin stop >& /dev/null
+}