Changeset 5b114182


Ignore:
Timestamp:
Aug 28, 2011 7:03:01 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f8df357
Parents:
8b05b16 (diff), 035829f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '35b2e734af9d2aff8fae586fccef3cd66e57e23a'

and 'fb0d6216234531927837fe7b886eb1feab790ecb'

Files:
1 added
7 edited

Legend:

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

    r8b05b16 r5b114182  
    6161--- a/installer/resources/wrapper.config
    6262+++ b/installer/resources/wrapper.config
    63 @@ -7,22 +7,16 @@
     63@@ -8,22 +8,13 @@
    6464 # click "Shutdown", wait 11 minutes, then start i2p.
    6565 #
     
    6969-# icon on Windows or the i2prouter script on Linux to run the wrapper.
    7070+# if you start I2P with the i2prouter-nowrapper script in Linux.
    71 +# Use i2prouter or the initscript run the wrapper.
     71+# Use i2prouter or the initscript to run the wrapper.
    7272 #
    7373 # NOTE - Directory organization:
     
    7777-# To set up a single-directory "portable" installation suitable for
    7878-# a USB stick, make several changes specified below (search for PORTABLE).
    79  #
     79-#
    8080-# NOTE - The izpack installer performs variable subsitiution on this
    8181-# file upon installation. If you did not use izpack, you must
     
    8383-# (dollar)SYSTEM_java_io_tmpdir with appropriate values
    8484-# (perhaps . and /var/tmp, respectively)
    85 +# Unless changed by an admin, the daemon user "i2psvc" has its home directory
    86 +# at /var/lib/i2p.
    8785 #
    8886 #********************************************************************
    8987 # Java Application
    90 @@ -45,20 +39,21 @@
     88@@ -51,13 +42,14 @@
    9189 # classes, or all the classes of i2p.jar, are in a different directory).
    9290 # Be sure there are no other duplicate classes.
     
    106104+wrapper.java.library.path.2=/usr/share/java/lib
    107105 
    108  # Java Additional Parameters
    109  # Numbers must be consecutive (except for stripquotes)
     106 # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
     107 wrapper.java.additional.auto_bits=TRUE
     108@@ -67,7 +59,7 @@
    110109 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    111110 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    112111 wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    113112-wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
    114 +wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
     113+wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p
    115114 wrapper.java.additional.4.stripquotes=TRUE
    116115 
    117116 # On some IPv6 enabled systems, I2P and other network-enabled java applications
    118 @@ -126,11 +121,7 @@
     117@@ -137,11 +129,7 @@
    119118 # tell the router where to find the wrapper log
    120119 # (change X to the next available number)
     
    129128 # Format of output for the log file.
    130129 # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
    131 @@ -192,10 +183,7 @@
     130@@ -203,10 +191,7 @@
    132131 # you should copy this file, change the location or file name,
    133132 # and edit the i2prouter script to change the WRAPPER_CONF setting
     
    141140 #
    142141 # From i2prouter:
    143 @@ -206,34 +194,4 @@
     142@@ -217,10 +202,7 @@
    144143 #
    145144 # This means i2prouter looks for './i2p.pid'.
     
    149148-# Use the following instead.
    150149-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
     150+wrapper.pidfile=/tmp/i2p.pid
     151 
     152 #********************************************************************
     153 # Wrapper General Properties
     154@@ -230,30 +212,3 @@
     155 
     156 # Title to use when running as a console
     157 wrapper.console.title=I2P Service
    151158-
    152159-#********************************************************************
     
    176183-wrapper.ntservice.interactive=false
    177184-
    178 +wrapper.pidfile=/tmp/i2p.pid
  • history.txt

    r8b05b16 r5b114182  
     12011-08-26 kytv
     2  * Debian: Bugfix: Avoid overwriting preseeded debconf values
     3    upon package installation (ticket #514).
     4  * Windows: Fix bug in fixperms.bat that occurred when installing on
     5    non-English versions of Windows 7 and Vista.
     6
    172011-08-25 zzz
    28  * Blockfile:
     
    6773
    68742011-07-30 kytv
    69  * Installer: 
     75 * Installer:
    7076   - add libjbigi*core*jnilib, libjbigi-osx-none_64.jnilib, and
    7177     libjbigi-linux-ppc.so
  • installer/resources/fix_logfile_path.cmd

    r8b05b16 r5b114182  
    88:: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level
    99:: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp%
    10 :: depends on whose account a process is running under. If the same user that installs I2P 
     10:: depends on whose account a process is running under. If the same user that installs I2P
    1111:: is the only one that will run I2P, this isn't a problem.
    1212::
     
    3030echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
    3131move wrapper.new wrapper.config
    32 
    33 :: As an added bonus, wrapper.config now has DOS line endings in Windows.
  • installer/resources/fixperms.bat

    r8b05b16 r5b114182  
    99:: /t : recursive
    1010::
    11 echo Y|icacls %1 /grant Users:F /c /t > %1%\fixperms.log
     11:: Note: We should not use the group name "Users" since this group will not
     12:: exist on non-English versions of Windows.
     13::
     14:: S-1-5-32-545 = Users (en). Benutzer (de), etc.
     15::
     16:: Specifying the SID will work on ALL versions of Windows.
     17:: List of well-known SIDs at http://support.microsoft.com/kb/243330/en-us
     18::
     19echo Y|icacls %1 /grant  *S-1-5-32-545:F /c /t > %1%\fixperms.log
  • installer/resources/shortcutSpec.xml

    r8b05b16 r5b114182  
    22<shortcuts>
    33 <programGroup defaultName="I2P" location="startMenu" />
    4  <shortcut name="Start I2P (no window)" 
    5            target="$INSTALL_PATH\I2P.exe" 
     4 <shortcut name="Start I2P (no window)"
     5           target="$INSTALL_PATH\I2P.exe"
    66           commandLine=""
    77           workingDirectory="$INSTALL_PATH"
     
    1212           desktop="yes"
    1313           startup="no" />
    14  <shortcut name="Start I2P (restartable)" 
    15            target="$INSTALL_PATH\I2Psvc.exe" 
     14 <shortcut name="Start I2P (restartable)"
     15           target="$INSTALL_PATH\I2Psvc.exe"
    1616           commandLine="-c wrapper.config"
    1717           workingDirectory="$INSTALL_PATH"
     
    2727           workingDirectory="$INSTALL_PATH"
    2828           iconFile="$INSTALL_PATH\docs\console.ico"
    29            initialState="noShow"
     29           initialState="normal"
    3030           programGroup="yes"
    3131           startMenu="no"
  • installer/resources/wrapper.config

    r8b05b16 r5b114182  
     1#encoding=UTF-8
    12#********************************************************************
    23# Wrapper Properties
     
    2829# Java Application
    2930wrapper.java.command=java
     31#  Specify a specific java binary:
     32#set.JAVA_HOME=/java/path
     33#wrapper.java.command=%JAVA_HOME%/bin/java
     34# Tell the Wrapper to log the full generated Java command line.
     35#wrapper.java.command.loglevel=INFO
    3036
    3137# Java Main class.  This class must implement the WrapperListener interface
     
    5460wrapper.java.library.path.2=$INSTALL_PATH/lib
    5561
     62# Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
     63wrapper.java.additional.auto_bits=TRUE
     64
    5665# Java Additional Parameters
    5766# Numbers must be consecutive (except for stripquotes)
     
    6473# On some IPv6 enabled systems, I2P and other network-enabled java applications
    6574# may fail to start. For examples see
    66 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560044. 
     75# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560044.
    6776# Two things that may help if you experience this issue
    6877# 1) "echo 0 > /proc/sys/net/ipv6/bindv6only" as root; or
     
    114123# Wrapper Logging Properties
    115124#********************************************************************
     125# Enables Debug output from the Wrapper.
     126# wrapper.debug=TRUE
    116127# Format of output for the console.  (See docs for formats)
    117128wrapper.console.format=PM
     
    183194wrapper.ping.timeout=320
    184195
    185 # use the wrapper's internal timer thread.  otherwise this would 
     196# use the wrapper's internal timer thread.  otherwise this would
    186197# force a restart of the router during daylight savings time as well
    187198# as any time that the OS clock changes
     
    213224
    214225#********************************************************************
     226# Wrapper General Properties
     227#********************************************************************
     228# Allow for the use of non-contiguous numbered properties
     229wrapper.ignore_sequence_gaps=TRUE
     230
     231# Title to use when running as a console
     232wrapper.console.title=I2P Service
     233
     234#********************************************************************
    215235# Wrapper NT Service Properties
    216236#********************************************************************
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    r8b05b16 r5b114182  
    7171              "https://forum.i2p2.de/netdb/," +
    7272              "https://www.i2pbote.net/netDb/," +
    73               "https://r31453.ovh.net/static_media/files/netDb/," +
     73              "https://reseed.i2p-projekt.de/," +
     74              "https://r31453.ovh.net/static_media/files/netDb/," +
    7475              "https://cowpuncher.drollette.com/netdb/";
    7576
Note: See TracChangeset for help on using the changeset viewer.