diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
commit | 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch) | |
tree | b72c523c72e764420f835ba9d63d43ffef687dcf /net-vpn/i2p/files | |
parent | f78108598211053d41752a83e0345441bb9014ae (diff) |
gentoo resync : 15.02.2018
Diffstat (limited to 'net-vpn/i2p/files')
-rw-r--r-- | net-vpn/i2p/files/i2p-0.9.30-add_libs.patch | 22 | ||||
-rw-r--r-- | net-vpn/i2p/files/i2p-0.9.30.initd | 35 | ||||
-rw-r--r-- | net-vpn/i2p/files/i2p.init | 19 | ||||
-rw-r--r-- | net-vpn/i2p/files/i2p.service (renamed from net-vpn/i2p/files/i2p-0.9.30.service) | 0 |
4 files changed, 19 insertions, 57 deletions
diff --git a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch deleted file mode 100644 index 0ea3149a3628..000000000000 --- a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config ---- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100 -+++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +0100 -@@ -61,12 +61,18 @@ - # Be sure there are no other duplicate classes. - # - wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar -+wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar -+wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar -+wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar -+wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar -+wrapper.java.classpath.6=/usr/share/jrobin/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.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 diff --git a/net-vpn/i2p/files/i2p-0.9.30.initd b/net-vpn/i2p/files/i2p-0.9.30.initd deleted file mode 100644 index 216d19474cb8..000000000000 --- a/net-vpn/i2p/files/i2p-0.9.30.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 $? -} - diff --git a/net-vpn/i2p/files/i2p.init b/net-vpn/i2p/files/i2p.init new file mode 100644 index 000000000000..bbc73b470053 --- /dev/null +++ b/net-vpn/i2p/files/i2p.init @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +CONFIG_PATH="/var/lib/i2p/.i2p" +INSTALL_PATH="/usr/share/i2p" +WRAPPER_CONF="$INSTALL_PATH/wrapper.config" + +command=wrapper +command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p wrapper.logfile=$CONFIG_PATH/wrapper.log" +command_background=true +command_progress=true +command_user=i2p +pidfile="/var/run/i2p.pid" +retry='SIGTERM/20 SIGKILL/20' diff --git a/net-vpn/i2p/files/i2p-0.9.30.service b/net-vpn/i2p/files/i2p.service index ccbadbd4d167..ccbadbd4d167 100644 --- a/net-vpn/i2p/files/i2p-0.9.30.service +++ b/net-vpn/i2p/files/i2p.service |