1 |
commit: c7120465539c5cc77c22d74304da1d93369cb853 |
2 |
Author: Tom Li <biergaizi <AT> member <DOT> fsf <DOT> org> |
3 |
AuthorDate: Mon Apr 3 06:07:48 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 8 21:21:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7120465 |
7 |
|
8 |
net-vpn/i2p: version bump to 0.9.29. |
9 |
|
10 |
Signed-off-by: Tom Li <biergaizi <AT> member.fsf.org> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4349 |
12 |
|
13 |
net-vpn/i2p/Manifest | 1 + |
14 |
net-vpn/i2p/files/i2p-0.9.29-add_libs.patch | 22 +++ |
15 |
.../files/i2p-0.9.29-revert-gentoo-detection.patch | 21 +++ |
16 |
net-vpn/i2p/files/i2p-0.9.29.initd | 35 +++++ |
17 |
net-vpn/i2p/files/i2p-0.9.29.service | 13 ++ |
18 |
net-vpn/i2p/i2p-0.9.29.ebuild | 156 +++++++++++++++++++++ |
19 |
6 files changed, 248 insertions(+) |
20 |
|
21 |
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest |
22 |
index b9bde310e97..892f4c866f4 100644 |
23 |
--- a/net-vpn/i2p/Manifest |
24 |
+++ b/net-vpn/i2p/Manifest |
25 |
@@ -1,3 +1,4 @@ |
26 |
DIST i2psource_0.9.26.tar.bz2 27039859 SHA256 49fbaea7f4d5ea0606de68ebb270fc3d4380631ecfd5c9ad82ed9356e29df937 SHA512 2b3f96fe97418c176b4e0058817bde81909e46d136ed5cadf9f8fb4323b0a35e0a5d3fc0eaadacbfe8f9578376d8a6c6757121452cd9f7c1c3c7d019169a914d WHIRLPOOL b8161e77a491d26f24e786bf185f9eba35aa4421ba17e668f3a8f73fc481c6c8b7ea630b8c860f4cb2c877660a703aaa0dfa2d03d8163ea98a151302067e1600 |
27 |
DIST i2psource_0.9.27.tar.bz2 27339726 SHA256 89808fa062735fc880d28d232fae27028d9ecdc13b1695a251ecfec119bc15da SHA512 44825a638c0867701825e3098ca570d240db7bce761261ce6b3ebf0d781d096969275e27774a0fdf65fde11231e4f762b113abb40b9cd4edcadfd696397c719f WHIRLPOOL ae3d10635c1f508ca6e9d58a2bdaa258d62f1b6841d7555c86ae5551faaf5ef12ac620c3f6be65e1104115dbcfdde3768df97d2242852081d1ee48f497e044c0 |
28 |
DIST i2psource_0.9.28.tar.bz2 27137199 SHA256 7bb27444bd1074a0f670276ad07e0b5b2a7a29ed6d25d93e6f95646981cd0aaf SHA512 95510e391e2b594c87b61cf6915d69f4f8cd08e7791b3710b5da28b1df8ec63a7e6829d37b1242fc603398495445e7024522f3554266aaf0028a6f82569660f6 WHIRLPOOL 2d7b82c64570d17e7484a51745cabeedbb54a219610d1b82e9c3f276e6c204be335d73bfe0cb05b1fbd50eee0e4d7dcc7ec1c124831d7b5cfd81a2dcc6b6807a |
29 |
+DIST i2psource_0.9.29.tar.bz2 27289093 SHA256 67da4ce224fef2b190ffeed5dba102a3b7724f061b1c168255625c028a97c3a7 SHA512 21f81ef1aa16bd6fa645a4fac243ec84c27ae4e8b58ac526d70001bb50ad63116010334d63e6188e5aedb197d1bd41646fca1964e33e976e7395d3f61c5798de WHIRLPOOL 8eaee1630decd047e852bd335d5d359818f52d06be177bb4cfdbe26604b838c5c5b832e5ec7c0cc7cc950ab8bdb73fda70bcbbc5a468bc76d4ba3b983fc6ee6e |
30 |
|
31 |
diff --git a/net-vpn/i2p/files/i2p-0.9.29-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.29-add_libs.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..0ea3149a362 |
34 |
--- /dev/null |
35 |
+++ b/net-vpn/i2p/files/i2p-0.9.29-add_libs.patch |
36 |
@@ -0,0 +1,22 @@ |
37 |
+diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config |
38 |
+--- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100 |
39 |
++++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +0100 |
40 |
+@@ -61,12 +61,18 @@ |
41 |
+ # Be sure there are no other duplicate classes. |
42 |
+ # |
43 |
+ wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar |
44 |
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar |
45 |
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar |
46 |
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar |
47 |
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar |
48 |
++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar |
49 |
+ # uncomment this to use the system classpath as well (e.g. to get tools.jar) |
50 |
+ # wrapper.java.classpath.2=%CLASSPATH% |
51 |
+ |
52 |
+ # Java Library Path (location of Wrapper.DLL or libwrapper.so) |
53 |
+ wrapper.java.library.path.1=$INSTALL_PATH |
54 |
+ wrapper.java.library.path.2=$INSTALL_PATH/lib |
55 |
++wrapper.java.library.path.3=/usr/lib/java-service-wrapper |
56 |
+ |
57 |
+ # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. |
58 |
+ wrapper.java.additional.auto_bits=TRUE |
59 |
|
60 |
diff --git a/net-vpn/i2p/files/i2p-0.9.29-revert-gentoo-detection.patch b/net-vpn/i2p/files/i2p-0.9.29-revert-gentoo-detection.patch |
61 |
new file mode 100644 |
62 |
index 00000000000..ac12811575b |
63 |
--- /dev/null |
64 |
+++ b/net-vpn/i2p/files/i2p-0.9.29-revert-gentoo-detection.patch |
65 |
@@ -0,0 +1,21 @@ |
66 |
+diff -upr i2p-0.9.29/core/java/src/net/i2p/util/SystemVersion.java i2p-0.9.29.workaround/core/java/src/net/i2p/util/SystemVersion.java |
67 |
+--- i2p-0.9.29/core/java/src/net/i2p/util/SystemVersion.java 2017-02-27 22:36:36.000000000 +0800 |
68 |
++++ i2p-0.9.29.workaround/core/java/src/net/i2p/util/SystemVersion.java 2017-04-03 14:04:17.395820925 +0800 |
69 |
+@@ -20,7 +20,6 @@ public abstract class SystemVersion { |
70 |
+ * @since 0.9.28 |
71 |
+ */ |
72 |
+ public static final String DAEMON_USER = "i2psvc"; |
73 |
+- public static final String GENTOO_USER = "i2p"; |
74 |
+ |
75 |
+ private static final boolean _isWin = System.getProperty("os.name").startsWith("Win"); |
76 |
+ private static final boolean _isMac = System.getProperty("os.name").startsWith("Mac"); |
77 |
+@@ -64,8 +63,7 @@ public abstract class SystemVersion { |
78 |
+ String runtime = System.getProperty("java.runtime.name"); |
79 |
+ _isOpenJDK = runtime != null && runtime.contains("OpenJDK"); |
80 |
+ _isLinuxService = !_isWin && !_isMac && !_isAndroid && |
81 |
+- (DAEMON_USER.equals(System.getProperty("user.name")) || |
82 |
+- (_isGentoo && GENTOO_USER.equals(System.getProperty("user.name")))); |
83 |
++ DAEMON_USER.equals(System.getProperty("user.name")); |
84 |
+ |
85 |
+ int sdk = 0; |
86 |
+ if (_isAndroid) { |
87 |
|
88 |
diff --git a/net-vpn/i2p/files/i2p-0.9.29.initd b/net-vpn/i2p/files/i2p-0.9.29.initd |
89 |
new file mode 100644 |
90 |
index 00000000000..216d19474cb |
91 |
--- /dev/null |
92 |
+++ b/net-vpn/i2p/files/i2p-0.9.29.initd |
93 |
@@ -0,0 +1,35 @@ |
94 |
+#!/sbin/openrc-run |
95 |
+# Copyright 1999-2016 Gentoo Foundation |
96 |
+# Distributed under the terms of the GNU General Public License v2 |
97 |
+ |
98 |
+depend() { |
99 |
+ need net |
100 |
+} |
101 |
+ |
102 |
+HOME="/var/lib/i2p" |
103 |
+USER_HOME="$HOME" |
104 |
+JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" |
105 |
+INSTALL_PATH="/usr/share/i2p" |
106 |
+I2P="$INSTALL_PATH" |
107 |
+I2P_CONFIG_DIR="$USER_HOME/.i2p" |
108 |
+SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" |
109 |
+I2PTEMP="$SYSTEM_java_io_tmpdir" |
110 |
+LOGFILE="$I2P_CONFIG_DIR/wrapper.log" |
111 |
+PIDFILE="/var/run/i2p.pid" |
112 |
+WRAPPER_CMD="$I2P/i2psvc" |
113 |
+WRAPPER_CONF="$I2P/wrapper.config" |
114 |
+ |
115 |
+start() { |
116 |
+ ebegin "Starting I2P" |
117 |
+ 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" |
118 |
+ sleep 1 |
119 |
+ [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] |
120 |
+ eend $? |
121 |
+} |
122 |
+ |
123 |
+stop() { |
124 |
+ ebegin "Stopping I2P" |
125 |
+ start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P |
126 |
+ eend $? |
127 |
+} |
128 |
+ |
129 |
|
130 |
diff --git a/net-vpn/i2p/files/i2p-0.9.29.service b/net-vpn/i2p/files/i2p-0.9.29.service |
131 |
new file mode 100644 |
132 |
index 00000000000..ccbadbd4d16 |
133 |
--- /dev/null |
134 |
+++ b/net-vpn/i2p/files/i2p-0.9.29.service |
135 |
@@ -0,0 +1,13 @@ |
136 |
+[Unit] |
137 |
+Description=Invisible Internet Project |
138 |
+After=network.target |
139 |
+ |
140 |
+[Service] |
141 |
+User=i2p |
142 |
+Type=forking |
143 |
+ExecReload=/usr/bin/i2prouter restart |
144 |
+ExecStart=/usr/bin/i2prouter start |
145 |
+ExecStop=/usr/bin/i2prouter stop |
146 |
+ |
147 |
+[Install] |
148 |
+WantedBy=multi-user.target |
149 |
|
150 |
diff --git a/net-vpn/i2p/i2p-0.9.29.ebuild b/net-vpn/i2p/i2p-0.9.29.ebuild |
151 |
new file mode 100644 |
152 |
index 00000000000..bb805206030 |
153 |
--- /dev/null |
154 |
+++ b/net-vpn/i2p/i2p-0.9.29.ebuild |
155 |
@@ -0,0 +1,156 @@ |
156 |
+# Copyright 1999-2016 Gentoo Foundation |
157 |
+# Distributed under the terms of the GNU General Public License v2 |
158 |
+ |
159 |
+EAPI="6" |
160 |
+ |
161 |
+inherit eutils java-pkg-2 java-ant-2 systemd user |
162 |
+ |
163 |
+DESCRIPTION="A privacy-centric, anonymous network." |
164 |
+HOMEPAGE="https://geti2p.net" |
165 |
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" |
166 |
+ |
167 |
+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" |
168 |
+SLOT="0" |
169 |
+ |
170 |
+# Until the deps reach other arches |
171 |
+KEYWORDS="~amd64 ~x86" |
172 |
+IUSE="+ecdsa nls" |
173 |
+ |
174 |
+# dev-java/ant-core is automatically added due to java-ant-2.eclass |
175 |
+CP_DEPEND="dev-java/bcprov:1.50 |
176 |
+ dev-java/jrobin:0 |
177 |
+ dev-java/slf4j-api:0 |
178 |
+ dev-java/tomcat-jstl-impl:0 |
179 |
+ dev-java/tomcat-jstl-spec:0 |
180 |
+ dev-java/java-service-wrapper:0" |
181 |
+ |
182 |
+DEPEND="${CP_DEPEND} |
183 |
+ dev-java/eclipse-ecj:* |
184 |
+ dev-libs/gmp:0 |
185 |
+ nls? ( >=sys-devel/gettext-0.19 ) |
186 |
+ >=virtual/jdk-1.7" |
187 |
+ |
188 |
+RDEPEND="${CP_DEPEND} |
189 |
+ ecdsa? ( |
190 |
+ || ( |
191 |
+ dev-java/icedtea:7[-sunec] |
192 |
+ dev-java/icedtea:8[-sunec] |
193 |
+ dev-java/icedtea-bin:7 |
194 |
+ dev-java/icedtea-bin:8 |
195 |
+ dev-java/oracle-jre-bin |
196 |
+ dev-java/oracle-jdk-bin |
197 |
+ ) |
198 |
+ ) |
199 |
+ !ecdsa? ( >=virtual/jre-1.7 )" |
200 |
+ |
201 |
+EANT_BUILD_TARGET="pkg" |
202 |
+JAVA_ANT_ENCODING="UTF-8" |
203 |
+ |
204 |
+I2P_ROOT='/usr/share/i2p' |
205 |
+I2P_CONFIG_HOME='/var/lib/i2p' |
206 |
+I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p" |
207 |
+ |
208 |
+RES_DIR='installer/resources' |
209 |
+ |
210 |
+PATCHES=( |
211 |
+ "${FILESDIR}/${P}-add_libs.patch" |
212 |
+ |
213 |
+ # New Gentoo detection code is added in 0.9.29 and its side-effect breaks Gentoo |
214 |
+ # http://zzz.i2p/topics/2285-gentoo-installation-is-broken-in-0-9-29 |
215 |
+ "${FILESDIR}/${P}-revert-gentoo-detection.patch" |
216 |
+) |
217 |
+ |
218 |
+pkg_setup() { |
219 |
+ java-pkg-2_pkg_setup |
220 |
+ |
221 |
+ enewgroup i2p |
222 |
+ enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p |
223 |
+} |
224 |
+ |
225 |
+src_unpack() { |
226 |
+ unpack ${A} |
227 |
+ cd "${S}" || die |
228 |
+ java-ant_rewrite-classpath |
229 |
+} |
230 |
+ |
231 |
+src_prepare() { |
232 |
+ java-pkg-2_src_prepare |
233 |
+ |
234 |
+ # We're on GNU/Linux, we don't need .exe files |
235 |
+ echo "noExe=true" > override.properties || die |
236 |
+ if ! use nls; then |
237 |
+ echo "require.gettext=false" >> override.properties || die |
238 |
+ fi |
239 |
+ |
240 |
+ # avoid auto starting browser |
241 |
+ sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ |
242 |
+ "${RES_DIR}/clients.config" || die |
243 |
+ |
244 |
+ # we do it now so we can resolve path after |
245 |
+ default |
246 |
+ |
247 |
+ # replace paths as the installer would |
248 |
+ sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \ |
249 |
+ "${RES_DIR}/"{eepget,i2prouter,runplain.sh} || die |
250 |
+ sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die |
251 |
+ sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \ |
252 |
+ "${RES_DIR}/"{i2prouter,runplain.sh} || die |
253 |
+ sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die |
254 |
+} |
255 |
+ |
256 |
+src_install() { |
257 |
+ # cd into pkg-temp. |
258 |
+ cd "${S}/pkg-temp" || die |
259 |
+ |
260 |
+ # This is ugly, but to satisfy all non-system .jar dependencies, jetty |
261 |
+ # would need to be packaged. It would be too large a task |
262 |
+ # for an unseasoned developer. This seems to be the most pragmatic solution |
263 |
+ java-pkg_jarinto "${I2P_ROOT}/lib" |
264 |
+ local i |
265 |
+ for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ |
266 |
+ jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ |
267 |
+ sam standard streaming systray; do |
268 |
+ java-pkg_dojar lib/${i}.jar |
269 |
+ done |
270 |
+ |
271 |
+ # Set up symlinks for binaries |
272 |
+ dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc" |
273 |
+ dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter |
274 |
+ dosym "${I2P_ROOT}/eepget" /usr/bin/eepget |
275 |
+ |
276 |
+ # Install main files and basic documentation |
277 |
+ exeinto "${I2P_ROOT}" |
278 |
+ insinto "${I2P_ROOT}" |
279 |
+ doins blocklist.txt hosts.txt *.config |
280 |
+ doexe eepget i2prouter runplain.sh |
281 |
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt |
282 |
+ doman man/* |
283 |
+ |
284 |
+ # Install other directories |
285 |
+ doins -r certificates docs eepsite geoip scripts |
286 |
+ dodoc -r licenses |
287 |
+ java-pkg_dowar webapps/*.war |
288 |
+ |
289 |
+ # Install daemon files |
290 |
+ newinitd "${FILESDIR}/${P}.initd" i2p |
291 |
+ systemd_newunit "${FILESDIR}/${P}.service" i2p.service |
292 |
+ |
293 |
+ # setup user |
294 |
+ keepdir "${I2P_CONFIG_DIR}" |
295 |
+ fowners -R i2p:i2p "${I2P_CONFIG_DIR}" |
296 |
+} |
297 |
+ |
298 |
+pkg_postinst() { |
299 |
+ elog "Custom configuration belongs in ${I2P_CONFIG_DIR} to avoid being overwritten." |
300 |
+ elog 'I2P can be configured through the web interface at http://localhost:7657/console' |
301 |
+ |
302 |
+ if use !ecdsa |
303 |
+ then |
304 |
+ ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and' |
305 |
+ ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.' |
306 |
+ ewarn |
307 |
+ ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" |
308 |
+ ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' |
309 |
+ ewarn 'as the one you built with.' |
310 |
+ fi |
311 |
+} |