From 3ea393d06672fa7367c41d85f9af2b9cdf4c301c Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 8 Mar 2010 17:12:37 +0100 Subject: [PATCH] Fix epatch invocation again, add missing files. --- net-p2p/amule/Manifest | 6 ++++- net-p2p/amule/amule-2.2.6.ebuild | 2 +- net-p2p/amule/files/amuled.confd | 13 ++++++++++ net-p2p/amule/files/amuled.initd | 50 ++++++++++++++++++++++++++++++++++++++ net-p2p/amule/files/amuleweb.confd | 28 +++++++++++++++++++++ net-p2p/amule/files/amuleweb.initd | 49 +++++++++++++++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 net-p2p/amule/files/amuled.confd create mode 100644 net-p2p/amule/files/amuled.initd create mode 100644 net-p2p/amule/files/amuleweb.confd create mode 100644 net-p2p/amule/files/amuleweb.initd diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 8cb39a2..385b12e 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,3 +1,7 @@ AUX amule-2.2.6-remove-download-limit.patch 934 RMD160 f7ea6f606e72652900846601883ed65826d4a726 SHA1 b487e5b44ec06779ad5d63e77ea87e9e2633abfb SHA256 c48a0548cbba3af307533dda3815846307f0b197a4542379ea034214e86d1d95 +AUX amuled.confd 409 RMD160 0e31c5aaa42c4ee2b6dfcd00afcde3b48b2d4299 SHA1 b5872943f5ec0ac41a7c054239a754f1f9669e09 SHA256 7af480fd6dd325ad66b37464417d4d89015a52722961d44da2e3f7990ac4959a +AUX amuled.initd 1204 RMD160 d17d6b709f8b7eb91132804fa8a420b5f9499d14 SHA1 936566e113bb91cbc7cfe6803bf7b1d76b8cbadb SHA256 af51a7d148368b2ed3b9cc289e0831c95348dbda9b331360a5635af31b81ed7a +AUX amuleweb.confd 830 RMD160 1921152543c6f327caf55087269cf0f277545764 SHA1 7800ad36f88a116ca4dcc7b68944b7acaf5877e1 SHA256 e0c4ad636011797618c31ce3d4d5d20ea689ecf6f3ad350fff5b1716c6009c4f +AUX amuleweb.initd 1236 RMD160 d9f417c3145a26d0e2e0879ab8fe4cc6b569dd35 SHA1 c4f7830950db758c1d961e1edb51e8b067cfb50c SHA256 64a2d1c7770b6d975a68a900b6b15f7bc8ff686b249da3ca96c7bc62cfee57d1 DIST aMule-2.2.6.tar.bz2 4722143 RMD160 9483eb1907803d3a6ac375c4d85a7b0cbd895daa SHA1 369bb950897c3f1f59fc1190ac7034113ac253d0 SHA256 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122 -EBUILD amule-2.2.6.ebuild 2564 RMD160 07426c5309a67c99e24e01efb3830a8818a6ab2a SHA1 d8b595247319f84e4da9e0c1b7c08f02dfc43a6c SHA256 54088df7793a01f8e274238c1565d6d3856d80bbe9898e9a7218e841641cd34c +EBUILD amule-2.2.6.ebuild 2576 RMD160 24afb2cb23f50f171593c920177e8777e1f09284 SHA1 6b4945d7f064d45395238586d732056e16f23c46 SHA256 4dc74b8d6e535ae1afad3e024cf273f479c9336ca127034cc2bd58ac340c7410 diff --git a/net-p2p/amule/amule-2.2.6.ebuild b/net-p2p/amule/amule-2.2.6.ebuild index bd1c91d..cad159b 100644 --- a/net-p2p/amule/amule-2.2.6.ebuild +++ b/net-p2p/amule/amule-2.2.6.ebuild @@ -77,7 +77,7 @@ src_configure() { --disable-alc" fi - epatch "${PN}-2.2.6-remove-download-limit.patch" + epatch "${FILESDIR}/${PN}-2.2.6-remove-download-limit.patch" econf \ --with-wx-config=${WX_CONFIG} \ diff --git a/net-p2p/amule/files/amuled.confd b/net-p2p/amule/files/amuled.confd new file mode 100644 index 0000000..2911297 --- /dev/null +++ b/net-p2p/amule/files/amuled.confd @@ -0,0 +1,13 @@ +# 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/amuled.confd,v 1.1 2005/07/10 15:02:47 chainsaw Exp $ + +# owner of amuled process (must be existing) +AMULEUSER="p2p" + +# home directory for amuled (must be existing) +AMULEHOME="/home/p2p" + +# log file (/dev/null for nowhere) +LOG=/var/log/amuled.log + diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd new file mode 100644 index 0000000..3eae511 --- /dev/null +++ b/net-p2p/amule/files/amuled.initd @@ -0,0 +1,50 @@ +#!/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/amuled.initd,v 1.4 2007/07/23 12:07:54 armin76 Exp $ + +depend() { + need net +} + +start() { + if ! test -f "${AMULEHOME}/.aMule/amule.conf"; then + eerror "You must start and configure amuled before launch it. Sorry." + return 1 + fi + + if pgrep -u ${AMULEUSER} amuled >/dev/null; then + eerror "An instance of aMule webserver is already running" + return 1 + fi + if [ -e /var/run/amuled.pid ]; then + rm /var/run/amuled.pid + fi + + ebegin "Starting aMule Daemon" + env HOME="${AMULEHOME}" start-stop-daemon --start \ + --quiet --background \ + --make-pidfile --pidfile /var/run/amuled.pid \ + -c ${AMULEUSER} \ + -x /usr/bin/amuled >${LOG} + + sleep 2 + if ! pgrep -u ${AMULEUSER} amuled > /dev/null; then + eerror "aMule daemon can't be started! Check logfile: ${LOG}" + fi + eend $? +} + +stop() { + ebegin "Stopping aMule daemon -- please wait" + start-stop-daemon --oknodo --stop --pidfile /var/run/amuled.pid &>/dev/null + eend $? +} + +restart() { + svc_stop + while `pgrep -u ${AMULEUSER} amuled >/dev/null`; do + sleep 1 + done + svc_start +} diff --git a/net-p2p/amule/files/amuleweb.confd b/net-p2p/amule/files/amuleweb.confd new file mode 100644 index 0000000..3c398a9 --- /dev/null +++ b/net-p2p/amule/files/amuleweb.confd @@ -0,0 +1,28 @@ +# 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.3 2008/02/04 16:51:51 armin76 Exp $ + +# owner of amuleweb process (must be existing) +AMULEUSER="p2p" + +# home directory for amuleweb (from where to read configuration) (must be existing) +AMULEHOME="/home/p2p" + +# log file (/dev/null for nowhere) +LOG=/var/log/amuleweb.log + +# aMule password (note: not your webserver password, but the external +# 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" + +# aMuleweb template (default, php-default, chicane) +TEMPLATE="default" diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd new file mode 100644 index 0000000..6f0e57c --- /dev/null +++ b/net-p2p/amule/files/amuleweb.initd @@ -0,0 +1,49 @@ +#!/sbin/runscript +# Copyright 1999-2007 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.7 2008/02/04 16:51:51 armin76 Exp $ + +depend() { + need net + use amuled +} + +start() { + if ! test -f "${AMULEHOME}/.aMule/amule.conf"; then + eerror "You must start and configure amuleweb before launch it. Sorry." + return 1 + fi + + if pgrep -u ${AMULEUSER} amuleweb >/dev/null; then + eerror "An instance of aMule webserver is already running" + return 1 + fi + + if [ -e /var/run/amuleweb.pid ]; then + rm /var/run/amuleweb.pid + fi + + OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD} -A ${WEBPWD} -t ${TEMPLATE} -q" + + ebegin "Starting aMule WebServer" + env HOME="${AMULEHOME}" start-stop-daemon --start \ + --quiet -b \ + --make-pidfile --pidfile /var/run/amuleweb.pid \ + -c ${AMULEUSER} \ + -x /usr/bin/amuleweb -- ${OPTIONS} &>${LOG} + + sleep 1 + if ! pgrep -u ${AMULEUSER} amuleweb > /dev/null; then + eerror "aMule daemon can't be started! Check logfile: ${LOG}" + eend 1 + return 1 + fi + eend $? +} + +stop() { + ebegin "Stopping aMule WebServer" + start-stop-daemon --oknodo --stop --pidfile /var/run/amuleweb.pid &>/dev/null + eend $? +} + -- 2.7.4