[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/

[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/

[Patrice Clement]

commit:     41f25eb21b8f14a516847ab494208539fec6ec8d
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue Oct 27 13:45:07 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 14:05:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f25eb2

net-p2p/amule: update init script

- properly pass env variable to the daemon
- replace/remove deprecated start-stop-daemon options
- use portable shell

Gentoo-Bug: 420157

 net-p2p/amule/files/amuled.initd   | 11 ++++++-----
 net-p2p/amule/files/amuleweb.initd | 13 +++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd
index 9b83458..082e2ff 100644
--- a/net-p2p/amule/files/amuled.initd
+++ b/net-p2p/amule/files/amuled.initd
@@ -22,12 +22,13 @@ start() {
 	fi
 
 	ebegin "Starting aMule Daemon"
-	env HOME="${AMULEHOME}" start-stop-daemon --start \
+	start-stop-daemon --start \
 		--quiet --background \
 		--make-pidfile --pidfile /var/run/amuled.pid \
-		-c ${AMULEUSER} \
-		-x /usr/bin/amuled >${LOG}
-	
+		--env HOME="${AMULEHOME}" \
+		--user ${AMULEUSER} \
+		--exec /usr/bin/amuled >${LOG}
+
 	sleep 2
 	if ! pgrep -u ${AMULEUSER} amuled > /dev/null; then
 		eerror "aMule daemon can't be started! Check logfile: ${LOG}"
@@ -37,7 +38,7 @@ start() {
 
 stop() {
 	ebegin "Stopping aMule daemon -- please wait"
-	start-stop-daemon --oknodo --stop --pidfile /var/run/amuled.pid &>/dev/null
+	start-stop-daemon --stop --pidfile /var/run/amuled.pid 2>&1 >/dev/null
 	eend $?
 }
 

diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd
index 0484780..05e7d9f 100644
--- a/net-p2p/amule/files/amuleweb.initd
+++ b/net-p2p/amule/files/amuleweb.initd
@@ -26,12 +26,13 @@ start() {
 	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 \
+	start-stop-daemon --start \
+		--quiet --background \
 		--make-pidfile --pidfile /var/run/amuleweb.pid \
-		-c ${AMULEUSER} \
-		-x /usr/bin/amuleweb -- ${OPTIONS} &>${LOG}
-	
+		--env HOME="${AMULEHOME}" \
+		--user ${AMULEUSER} \
+		--exec /usr/bin/amuleweb -- ${OPTIONS} 2>&1 >${LOG}
+
 	sleep 1
 	if ! pgrep -u ${AMULEUSER} amuleweb > /dev/null; then
 		eerror "aMule daemon can't be started! Check logfile: ${LOG}"
@@ -43,7 +44,7 @@ start() {
 
 stop() {
 	ebegin "Stopping aMule WebServer"
-	start-stop-daemon --oknodo --stop --pidfile /var/run/amuleweb.pid &>/dev/null
+	start-stop-daemon --stop --pidfile /var/run/amuleweb.pid 2>&1 >/dev/null
 	eend $?
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/amule/files/

[David Seifert]

commit:     62d26e71b50e6f526743dc4bd2b1df0eae667a26
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jan 17 17:48:33 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 09:19:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d26e71

net-p2p/amule: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3516

 net-p2p/amule/files/amule-2.3.1-build.patch | 10 -------
 net-p2p/amule/files/amule-2.3.1-wx3.0.patch | 45 -----------------------------
 2 files changed, 55 deletions(-)

diff --git a/net-p2p/amule/files/amule-2.3.1-build.patch b/net-p2p/amule/files/amule-2.3.1-build.patch
deleted file mode 100644
index 2e977f3..00000000
--- a/net-p2p/amule/files/amule-2.3.1-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- aMule-2.3.1/src/LoggerConsole.cpp~	2011-06-13 10:50:25.000000000 +0200
-+++ aMule-2.3.1/src/LoggerConsole.cpp	2015-04-11 10:58:20.592470541 +0200
-@@ -29,6 +29,7 @@
- 
- #include "Logger.h"				// for Add(Debug)LogLineM()
- 
-+DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE)
- 
- #ifdef __DEBUG__
- bool CLogger::IsEnabled(DebugType /*type*/) const

diff --git a/net-p2p/amule/files/amule-2.3.1-wx3.0.patch b/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
deleted file mode 100644
index 77568b1..00000000
--- a/net-p2p/amule/files/amule-2.3.1-wx3.0.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur aMule-2.3.1/src/amuled.cpp aMule-2.3.1.wx3/src/amuled.cpp
---- aMule-2.3.1/src/amuled.cpp	2011-07-13 17:00:12.000000000 +0200
-+++ aMule-2.3.1.wx3/src/amuled.cpp	2014-01-19 13:55:50.904800356 +0100
-@@ -423,7 +423,9 @@
- #ifndef __WXMSW__
- 
- 
-+/*
- static EndProcessDataMap endProcDataMap;
-+*/
- 
- 
- int CDaemonAppTraits::WaitForChild(wxExecuteData &execData)
-@@ -449,6 +451,7 @@
- 		wxSleep(1);
- 		result = AmuleWaitPid(execData.pid, &status, WNOHANG, &msg);
- 		if (result == 0) {
-+		/*
- 			// Add a WxEndProcessData entry to the map, so that we can
- 			// support process termination
- 			wxEndProcessData *endProcData = new wxEndProcessData();
-@@ -456,6 +459,7 @@
- 			endProcData->process = execData.process;
- 			endProcData->tag = 0;
- 			endProcDataMap[execData.pid] = endProcData;
-+		*/
- 
- 			status = execData.pid;
- 		} else {
-@@ -480,6 +484,7 @@
- 	msg << wxT("OnSignalChildHandler() has been called for child process with pid `") <<
- 		siginfo->si_pid <<
- 		wxT("'. ");
-+/*
- 	// Make sure we leave no zombies by calling waitpid()
- 	int status = 0;
- 	pid_t result = AmuleWaitPid(siginfo->si_pid, &status, WNOHANG, &msg);
-@@ -503,6 +508,7 @@
- 			msg << wxT(" Error: the child process pid is not on the pid map.");
- 		}
- 	}
-+*/
- 
- 	// Log our passage here
- 	AddDebugLogLineN(logGeneral, msg);