add updated mldonkey
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2278 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
44
net-p2p/mldonkey/files/2.9.5-execstacks.patch
Normal file
44
net-p2p/mldonkey/files/2.9.5-execstacks.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i386.s mldonkey-2.9.5/src/utils/lib/md4_i386.s
|
||||
--- mldonkey-2.9.5.orig/src/utils/lib/md4_i386.s 2008-06-30 17:45:37.000000000 +0200
|
||||
+++ mldonkey-2.9.5/src/utils/lib/md4_i386.s 2008-06-30 17:48:10.000000000 +0200
|
||||
@@ -934,3 +934,7 @@
|
||||
|
||||
.data
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i486.s mldonkey-2.9.5/src/utils/lib/md4_i486.s
|
||||
--- mldonkey-2.9.5.orig/src/utils/lib/md4_i486.s 2008-06-30 17:45:37.000000000 +0200
|
||||
+++ mldonkey-2.9.5/src/utils/lib/md4_i486.s 2008-06-30 17:48:21.000000000 +0200
|
||||
@@ -1091,3 +1091,7 @@
|
||||
|
||||
.data
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i586.s mldonkey-2.9.5/src/utils/lib/md4_i586.s
|
||||
--- mldonkey-2.9.5.orig/src/utils/lib/md4_i586.s 2008-06-30 17:45:37.000000000 +0200
|
||||
+++ mldonkey-2.9.5/src/utils/lib/md4_i586.s 2008-06-30 17:48:27.000000000 +0200
|
||||
@@ -1047,3 +1047,7 @@
|
||||
|
||||
.data
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
diff -ur mldonkey-2.9.5.orig/src/utils/lib/md4_i686.s mldonkey-2.9.5/src/utils/lib/md4_i686.s
|
||||
--- mldonkey-2.9.5.orig/src/utils/lib/md4_i686.s 2008-06-30 17:45:37.000000000 +0200
|
||||
+++ mldonkey-2.9.5/src/utils/lib/md4_i686.s 2008-06-30 17:48:34.000000000 +0200
|
||||
@@ -1009,3 +1009,7 @@
|
||||
|
||||
.data
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
+
|
||||
39
net-p2p/mldonkey/files/mldonkey.confd-2.8
Normal file
39
net-p2p/mldonkey/files/mldonkey.confd-2.8
Normal file
@@ -0,0 +1,39 @@
|
||||
# /etc/conf.d/mldonkey
|
||||
# Config file for mldonkey control script
|
||||
|
||||
# Change the following vars only if you know
|
||||
# what you're doing, there's no checking for
|
||||
# invalid data yet!
|
||||
|
||||
# owner of mlnet process (don't change, must be existing)
|
||||
USER="p2p"
|
||||
|
||||
# mldonkey's working dir (must be existing)
|
||||
MLDONKEY_DIR="/home/p2p/mldonkey"
|
||||
|
||||
# logfile (/dev/null for nowhere)
|
||||
LOG="/var/log/mldonkey.log"
|
||||
|
||||
# set to true, if you have enabled logging to syslog in MLDonkey with
|
||||
# set log_to_syslog true
|
||||
USE_LOGGER=false
|
||||
|
||||
# bandwidth control, values in kb/s
|
||||
LOW_DOWN="6"
|
||||
LOW_UP="2"
|
||||
HIGH_DOWN="30"
|
||||
HIGH_UP="10"
|
||||
|
||||
# nice level, 0<x<19, more nice -> less cpuspeed consumed
|
||||
NICE="19"
|
||||
|
||||
# mldonkey server ip, usually localhost
|
||||
SERVER="localhost"
|
||||
|
||||
# port for webinterface, usually 4080
|
||||
PORT="4080"
|
||||
|
||||
# to enable password restricted access,
|
||||
# uncomment and set BOTH following vars:
|
||||
#USERNAME="admin"
|
||||
#PASSWORD=""
|
||||
141
net-p2p/mldonkey/files/mldonkey.initd
Normal file
141
net-p2p/mldonkey/files/mldonkey.initd
Normal file
@@ -0,0 +1,141 @@
|
||||
#!/sbin/runscript
|
||||
|
||||
opts="reload slow fast info"
|
||||
|
||||
MLDONKEY_BINARY=${MLDONKEY_BINARY:-/usr/bin/mlnet}
|
||||
MLDONKEY_TIMEOUT=${TIMEOUT:-10}
|
||||
|
||||
depend() {
|
||||
need localmount net
|
||||
${USE_LOGGER} && use logger
|
||||
}
|
||||
|
||||
start() {
|
||||
if [ -z "${MLDONKEY_DIR}" ]; then
|
||||
ewarn "mldonkey's start script has been changed. You should remove"
|
||||
ewarn "BASEDIR and SUBDIR from /etc/conf.d/mldonkey and set MLDONKEY_DIR"
|
||||
ewarn "to the correct value (you probably want"
|
||||
ewarn "MLDONKEY_DIR=${BASEDIR}/${SUBDIR})"
|
||||
MLDONKEY_DIR="${BASEDIR}/${SUBDIR}"
|
||||
einfo "Using ${MLDONKEY_DIR} as working directory"
|
||||
fi
|
||||
|
||||
if [ ! -d "${MLDONKEY_DIR}" ]; then
|
||||
ebegin "Directory ${MLDONKEY_DIR} not existing, trying to create..."
|
||||
mkdir -p "${MLDONKEY_DIR}" && chown ${USER}:users "${MLDONKEY_DIR}"
|
||||
eend $? || return 1
|
||||
fi
|
||||
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
cd "${MLDONKEY_DIR}"
|
||||
export MLDONKEY_DIR
|
||||
start-stop-daemon --start --chuid "${USER}" --nice "${NICE}" \
|
||||
--exec "${MLDONKEY_BINARY}" --pidfile /var/run/"${SVCNAME}".pid \
|
||||
--background --make-pidfile
|
||||
eend $?
|
||||
}
|
||||
|
||||
setup_uri() {
|
||||
BASE="http://"
|
||||
if [ -n "${USERNAME}" -a -n "${PASSWORD}" ]; then
|
||||
BASE="${BASE}${USERNAME}:${PASSWORD}@"
|
||||
fi
|
||||
BASE="${BASE}${SERVER}:${PORT}"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME} -- please wait"
|
||||
|
||||
setup_uri
|
||||
wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=close_fds -q
|
||||
wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=save -q
|
||||
wget --spider --timeout="${MLDONKEY_TIMEOUT}" "${BASE}"/submit?q=kill -q
|
||||
|
||||
# give it a chance to die:
|
||||
local timeout=${MLDONKEY_TIMEOUT}
|
||||
while [ $timeout -gt 0 ]; do
|
||||
if ! start-stop-daemon --test --quiet --stop \
|
||||
--exec "${MLDONKEY_BINARY}" \
|
||||
--pidfile /var/run/"${SVCNAME}".pid ; then
|
||||
eend 0
|
||||
return 0
|
||||
fi
|
||||
sleep 1
|
||||
timeout=$((${timeout} - 1))
|
||||
done
|
||||
|
||||
eend 1 "Failed to cleanly stop ${SVCNAME}"
|
||||
ebegin "Forcing ${SVCNAME} to stop"
|
||||
start-stop-daemon --stop --exec "${MLDONKEY_BINARY}" \
|
||||
--pidfile /var/run/"${SVCNAME}".pid
|
||||
eend $?
|
||||
}
|
||||
|
||||
# This doesn't work for baselayout-2
|
||||
restart() {
|
||||
svc_stop
|
||||
sleep 5
|
||||
svc_start
|
||||
}
|
||||
|
||||
reload() {
|
||||
if ! service_started "${SVCNAME}"; then
|
||||
eerror "${SVCNAME} is not started"
|
||||
return 1
|
||||
fi
|
||||
|
||||
ebegin "Reloading ${SVCNAME}"
|
||||
start-stop-daemon --stop --signal HUP --oknodo \
|
||||
--exec "${MLDONKEY_BINARY}" --pidfile /var/run/"${SVCNAME}".pid
|
||||
eend $?
|
||||
}
|
||||
|
||||
slow() {
|
||||
if ! service_started "${SVCNAME}"; then
|
||||
eerror "${SVCNAME} is not started"
|
||||
return 1
|
||||
fi
|
||||
|
||||
ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
|
||||
setup_uri
|
||||
wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
|
||||
"${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN}" -q
|
||||
wget --spider --timeout=${MLDONKEY_TIMEOUT} \
|
||||
"${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP}" -q
|
||||
eend $?
|
||||
}
|
||||
|
||||
fast() {
|
||||
if ! service_started "${SVCNAME}"; then
|
||||
eerror "${SVCNAME} is not started"
|
||||
return 1
|
||||
fi
|
||||
|
||||
ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
|
||||
|
||||
setup_uri
|
||||
wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
|
||||
"${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP}" -q
|
||||
wget --spider --timeout="${MLDONKEY_TIMEOUT}" \
|
||||
"${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN}" -q
|
||||
eend $?
|
||||
}
|
||||
|
||||
|
||||
info() {
|
||||
if ! service_started "${SVCNAME}"; then
|
||||
eerror "${SVCNAME} is not started"
|
||||
return 1
|
||||
fi
|
||||
|
||||
setup_uri
|
||||
local result=$(wget --timeout="${MLDONKEY_TIMEOUT}" \
|
||||
-O - "${BASE}"/submit?q=vo 2>/dev/null | \
|
||||
grep -C1 max_hard_upload | \
|
||||
grep value=\" | cut -d\" -f2)
|
||||
if [ "${result}" = "${LOW_UP}" ]; then
|
||||
einfo "${SVCNAME} runs slow"
|
||||
else
|
||||
einfo "${SVCNAME} runs fast"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user