Changeset 816149ef


Ignore:
Timestamp:
Dec 19, 2012 9:31:02 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
b7c10d2
Parents:
aa6eefc
Message:

debian: refresh patches

Location:
debian/patches
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    raa6eefc r816149ef  
    99Debian wrapper.config to try to prevent confusion.
    1010---
     11 installer/resources/eepget         |    2 +-
     12 installer/resources/i2prouter      |   82 ++++--------------------------------
     13 installer/resources/runplain.sh    |    4 +-
     14 installer/resources/wrapper.config |   70 ++++++------------------------
     15 4 files changed, 24 insertions(+), 134 deletions(-)
    1116
     17diff --git a/installer/resources/eepget b/installer/resources/eepget
     18index 080bcc8..f2e84ba 100644
    1219--- a/installer/resources/eepget
    1320+++ b/installer/resources/eepget
     
    1724+I2P="/usr/share/i2p"
    1825 java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
     26diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
     27index cdf3e71..266dc16 100644
    1928--- a/installer/resources/i2prouter
    2029+++ b/installer/resources/i2prouter
     
    3039@@ -24,16 +24,9 @@
    3140 # These settings can be modified to fit the needs of your application
    32  # Optimized for use with version 3.5.14 of the Wrapper.
     41 # Optimized for use with version 3.5.16 of the Wrapper.
    3342 
    3443-# Paths
     
    4857 # Application
    4958 APP_NAME="i2p"
    50 @@ -61,8 +54,8 @@
     59@@ -61,8 +54,8 @@ fi
    5160 #RUN_AS_USER=
    5261 
     
    5968 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    6069 #  nice is only used if a priority is specified.
    61 @@ -173,48 +166,6 @@
     70@@ -173,48 +166,6 @@ fi
    6271 # Workaround for Gentoo
    6372 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     
    108117 then
    109118     COMMAND="$FIXED_COMMAND"
    110 @@ -908,9 +859,6 @@
     119@@ -918,9 +869,6 @@ console() {
    111120         # The string passed to eval must handles spaces in paths correctly.
    112121         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"
     
    118127         eval echo `gettext '$APP_LONG_NAME is already running.'`
    119128         exit 1
    120 @@ -1034,9 +982,6 @@
     129@@ -1044,9 +992,6 @@ start() {
    121130         # The string passed to eval must handles spaces in paths correctly.
    122131         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"
     
    128137         eval echo `gettext '$APP_LONG_NAME is already running.'`
    129138         exit 1
    130 @@ -1877,18 +1822,9 @@
     139@@ -1887,18 +1832,9 @@ docommand() {
    131140             status
    132141             ;;
     
    150159 
    151160         'dump')
     161diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
     162index 949a7ab..48b82fb 100644
    152163--- a/installer/resources/runplain.sh
    153164+++ b/installer/resources/runplain.sh
     
    163174 # Having IPv6 enabled can cause problems with certain configurations. Changing the
    164175 # next value to true may help.
     176diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
     177index cfc5918..d4a5de9 100644
    165178--- a/installer/resources/wrapper.config
    166179+++ b/installer/resources/wrapper.config
     
    190203 #********************************************************************
    191204 # Java Application
    192 @@ -60,13 +51,14 @@
     205@@ -60,13 +51,14 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
    193206 # classes, or all the classes of i2p.jar, are in a different directory).
    194207 # Be sure there are no other duplicate classes.
     
    210223 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
    211224 wrapper.java.additional.auto_bits=TRUE
    212 @@ -76,7 +68,7 @@
     225@@ -76,7 +68,7 @@ wrapper.java.additional.auto_bits=TRUE
    213226 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    214227 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
     
    219232 
    220233 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    221 @@ -144,11 +136,7 @@
     234@@ -144,11 +136,7 @@ wrapper.console.loglevel=INFO
    222235 # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
    223236 # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
     
    232245 # Format of output for the log file.
    233246 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    234 @@ -218,11 +206,7 @@
     247@@ -218,11 +206,7 @@ wrapper.use_system_time=false
    235248 # Linux/Mac users, do not set here, see settings in the i2prouter script.
    236249 # Directory must exist or the wrapper will fail to start.
     
    245258 # From i2prouter:
    246259 #
    247 @@ -236,10 +220,7 @@
     260@@ -236,10 +220,7 @@ wrapper.use_system_time=false
    248261 # Linux/Mac users, do not set here, see settings in the i2prouter script.
    249262 # Directory must exist or the wrapper will fail to start.
     
    257270 #********************************************************************
    258271 # Wrapper General Properties
    259 @@ -256,30 +237,3 @@
     272@@ -256,30 +237,3 @@ wrapper.console.title=I2P Service
    260273 wrapper.umask=0022
    261274 wrapper.java.umask=0022
  • debian/patches/0002-jbigi-soname.patch

    raa6eefc r816149ef  
    66expects to find the source files at. At the same time I'm specifying
    77a soname to shut lintian up.
     8---
     9 core/c/jbigi/build_jbigi.sh |    4 ++--
     10 1 file changed, 2 insertions(+), 2 deletions(-)
    811
    9 ---
    10  core/c/jbigi/build_jbigi.sh |    4 +++---
    11  1 files changed, 2 insertions(+), 2 deletions(-)
    12 
     12diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
     13index b1a68dd..99b31e4 100755
    1314--- a/core/c/jbigi/build_jbigi.sh
    1415+++ b/core/c/jbigi/build_jbigi.sh
    15 @@ -39,7 +39,7 @@
     16@@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
    1617             UNIXTYPE="linux"
    1718         fi
     
    2223         LIBFILE="libjbigi.so";;
    2324 *)
    24 @@ -58,7 +58,7 @@
     25@@ -58,7 +58,7 @@ fi
    2526 
    2627 echo "Compiling C code..."
  • debian/patches/0003-renaming-jcpuid.patch

    raa6eefc r816149ef  
    44
    55---
    6  core/c/jcpuid/build.sh |    6 +++---
    7  1 files changed, 3 insertions(+), 3 deletions(-)
     6 core/c/jcpuid/build.sh |    8 ++------
     7 1 file changed, 2 insertions(+), 6 deletions(-)
    88
     9diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
     10index f3fc9c2..cbd0934 100755
    911--- a/core/c/jcpuid/build.sh
    1012+++ b/core/c/jcpuid/build.sh
    11 @@ -67,12 +67,8 @@
     13@@ -67,12 +67,8 @@ case `uname -s` in
    1214                 exit 0;;
    1315         esac
  • debian/patches/0004-oom-listener.patch

    raa6eefc r816149ef  
     1From: Kill Your TV <killyourtv@i2pmail.org>
     2Date: Wed, 19 Dec 2012 16:05:45 +0000
     3Subject: oom-listener
     4
     5---
     6 router/java/src/net/i2p/router/tasks/OOMListener.java |    2 +-
     7 1 file changed, 1 insertion(+), 1 deletion(-)
     8
     9diff --git a/router/java/src/net/i2p/router/tasks/OOMListener.java b/router/java/src/net/i2p/router/tasks/OOMListener.java
     10index 1662b9f..2899100 100644
    111--- a/router/java/src/net/i2p/router/tasks/OOMListener.java
    212+++ b/router/java/src/net/i2p/router/tasks/OOMListener.java
    3 @@ -48,7 +48,7 @@
     13@@ -48,7 +48,7 @@ public class OOMListener implements I2PThread.OOMEventListener {
    414             log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() +
    515                               " total mem: " + Runtime.getRuntime().totalMemory());
Note: See TracChangeset for help on using the changeset viewer.