1 |
commit: 1c4e83ecabe30a61a893021b56b4dc4a88bf6495 |
2 |
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn> |
3 |
AuthorDate: Thu Mar 24 10:42:59 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 26 18:58:04 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4e83ec |
7 |
|
8 |
net-p2p/i2p: version bump to 0.9.25. |
9 |
|
10 |
This version bump also enables the ecdsa USE flag. |
11 |
|
12 |
Package-Manager: portage-2.2.28 |
13 |
RepoMan-Options: --ignore-arches |
14 |
Acked-By: Valérian Rousset <tharvik <AT> gmail.com> |
15 |
Closes: https://github.com/gentoo/gentoo/pull/1123 |
16 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
17 |
|
18 |
net-p2p/i2p/Manifest | 1 + |
19 |
net-p2p/i2p/files/i2p-0.9.25-add_libs.patch | 22 ++++ |
20 |
net-p2p/i2p/files/i2p-0.9.25-initd | 36 +++++++ |
21 |
net-p2p/i2p/i2p-0.9.25.ebuild | 155 ++++++++++++++++++++++++++++ |
22 |
net-p2p/i2p/metadata.xml | 3 +- |
23 |
5 files changed, 216 insertions(+), 1 deletion(-) |
24 |
|
25 |
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest |
26 |
index f9f9dc7..c2dfc5b 100644 |
27 |
--- a/net-p2p/i2p/Manifest |
28 |
+++ b/net-p2p/i2p/Manifest |
29 |
@@ -1,3 +1,4 @@ |
30 |
DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971 |
31 |
DIST i2psource_0.9.23.tar.bz2 24427211 SHA256 24e303f2af1b7b14ed3a6e17cc7d1b6432ec99d8d00246a88486922941c72345 SHA512 1697ee03c5b09c7653f4e30e976062908e0c0ece7ee9651979384fce0d5c887d7cfbd841522d31203f23d7f5dc97d8f8ef238784199b22fe5452299587038f82 WHIRLPOOL a2141b8d9d5f8b552e354678294364bedde9cef5aa39aa95a06dbe19f5f7996b6d5eb0e1b43ad8ce5c2f9e20dc4dda792b994004a95ea1dc83c5541f46de5b89 |
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 |
|
35 |
diff --git a/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch b/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch |
36 |
new file mode 100644 |
37 |
index 0000000..6e8fc8d |
38 |
--- /dev/null |
39 |
+++ b/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch |
40 |
@@ -0,0 +1,22 @@ |
41 |
+diff -Naur a/wrapper.config b/wrapper.config |
42 |
+--- a/pkg-temp/wrapper.config 2016-02-07 23:19:48.714569016 +0100 |
43 |
++++ b/pkg-temp/wrapper.config 2016-02-07 23:20:37.523566840 +0100 |
44 |
+@@ -61,12 +61,18 @@ |
45 |
+ # Be sure there are no other duplicate classes. |
46 |
+ # |
47 |
+ wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar |
48 |
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar |
49 |
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar |
50 |
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar |
51 |
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar |
52 |
++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar |
53 |
+ # uncomment this to use the system classpath as well (e.g. to get tools.jar) |
54 |
+ # wrapper.java.classpath.2=%CLASSPATH% |
55 |
+ |
56 |
+ # Java Library Path (location of Wrapper.DLL or libwrapper.so) |
57 |
+ wrapper.java.library.path.1=$INSTALL_PATH |
58 |
+ wrapper.java.library.path.2=$INSTALL_PATH/lib |
59 |
++wrapper.java.library.path.3=/usr/lib/java-service-wrapper |
60 |
+ |
61 |
+ # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. |
62 |
+ wrapper.java.additional.auto_bits=TRUE |
63 |
|
64 |
diff --git a/net-p2p/i2p/files/i2p-0.9.25-initd b/net-p2p/i2p/files/i2p-0.9.25-initd |
65 |
new file mode 100644 |
66 |
index 0000000..00e91ac |
67 |
--- /dev/null |
68 |
+++ b/net-p2p/i2p/files/i2p-0.9.25-initd |
69 |
@@ -0,0 +1,36 @@ |
70 |
+#!/sbin/runscript |
71 |
+# Copyright 1999-2016 Gentoo Foundation |
72 |
+# Distributed under the terms of the GNU General Public License v2 |
73 |
+# $Id$ |
74 |
+ |
75 |
+depend() { |
76 |
+ need net |
77 |
+} |
78 |
+ |
79 |
+HOME="/var/lib/i2p" |
80 |
+USER_HOME="$HOME" |
81 |
+JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" |
82 |
+INSTALL_PATH="/usr/share/i2p" |
83 |
+I2P="$INSTALL_PATH" |
84 |
+I2P_CONFIG_DIR="$USER_HOME/.i2p" |
85 |
+SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" |
86 |
+I2PTEMP="$SYSTEM_java_io_tmpdir" |
87 |
+LOGFILE="$I2P_CONFIG_DIR/wrapper.log" |
88 |
+PIDFILE="/var/run/i2p.pid" |
89 |
+WRAPPER_CMD="$I2P/i2psvc" |
90 |
+WRAPPER_CONF="$I2P/wrapper.config" |
91 |
+ |
92 |
+start() { |
93 |
+ ebegin "Starting I2P" |
94 |
+ 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" |
95 |
+ sleep 1 |
96 |
+ [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] |
97 |
+ eend $? |
98 |
+} |
99 |
+ |
100 |
+stop() { |
101 |
+ ebegin "Stopping I2P" |
102 |
+ start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P |
103 |
+ eend $? |
104 |
+} |
105 |
+ |
106 |
|
107 |
diff --git a/net-p2p/i2p/i2p-0.9.25.ebuild b/net-p2p/i2p/i2p-0.9.25.ebuild |
108 |
new file mode 100644 |
109 |
index 0000000..8e00d27 |
110 |
--- /dev/null |
111 |
+++ b/net-p2p/i2p/i2p-0.9.25.ebuild |
112 |
@@ -0,0 +1,155 @@ |
113 |
+# Copyright 1999-2016 Gentoo Foundation |
114 |
+# Distributed under the terms of the GNU General Public License v2 |
115 |
+# $Id$ |
116 |
+ |
117 |
+EAPI="6" |
118 |
+ |
119 |
+inherit eutils java-pkg-2 java-ant-2 systemd user |
120 |
+ |
121 |
+DESCRIPTION="A privacy-centric, anonymous network." |
122 |
+HOMEPAGE="https://geti2p.net" |
123 |
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" |
124 |
+ |
125 |
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2" |
126 |
+SLOT="0" |
127 |
+ |
128 |
+# Until the deps reach other arches |
129 |
+KEYWORDS="~amd64 ~x86" |
130 |
+IUSE="+ecdsa nls" |
131 |
+ |
132 |
+# dev-java/ant-core is automatically added due to java-ant-2.eclass |
133 |
+CDEPEND="dev-java/bcprov:1.50 |
134 |
+ dev-java/jrobin:0 |
135 |
+ dev-java/slf4j-api:0 |
136 |
+ dev-java/tomcat-jstl-impl:0 |
137 |
+ dev-java/tomcat-jstl-spec:0 |
138 |
+ dev-java/java-service-wrapper:0" |
139 |
+ |
140 |
+DEPEND="${CDEPEND} |
141 |
+ dev-java/eclipse-ecj:* |
142 |
+ dev-libs/gmp:* |
143 |
+ nls? ( sys-devel/gettext ) |
144 |
+ >=virtual/jdk-1.7" |
145 |
+ |
146 |
+RDEPEND="${CDEPEND} |
147 |
+ ecdsa? ( |
148 |
+ || ( |
149 |
+ dev-java/icedtea:7[-sunec] |
150 |
+ dev-java/icedtea:8[-sunec] |
151 |
+ dev-java/icedtea:7[nss,-sunec] |
152 |
+ dev-java/icedtea-bin:7[nss] |
153 |
+ dev-java/icedtea-bin:7 |
154 |
+ dev-java/icedtea-bin:8 |
155 |
+ dev-java/oracle-jre-bin |
156 |
+ dev-java/oracle-jdk-bin |
157 |
+ ) |
158 |
+ ) |
159 |
+ !ecdsa? ( >=virtual/jre-1.7 )" |
160 |
+ |
161 |
+EANT_BUILD_TARGET="pkg" |
162 |
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50" |
163 |
+ |
164 |
+I2P_ROOT='/usr/share/i2p' |
165 |
+I2P_CONFIG_HOME='/var/lib/i2p' |
166 |
+I2P_CONFIG_DIR="${I2P_HOME}/.i2p" |
167 |
+ |
168 |
+pkg_setup() { |
169 |
+ java-pkg-2_pkg_setup |
170 |
+ |
171 |
+ enewgroup i2p |
172 |
+ enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p -m |
173 |
+} |
174 |
+ |
175 |
+src_unpack() { |
176 |
+ unpack ${A} |
177 |
+ cd "${S}" || die |
178 |
+ java-ant_rewrite-classpath |
179 |
+} |
180 |
+ |
181 |
+src_prepare() { |
182 |
+ java-pkg-2_src_prepare |
183 |
+ |
184 |
+ # We're on GNU/Linux, we don't need .exe files |
185 |
+ echo "noExe=true" > override.properties |
186 |
+ if ! use nls; then |
187 |
+ echo "require.gettext=false" >> override.properties |
188 |
+ fi |
189 |
+ eapply_user |
190 |
+} |
191 |
+ |
192 |
+src_install() { |
193 |
+ # add libs |
194 |
+ eapply "${FILESDIR}/${PN}-0.9.25-add_libs.patch" |
195 |
+ |
196 |
+ # Cd into pkg-temp. |
197 |
+ cd "${S}/pkg-temp" || die |
198 |
+ |
199 |
+ # avoid auto starting browser |
200 |
+ sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ |
201 |
+ clients.config || die |
202 |
+ |
203 |
+ # replace paths as the installer would |
204 |
+ sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \ |
205 |
+ eepget i2prouter runplain.sh || die |
206 |
+ sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" wrapper.config || die |
207 |
+ sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \ |
208 |
+ i2prouter runplain.sh || die |
209 |
+ sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" i2prouter || die |
210 |
+ |
211 |
+ # This is ugly, but to satisfy all non-system .jar dependencies, jetty and |
212 |
+ # systray4j would need to be packaged. The former would be too large a task |
213 |
+ # for an unseasoned developer and systray4j hasn't been touched in over 10 |
214 |
+ # years. This seems to be the most pragmatic solution |
215 |
+ java-pkg_jarinto "${I2P_ROOT}/lib" |
216 |
+ for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ |
217 |
+ jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ |
218 |
+ sam standard streaming systray systray4j; do |
219 |
+ java-pkg_dojar lib/${i}.jar |
220 |
+ done |
221 |
+ |
222 |
+ # Set up symlinks for binaries |
223 |
+ dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc" |
224 |
+ dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter |
225 |
+ dosym "${I2P_ROOT}/eepget" /usr/bin/eepget |
226 |
+ |
227 |
+ # Install main files and basic documentation |
228 |
+ exeinto "${I2P_ROOT}" |
229 |
+ insinto "${I2P_ROOT}" |
230 |
+ doins blocklist.txt hosts.txt *.config |
231 |
+ doexe eepget i2prouter runplain.sh |
232 |
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt |
233 |
+ doman man/* |
234 |
+ |
235 |
+ # Install other directories |
236 |
+ doins -r certificates docs eepsite geoip scripts |
237 |
+ dodoc -r licenses |
238 |
+ java-pkg_dowar webapps/*.war |
239 |
+ |
240 |
+ # Install daemon files |
241 |
+ newinitd "${FILESDIR}/${PN}-0.9.25-initd" i2p |
242 |
+ systemd_newunit "${FILESDIR}"/i2p.service i2p.service |
243 |
+ |
244 |
+ # setup user |
245 |
+ dodir "${I2P_CONFIG_DIR}" |
246 |
+ fowners -R i2p:i2p "${I2P_CONFIG_DIR}" |
247 |
+} |
248 |
+ |
249 |
+pkg_postinst() { |
250 |
+ elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten." |
251 |
+ elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp" |
252 |
+ |
253 |
+ ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and' |
254 |
+ ewarn 'more pushed. To help the network, you are recommended to have either:' |
255 |
+ ewarn ' dev-java/icedtea[-sunec,nss]' |
256 |
+ ewarn ' dev-java/icedtea-bin[nss]' |
257 |
+ ewarn ' dev-java/icedtea[-sunec] and bouncycastle (bcprov)' |
258 |
+ ewarn ' dev-java/icedtea-bin and bouncycastle (bcprov)' |
259 |
+ ewarn ' dev-java/oracle-jre-bin' |
260 |
+ ewarn ' dev-java/oracle-jdk-bin' |
261 |
+ ewarn 'Alternatively you can just use Ed25519 keys - which is a stronger algorithm anyways.' |
262 |
+ ewarn |
263 |
+ ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" |
264 |
+ ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' |
265 |
+ ewarn 'as the one you built with.' |
266 |
+ |
267 |
+} |
268 |
|
269 |
diff --git a/net-p2p/i2p/metadata.xml b/net-p2p/i2p/metadata.xml |
270 |
index eb1dd22..52ff642 100644 |
271 |
--- a/net-p2p/i2p/metadata.xml |
272 |
+++ b/net-p2p/i2p/metadata.xml |
273 |
@@ -21,6 +21,7 @@ |
274 |
</maintainer> |
275 |
<longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription> |
276 |
<use> |
277 |
-<flag name="nls">Adds Native Language Support using GNU gettext.</flag> |
278 |
+ <flag name="ecdsa">Enables additional checks to make sure a setup is available that is capable of using I2Ps ECDSA provisions. I2P will work without it, but you will likely see warnings.</flag> |
279 |
+ <flag name="nls">Adds Native Language Support using GNU gettext.</flag> |
280 |
</use> |
281 |
</pkgmetadata> |