Ssl issue.

5 files changed, 9 insertions, 79 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 003ccdfc3c68..bf265820e0cb 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.23 2003/07/21 19:28:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.24 2003/09/08 17:23:05 mholzer Exp $
+
+  08 Sep 2003; Martin Holzer <mholzer@gentoo.org> webmin-1.100-r1.ebuild:
+  Adding ssl config through useflag. Closes #28191
 
 *webmin-1.100-r1 (22 Jul 2003)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 64ac18aff956..9bf0972f809b 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,9 +1,7 @@
-MD5 c37a1b7ccc10be645fe30b4f7d84d61e ChangeLog 3987
+MD5 e8b96a6fc6a207499e81d140cb81897f ChangeLog 4113
 MD5 85e44244d64f3c9d6c9633fcc8d97d76 webmin-1.080.ebuild 1763
-MD5 25776227805825796b407a70a92b7d3f webmin-1.100.ebuild 1764
-MD5 c0a0371f8c1263edb293e1a6d6b18953 webmin-1.100-r1.ebuild 1889
-MD5 31d430597ce4bb6b1d249fbc827688fc files/webmin-gentoo-init 306
+MD5 7fdd3ae59bfbac3959bdc75e2b40e3dc webmin-1.100-r1.ebuild 1933
 MD5 c2e70e10958f50cd84c377b5963a8ced files/digest-webmin-1.080 65
+MD5 31d430597ce4bb6b1d249fbc827688fc files/webmin-gentoo-init 306
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
-MD5 bacc4ea9d2d0e8fb5a98b9a5e15f338a files/digest-webmin-1.100 65
 MD5 bacc4ea9d2d0e8fb5a98b9a5e15f338a files/digest-webmin-1.100-r1 65
diff --git a/app-admin/webmin/files/digest-webmin-1.100 b/app-admin/webmin/files/digest-webmin-1.100
deleted file mode 100644
index 721077f278ae..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.100
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b426bc40b51f70182d0e5bf41f82078 webmin-1.100.tar.gz 6682855
diff --git a/app-admin/webmin/webmin-1.100-r1.ebuild b/app-admin/webmin/webmin-1.100-r1.ebuild
index 235496cee9e2..f6d303846bb5 100644
--- a/app-admin/webmin/webmin-1.100-r1.ebuild
+++ b/app-admin/webmin/webmin-1.100-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.100-r1.ebuild,v 1.2 2003/09/05 01:21:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.100-r1.ebuild,v 1.3 2003/09/08 17:23:05 mholzer Exp $
 
 IUSE="ssl"
 
@@ -42,6 +42,7 @@ src_install() {
 
 	exeinto /etc/webmin
 	doexe ${FILESDIR}/uninstall.sh
+	use ssl sed -i 's:ssl=$ssl:ssl=1:' setup.sh
 }
 
 pkg_postinst() {
diff --git a/app-admin/webmin/webmin-1.100.ebuild b/app-admin/webmin/webmin-1.100.ebuild
deleted file mode 100644
index 2cf52af5c5c8..000000000000
--- a/app-admin/webmin/webmin-1.100.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.100.ebuild,v 1.3 2003/09/05 01:21:37 msterret Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-HOMEPAGE="http://www.webmin.com/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ~ppc ~sparc"
-
-DEPEND="dev-lang/perl
-	ssl? ( dev-perl/Net-SSLeay )"
-
-RDEPEND=""
-
-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
-
-	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
-}
-
-pkg_postinst() {
-	/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd /usr/libexec/webmin
-	config_dir=/etc/webmin
-	var_dir=/var/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	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
-}