zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debian: refresh patches

Browse Source
This commit is contained in:
kytv
2012-10-10 23:32:27 +00:00
parent 9331b229fe
commit 2b13973eca
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
debian/patches/0001-path-substitution.patch vendored
View File

@@ -47,7 +47,7 @@ Debian wrapper.config to try to prevent confusion.
# Application # Application
APP_NAME="i2p" APP_NAME="i2p"
@@ -55,8 +48,8 @@ @@ -61,8 +54,8 @@
#RUN_AS_USER= #RUN_AS_USER=
# Wrapper # Wrapper
@@ -58,7 +58,7 @@ Debian wrapper.config to try to prevent confusion.
# Priority at which to run the wrapper. See "man nice" for valid priorities. # Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified. # nice is only used if a priority is specified.
@@ -167,48 +160,6 @@ @@ -173,48 +166,6 @@
# Workaround for Gentoo # Workaround for Gentoo
JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF") JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
@@ -107,7 +107,7 @@ Debian wrapper.config to try to prevent confusion.
if [ -n "$FIXED_COMMAND" ] if [ -n "$FIXED_COMMAND" ]
then then
COMMAND="$FIXED_COMMAND" COMMAND="$FIXED_COMMAND"
@@ -899,9 +850,6 @@ @@ -905,9 +856,6 @@
# The string passed to eval must handles spaces in paths correctly. # The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA" COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
@@ -117,7 +117,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo `gettext '$APP_LONG_NAME is already running.'` eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1 exit 1
@@ -1025,9 +973,6 @@ @@ -1031,9 +979,6 @@
# The string passed to eval must handles spaces in paths correctly. # The string passed to eval must handles spaces in paths correctly.
COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA" COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
eval $COMMAND_LINE eval $COMMAND_LINE
@@ -127,7 +127,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo `gettext '$APP_LONG_NAME is already running.'` eval echo `gettext '$APP_LONG_NAME is already running.'`
exit 1 exit 1
@@ -1798,16 +1743,8 @@ @@ -1871,18 +1816,9 @@
status status
;; ;;
@@ -136,13 +136,16 @@ Debian wrapper.config to try to prevent confusion.
- if [ ! `grep ^RUN_AS_USER $0` ]; then - if [ ! `grep ^RUN_AS_USER $0` ]; then
- showsetusermesg - showsetusermesg
- fi - fi
- - echo
- echo "You may want to disable the browser from launching at startup at"
- echo "http://127.0.0.1:7657/configclients"
- ;; - ;;
- -
- 'remove' | 'uninstall') - 'remove' | 'uninstall')
- removedaemon - removedaemon
+ 'install' | 'remove' | 'uninstall') + 'install' | 'remove' | 'uninstall')
+ echo "Use \"dpkg-reconfigure i2p\" to configure the initscript." + echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
+ exit 1
;; ;;
'dump') 'dump')
@@ -186,7 +189,7 @@ Debian wrapper.config to try to prevent confusion.
# #
#******************************************************************** #********************************************************************
# Java Application # Java Application
@@ -53,13 +44,14 @@ @@ -60,13 +51,14 @@
# classes, or all the classes of i2p.jar, are in a different directory). # classes, or all the classes of i2p.jar, are in a different directory).
# Be sure there are no other duplicate classes. # Be sure there are no other duplicate classes.
# #
@@ -206,7 +209,7 @@ Debian wrapper.config to try to prevent confusion.
# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
wrapper.java.additional.auto_bits=TRUE wrapper.java.additional.auto_bits=TRUE
@@ -69,7 +61,7 @@ @@ -76,7 +68,7 @@
wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
@@ -215,7 +218,7 @@ Debian wrapper.config to try to prevent confusion.
wrapper.java.additional.4.stripquotes=TRUE wrapper.java.additional.4.stripquotes=TRUE
# On some IPv6 enabled systems, I2P and other network-enabled java applications # On some IPv6 enabled systems, I2P and other network-enabled java applications
@@ -137,11 +129,7 @@ @@ -144,11 +136,7 @@
# NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect. # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
# Windows users may wish to change this to %APPDATA%\I2P\wrapper.log # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
# System temp directory: # System temp directory:
@@ -228,7 +231,7 @@ Debian wrapper.config to try to prevent confusion.
# Format of output for the log file. # Format of output for the log file.
# The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
@@ -211,11 +199,7 @@ @@ -218,11 +206,7 @@
# Linux/Mac users, do not set here, see settings in the i2prouter script. # Linux/Mac users, do not set here, see settings in the i2prouter script.
# Directory must exist or the wrapper will fail to start. # Directory must exist or the wrapper will fail to start.
# System temp directory: # System temp directory:
@@ -241,7 +244,7 @@ Debian wrapper.config to try to prevent confusion.
# #
# From i2prouter: # From i2prouter:
# #
@@ -229,10 +213,7 @@ @@ -236,10 +220,7 @@
# Linux/Mac users, do not set here, see settings in the i2prouter script. # Linux/Mac users, do not set here, see settings in the i2prouter script.
# Directory must exist or the wrapper will fail to start. # Directory must exist or the wrapper will fail to start.
# System temp directory: # System temp directory:
@@ -253,7 +256,7 @@ Debian wrapper.config to try to prevent confusion.
#******************************************************************** #********************************************************************
# Wrapper General Properties # Wrapper General Properties
@@ -249,30 +230,3 @@ @@ -256,30 +237,3 @@
wrapper.umask=0022 wrapper.umask=0022
wrapper.java.umask=0022 wrapper.java.umask=0022
wrapper.logfile.umask=077 wrapper.logfile.umask=077

2
debian/patches/0004-oom-listener.patch vendored
View File

@@ -1,6 +1,6 @@
--- a/router/java/src/net/i2p/router/tasks/OOMListener.java --- a/router/java/src/net/i2p/router/tasks/OOMListener.java
+++ b/router/java/src/net/i2p/router/tasks/OOMListener.java +++ b/router/java/src/net/i2p/router/tasks/OOMListener.java
@@ -46,7 +46,7 @@ @@ -48,7 +48,7 @@
log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() + log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() +
" total mem: " + Runtime.getRuntime().totalMemory()); " total mem: " + Runtime.getRuntime().totalMemory());
if (_context.hasWrapper()) if (_context.hasWrapper())