propagate from branch 'i2p.i2p' (head 96b4e09e85e0947d0b9df188f4861664073f07a6)

to branch 'i2p.i2p.zzz.jetty6' (head 4024ef4f6e6c5e4ca6a7803614dc769ca654ac5f)

debian/patches/0001-path-substitution.patch

@@ -105,7 +105,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.
  wrapper.java.additional.auto_bits=TRUE
-@@ -69,7 +61,7 @@
+@@ -71,7 +63,7 @@
  wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
  wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
  wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
@@ -114,7 +114,7 @@ Debian wrapper.config to try to prevent confusion.
  wrapper.java.additional.4.stripquotes=TRUE
  
  # On some IPv6 enabled systems, I2P and other network-enabled java applications
-@@ -139,11 +131,7 @@
+@@ -141,11 +133,7 @@
  # tell the router where to find the wrapper log
  # (change X to the next available number)
  # wrapper.java.additional.X=-Dwrapper.logfile=/path/to/wrapper.log
@@ -127,7 +127,7 @@ Debian wrapper.config to try to prevent confusion.
  
  # Format of output for the log file.
  # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
-@@ -205,10 +193,7 @@
+@@ -211,10 +199,7 @@
  # you should copy this file, change the location or file name,
  # and edit the i2prouter script to change the WRAPPER_CONF setting
  # to point to the new wrapper.config location.
@@ -139,7 +139,7 @@ Debian wrapper.config to try to prevent confusion.
  # pid file for the service monitoring the JVM
  #
  # From i2prouter:
-@@ -219,10 +204,7 @@
+@@ -225,10 +210,7 @@
  #
  # This means i2prouter looks for './i2p.pid'.
  # See comments above for wrapper.java.pidfile
@@ -151,7 +151,7 @@ Debian wrapper.config to try to prevent confusion.
  
  #********************************************************************
  # Wrapper General Properties
-@@ -239,30 +221,3 @@
+@@ -245,30 +227,3 @@
  wrapper.umask=0022
  wrapper.java.umask=0022
  wrapper.logfile.umask=077

debian/patches/0002-jbigi-soname.patch

@@ -2,18 +2,18 @@ From: Kill Your TV <killyourtv@i2pmail.org>
 Date: Wed, 11 May 2011 00:12:04 +0000
 Subject: jbigi soname
 
-The purpose of this patch is to change the path that mbuild_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
 a soname to shut lintian up.
 
 ---
- core/c/jbigi/mbuild_jbigi.sh |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ core/c/jbigi/build_jbigi.sh |    4 +++---
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
---- a/core/c/jbigi/mbuild_jbigi.sh
-+++ b/core/c/jbigi/mbuild_jbigi.sh
-@@ -47,7 +47,7 @@
-                 fi
+--- a/core/c/jbigi/build_jbigi.sh
++++ b/core/c/jbigi/build_jbigi.sh
+@@ -37,7 +37,7 @@
+             UNIXTYPE="solaris"
          fi
          COMPILEFLAGS="-fPIC -Wall"
 -        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
@@ -21,12 +21,12 @@ a soname to shut lintian up.
          LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
          LIBFILE="libjbigi.so";;
  *)
-@@ -66,7 +66,7 @@
+@@ -56,7 +56,7 @@
  
  echo "Compiling C code..."
  rm -f jbigi.o $LIBFILE
 -$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c || exit 1
 +$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c || exit 1
- $CC $LINKFLAGS $INCLUDES $INCLUDELIBS -o $LIBFILE jbigi.o $STATICLIBS || exit 1
+ $CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS || exit 1
  
  exit 0

debian/patches/0004-oom-listener.patch

@@ -0,0 +1,11 @@
+--- a/router/java/src/net/i2p/router/tasks/OOMListener.java
++++ b/router/java/src/net/i2p/router/tasks/OOMListener.java
+@@ -33,7 +33,7 @@
+                 // gobble
+             }
+         }
+-        log.log(Log.CRIT, "To prevent future shutdowns, increase wrapper.java.maxmemory in $I2P/wrapper.config");
++        log.log(Log.CRIT, "To prevent future shutdowns, increase wrapper.java.maxmemory in /etc/i2p/wrapper.config");
+         _context.router().shutdown(Router.EXIT_OOM); 
+     }
+ }

debian/patches/series

@@ -1,5 +1,6 @@
 0001-path-substitution.patch
 0002-jbigi-soname.patch
 0003-renaming-jcpuid.patch
+0004-oom-listener.patch
 #debian-version.patch
 0004-jetty6.patch