AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of '35b2e734af9d2aff8fae586fccef3cd66e57e23a'

Browse Source 
and 'fb0d6216234531927837fe7b886eb1feab790ecb'
This commit is contained in:
zzz
2011-08-28 19:03:01 +00:00
parent 8b05b16c8a 035829f33d
commit 5b11418209
8 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
debian/patches/0001-path-substitution.patch vendored
View File

@@ -60,7 +60,7 @@ Debian wrapper.config to try to prevent confusion.
# next value to true may help.
--- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config
@@ -7,22 +7,16 @@
@@ -8,22 +8,13 @@
# click "Shutdown", wait 11 minutes, then start i2p.
#
# WARNING - The wrapper is NOT run (and this file is not used)
@@ -68,7 +68,7 @@ Debian wrapper.config to try to prevent confusion.
-# with the runplain.sh script on Linux. Use the 'restartable'
-# icon on Windows or the i2prouter script on Linux to run the wrapper.
+# if you start I2P with the i2prouter-nowrapper script in Linux.
+# Use i2prouter or the initscript run the wrapper.
+# Use i2prouter or the initscript to run the wrapper.
#
# NOTE - Directory organization:
# The standard I2P Installation will set up a "split" directory structure
@@ -76,18 +76,16 @@ Debian wrapper.config to try to prevent confusion.
# user's home directory, and temporary files in the system temporary directory.
-# To set up a single-directory "portable" installation suitable for
-# a USB stick, make several changes specified below (search for PORTABLE).
#
-#
-# NOTE - The izpack installer performs variable subsitiution on this
-# file upon installation. If you did not use izpack, you must
-# find and replace all instances of (dollar)INSTALL_PATH and
-# (dollar)SYSTEM_java_io_tmpdir with appropriate values
-# (perhaps . and /var/tmp, respectively)
+# Unless changed by an admin, the daemon user "i2psvc" has its home directory
+# at /var/lib/i2p.
#
#********************************************************************
# Java Application
@@ -45,20 +39,21 @@
@@ -51,13 +42,14 @@
# classes, or all the classes of i2p.jar, are in a different directory).
# Be sure there are no other duplicate classes.
#
@@ -105,17 +103,18 @@ Debian wrapper.config to try to prevent confusion.
+wrapper.java.library.path.1=/usr/lib/jni
+wrapper.java.library.path.2=/usr/share/java/lib
# Java Additional Parameters
# Numbers must be consecutive (except for stripquotes)
# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
wrapper.java.additional.auto_bits=TRUE
@@ -67,7 +59,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
-wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
+wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
+wrapper.java.additional.4=-Di2p.dir.base=/usr/share/i2p
wrapper.java.additional.4.stripquotes=TRUE
# On some IPv6 enabled systems, I2P and other network-enabled java applications
@@ -126,11 +121,7 @@
@@ -137,11 +129,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
@@ -128,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,
@@ -192,10 +183,7 @@
@@ -203,10 +191,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.
@@ -140,7 +139,7 @@ Debian wrapper.config to try to prevent confusion.
# pid file for the service monitoring the JVM
#
# From i2prouter:
@@ -206,34 +194,4 @@
@@ -217,10 +202,7 @@
#
# This means i2prouter looks for './i2p.pid'.
# See comments above for wrapper.java.pidfile
@@ -148,6 +147,14 @@ Debian wrapper.config to try to prevent confusion.
-# PORTABLE installation:
-# Use the following instead.
-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
+wrapper.pidfile=/tmp/i2p.pid
#********************************************************************
# Wrapper General Properties
@@ -230,30 +212,3 @@
# Title to use when running as a console
wrapper.console.title=I2P Service
-
-#********************************************************************
-# Wrapper NT Service Properties
@@ -175,4 +182,3 @@ Debian wrapper.config to try to prevent confusion.
-# Allow the service to interact with the desktop.
-wrapper.ntservice.interactive=false
-
+wrapper.pidfile=/tmp/i2p.pid

8
history.txt
View File

