forked from I2P_Developers/i2p.i2p
Debian packaging fixes
This commit is contained in:
kytv
124
debian/patches/0001-Update-paths.patch
vendored
Normal file
124
debian/patches/0001-Update-paths.patch
vendored
Normal file
@@ -0,0 +1,124 @@
|
||||
From: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Date: Mon, 18 Apr 2011 16:43:40 +0000
|
||||
Subject: Update-paths
|
||||
|
||||
---
|
||||
installer/resources/eepget | 2 +-
|
||||
installer/resources/i2prouter | 8 ++++----
|
||||
installer/resources/runplain.sh | 6 +++---
|
||||
installer/resources/wrapper.config | 17 ++++++++---------
|
||||
4 files changed, 16 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/installer/resources/eepget b/installer/resources/eepget
|
||||
index 080bcc8..f2e84ba 100644
|
||||
--- a/installer/resources/eepget
|
||||
+++ b/installer/resources/eepget
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
-I2P="%INSTALL_PATH"
|
||||
+I2P="/usr/share/i2p"
|
||||
java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
|
||||
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
|
||||
index be6ef4f..8ebe059 100644
|
||||
--- a/installer/resources/i2prouter
|
||||
+++ b/installer/resources/i2prouter
|
||||
@@ -22,8 +22,8 @@
|
||||
# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
|
||||
# should have been replaced by the izpack installer.
|
||||
# If you did not run the installer, replace them with the appropriate path.
|
||||
-I2P="%INSTALL_PATH"
|
||||
-I2PTEMP="%SYSTEM_java_io_tmpdir"
|
||||
+I2P="/usr/share/i2p"
|
||||
+I2PTEMP="/tmp"
|
||||
# PORTABLE installation:
|
||||
# Use the following instead.
|
||||
#I2PTEMP="%INSTALL_PATH"
|
||||
@@ -33,8 +33,8 @@ APP_NAME="i2p"
|
||||
APP_LONG_NAME="I2P Service"
|
||||
|
||||
# Wrapper
|
||||
-WRAPPER_CMD="$I2P/i2psvc"
|
||||
-WRAPPER_CONF="$I2P/wrapper.config"
|
||||
+WRAPPER_CMD="/usr/sbin/wrapper"
|
||||
+WRAPPER_CONF="/etc/i2p/wrapper.config"
|
||||
|
||||
# Priority at which to run the wrapper. See "man nice" for valid priorities.
|
||||
# nice is only used if a priority is specified.
|
||||
diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh
|
||||
index eaf2d29..e5530eb 100644
|
||||
--- a/installer/resources/runplain.sh
|
||||
+++ b/installer/resources/runplain.sh
|
||||
@@ -11,12 +11,12 @@
|
||||
# Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
|
||||
# should have been replaced by the izpack installer.
|
||||
# If you did not run the installer, replace them with the appropriate path.
|
||||
-I2P="%INSTALL_PATH"
|
||||
-I2PTEMP="%SYSTEM_java_io_tmpdir"
|
||||
+I2P="/usr/share/i2p"
|
||||
+I2PTEMP="/tmp"
|
||||
|
||||
export CP="$I2P" ; for j in "$I2P/lib/*" ; do export CP="$CP:$j" ; done;
|
||||
JAVA=java
|
||||
|
||||
-JAVAOPTS="-Djava.library.path=$I2P:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
|
||||
+JAVAOPTS="-Djava.library.path=/usr/lib/jni:$I2P/lib -Di2p.dir.base=$I2P -DloggerFilenameOverride=logs/log-router-@.txt"
|
||||
nohup $JAVA -cp "$CP" $JAVAOPTS net.i2p.router.RouterLaunch > /dev/null 2>&1 &
|
||||
echo $! > "$I2PTEMP/router.pid"
|
||||
diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config
|
||||
index 380f94b..7bda095 100644
|
||||
--- a/installer/resources/wrapper.config
|
||||
+++ b/installer/resources/wrapper.config
|
||||
@@ -45,20 +45,19 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
|
||||
# classes, or all the classes of i2p.jar, are in a different directory).
|
||||
# Be sure there are no other duplicate classes.
|
||||
#
|
||||
-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
|
||||
+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
|
||||
# uncomment this to use the system classpath as well (e.g. to get tools.jar)
|
||||
-# wrapper.java.classpath.2=%CLASSPATH%
|
||||
-
|
||||
+wrapper.java.classpath.2=/usr/share/java/wrapper.jar
|
||||
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
|
||||
-wrapper.java.library.path.1=$INSTALL_PATH
|
||||
-wrapper.java.library.path.2=$INSTALL_PATH/lib
|
||||
+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)
|
||||
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.stripquotes=TRUE
|
||||
# Jetty says this is a security risk
|
||||
# Uncommenting this won't help as the router forces it to true
|
||||
@@ -116,7 +115,7 @@ wrapper.console.loglevel=INFO
|
||||
# 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
|
||||
-wrapper.logfile=$SYSTEM_java_io_tmpdir/wrapper.log
|
||||
+wrapper.logfile=/tmp/wrapper.log
|
||||
# PORTABLE installation:
|
||||
# Use the following instead. I2P will find the logfile here,
|
||||
# no need for a wrapper.java.additional line too.
|
||||
@@ -182,7 +181,7 @@ wrapper.use_system_time=false
|
||||
# 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.
|
||||
-wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
|
||||
+wrapper.java.pidfile=/tmp/routerjvm.pid
|
||||
# PORTABLE installation:
|
||||
# Use the following instead.
|
||||
#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
|
||||
@@ -196,7 +195,7 @@ wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
|
||||
#
|
||||
# This means i2prouter looks for './i2p.pid'.
|
||||
# See comments above for wrapper.java.pidfile
|
||||
-wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
|
||||
+wrapper.pidfile=/tmp/i2p.pid
|
||||
# PORTABLE installation:
|
||||
# Use the following instead.
|
||||
#wrapper.pidfile=$INSTALL_PATH/i2p.pid
|
||||
--
|
||||
22
debian/patches/0002-disable-browser-launch.patch
vendored
Normal file
22
debian/patches/0002-disable-browser-launch.patch
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
From: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Date: Mon, 18 Apr 2011 16:43:40 +0000
|
||||
Subject: disable browser launch
|
||||
|
||||
---
|
||||
installer/resources/clients.config | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/installer/resources/clients.config b/installer/resources/clients.config
|
||||
index 08c6c62..0506a45 100644
|
||||
--- a/installer/resources/clients.config
|
||||
+++ b/installer/resources/clients.config
|
||||
@@ -51,7 +51,7 @@ clientApp.4.main=net.i2p.apps.systray.UrlLauncher
|
||||
clientApp.4.name=Open Router Console in web browser at startup
|
||||
clientApp.4.args=http://127.0.0.1:7657/
|
||||
clientApp.4.delay=3
|
||||
-clientApp.4.startOnLoad=true
|
||||
+clientApp.4.startOnLoad=false
|
||||
|
||||
# BOB bridge
|
||||
clientApp.5.args=
|
||||
--
|
||||
33
debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch
vendored
Normal file
33
debian/patches/0004-Update-path-of-jbigi-and-add-soname.patch
vendored
Normal file
@@ -0,0 +1,33 @@
|
||||
From: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Date: Wed, 11 May 2011 00:12:04 +0000
|
||||
Subject: Update path of jbigi and add soname
|
||||
|
||||
---
|
||||
core/c/jbigi/mbuild_jbigi.sh | 6 +++---
|
||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/core/c/jbigi/mbuild_jbigi.sh b/core/c/jbigi/mbuild_jbigi.sh
|
||||
index 1e262a6..7581335 100755
|
||||
--- a/core/c/jbigi/mbuild_jbigi.sh
|
||||
+++ b/core/c/jbigi/mbuild_jbigi.sh
|
||||
@@ -25,8 +25,8 @@ Darwin*)
|
||||
LIBFILE="libjbigi.jnilib";;
|
||||
*)
|
||||
COMPILEFLAGS="-fPIC -Wall"
|
||||
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
|
||||
- LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
|
||||
+ INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
|
||||
+ LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0"
|
||||
LIBFILE="libjbigi.so";;
|
||||
esac
|
||||
|
||||
@@ -41,7 +41,7 @@ fi
|
||||
|
||||
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
|
||||
|
||||
exit 0
|
||||
--
|
||||
44
debian/patches/0005-update-launch-i2psnark-paths.patch
vendored
Normal file
44
debian/patches/0005-update-launch-i2psnark-paths.patch
vendored
Normal file
@@ -0,0 +1,44 @@
|
||||
From: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Date: Wed, 18 May 2011 11:32:14 +0000
|
||||
Subject: update launch-i2psnark paths
|
||||
|
||||
---
|
||||
apps/i2psnark/jetty-i2psnark.xml | 4 ++--
|
||||
apps/i2psnark/launch-i2psnark | 3 ++-
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/apps/i2psnark/jetty-i2psnark.xml b/apps/i2psnark/jetty-i2psnark.xml
|
||||
index b5d6d1e..b9b375e 100644
|
||||
--- a/apps/i2psnark/jetty-i2psnark.xml
|
||||
+++ b/apps/i2psnark/jetty-i2psnark.xml
|
||||
@@ -55,7 +55,7 @@
|
||||
<Set name="rootWebApp">i2psnark</Set>
|
||||
<Call name="addWebApplication">
|
||||
<Arg>/</Arg>
|
||||
- <Arg>webapps/i2psnark.war</Arg>
|
||||
+ <Arg>/usr/share/i2p/webapps/i2psnark.war</Arg>
|
||||
</Call>
|
||||
|
||||
<!-- this is so we can find the css -->
|
||||
@@ -63,7 +63,7 @@
|
||||
<Arg>
|
||||
<New class="org.mortbay.http.HttpContext">
|
||||
<Set name="contextPath">/themes</Set>
|
||||
- <Set name="resourceBase">./docs/themes</Set>
|
||||
+ <Set name="resourceBase">/usr/share/i2p/docs/themes</Set>
|
||||
<Call name="addHandler">
|
||||
<Arg>
|
||||
<New class="org.mortbay.http.handler.ResourceHandler">
|
||||
diff --git a/apps/i2psnark/launch-i2psnark b/apps/i2psnark/launch-i2psnark
|
||||
index 023b5a2..03a4ed2 100755
|
||||
--- a/apps/i2psnark/launch-i2psnark
|
||||
+++ b/apps/i2psnark/launch-i2psnark
|
||||
@@ -4,5 +4,6 @@
|
||||
# The file jetty-i2psnark.xml must be present in the current directory.
|
||||
# i2psnark will be accessed at http://127.0.0.1:8002/
|
||||
#
|
||||
-I2P="."
|
||||
+cd /var/lib/i2p/i2p-config
|
||||
+I2P="/usr/share/i2p"
|
||||
java -cp "$I2P/lib/i2psnark.jar:$I2P/lib/i2p.jar:$I2P/lib/mstreaming.jar:$I2P/lib/streaming.jar:$I2P/lib/commons-el.jar:$I2P/lib/commons-logging.jar:$I2P/lib/jasper-compiler.jar:$I2P/lib/jasper-runtime.jar:$I2P/lib/javax.servlet.jar:$I2P/lib/org.mortbay.jetty.jar" org.klomp.snark.web.RunStandalone "$@"
|
||||
--
|
||||
24
debian/patches/0007-rename-jcpuid.patch
vendored
Normal file
24
debian/patches/0007-rename-jcpuid.patch
vendored
Normal file
@@ -0,0 +1,24 @@
|
||||
From: Kill Your TV <killyourtv@i2pmail.org>
|
||||
Date: Wed, 25 May 2011 00:26:10 +0300
|
||||
Subject: rename jcpuid
|
||||
|
||||
---
|
||||
core/c/jcpuid/build.sh | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
|
||||
index 244eb07..827e14b 100755
|
||||
--- a/core/c/jcpuid/build.sh
|
||||
+++ b/core/c/jcpuid/build.sh
|
||||
@@ -37,8 +37,8 @@ FreeBSD*)
|
||||
Linux*)
|
||||
COMPILEFLAGS="-fPIC -Wall"
|
||||
INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
|
||||
- LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
|
||||
- LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
|
||||
+ LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
|
||||
+ LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";;
|
||||
esac
|
||||
|
||||
echo "Compiling C code..."
|
||||
--
|
||||
5
debian/patches/series
vendored
Normal file
5
debian/patches/series
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
0001-Update-paths.patch
|
||||
0002-disable-browser-launch.patch
|
||||
0004-Update-path-of-jbigi-and-add-soname.patch
|
||||
0005-update-launch-i2psnark-paths.patch
|
||||
0007-rename-jcpuid.patch
|
||||
Reference in New Issue
Block a user