zlg 15/05/22 05:44:58 Added: i2p.service i2p.initd i2p-0.9.18_fix-paths.patch Log: New ebuild for i2p wrt 297660. Thanks Andrey Tikhomirov, M. B., Chaser, et al (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 5039E170)
Revision Changes Path 1.1 net-p2p/i2p/files/i2p.service file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/i2p/files/i2p.service?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/i2p/files/i2p.service?rev=1.1&content-type=text/plain Index: i2p.service =================================================================== [Unit] Description=Invisible Internet Project After=network.target [Service] User=i2p Type=forking ExecReload=/usr/bin/i2prouter restart ExecStart=/usr/bin/i2prouter start ExecStop=/usr/bin/i2prouter stop [Install] WantedBy=multi-user.target 1.1 net-p2p/i2p/files/i2p.initd file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/i2p/files/i2p.initd?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/i2p/files/i2p.initd?rev=1.1&content-type=text/plain Index: i2p.initd =================================================================== #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-p2p/i2p/files/i2p.initd,v 1.1 2015/05/22 05:44:58 zlg Exp $ depend() { need net } HOME="/var/lib/i2p" USER_HOME="$HOME" JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" INSTALL_PATH="/usr/share/i2p" I2P="$INSTALL_PATH" I2P_CONFIG_DIR="$USER_HOME/.i2p" SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" I2PTEMP="$SYSTEM_java_io_tmpdir" LOGFILE="$I2P_CONFIG_DIR/wrapper.log" PIDFILE="/var/run/i2p.pid" WRAPPER_CMD="$I2P/i2psvc" WRAPPER_CONF="$I2P/wrapper.config" start() { ebegin "Starting I2P" start-stop-daemon --start -b -m -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -- -c $WRAPPER_CONF wrapper.daemonize=FALSE wrapper.syslog.ident=i2p wrapper.java.command="$JAVABINARY" wrapper.name=i2p wrapper.displayname="I2P Service" wrapper.statusfile="$I2P_CONFIG_DIR/i2p.status" wrapper.java.statusfile="$I2P_CONFIG_DIR/i2p.java.status" wrapper.logfile="$LOGFILE" sleep 1 [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] eend $? } stop() { ebegin "Stopping I2P" start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P eend $? } 1.1 net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch?rev=1.1&content-type=text/plain Index: i2p-0.9.18_fix-paths.patch =================================================================== --- clients.config 2015-03-15 02:02:29.021408673 -0700 +++ clients.config 2015-03-15 02:24:33.460308396 -0700 @@ -60,7 +60,7 @@ 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= --- eepget 2015-03-15 02:02:29.078407997 -0700 +++ eepget 2015-03-15 02:17:51.441075791 -0700 @@ -1,3 +1,3 @@ #!/bin/sh -I2P="%INSTALL_PATH" +I2P="/usr/share/i2p" java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" --- i2prouter 2015-03-15 02:02:29.079407985 -0700 +++ i2prouter 2015-03-15 02:11:13.023194731 -0700 @@ -28,20 +28,22 @@ # Note that (percent)INSTALL_PATH, (percent)USER_HOME, 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 paths. -I2P="%INSTALL_PATH" +USER_HOME="$HOME" +SYSTEM_java_io_tmpdir="$USER_HOME/.i2p" +I2P="/usr/share/i2p" if [ "`uname -s`" = "Darwin" ]; then - if [ -d "%USER_HOME/Library/Application Support" ]; then - I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" + if [ -d "$USER_HOME/Library/Application Support" ]; then + I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p" else - I2P_CONFIG_DIR="%USER_HOME/.i2p" + I2P_CONFIG_DIR="$USER_HOME/.i2p" fi else - I2P_CONFIG_DIR="%USER_HOME/.i2p" + I2P_CONFIG_DIR="$USER_HOME/.i2p" fi -I2PTEMP="%SYSTEM_java_io_tmpdir" +I2PTEMP="$SYSTEM_java_io_tmpdir" # PORTABLE installation: # Use the following instead. -#I2PTEMP="%INSTALL_PATH" +#I2PTEMP="/usr/share/i2p" # Application APP_NAME="i2p" --- runplain.sh 2015-03-15 02:02:29.078407997 -0700 +++ runplain.sh 2015-03-15 02:18:46.530422508 -0700 @@ -11,8 +11,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="$SYSTEM_java_io_tmpdir" # Having IPv6 enabled can cause problems with certain configurations. Changing the # next value to true may help. --- wrapper.config 2015-03-15 02:02:29.022408661 -0700 +++ wrapper.config 2015-03-15 02:21:50.666238909 -0700 @@ -60,13 +60,17 @@ # 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 +wrapper.java.classpath.2=/usr/share/jakarta-jstl/lib/*.jar +wrapper.java.classpath.3=/usr/share/java-service-wrapper/lib/*.jar +wrapper.java.classpath.4=/usr/share/bcprov/lib/*.jar # uncomment this to use the system classpath as well (e.g. to get tools.jar) # wrapper.java.classpath.2=%CLASSPATH% # 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/share/i2p +wrapper.java.library.path.2=/usr/share/i2p/lib +wrapper.java.library.path.3=/usr/lib/java-service-wrapper # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. wrapper.java.additional.auto_bits=TRUE @@ -76,7 +80,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.stripquotes=TRUE # On some IPv6 enabled systems, I2P and other network-enabled java applications @@ -96,11 +100,11 @@ # wrapper.java.additional.7=-Dorg.mortbay.util.FileResource.checkAliases=false # PORTABLE installation: # uncomment the following -#wrapper.java.additional.7=-Di2p.dir.pid="$INSTALL_PATH" +#wrapper.java.additional.7=-Di2p.dir.pid="/usr/share/i2p" #wrapper.java.additional.7.stripquotes=TRUE -#wrapper.java.additional.8=-Di2p.dir.temp="$INSTALL_PATH" +#wrapper.java.additional.8=-Di2p.dir.temp="/usr/share/i2p" #wrapper.java.additional.8.stripquotes=TRUE -#wrapper.java.additional.9=-Di2p.dir.config="$INSTALL_PATH" +#wrapper.java.additional.9=-Di2p.dir.config="/usr/share/i2p" #wrapper.java.additional.9.stripquotes=TRUE # # Uncomment this for better performance. @@ -147,7 +151,7 @@ # PORTABLE installation: # Use the following instead. I2P will find the logfile here, # no need for a wrapper.java.additional line too. -#wrapper.logfile=$INSTALL_PATH/wrapper.log +#wrapper.logfile=/usr/share/i2p/wrapper.log # Format of output for the log file. # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, @@ -220,7 +224,7 @@ #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid # PORTABLE installation: # Use the following instead. -#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid +#wrapper.java.pidfile=/usr/share/i2p/routerjvm.pid # pid file for the service monitoring the JVM # # From i2prouter: @@ -238,7 +242,7 @@ #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid # PORTABLE installation: # Use the following instead. -#wrapper.pidfile=$INSTALL_PATH/i2p.pid +#wrapper.pidfile=/usr/share/i2p/i2p.pid #******************************************************************** # Wrapper General Properties
