Install now works right when webmin is already running.

4 files changed, 35 insertions, 17 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index dffd291479e6..d7e0545a59d5 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.68 2004/12/31 22:14:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.69 2004/12/31 22:45:19 eradicator Exp $
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/webmin-1.170-setup-nocheck.patch, webmin-1.170-r2.ebuild:
+  Install now works right when webmin is already running.
 
 *webmin-1.170-r2 (31 Dec 2004)
 
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 1a9f7a628972..6673875a95ff 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a06857a8166961d24e80b24e7964bfcf ChangeLog 10053
+MD5 6fb1d4b4bb4a64f90ad32f60dd83ef8c ChangeLog 10236
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
 MD5 14973a6b696c3410874c04a2210b20ba webmin-1.170.ebuild 2697
 MD5 a21a0a8a415d1e5a1764199b0b4eeed2 webmin-1.160.ebuild 2685
-MD5 f20b667a910be66e50c96847a310fc4b webmin-1.170-r2.ebuild 3759
+MD5 34cbd5e1f05adc2ef7e6bdeef5b27284 webmin-1.170-r2.ebuild 3587
 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101
 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859
 MD5 58f9530c780e652271313555858ad909 files/digest-webmin-1.170 138
@@ -20,10 +20,11 @@ MD5 cad6a5577a4c4b3773702ab1bd8d6461 files/virtual-server-2.31-nocgibin.patch 10
 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607
 MD5 4f5dc10c2c1d19218cecfc2a678a0ce4 files/virtual-server-2.31-pgsql.patch 579
 MD5 cc16dcb159f84c912365504002444a08 files/virtual-server-2.31-namevirtual.patch 2951
+MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB1c8/ArHZZzCEUG0RAlOYAJ4rrRSu51yPqg1cjxwZUEJWMXSUowCeMo2s
-miF0wKD6Q9ZtkRV3AZeNolI=
-=4GjQ
+iD8DBQFB1daKArHZZzCEUG0RAtM1AJ4wAn61MsIzFTD/8JwLA1aU6GqpTgCdHGKS
+XJGbTmbiRjMiSr2vs0xabtg=
+=vpI8
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webmin/files/webmin-1.170-setup-nocheck.patch b/app-admin/webmin/files/webmin-1.170-setup-nocheck.patch
new file mode 100644
index 000000000000..6bc3c4d6958c
--- /dev/null
+++ b/app-admin/webmin/files/webmin-1.170-setup-nocheck.patch
@@ -0,0 +1,21 @@
+--- webmin-1.170/setup.sh.orig	2004-12-31 14:40:55.956541085 -0800
++++ webmin-1.170/setup.sh	2004-12-31 14:41:23.431018153 -0800
+@@ -356,12 +356,12 @@
+ 		echo ""
+ 		exit 12
+ 	fi
+-	$perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port
+-	if [ $? != "0" ]; then
+-		echo "ERROR: TCP port $port is already in use by another program"
+-		echo ""
+-		exit 13
+-	fi
++	#$perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port
++	#if [ $? != "0" ]; then
++	#	echo "ERROR: TCP port $port is already in use by another program"
++	#	echo ""
++	#	exit 13
++	#fi
+ 	printf "Login name (default admin): "
+ 	if [ "$login" = "" ]; then
+ 		read login
diff --git a/app-admin/webmin/webmin-1.170-r2.ebuild b/app-admin/webmin/webmin-1.170-r2.ebuild
index 1865946a9919..33101d84f601 100644
--- a/app-admin/webmin/webmin-1.170-r2.ebuild
+++ b/app-admin/webmin/webmin-1.170-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r2.ebuild,v 1.1 2004/12/31 22:14:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r2.ebuild,v 1.2 2004/12/31 22:45:19 eradicator Exp $
 
 IUSE="ssl apache2 webmin-minimal"
 
@@ -54,6 +54,8 @@ src_unpack() {
 		# 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() {
@@ -112,19 +114,9 @@ src_install() {
 	# Cleanup from the config script
 	rm -rf ${D}/var/log/webmin
 	keepdir /var/log/webmin/
-
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
 }
 
 pkg_postinst() {
-	${ROOT}/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		${ROOT}/etc/init.d/webmin start
-	fi
-
 	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."
 }