1 |
commit: c1d9710c8876f3569124a09e6d3e99eb01537bd0 |
2 |
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Mon Jul 11 14:45:06 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 14 17:38:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d9710c |
7 |
|
8 |
net-p2p/i2p: version bump to 0.9.26. |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/586850 |
11 |
Package-Manager: portage-2.2.28 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/1756 |
13 |
|
14 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
15 |
|
16 |
net-p2p/i2p/Manifest | 2 +- |
17 |
net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch | 96 ------------------- |
18 |
net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch | 43 --------- |
19 |
net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch | 102 --------------------- |
20 |
net-p2p/i2p/files/i2p-0.9.24_initd | 36 -------- |
21 |
...24_add-libs.patch => i2p-0.9.26-add_libs.patch} | 4 +- |
22 |
.../files/{i2p-0.9.23_initd => i2p-0.9.26.initd} | 0 |
23 |
net-p2p/i2p/files/i2p-0.9.26.service | 13 +++ |
24 |
.../{i2p-0.9.24-r2.ebuild => i2p-0.9.26.ebuild} | 86 +++++++++-------- |
25 |
9 files changed, 63 insertions(+), 319 deletions(-) |
26 |
|
27 |
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest |
28 |
index 1504c9c..80867db 100644 |
29 |
--- a/net-p2p/i2p/Manifest |
30 |
+++ b/net-p2p/i2p/Manifest |
31 |
@@ -1,2 +1,2 @@ |
32 |
-DIST i2psource_0.9.24.tar.bz2 24468215 SHA256 134481ae5ef934a411545330d1b22e768189c424a65db47058db0f7d9cf51e7d SHA512 9029ea06640a937385499fd308232f2c3b04308cc834e2e2491a567c47be4aa128d509b2058735cb8cf088a0b9273b418efbca05d70944ef9e95c3d15d96a47a WHIRLPOOL d7211cf46bf4bbaa54340de0dadcb255f2321d75b3d968401612c1bc0926f91f1d248e634c97c8d6948f78cd4a68c9a79ca4a65102e205a56c704a2409416cf3 |
33 |
DIST i2psource_0.9.25.tar.bz2 24652935 SHA256 daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236 SHA512 a50f00d9ad32993da30529339e3ffd425d5e97d5120d9e4e446f6fa7ac0cbb6ee4f35c013b0815802ff6c72e188b00d408c7fa398c8ee1ae71be57383a1411f6 WHIRLPOOL a851f6505155201d872774407dc71c9dd03a4683b3ce35d2fff74fd3f7f17d12cc1cc72dfcc2c7c4f0d82b86333bd0424066ae41330e603ba07872d56c257e27 |
34 |
+DIST i2psource_0.9.26.tar.bz2 27039859 SHA256 49fbaea7f4d5ea0606de68ebb270fc3d4380631ecfd5c9ad82ed9356e29df937 SHA512 2b3f96fe97418c176b4e0058817bde81909e46d136ed5cadf9f8fb4323b0a35e0a5d3fc0eaadacbfe8f9578376d8a6c6757121452cd9f7c1c3c7d019169a914d WHIRLPOOL b8161e77a491d26f24e786bf185f9eba35aa4421ba17e668f3a8f73fc481c6c8b7ea630b8c860f4cb2c877660a703aaa0dfa2d03d8163ea98a151302067e1600 |
35 |
|
36 |
diff --git a/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch |
37 |
deleted file mode 100644 |
38 |
index e189016..0000000 |
39 |
--- a/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch |
40 |
+++ /dev/null |
41 |
@@ -1,96 +0,0 @@ |
42 |
---- clients.config 2015-03-15 02:02:29.021408673 -0700 |
43 |
-+++ clients.config 2015-03-15 02:24:33.460308396 -0700 |
44 |
-@@ -60,7 +60,7 @@ |
45 |
- clientApp.4.name=Open Router Console in web browser at startup |
46 |
- clientApp.4.args=http://127.0.0.1:7657/ |
47 |
- clientApp.4.delay=3 |
48 |
--clientApp.4.startOnLoad=true |
49 |
-+clientApp.4.startOnLoad=false |
50 |
- |
51 |
- # BOB bridge |
52 |
- clientApp.5.args= |
53 |
---- eepget 2015-03-15 02:02:29.078407997 -0700 |
54 |
-+++ eepget 2015-03-15 02:17:51.441075791 -0700 |
55 |
-@@ -1,3 +1,3 @@ |
56 |
- #!/bin/sh |
57 |
--I2P="%INSTALL_PATH" |
58 |
-+I2P="/usr/share/i2p" |
59 |
- java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" |
60 |
---- i2prouter 2015-03-15 02:02:29.079407985 -0700 |
61 |
-+++ i2prouter 2015-03-15 02:11:13.023194731 -0700 |
62 |
-@@ -28,20 +28,22 @@ |
63 |
- # Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir |
64 |
- # should have been replaced by the izpack installer. |
65 |
- # If you did not run the installer, replace them with the appropriate paths. |
66 |
--I2P="%INSTALL_PATH" |
67 |
-+USER_HOME="$HOME" |
68 |
-+SYSTEM_java_io_tmpdir="$USER_HOME/.i2p" |
69 |
-+I2P="/usr/share/i2p" |
70 |
- if [ "`uname -s`" = "Darwin" ]; then |
71 |
-- if [ -d "%USER_HOME/Library/Application Support" ]; then |
72 |
-- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" |
73 |
-+ if [ -d "$USER_HOME/Library/Application Support" ]; then |
74 |
-+ I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p" |
75 |
- else |
76 |
-- I2P_CONFIG_DIR="%USER_HOME/.i2p" |
77 |
-+ I2P_CONFIG_DIR="$USER_HOME/.i2p" |
78 |
- fi |
79 |
- else |
80 |
-- I2P_CONFIG_DIR="%USER_HOME/.i2p" |
81 |
-+ I2P_CONFIG_DIR="$USER_HOME/.i2p" |
82 |
- fi |
83 |
--I2PTEMP="%SYSTEM_java_io_tmpdir" |
84 |
-+I2PTEMP="$SYSTEM_java_io_tmpdir" |
85 |
- # PORTABLE installation: |
86 |
- # Use the following instead. |
87 |
--#I2PTEMP="%INSTALL_PATH" |
88 |
-+#I2PTEMP="/usr/share/i2p" |
89 |
- |
90 |
- # Application |
91 |
- APP_NAME="i2p" |
92 |
---- runplain.sh 2015-03-15 02:02:29.078407997 -0700 |
93 |
-+++ runplain.sh 2015-03-15 02:18:46.530422508 -0700 |
94 |
-@@ -11,8 +11,8 @@ |
95 |
- # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir |
96 |
- # should have been replaced by the izpack installer. |
97 |
- # If you did not run the installer, replace them with the appropriate path. |
98 |
--I2P="%INSTALL_PATH" |
99 |
--I2PTEMP="%SYSTEM_java_io_tmpdir" |
100 |
-+I2P="/usr/share/i2p" |
101 |
-+I2PTEMP="$SYSTEM_java_io_tmpdir" |
102 |
- |
103 |
- # Having IPv6 enabled can cause problems with certain configurations. Changing the |
104 |
- # next value to true may help. |
105 |
---- wrapper.config.orig 2015-10-18 13:31:29.410486000 +0000 |
106 |
-+++ wrapper.config 2015-10-18 13:48:05.823486000 +0000 |
107 |
-@@ -60,13 +60,18 @@ |
108 |
- # classes, or all the classes of i2p.jar, are in a different directory). |
109 |
- # Be sure there are no other duplicate classes. |
110 |
- # |
111 |
--wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar |
112 |
-+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar |
113 |
-+wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar |
114 |
-+wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar |
115 |
-+wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar |
116 |
-+wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar |
117 |
- # uncomment this to use the system classpath as well (e.g. to get tools.jar) |
118 |
- # wrapper.java.classpath.2=%CLASSPATH% |
119 |
- |
120 |
- # Java Library Path (location of Wrapper.DLL or libwrapper.so) |
121 |
--wrapper.java.library.path.1=$INSTALL_PATH |
122 |
--wrapper.java.library.path.2=$INSTALL_PATH/lib |
123 |
-+wrapper.java.library.path.1=/usr/share/i2p |
124 |
-+wrapper.java.library.path.2=/usr/share/i2p/lib |
125 |
-+wrapper.java.library.path.3=/usr/lib/java-service-wrapper |
126 |
- |
127 |
- # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. |
128 |
- wrapper.java.additional.auto_bits=TRUE |
129 |
-@@ -74,7 +79,7 @@ |
130 |
- # Java Additional Parameters |
131 |
- # Numbers must be consecutive (except for stripquotes) |
132 |
- wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt |
133 |
--wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH" |
134 |
-+wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p" |
135 |
- wrapper.java.additional.2.stripquotes=TRUE |
136 |
- |
137 |
- # Prevent the JVM from exporting stats (and thereby causing hundreds of |
138 |
|
139 |
diff --git a/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch b/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch |
140 |
deleted file mode 100644 |
141 |
index 4c542b5..0000000 |
142 |
--- a/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch |
143 |
+++ /dev/null |
144 |
@@ -1,43 +0,0 @@ |
145 |
-diff -Naur a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java |
146 |
---- a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java 2016-01-07 01:40:50.225460721 +0100 |
147 |
-+++ b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java 2016-01-07 01:41:19.960462373 +0100 |
148 |
-@@ -216,9 +216,9 @@ |
149 |
- * x is recovered in the following way: |
150 |
- * <p><ul> |
151 |
- * <li>x = sign(x) * sqrt((y^2 - 1) / (d * y^2 + 1)) = sign(x) * sqrt(u / v) with u = y^2 - 1 and v = d * y^2 + 1. |
152 |
-- * <li>Setting β = (u * v^3) * (u * v^7)^((q - 5) / 8) one has β^2 = +-(u / v). |
153 |
-- * <li>If v * β = -u multiply β with i=sqrt(-1). |
154 |
-- * <li>Set x := β. |
155 |
-+ * <li>Setting b = (u * v^3) * (u * v^7)^((q - 5) / 8) one has b^2 = +-(u / v). |
156 |
-+ * <li>If v * b = -u multiply b with i=sqrt(-1). |
157 |
-+ * <li>Set x := b. |
158 |
- * <li>If sign(x) != bit 255 of s then negate x. |
159 |
- * |
160 |
- * @param curve The curve. |
161 |
-@@ -511,10 +511,10 @@ |
162 |
- * Formula for the P^2 representation is in agreement with the formula given in [4] page 12 (with a = -1) |
163 |
- * up to a common factor -1 which does not matter: |
164 |
- * <p> |
165 |
-- * B = (X + Y)^2; C = X^2; D = Y^2; E = -C = -X^2; F := E + D = Y^2 - X^2; H = Z^2; J = F − 2 * H; |
166 |
-- * X3 = (B − C − D) · J = X' * (-T'); |
167 |
-- * Y3 = F · (E − D) = Z' * (-Y'); |
168 |
-- * Z3 = F · J = Z' * (-T'). |
169 |
-+ * B = (X + Y)^2; C = X^2; D = Y^2; E = -C = -X^2; F := E + D = Y^2 - X^2; H = Z^2; J = F - 2 * H; |
170 |
-+ * X3 = (B - C - D) . J = X' * (-T'); |
171 |
-+ * Y3 = F . (E - D) = Z' * (-Y'); |
172 |
-+ * Z3 = F . J = Z' * (-T'). |
173 |
- * |
174 |
- * @return The P1P1 representation |
175 |
- */ |
176 |
-diff -Naur a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java |
177 |
---- a/core/java/src/net/i2p/data/DataHelper.java 2016-01-07 01:40:50.214460721 +0100 |
178 |
-+++ b/core/java/src/net/i2p/data/DataHelper.java 2016-01-07 01:41:02.491461403 +0100 |
179 |
-@@ -1577,7 +1577,7 @@ |
180 |
- } else if (adms < 0.001d) { |
181 |
- t = ngettext("1 ns", "{0,number,###} ns", (int) Math.round(ms * 1000000d)); |
182 |
- } else if (adms < 1.0d) { |
183 |
-- t = ngettext("1 μs", "{0,number,###} μs", (int) Math.round(ms * 1000d)); |
184 |
-+ t = ngettext("1 us", "{0,number,###} us", (int) Math.round(ms * 1000d)); |
185 |
- } else if (ams < 3 * 1000) { |
186 |
- t = ngettext("1 ms", "{0,number,####} ms", (int) Math.round(ms)); |
187 |
- } else if (ams < 2 * 60 * 1000) { |
188 |
|
189 |
diff --git a/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch |
190 |
deleted file mode 100644 |
191 |
index c30e208..0000000 |
192 |
--- a/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch |
193 |
+++ /dev/null |
194 |
@@ -1,102 +0,0 @@ |
195 |
-diff -Naur a/clients.config b/clients.config |
196 |
---- a/clients.config 2016-01-07 00:44:46.721273819 +0100 |
197 |
-+++ b/clients.config 2016-01-07 00:44:52.185274122 +0100 |
198 |
-@@ -60,7 +60,7 @@ |
199 |
- clientApp.4.name=Open Router Console in web browser at startup |
200 |
- clientApp.4.args=http://127.0.0.1:7657/ |
201 |
- clientApp.4.delay=3 |
202 |
--clientApp.4.startOnLoad=true |
203 |
-+clientApp.4.startOnLoad=false |
204 |
- |
205 |
- # BOB bridge |
206 |
- clientApp.5.args= |
207 |
-diff -Naur a/eepget b/eepget |
208 |
---- a/eepget 2016-01-07 00:44:46.721273819 +0100 |
209 |
-+++ b/eepget 2016-01-07 00:44:52.186274123 +0100 |
210 |
-@@ -1,3 +1,3 @@ |
211 |
- #!/bin/sh |
212 |
--I2P="%INSTALL_PATH" |
213 |
-+I2P="/usr/share/i2p" |
214 |
- java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" |
215 |
-diff -Naur a/i2prouter b/i2prouter |
216 |
---- a/i2prouter 2016-01-07 00:44:46.721273819 +0100 |
217 |
-+++ b/i2prouter 2016-01-07 00:44:52.188274123 +0100 |
218 |
-@@ -28,20 +28,22 @@ |
219 |
- # Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir |
220 |
- # should have been replaced by the izpack installer. |
221 |
- # If you did not run the installer, replace them with the appropriate paths. |
222 |
--I2P="%INSTALL_PATH" |
223 |
-+USER_HOME="$HOME" |
224 |
-+SYSTEM_java_io_tmpdir="$USER_HOME/.i2p" |
225 |
-+I2P="/usr/share/i2p" |
226 |
- if [ "`uname -s`" = "Darwin" ]; then |
227 |
-- if [ -d "%USER_HOME/Library/Application Support" ]; then |
228 |
-- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p" |
229 |
-+ if [ -d "$USER_HOME/Library/Application Support" ]; then |
230 |
-+ I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p" |
231 |
- else |
232 |
-- I2P_CONFIG_DIR="%USER_HOME/.i2p" |
233 |
-+ I2P_CONFIG_DIR="$USER_HOME/.i2p" |
234 |
- fi |
235 |
- else |
236 |
-- I2P_CONFIG_DIR="%USER_HOME/.i2p" |
237 |
-+ I2P_CONFIG_DIR="$USER_HOME/.i2p" |
238 |
- fi |
239 |
--I2PTEMP="%SYSTEM_java_io_tmpdir" |
240 |
-+I2PTEMP="$SYSTEM_java_io_tmpdir" |
241 |
- # PORTABLE installation: |
242 |
- # Use the following instead. |
243 |
--#I2PTEMP="%INSTALL_PATH" |
244 |
-+#I2PTEMP="/usr/share/i2p" |
245 |
- |
246 |
- # Application |
247 |
- APP_NAME="i2p" |
248 |
-diff -Naur a/runplain.sh b/runplain.sh |
249 |
---- a/runplain.sh 2016-01-07 00:44:46.721273819 +0100 |
250 |
-+++ b/runplain.sh 2016-01-07 00:44:52.189274123 +0100 |
251 |
-@@ -11,8 +11,8 @@ |
252 |
- # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir |
253 |
- # should have been replaced by the izpack installer. |
254 |
- # If you did not run the installer, replace them with the appropriate path. |
255 |
--I2P="%INSTALL_PATH" |
256 |
--I2PTEMP="%SYSTEM_java_io_tmpdir" |
257 |
-+I2P="/usr/share/i2p" |
258 |
-+I2PTEMP="$SYSTEM_java_io_tmpdir" |
259 |
- |
260 |
- # Having IPv6 enabled can cause problems with certain configurations. Changing the |
261 |
- # next value to true may help. |
262 |
-diff -Naur a/wrapper.config b/wrapper.config |
263 |
---- a/wrapper.config 2016-01-07 00:44:46.714273818 +0100 |
264 |
-+++ b/wrapper.config 2016-01-07 00:46:24.151279233 +0100 |
265 |
-@@ -60,13 +60,19 @@ |
266 |
- # classes, or all the classes of i2p.jar, are in a different directory). |
267 |
- # Be sure there are no other duplicate classes. |
268 |
- # |
269 |
--wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar |
270 |
-+wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar |
271 |
-+wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar |
272 |
-+wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar |
273 |
-+wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar |
274 |
-+wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar |
275 |
-+wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar |
276 |
- # uncomment this to use the system classpath as well (e.g. to get tools.jar) |
277 |
- # wrapper.java.classpath.2=%CLASSPATH% |
278 |
- |
279 |
- # Java Library Path (location of Wrapper.DLL or libwrapper.so) |
280 |
--wrapper.java.library.path.1=$INSTALL_PATH |
281 |
--wrapper.java.library.path.2=$INSTALL_PATH/lib |
282 |
-+wrapper.java.library.path.1=/usr/share/i2p |
283 |
-+wrapper.java.library.path.2=/usr/share/i2p/lib |
284 |
-+wrapper.java.library.path.3=/usr/lib/java-service-wrapper |
285 |
- |
286 |
- # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. |
287 |
- wrapper.java.additional.auto_bits=TRUE |
288 |
-@@ -74,7 +80,7 @@ |
289 |
- # Java Additional Parameters |
290 |
- # Numbers must be consecutive (except for stripquotes) |
291 |
- wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt |
292 |
--wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH" |
293 |
-+wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p" |
294 |
- wrapper.java.additional.2.stripquotes=TRUE |
295 |
- |
296 |
- # Prevent the JVM from exporting stats (and thereby causing hundreds of |
297 |
|
298 |
diff --git a/net-p2p/i2p/files/i2p-0.9.24_initd b/net-p2p/i2p/files/i2p-0.9.24_initd |
299 |
deleted file mode 100644 |
300 |
index bd00917..0000000 |
301 |
--- a/net-p2p/i2p/files/i2p-0.9.24_initd |
302 |
+++ /dev/null |
303 |
@@ -1,36 +0,0 @@ |
304 |
-#!/sbin/openrc-run |
305 |
-# Copyright 1999-2016 Gentoo Foundation |
306 |
-# Distributed under the terms of the GNU General Public License v2 |
307 |
-# $Id$ |
308 |
- |
309 |
-depend() { |
310 |
- need net |
311 |
-} |
312 |
- |
313 |
-HOME="/var/lib/i2p" |
314 |
-USER_HOME="$HOME" |
315 |
-JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" |
316 |
-INSTALL_PATH="/usr/share/i2p" |
317 |
-I2P="$INSTALL_PATH" |
318 |
-I2P_CONFIG_DIR="$USER_HOME/.i2p" |
319 |
-SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" |
320 |
-I2PTEMP="$SYSTEM_java_io_tmpdir" |
321 |
-LOGFILE="$I2P_CONFIG_DIR/wrapper.log" |
322 |
-PIDFILE="/var/run/i2p.pid" |
323 |
-WRAPPER_CMD="$I2P/i2psvc" |
324 |
-WRAPPER_CONF="$I2P/wrapper.config" |
325 |
- |
326 |
-start() { |
327 |
- ebegin "Starting I2P" |
328 |
- 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" |
329 |
- sleep 1 |
330 |
- [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] |
331 |
- eend $? |
332 |
-} |
333 |
- |
334 |
-stop() { |
335 |
- ebegin "Stopping I2P" |
336 |
- start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P |
337 |
- eend $? |
338 |
-} |
339 |
- |
340 |
|
341 |
diff --git a/net-p2p/i2p/files/i2p-0.9.24_add-libs.patch b/net-p2p/i2p/files/i2p-0.9.26-add_libs.patch |
342 |
similarity index 85% |
343 |
rename from net-p2p/i2p/files/i2p-0.9.24_add-libs.patch |
344 |
rename to net-p2p/i2p/files/i2p-0.9.26-add_libs.patch |
345 |
index f223044..9453669 100644 |
346 |
--- a/net-p2p/i2p/files/i2p-0.9.24_add-libs.patch |
347 |
+++ b/net-p2p/i2p/files/i2p-0.9.26-add_libs.patch |
348 |
@@ -1,6 +1,6 @@ |
349 |
diff -Naur a/wrapper.config b/wrapper.config |
350 |
---- a/wrapper.config 2016-02-07 23:19:48.714569016 +0100 |
351 |
-+++ b/wrapper.config 2016-02-07 23:20:37.523566840 +0100 |
352 |
+--- a/installer/resources/wrapper.config 2016-02-07 23:19:48.714569016 +0100 |
353 |
++++ b/installer/resources/wrapper.config 2016-02-07 23:20:37.523566840 +0100 |
354 |
@@ -61,12 +61,18 @@ |
355 |
# Be sure there are no other duplicate classes. |
356 |
# |
357 |
|
358 |
diff --git a/net-p2p/i2p/files/i2p-0.9.23_initd b/net-p2p/i2p/files/i2p-0.9.26.initd |
359 |
similarity index 100% |
360 |
rename from net-p2p/i2p/files/i2p-0.9.23_initd |
361 |
rename to net-p2p/i2p/files/i2p-0.9.26.initd |
362 |
|
363 |
diff --git a/net-p2p/i2p/files/i2p-0.9.26.service b/net-p2p/i2p/files/i2p-0.9.26.service |
364 |
new file mode 100644 |
365 |
index 0000000..ccbadbd |
366 |
--- /dev/null |
367 |
+++ b/net-p2p/i2p/files/i2p-0.9.26.service |
368 |
@@ -0,0 +1,13 @@ |
369 |
+[Unit] |
370 |
+Description=Invisible Internet Project |
371 |
+After=network.target |
372 |
+ |
373 |
+[Service] |
374 |
+User=i2p |
375 |
+Type=forking |
376 |
+ExecReload=/usr/bin/i2prouter restart |
377 |
+ExecStart=/usr/bin/i2prouter start |
378 |
+ExecStop=/usr/bin/i2prouter stop |
379 |
+ |
380 |
+[Install] |
381 |
+WantedBy=multi-user.target |
382 |
|
383 |
diff --git a/net-p2p/i2p/i2p-0.9.24-r2.ebuild b/net-p2p/i2p/i2p-0.9.26.ebuild |
384 |
similarity index 73% |
385 |
rename from net-p2p/i2p/i2p-0.9.24-r2.ebuild |
386 |
rename to net-p2p/i2p/i2p-0.9.26.ebuild |
387 |
index f0f48b0..8f0da55 100644 |
388 |
--- a/net-p2p/i2p/i2p-0.9.24-r2.ebuild |
389 |
+++ b/net-p2p/i2p/i2p-0.9.26.ebuild |
390 |
@@ -2,7 +2,7 @@ |
391 |
# Distributed under the terms of the GNU General Public License v2 |
392 |
# $Id$ |
393 |
|
394 |
-EAPI="5" |
395 |
+EAPI="6" |
396 |
|
397 |
inherit eutils java-pkg-2 java-ant-2 systemd user |
398 |
|
399 |
@@ -15,7 +15,7 @@ SLOT="0" |
400 |
|
401 |
# Until the deps reach other arches |
402 |
KEYWORDS="~amd64 ~x86" |
403 |
-IUSE="nls" |
404 |
+IUSE="+ecdsa nls" |
405 |
|
406 |
# dev-java/ant-core is automatically added due to java-ant-2.eclass |
407 |
CDEPEND="dev-java/bcprov:1.50 |
408 |
@@ -27,21 +27,24 @@ CDEPEND="dev-java/bcprov:1.50 |
409 |
|
410 |
DEPEND="${CDEPEND} |
411 |
dev-java/eclipse-ecj:* |
412 |
- dev-libs/gmp:* |
413 |
- nls? ( sys-devel/gettext ) |
414 |
+ dev-libs/gmp:0 |
415 |
+ nls? ( >=sys-devel/gettext-0.19 ) |
416 |
>=virtual/jdk-1.7" |
417 |
|
418 |
RDEPEND="${CDEPEND} |
419 |
- || ( |
420 |
- dev-java/icedtea:7[-sunec] |
421 |
- dev-java/icedtea:8[-sunec] |
422 |
- dev-java/icedtea:7[nss,-sunec] |
423 |
- dev-java/icedtea-bin:7[nss] |
424 |
- dev-java/icedtea-bin:7 |
425 |
- dev-java/icedtea-bin:8 |
426 |
- dev-java/oracle-jre-bin |
427 |
- dev-java/oracle-jdk-bin |
428 |
- )" |
429 |
+ ecdsa? ( |
430 |
+ || ( |
431 |
+ dev-java/icedtea:7[-sunec] |
432 |
+ dev-java/icedtea:8[-sunec] |
433 |
+ dev-java/icedtea:7[nss,-sunec] |
434 |
+ dev-java/icedtea-bin:7[nss] |
435 |
+ dev-java/icedtea-bin:7 |
436 |
+ dev-java/icedtea-bin:8 |
437 |
+ dev-java/oracle-jre-bin |
438 |
+ dev-java/oracle-jdk-bin |
439 |
+ ) |
440 |
+ ) |
441 |
+ !ecdsa? ( >=virtual/jre-1.7 )" |
442 |
|
443 |
EANT_BUILD_TARGET="pkg" |
444 |
EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50" |
445 |
@@ -49,7 +52,13 @@ JAVA_ANT_ENCODING="UTF-8" |
446 |
|
447 |
I2P_ROOT='/usr/share/i2p' |
448 |
I2P_CONFIG_HOME='/var/lib/i2p' |
449 |
-I2P_CONFIG_DIR="${I2P_HOME}/.i2p" |
450 |
+I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p" |
451 |
+ |
452 |
+RES_DIR='installer/resources' |
453 |
+ |
454 |
+PATCHES=( |
455 |
+ "${FILESDIR}/${P}-add_libs.patch" |
456 |
+) |
457 |
|
458 |
pkg_setup() { |
459 |
java-pkg-2_pkg_setup |
460 |
@@ -68,39 +77,39 @@ src_prepare() { |
461 |
java-pkg-2_src_prepare |
462 |
|
463 |
# We're on GNU/Linux, we don't need .exe files |
464 |
- echo "noExe=true" > override.properties |
465 |
+ echo "noExe=true" > override.properties || die |
466 |
if ! use nls; then |
467 |
- echo "require.gettext=false" >> override.properties |
468 |
+ echo "require.gettext=false" >> override.properties || die |
469 |
fi |
470 |
-} |
471 |
- |
472 |
-src_install() { |
473 |
- # Cd into pkg-temp. |
474 |
- cd "${S}/pkg-temp" || die |
475 |
- |
476 |
- # add libs |
477 |
- epatch "${FILESDIR}/${P}_add-libs.patch" |
478 |
|
479 |
# avoid auto starting browser |
480 |
sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ |
481 |
- clients.config || die |
482 |
+ "${RES_DIR}/clients.config" || die |
483 |
+ |
484 |
+ # we do it now so we can resolve path after |
485 |
+ default |
486 |
|
487 |
# replace paths as the installer would |
488 |
sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \ |
489 |
- eepget i2prouter runplain.sh || die |
490 |
- sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" wrapper.config || die |
491 |
+ "${RES_DIR}/"{eepget,i2prouter,runplain.sh} || die |
492 |
+ sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die |
493 |
sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \ |
494 |
- i2prouter runplain.sh || die |
495 |
- sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" i2prouter || die |
496 |
+ "${RES_DIR}/"{i2prouter,runplain.sh} || die |
497 |
+ sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die |
498 |
+} |
499 |
+ |
500 |
+src_install() { |
501 |
+ # cd into pkg-temp. |
502 |
+ cd "${S}/pkg-temp" || die |
503 |
|
504 |
- # This is ugly, but to satisfy all non-system .jar dependencies, jetty and |
505 |
- # systray4j would need to be packaged. The former would be too large a task |
506 |
- # for an unseasoned developer and systray4j hasn't been touched in over 10 |
507 |
- # years. This seems to be the most pragmatic solution |
508 |
+ # This is ugly, but to satisfy all non-system .jar dependencies, jetty |
509 |
+ # would need to be packaged. It would be too large a task |
510 |
+ # for an unseasoned developer. This seems to be the most pragmatic solution |
511 |
java-pkg_jarinto "${I2P_ROOT}/lib" |
512 |
+ local i |
513 |
for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ |
514 |
jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ |
515 |
- sam standard streaming systray systray4j; do |
516 |
+ sam standard streaming systray; do |
517 |
java-pkg_dojar lib/${i}.jar |
518 |
done |
519 |
|
520 |
@@ -123,11 +132,11 @@ src_install() { |
521 |
java-pkg_dowar webapps/*.war |
522 |
|
523 |
# Install daemon files |
524 |
- newinitd "${FILESDIR}/${P}_initd" i2p |
525 |
- systemd_newunit "${FILESDIR}"/i2p.service i2p.service |
526 |
+ newinitd "${FILESDIR}/${P}.initd" i2p |
527 |
+ systemd_newunit "${FILESDIR}/${P}.service" i2p.service |
528 |
|
529 |
# setup user |
530 |
- dodir "${I2P_CONFIG_DIR}" |
531 |
+ keepdir "${I2P_CONFIG_DIR}" |
532 |
fowners -R i2p:i2p "${I2P_CONFIG_DIR}" |
533 |
} |
534 |
|
535 |
@@ -148,5 +157,4 @@ pkg_postinst() { |
536 |
ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" |
537 |
ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' |
538 |
ewarn 'as the one you built with.' |
539 |
- |
540 |
} |