@@ -1,3 +1,9 @@
2011-08-26 kytv
* Debian: Bugfix: Avoid overwriting preseeded debconf values
upon package installation (ticket #514).
* Windows: Fix bug in fixperms.bat that occurred when installing on
non-English versions of Windows 7 and Vista.
2011-08-25 zzz
* Blockfile:
- Avoid NPE after corruption (ticket #515)
@@ -66,7 +72,7 @@
to speed integration
2011-07-30 kytv
* Installer:
* Installer:
- add libjbigi*core*jnilib, libjbigi-osx-none_64.jnilib, and
libjbigi-linux-ppc.so
- Add Linux PPC wrapper

12
installer/resources/certificates/i2pprojekt.de.cert Normal file
View File

@@ -0,0 +1,12 @@
-----BEGIN CERTIFICATE-----
MIIB1zCCAUACCQDn1xjRAoQgEDANBgkqhkiG9w0BAQUFADAwMS4wLAYDVQQDEyU4
NS0zMS0xODYtNzAuYmx1ZS5rdW5kZW5jb250cm9sbGVyLmRlMB4XDTEwMDQwMTA4
MDEyN1oXDTIwMDMyOTA4MDEyN1owMDEuMCwGA1UEAxMlODUtMzEtMTg2LTcwLmJs
dWUua3VuZGVuY29udHJvbGxlci5kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
gYEAs71zW2N3kEjIVOxoREXnELxcczgFNxyCjajp+kMvwW/s51hf0u6HhgQJtRU6
6lJBVUQoTvrwB5vF6xv+2biLmq4m8cFwE0MFdHhj0VGEi7X9VoNAeLvlLd47/2mm
wqYi0x+LVWseJa2Ho5mdRyiuMqcbOpJSSJ76Ug6Yhs88jIsCAwEAATANBgkqhkiG
9w0BAQUFAAOBgQCUdq7FpiPHNKaUQEZkmKNz8tkLraRN7IUFwlPfoGeGdlFNIYqa
7B8a6zszjvOtY/EgaSXBxctbCDj77K+nPZHmHzbsfUU9j06qsIHdAqlxAg1Rs36/
dWjAR19Fr4l5rshjk94ABuebaWCwVz8GoOFuFghO7jhaqi4vMPZwMCeS9g==
-----END CERTIFICATE-----

4
installer/resources/fix_logfile_path.cmd
View File

@@ -7,7 +7,7 @@
::
:: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level
:: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp%
:: depends on whose account a process is running under. If the same user that installs I2P
:: depends on whose account a process is running under. If the same user that installs I2P
:: is the only one that will run I2P, this isn't a problem.
::
:: The problem comes from trying to run the process as a service, or trying to run under an
@@ -29,5 +29,3 @@ cd /d %~dp0
findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
move wrapper.new wrapper.config
:: As an added bonus, wrapper.config now has DOS line endings in Windows.

30
installer/resources/fixperms.bat
View File

@@ -1,11 +1,19 @@
:: Fix Vista permission problems
:: From http://www.nabble.com/Classpath-security-issues-on-Vista-td22456230.html
::
:: 'echo Y' to get past the 'are you sure' question...
:: cacls requires it on XP, icacls doesnt appear so, but can't hurt
:: F : full control
:: /c : continue on error
:: /q : quiet
:: /t : recursive
::
echo Y|icacls %1 /grant Users:F /c /t > %1%\fixperms.log
:: Fix Vista permission problems
:: From http://www.nabble.com/Classpath-security-issues-on-Vista-td22456230.html
::
:: 'echo Y' to get past the 'are you sure' question...
:: cacls requires it on XP, icacls doesnt appear so, but can't hurt
:: F : full control
:: /c : continue on error
:: /q : quiet
:: /t : recursive
::
:: Note: We should not use the group name "Users" since this group will not
:: exist on non-English versions of Windows.
::
:: S-1-5-32-545 = Users (en). Benutzer (de), etc.
::
:: Specifying the SID will work on ALL versions of Windows.
:: List of well-known SIDs at http://support.microsoft.com/kb/243330/en-us
::
echo Y|icacls %1 /grant *S-1-5-32-545:F /c /t > %1%\fixperms.log

10
installer/resources/shortcutSpec.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<shortcuts>
<programGroup defaultName="I2P" location="startMenu" />
<shortcut name="Start I2P (no window)"
target="$INSTALL_PATH\I2P.exe"
<shortcut name="Start I2P (no window)"
target="$INSTALL_PATH\I2P.exe"
commandLine=""
workingDirectory="$INSTALL_PATH"
iconFile="$INSTALL_PATH\docs\start.ico"
@@ -11,8 +11,8 @@
startMenu="no"
desktop="yes"
startup="no" />
<shortcut name="Start I2P (restartable)"
target="$INSTALL_PATH\I2Psvc.exe"
<shortcut name="Start I2P (restartable)"
target="$INSTALL_PATH\I2Psvc.exe"
commandLine="-c wrapper.config"
workingDirectory="$INSTALL_PATH"
iconFile="$INSTALL_PATH\docs\start.ico"
@@ -26,7 +26,7 @@
commandLine=""
workingDirectory="$INSTALL_PATH"
iconFile="$INSTALL_PATH\docs\console.ico"
initialState="noShow"
initialState="normal"
programGroup="yes"
startMenu="no"
desktop="yes"

24
installer/resources/wrapper.config
View File

@@ -1,3 +1,4 @@
#encoding=UTF-8
#********************************************************************
# Wrapper Properties
#
@@ -27,6 +28,11 @@
#********************************************************************
# Java Application
wrapper.java.command=java
# Specify a specific java binary:
#set.JAVA_HOME=/java/path
#wrapper.java.command=%JAVA_HOME%/bin/java
# Tell the Wrapper to log the full generated Java command line.
#wrapper.java.command.loglevel=INFO
# Java Main class. This class must implement the WrapperListener interface
# or guarantee that the WrapperManager class is initialized. Helper
@@ -53,6 +59,9 @@ wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
wrapper.java.library.path.1=$INSTALL_PATH
wrapper.java.library.path.2=$INSTALL_PATH/lib
# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
wrapper.java.additional.auto_bits=TRUE
# Java Additional Parameters
# Numbers must be consecutive (except for stripquotes)
wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
@@ -63,7 +72,7 @@ wrapper.java.additional.4.stripquotes=TRUE
# On some IPv6 enabled systems, I2P and other network-enabled java applications
# may fail to start. For examples see
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560044.
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560044.
# Two things that may help if you experience this issue
# 1) "echo 0 > /proc/sys/net/ipv6/bindv6only" as root; or
# 2) uncomment the next two lines:
@@ -113,6 +122,8 @@ wrapper.app.parameter.1=net.i2p.router.Router
#********************************************************************
# Wrapper Logging Properties
#********************************************************************
# Enables Debug output from the Wrapper.
# wrapper.debug=TRUE
# Format of output for the console. (See docs for formats)
wrapper.console.format=PM
@@ -182,7 +193,7 @@ wrapper.ping.interval=300
# Extend this if you are getting 'JVM appears hung' shutdowns.
wrapper.ping.timeout=320
# use the wrapper's internal timer thread. otherwise this would
# use the wrapper's internal timer thread. otherwise this would
# force a restart of the router during daylight savings time as well
# as any time that the OS clock changes
wrapper.use_system_time=false
@@ -211,6 +222,15 @@ wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
# Use the following instead.
#wrapper.pidfile=$INSTALL_PATH/i2p.pid
#********************************************************************
# Wrapper General Properties
#********************************************************************
# Allow for the use of non-contiguous numbered properties
wrapper.ignore_sequence_gaps=TRUE
# Title to use when running as a console
wrapper.console.title=I2P Service
#********************************************************************
# Wrapper NT Service Properties
#********************************************************************

3
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@@ -70,7 +70,8 @@ public class Reseeder {
/* "https://c.netdb.i2p2.de/," + no data */
"https://forum.i2p2.de/netdb/," +
"https://www.i2pbote.net/netDb/," +
"https://r31453.ovh.net/static_media/files/netDb/," +
"https://reseed.i2p-projekt.de/," +
"https://r31453.ovh.net/static_media/files/netDb/," +
"https://cowpuncher.drollette.com/netdb/";
private static final String PROP_INPROGRESS = "net.i2p.router.web.ReseedHandler.reseedInProgress";