1 |
commit: 9e4861349d2f7b614879eb4b345838da524a5dbe |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Sep 19 17:33:09 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 21 18:25:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e486134 |
7 |
|
8 |
net-vpn/i2p: remove unused patch/files |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/9918 |
12 |
|
13 |
net-vpn/i2p/files/i2p-0.9.31-add_libs.patch | 22 ------------------- |
14 |
net-vpn/i2p/files/i2p-0.9.31.initd | 33 ----------------------------- |
15 |
net-vpn/i2p/files/i2p-0.9.31.service | 13 ------------ |
16 |
3 files changed, 68 deletions(-) |
17 |
|
18 |
diff --git a/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch |
19 |
deleted file mode 100644 |
20 |
index 0ea3149a362..00000000000 |
21 |
--- a/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch |
22 |
+++ /dev/null |
23 |
@@ -1,22 +0,0 @@ |
24 |
-diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config |
25 |
---- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100 |
26 |
-+++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +0100 |
27 |
-@@ -61,12 +61,18 @@ |
28 |
- # Be sure there are no other duplicate classes. |
29 |
- # |
30 |
- wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar |
31 |
-+wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar |
32 |
-+wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar |
33 |
-+wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar |
34 |
-+wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar |
35 |
-+wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar |
36 |
- # uncomment this to use the system classpath as well (e.g. to get tools.jar) |
37 |
- # wrapper.java.classpath.2=%CLASSPATH% |
38 |
- |
39 |
- # Java Library Path (location of Wrapper.DLL or libwrapper.so) |
40 |
- wrapper.java.library.path.1=$INSTALL_PATH |
41 |
- wrapper.java.library.path.2=$INSTALL_PATH/lib |
42 |
-+wrapper.java.library.path.3=/usr/lib/java-service-wrapper |
43 |
- |
44 |
- # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. |
45 |
- wrapper.java.additional.auto_bits=TRUE |
46 |
|
47 |
diff --git a/net-vpn/i2p/files/i2p-0.9.31.initd b/net-vpn/i2p/files/i2p-0.9.31.initd |
48 |
deleted file mode 100644 |
49 |
index 122d64f4919..00000000000 |
50 |
--- a/net-vpn/i2p/files/i2p-0.9.31.initd |
51 |
+++ /dev/null |
52 |
@@ -1,33 +0,0 @@ |
53 |
-#!/sbin/openrc-run |
54 |
-# Copyright 1999-2017 Gentoo Foundation |
55 |
-# Distributed under the terms of the GNU General Public License v2 |
56 |
- |
57 |
-depend() { |
58 |
- need net |
59 |
-} |
60 |
- |
61 |
-HOME="/var/lib/i2p" |
62 |
-USER_HOME="$HOME" |
63 |
-JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" |
64 |
-INSTALL_PATH="/usr/share/i2p" |
65 |
-I2P="$INSTALL_PATH" |
66 |
-I2P_CONFIG_DIR="$USER_HOME/.i2p" |
67 |
-SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" |
68 |
-I2PTEMP="$SYSTEM_java_io_tmpdir" |
69 |
-LOGFILE="$I2P_CONFIG_DIR/wrapper.log" |
70 |
-PIDFILE="/var/run/i2p.pid" |
71 |
-WRAPPER_CMD="$I2P/i2psvc" |
72 |
-WRAPPER_CONF="$I2P/wrapper.config" |
73 |
- |
74 |
-start() { |
75 |
- ebegin "Starting I2P" |
76 |
- 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" |
77 |
- eend $? |
78 |
-} |
79 |
- |
80 |
-stop() { |
81 |
- ebegin "Stopping I2P" |
82 |
- start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P |
83 |
- eend $? |
84 |
-} |
85 |
- |
86 |
|
87 |
diff --git a/net-vpn/i2p/files/i2p-0.9.31.service b/net-vpn/i2p/files/i2p-0.9.31.service |
88 |
deleted file mode 100644 |
89 |
index ccbadbd4d16..00000000000 |
90 |
--- a/net-vpn/i2p/files/i2p-0.9.31.service |
91 |
+++ /dev/null |
92 |
@@ -1,13 +0,0 @@ |
93 |
-[Unit] |
94 |
-Description=Invisible Internet Project |
95 |
-After=network.target |
96 |
- |
97 |
-[Service] |
98 |
-User=i2p |
99 |
-Type=forking |
100 |
-ExecReload=/usr/bin/i2prouter restart |
101 |
-ExecStart=/usr/bin/i2prouter start |
102 |
-ExecStop=/usr/bin/i2prouter stop |
103 |
- |
104 |
-[Install] |
105 |
-WantedBy=multi-user.target |