Changeset 2b13973 for debian


Ignore:
Timestamp:
Oct 10, 2012 11:32:27 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
b797f9e
Parents:
9331b22
Message:

debian: refresh patches

Location:
debian/patches
Files:
2 edited

Legend:

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

    r9331b22 r2b13973  
    4848 # Application
    4949 APP_NAME="i2p"
    50 @@ -55,8 +48,8 @@
     50@@ -61,8 +54,8 @@
    5151 #RUN_AS_USER=
    5252 
     
    5959 # Priority at which to run the wrapper.  See "man nice" for valid priorities.
    6060 #  nice is only used if a priority is specified.
    61 @@ -167,48 +160,6 @@
     61@@ -173,48 +166,6 @@
    6262 # Workaround for Gentoo
    6363 JAVABINARY=$(awk -F'=' '/^ *wrapper\.java\.command/{print $2}' "$WRAPPER_CONF")
     
    108108 then
    109109     COMMAND="$FIXED_COMMAND"
    110 @@ -899,9 +850,6 @@
     110@@ -905,9 +856,6 @@
    111111         # The string passed to eval must handles spaces in paths correctly.
    112112         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"
     
    118118         eval echo `gettext '$APP_LONG_NAME is already running.'`
    119119         exit 1
    120 @@ -1025,9 +973,6 @@
     120@@ -1031,9 +979,6 @@
    121121         # The string passed to eval must handles spaces in paths correctly.
    122122         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"
     
    128128         eval echo `gettext '$APP_LONG_NAME is already running.'`
    129129         exit 1
    130 @@ -1798,16 +1743,8 @@
     130@@ -1871,18 +1816,9 @@
    131131             status
    132132             ;;
     
    137137-                 showsetusermesg
    138138-            fi
    139 -
     139-            echo
     140-            echo "You may want to disable the browser from launching at startup at"
     141-            echo "http://127.0.0.1:7657/configclients"
    140142-            ;;
    141143-
     
    144146+        'install' | 'remove' | 'uninstall')
    145147+            echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
     148+            exit 1
    146149             ;;
    147150 
     
    187190 #********************************************************************
    188191 # Java Application
    189 @@ -53,13 +44,14 @@
     192@@ -60,13 +51,14 @@
    190193 # classes, or all the classes of i2p.jar, are in a different directory).
    191194 # Be sure there are no other duplicate classes.
     
    207210 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
    208211 wrapper.java.additional.auto_bits=TRUE
    209 @@ -69,7 +61,7 @@
     212@@ -76,7 +68,7 @@
    210213 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    211214 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
     
    216219 
    217220 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    218 @@ -137,11 +129,7 @@
     221@@ -144,11 +136,7 @@
    219222 # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
    220223 # Windows users may wish to change this to %APPDATA%\I2P\wrapper.log
     
    229232 # Format of output for the log file.
    230233 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    231 @@ -211,11 +199,7 @@
     234@@ -218,11 +206,7 @@
    232235 # Linux/Mac users, do not set here, see settings in the i2prouter script.
    233236 # Directory must exist or the wrapper will fail to start.
     
    242245 # From i2prouter:
    243246 #
    244 @@ -229,10 +213,7 @@
     247@@ -236,10 +220,7 @@
    245248 # Linux/Mac users, do not set here, see settings in the i2prouter script.
    246249 # Directory must exist or the wrapper will fail to start.
     
    254257 #********************************************************************
    255258 # Wrapper General Properties
    256 @@ -249,30 +230,3 @@
     259@@ -256,30 +237,3 @@
    257260 wrapper.umask=0022
    258261 wrapper.java.umask=0022
  • debian/patches/0004-oom-listener.patch

    r9331b22 r2b13973  
    11--- a/router/java/src/net/i2p/router/tasks/OOMListener.java
    22+++ b/router/java/src/net/i2p/router/tasks/OOMListener.java
    3 @@ -46,7 +46,7 @@
     3@@ -48,7 +48,7 @@
    44             log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() +
    55                               " total mem: " + Runtime.getRuntime().totalMemory());
Note: See TracChangeset for help on using the changeset viewer.