Fixes for bug #106826 (added password for local connection to webserwer) and #118268 (changed parameters)

Package-Manager: portage-2.1_pre3-r1

4 files changed, 17 insertions, 8 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index e3dab9799cfb..6fdc1ab73018 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.61 2006/01/13 11:18:44 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.62 2006/01/13 13:56:47 mkay Exp $
+
+  13 Jan 2006; Marcin Kryczek <mkay@gentoo.org> files/amuleweb.confd,
+  files/amuleweb.initd:
+  Fixes for bug #106826 (added password for local connection to webserwer) and
+  #118268 (changed parameters)
 
 *amule-2.1.0-r1 (13 Jan 2006)
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 8a3e1da45706..ecaac401172d 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,4 +1,4 @@
-MD5 db738b6a1de99712846ac16df25e0b79 ChangeLog 8657
+MD5 7fb5b92bed515ec22d9a0f7314bf52e2 ChangeLog 8862
 MD5 b3c15e104e1b64f5499fad3b01f9b27d amule-1.2.8-r1.ebuild 829
 MD5 52781eab799d0ab31cdcd3847805789e amule-1.2.8-r2.ebuild 826
 MD5 8089773038f60bec63f9fc87c15aa26e amule-1.2.8.ebuild 922
@@ -13,8 +13,8 @@ MD5 98f71604f7f7ccc8b63b3aaaba3c9b89 amule-2.1.0-r1.ebuild 3117
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
 MD5 37c7ee8278a02051a68d062beba82fbc files/amuled.initd 1138
-MD5 9b94153fb9594079c1df009460ece8fd files/amuleweb.confd 697
-MD5 75c780e3a94f217a14a99371aa7e9a56 files/amuleweb.initd 1176
+MD5 a10ba0e3eace37231ef0aab8a91d312c files/amuleweb.confd 758
+MD5 fcb8c3ac5b48723eee8565d59d0fb622 files/amuleweb.initd 1171
 MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8 65
 MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8-r1 65
 MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8-r2 65
diff --git a/net-p2p/amule/files/amuleweb.confd b/net-p2p/amule/files/amuleweb.confd
index 4bb37b3dd949..56e81a808505 100644
--- a/net-p2p/amule/files/amuleweb.confd
+++ b/net-p2p/amule/files/amuleweb.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.confd,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.confd,v 1.2 2006/01/13 13:56:48 mkay Exp $
 
 # owner of amuleweb process (must be existing)
 AMULEUSER="p2p"
@@ -15,9 +15,14 @@ LOG=/var/log/amuleweb.log
 # connection one)
 AMULEPWD="secret"
 
+# Full (admin) access password for webserver
+WEBPWD="secret2"
+
 # aMule host (this could be a remote host or usually localhost)
 AMULEHOST="localhost"
 
 # aMule external connection port
 AMULEPORT="4712"
 
+
+
diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd
index 3d5961bafd6e..70cd119925c9 100644
--- a/net-p2p/amule/files/amuleweb.initd
+++ b/net-p2p/amule/files/amuleweb.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.4 2005/09/20 09:40:20 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.5 2006/01/13 13:56:48 mkay Exp $
 
 depend() {
 	need net
@@ -21,9 +21,8 @@ start() {
 
 	rm /var/run/amuleweb.pid
 
-	OPTIONS="-rh ${AMULEHOST} -p ${AMULEPORT} -pw ${AMULEPWD}"
+	OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD} -A ${WEBPWD}"
 
-	einfo $OPTIONS
 	ebegin "Starting aMule WebServer"
 	env HOME="${AMULEHOME}" start-stop-daemon --start \
 		--quiet -b \