I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 816149ef authored by kytv's avatar kytv
Browse files

debian: refresh patches

parent aa6eefcc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian/patches/0001-path-substitution.patch
+ 25
− 12
View file @ 816149ef
...@@ -8,7 +8,14 @@ the Izpack based installer. ...@@ -8,7 +8,14 @@ the Izpack based installer.
Non-applicable sections (e.g., portable & windows) are also removed for the Non-applicable sections (e.g., portable & windows) are also removed for the
Debian wrapper.config to try to prevent confusion. Debian wrapper.config to try to prevent confusion.
--- ---
installer/resources/eepget | 2 +-
installer/resources/i2prouter | 82 ++++--------------------------------
installer/resources/runplain.sh | 4 +-
installer/resources/wrapper.config | 70 ++++++------------------------
4 files changed, 24 insertions(+), 134 deletions(-)
diff --git a/installer/resources/eepget b/installer/resources/eepget
index 080bcc8..f2e84ba 100644
--- a/installer/resources/eepget --- a/installer/resources/eepget
+++ b/installer/resources/eepget +++ b/installer/resources/eepget
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
...@@ -16,6 +23,8 @@ Debian wrapper.config to try to prevent confusion. ...@@ -16,6 +23,8 @@ Debian wrapper.config to try to prevent confusion.
-I2P="%INSTALL_PATH" -I2P="%INSTALL_PATH"
+I2P="/usr/share/i2p" +I2P="/usr/share/i2p"
java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index cdf3e71..266dc16 100644
--- a/installer/resources/i2prouter --- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter +++ b/installer/resources/i2prouter
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
...@@ -29,7 +38,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -29,7 +38,7 @@ Debian wrapper.config to try to prevent confusion.
# You shall use it only in accordance with the terms of the # You shall use it only in accordance with the terms of the
@@ -24,16 +24,9 @@ @@ -24,16 +24,9 @@
# These settings can be modified to fit the needs of your application # These settings can be modified to fit the needs of your application
# Optimized for use with version 3.5.14 of the Wrapper. # Optimized for use with version 3.5.16 of the Wrapper.
-# Paths -# Paths
-# Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir -# Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir
...@@ -47,7 +56,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -47,7 +56,7 @@ Debian wrapper.config to try to prevent confusion.
# Application # Application
APP_NAME="i2p" APP_NAME="i2p"
@@ -61,8 +54,8 @@ @@ -61,8 +54,8 @@ fi
#RUN_AS_USER= #RUN_AS_USER=
# Wrapper # Wrapper
...@@ -58,7 +67,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -58,7 +67,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.
@@ -173,48 +166,6 @@ @@ -173,48 +166,6 @@ fi
# 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 +116,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -107,7 +116,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"
@@ -908,9 +859,6 @@ @@ -918,9 +869,6 @@ console() {
# 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 +126,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -117,7 +126,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
@@ -1034,9 +982,6 @@ @@ -1044,9 +992,6 @@ start() {
# 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 +136,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -127,7 +136,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
@@ -1877,18 +1822,9 @@ @@ -1887,18 +1832,9 @@ docommand() {
status status
;; ;;
...@@ -149,6 +158,8 @@ Debian wrapper.config to try to prevent confusion. ...@@ -149,6 +158,8 @@ Debian wrapper.config to try to prevent confusion.
;; ;;
'dump') 'dump')
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
index 949a7ab..48b82fb 100644
--- a/installer/resources/runplain.sh --- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
...@@ -162,6 +173,8 @@ Debian wrapper.config to try to prevent confusion. ...@@ -162,6 +173,8 @@ Debian wrapper.config to try to prevent confusion.
# Having IPv6 enabled can cause problems with certain configurations. Changing the # Having IPv6 enabled can cause problems with certain configurations. Changing the
# next value to true may help. # next value to true may help.
diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
index cfc5918..d4a5de9 100644
--- a/installer/resources/wrapper.config --- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config
@@ -8,22 +8,13 @@ @@ -8,22 +8,13 @@
...@@ -189,7 +202,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -189,7 +202,7 @@ Debian wrapper.config to try to prevent confusion.
# #
#******************************************************************** #********************************************************************
# Java Application # Java Application
@@ -60,13 +51,14 @@ @@ -60,13 +51,14 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
# 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.
# #
...@@ -209,7 +222,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -209,7 +222,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
@@ -76,7 +68,7 @@ @@ -76,7 +68,7 @@ wrapper.java.additional.auto_bits=TRUE
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
...@@ -218,7 +231,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -218,7 +231,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
@@ -144,11 +136,7 @@ @@ -144,11 +136,7 @@ wrapper.console.loglevel=INFO
# 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:
...@@ -231,7 +244,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -231,7 +244,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,
@@ -218,11 +206,7 @@ @@ -218,11 +206,7 @@ wrapper.use_system_time=false
# 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:
...@@ -244,7 +257,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -244,7 +257,7 @@ Debian wrapper.config to try to prevent confusion.
# #
# From i2prouter: # From i2prouter:
# #
@@ -236,10 +220,7 @@ @@ -236,10 +220,7 @@ wrapper.use_system_time=false
# 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:
...@@ -256,7 +269,7 @@ Debian wrapper.config to try to prevent confusion. ...@@ -256,7 +269,7 @@ Debian wrapper.config to try to prevent confusion.
#******************************************************************** #********************************************************************
# Wrapper General Properties # Wrapper General Properties
@@ -256,30 +237,3 @@ @@ -256,30 +237,3 @@ wrapper.console.title=I2P Service
wrapper.umask=0022 wrapper.umask=0022
wrapper.java.umask=0022 wrapper.java.umask=0022
wrapper.logfile.umask=077 wrapper.logfile.umask=077
......
debian/patches/0002-jbigi-soname.patch
+ 6
− 5
View file @ 816149ef
...@@ -5,14 +5,15 @@ Subject: jbigi soname ...@@ -5,14 +5,15 @@ Subject: jbigi soname
The purpose of this patch is to change the path that build_jbigi.sh The purpose of this patch is to change the path that build_jbigi.sh
expects to find the source files at. At the same time I'm specifying expects to find the source files at. At the same time I'm specifying
a soname to shut lintian up. a soname to shut lintian up.
--- ---
core/c/jbigi/build_jbigi.sh | 4 +++--- core/c/jbigi/build_jbigi.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
index b1a68dd..99b31e4 100755
--- a/core/c/jbigi/build_jbigi.sh --- a/core/c/jbigi/build_jbigi.sh
+++ b/core/c/jbigi/build_jbigi.sh +++ b/core/c/jbigi/build_jbigi.sh
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
UNIXTYPE="linux" UNIXTYPE="linux"
fi fi
COMPILEFLAGS="-fPIC -Wall" COMPILEFLAGS="-fPIC -Wall"
...@@ -21,7 +22,7 @@ a soname to shut lintian up. ...@@ -21,7 +22,7 @@ a soname to shut lintian up.
LINKFLAGS="-shared -Wl,-soname,libjbigi.so" LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";; LIBFILE="libjbigi.so";;
*) *)
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@ fi
echo "Compiling C code..." echo "Compiling C code..."
rm -f jbigi.o $LIBFILE rm -f jbigi.o $LIBFILE
......
debian/patches/0003-renaming-jcpuid.patch
+ 5
− 3
View file @ 816149ef
...@@ -3,12 +3,14 @@ Date: Tue, 24 May 2011 21:26:10 +0000 ...@@ -3,12 +3,14 @@ Date: Tue, 24 May 2011 21:26:10 +0000
Subject: rename jcpuid Subject: rename jcpuid
--- ---
core/c/jcpuid/build.sh | 6 +++--- core/c/jcpuid/build.sh | 8 ++------
1 files changed, 3 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
index f3fc9c2..cbd0934 100755
--- a/core/c/jcpuid/build.sh --- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh +++ b/core/c/jcpuid/build.sh
@@ -67,12 +67,8 @@ @@ -67,12 +67,8 @@ case `uname -s` in
exit 0;; exit 0;;
esac esac
......
debian/patches/0004-oom-listener.patch
+ 11
− 1
View file @ 816149ef
From: Kill Your TV <killyourtv@i2pmail.org>
Date: Wed, 19 Dec 2012 16:05:45 +0000
Subject: oom-listener
---
router/java/src/net/i2p/router/tasks/OOMListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/router/java/src/net/i2p/router/tasks/OOMListener.java b/router/java/src/net/i2p/router/tasks/OOMListener.java
index 1662b9f..2899100 100644
--- 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
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@ public class OOMListener implements I2PThread.OOMEventListener {
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())
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]