| 1 |
commit: d56d66381538b5d66697250961416464bb6c91b2 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 20:43:24 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 20:46:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56d6638 |
| 7 |
|
| 8 |
net-p2p/i2p: Remove old 0.9.25-r1 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
net-p2p/i2p/Manifest | 1 - |
| 13 |
net-p2p/i2p/files/i2p-0.9.25-add_libs.patch | 22 ---- |
| 14 |
net-p2p/i2p/files/i2p-0.9.25-initd | 36 ------- |
| 15 |
net-p2p/i2p/files/i2p.initd | 36 ------- |
| 16 |
net-p2p/i2p/files/i2p.service | 13 --- |
| 17 |
net-p2p/i2p/i2p-0.9.25-r1.ebuild | 156 ---------------------------- |
| 18 |
6 files changed, 264 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest |
| 21 |
index 80867db..d437335 100644 |
| 22 |
--- a/net-p2p/i2p/Manifest |
| 23 |
+++ b/net-p2p/i2p/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST i2psource_0.9.25.tar.bz2 24652935 SHA256 daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236 SHA512 a50f00d9ad32993da30529339e3ffd425d5e97d5120d9e4e446f6fa7ac0cbb6ee4f35c013b0815802ff6c72e188b00d408c7fa398c8ee1ae71be57383a1411f6 WHIRLPOOL a851f6505155201d872774407dc71c9dd03a4683b3ce35d2fff74fd3f7f17d12cc1cc72dfcc2c7c4f0d82b86333bd0424066ae41330e603ba07872d56c257e27 |
| 26 |
DIST i2psource_0.9.26.tar.bz2 27039859 SHA256 49fbaea7f4d5ea0606de68ebb270fc3d4380631ecfd5c9ad82ed9356e29df937 SHA512 2b3f96fe97418c176b4e0058817bde81909e46d136ed5cadf9f8fb4323b0a35e0a5d3fc0eaadacbfe8f9578376d8a6c6757121452cd9f7c1c3c7d019169a914d WHIRLPOOL b8161e77a491d26f24e786bf185f9eba35aa4421ba17e668f3a8f73fc481c6c8b7ea630b8c860f4cb2c877660a703aaa0dfa2d03d8163ea98a151302067e1600 |
| 27 |
|
| 28 |
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 |
| 29 |
deleted file mode 100644 |
| 30 |
index 6e8fc8d..00000000 |
| 31 |
--- a/net-p2p/i2p/files/i2p-0.9.25-add_libs.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,22 +0,0 @@ |
| 34 |
-diff -Naur a/wrapper.config b/wrapper.config |
| 35 |
---- a/pkg-temp/wrapper.config 2016-02-07 23:19:48.714569016 +0100 |
| 36 |
-+++ b/pkg-temp/wrapper.config 2016-02-07 23:20:37.523566840 +0100 |
| 37 |
-@@ -61,12 +61,18 @@ |
| 38 |
- # Be sure there are no other duplicate classes. |
| 39 |
- # |
| 40 |
- wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar |
| 41 |
-+wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar |
| 42 |
-+wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar |
| 43 |
-+wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar |
| 44 |
-+wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar |
| 45 |
-+wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar |
| 46 |
- # uncomment this to use the system classpath as well (e.g. to get tools.jar) |
| 47 |
- # wrapper.java.classpath.2=%CLASSPATH% |
| 48 |
- |
| 49 |
- # Java Library Path (location of Wrapper.DLL or libwrapper.so) |
| 50 |
- wrapper.java.library.path.1=$INSTALL_PATH |
| 51 |
- wrapper.java.library.path.2=$INSTALL_PATH/lib |
| 52 |
-+wrapper.java.library.path.3=/usr/lib/java-service-wrapper |
| 53 |
- |
| 54 |
- # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. |
| 55 |
- wrapper.java.additional.auto_bits=TRUE |
| 56 |
|
| 57 |
diff --git a/net-p2p/i2p/files/i2p-0.9.25-initd b/net-p2p/i2p/files/i2p-0.9.25-initd |
| 58 |
deleted file mode 100644 |
| 59 |
index bd00917..00000000 |
| 60 |
--- a/net-p2p/i2p/files/i2p-0.9.25-initd |
| 61 |
+++ /dev/null |
| 62 |
@@ -1,36 +0,0 @@ |
| 63 |
-#!/sbin/openrc-run |
| 64 |
-# Copyright 1999-2016 Gentoo Foundation |
| 65 |
-# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Id$ |
| 67 |
- |
| 68 |
-depend() { |
| 69 |
- need net |
| 70 |
-} |
| 71 |
- |
| 72 |
-HOME="/var/lib/i2p" |
| 73 |
-USER_HOME="$HOME" |
| 74 |
-JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" |
| 75 |
-INSTALL_PATH="/usr/share/i2p" |
| 76 |
-I2P="$INSTALL_PATH" |
| 77 |
-I2P_CONFIG_DIR="$USER_HOME/.i2p" |
| 78 |
-SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" |
| 79 |
-I2PTEMP="$SYSTEM_java_io_tmpdir" |
| 80 |
-LOGFILE="$I2P_CONFIG_DIR/wrapper.log" |
| 81 |
-PIDFILE="/var/run/i2p.pid" |
| 82 |
-WRAPPER_CMD="$I2P/i2psvc" |
| 83 |
-WRAPPER_CONF="$I2P/wrapper.config" |
| 84 |
- |
| 85 |
-start() { |
| 86 |
- ebegin "Starting I2P" |
| 87 |
- 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" |
| 88 |
- sleep 1 |
| 89 |
- [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] |
| 90 |
- eend $? |
| 91 |
-} |
| 92 |
- |
| 93 |
-stop() { |
| 94 |
- ebegin "Stopping I2P" |
| 95 |
- start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P |
| 96 |
- eend $? |
| 97 |
-} |
| 98 |
- |
| 99 |
|
| 100 |
diff --git a/net-p2p/i2p/files/i2p.initd b/net-p2p/i2p/files/i2p.initd |
| 101 |
deleted file mode 100644 |
| 102 |
index f10c4a0..00000000 |
| 103 |
--- a/net-p2p/i2p/files/i2p.initd |
| 104 |
+++ /dev/null |
| 105 |
@@ -1,36 +0,0 @@ |
| 106 |
-#!/sbin/openrc-run |
| 107 |
-# Copyright 1999-2013 Gentoo Foundation |
| 108 |
-# Distributed under the terms of the GNU General Public License v2 |
| 109 |
-# $Id$ |
| 110 |
- |
| 111 |
-depend() { |
| 112 |
- need net |
| 113 |
-} |
| 114 |
- |
| 115 |
-HOME="/var/lib/i2p" |
| 116 |
-USER_HOME="$HOME" |
| 117 |
-JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" |
| 118 |
-INSTALL_PATH="/usr/share/i2p" |
| 119 |
-I2P="$INSTALL_PATH" |
| 120 |
-I2P_CONFIG_DIR="$USER_HOME/.i2p" |
| 121 |
-SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" |
| 122 |
-I2PTEMP="$SYSTEM_java_io_tmpdir" |
| 123 |
-LOGFILE="$I2P_CONFIG_DIR/wrapper.log" |
| 124 |
-PIDFILE="/var/run/i2p.pid" |
| 125 |
-WRAPPER_CMD="$I2P/i2psvc" |
| 126 |
-WRAPPER_CONF="$I2P/wrapper.config" |
| 127 |
- |
| 128 |
-start() { |
| 129 |
- ebegin "Starting I2P" |
| 130 |
- 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" |
| 131 |
- sleep 1 |
| 132 |
- [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ] |
| 133 |
- eend $? |
| 134 |
-} |
| 135 |
- |
| 136 |
-stop() { |
| 137 |
- ebegin "Stopping I2P" |
| 138 |
- start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P |
| 139 |
- eend $? |
| 140 |
-} |
| 141 |
- |
| 142 |
|
| 143 |
diff --git a/net-p2p/i2p/files/i2p.service b/net-p2p/i2p/files/i2p.service |
| 144 |
deleted file mode 100644 |
| 145 |
index ccbadbd..00000000 |
| 146 |
--- a/net-p2p/i2p/files/i2p.service |
| 147 |
+++ /dev/null |
| 148 |
@@ -1,13 +0,0 @@ |
| 149 |
-[Unit] |
| 150 |
-Description=Invisible Internet Project |
| 151 |
-After=network.target |
| 152 |
- |
| 153 |
-[Service] |
| 154 |
-User=i2p |
| 155 |
-Type=forking |
| 156 |
-ExecReload=/usr/bin/i2prouter restart |
| 157 |
-ExecStart=/usr/bin/i2prouter start |
| 158 |
-ExecStop=/usr/bin/i2prouter stop |
| 159 |
- |
| 160 |
-[Install] |
| 161 |
-WantedBy=multi-user.target |
| 162 |
|
| 163 |
diff --git a/net-p2p/i2p/i2p-0.9.25-r1.ebuild b/net-p2p/i2p/i2p-0.9.25-r1.ebuild |
| 164 |
deleted file mode 100644 |
| 165 |
index e25d09f..00000000 |
| 166 |
--- a/net-p2p/i2p/i2p-0.9.25-r1.ebuild |
| 167 |
+++ /dev/null |
| 168 |
@@ -1,156 +0,0 @@ |
| 169 |
-# Copyright 1999-2016 Gentoo Foundation |
| 170 |
-# Distributed under the terms of the GNU General Public License v2 |
| 171 |
-# $Id$ |
| 172 |
- |
| 173 |
-EAPI="6" |
| 174 |
- |
| 175 |
-inherit eutils java-pkg-2 java-ant-2 systemd user |
| 176 |
- |
| 177 |
-DESCRIPTION="A privacy-centric, anonymous network." |
| 178 |
-HOMEPAGE="https://geti2p.net" |
| 179 |
-SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" |
| 180 |
- |
| 181 |
-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" |
| 182 |
-SLOT="0" |
| 183 |
- |
| 184 |
-# Until the deps reach other arches |
| 185 |
-KEYWORDS="~amd64 ~x86" |
| 186 |
-IUSE="+ecdsa nls" |
| 187 |
- |
| 188 |
-# dev-java/ant-core is automatically added due to java-ant-2.eclass |
| 189 |
-CDEPEND="dev-java/bcprov:1.50 |
| 190 |
- dev-java/jrobin:0 |
| 191 |
- dev-java/slf4j-api:0 |
| 192 |
- dev-java/tomcat-jstl-impl:0 |
| 193 |
- dev-java/tomcat-jstl-spec:0 |
| 194 |
- dev-java/java-service-wrapper:0" |
| 195 |
- |
| 196 |
-DEPEND="${CDEPEND} |
| 197 |
- dev-java/eclipse-ecj:* |
| 198 |
- dev-libs/gmp:* |
| 199 |
- nls? ( sys-devel/gettext ) |
| 200 |
- >=virtual/jdk-1.7" |
| 201 |
- |
| 202 |
-RDEPEND="${CDEPEND} |
| 203 |
- ecdsa? ( |
| 204 |
- || ( |
| 205 |
- dev-java/icedtea:7[-sunec] |
| 206 |
- dev-java/icedtea:8[-sunec] |
| 207 |
- dev-java/icedtea:7[nss,-sunec] |
| 208 |
- dev-java/icedtea-bin:7[nss] |
| 209 |
- dev-java/icedtea-bin:7 |
| 210 |
- dev-java/icedtea-bin:8 |
| 211 |
- dev-java/oracle-jre-bin |
| 212 |
- dev-java/oracle-jdk-bin |
| 213 |
- ) |
| 214 |
- ) |
| 215 |
- !ecdsa? ( >=virtual/jre-1.7 )" |
| 216 |
- |
| 217 |
-EANT_BUILD_TARGET="pkg" |
| 218 |
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50" |
| 219 |
-JAVA_ANT_ENCODING="UTF-8" |
| 220 |
- |
| 221 |
-I2P_ROOT='/usr/share/i2p' |
| 222 |
-I2P_CONFIG_HOME='/var/lib/i2p' |
| 223 |
-I2P_CONFIG_DIR="${I2P_HOME}/.i2p" |
| 224 |
- |
| 225 |
-pkg_setup() { |
| 226 |
- java-pkg-2_pkg_setup |
| 227 |
- |
| 228 |
- enewgroup i2p |
| 229 |
- enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p -m |
| 230 |
-} |
| 231 |
- |
| 232 |
-src_unpack() { |
| 233 |
- unpack ${A} |
| 234 |
- cd "${S}" || die |
| 235 |
- java-ant_rewrite-classpath |
| 236 |
-} |
| 237 |
- |
| 238 |
-src_prepare() { |
| 239 |
- java-pkg-2_src_prepare |
| 240 |
- |
| 241 |
- # We're on GNU/Linux, we don't need .exe files |
| 242 |
- echo "noExe=true" > override.properties |
| 243 |
- if ! use nls; then |
| 244 |
- echo "require.gettext=false" >> override.properties |
| 245 |
- fi |
| 246 |
- eapply_user |
| 247 |
-} |
| 248 |
- |
| 249 |
-src_install() { |
| 250 |
- # add libs |
| 251 |
- eapply "${FILESDIR}/${PN}-0.9.25-add_libs.patch" |
| 252 |
- |
| 253 |
- # Cd into pkg-temp. |
| 254 |
- cd "${S}/pkg-temp" || die |
| 255 |
- |
| 256 |
- # avoid auto starting browser |
| 257 |
- sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ |
| 258 |
- clients.config || die |
| 259 |
- |
| 260 |
- # replace paths as the installer would |
| 261 |
- sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \ |
| 262 |
- eepget i2prouter runplain.sh || die |
| 263 |
- sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" wrapper.config || die |
| 264 |
- sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \ |
| 265 |
- i2prouter runplain.sh || die |
| 266 |
- sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" i2prouter || die |
| 267 |
- |
| 268 |
- # This is ugly, but to satisfy all non-system .jar dependencies, jetty and |
| 269 |
- # systray4j would need to be packaged. The former would be too large a task |
| 270 |
- # for an unseasoned developer and systray4j hasn't been touched in over 10 |
| 271 |
- # years. This seems to be the most pragmatic solution |
| 272 |
- java-pkg_jarinto "${I2P_ROOT}/lib" |
| 273 |
- for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ |
| 274 |
- jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ |
| 275 |
- sam standard streaming systray systray4j; do |
| 276 |
- java-pkg_dojar lib/${i}.jar |
| 277 |
- done |
| 278 |
- |
| 279 |
- # Set up symlinks for binaries |
| 280 |
- dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc" |
| 281 |
- dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter |
| 282 |
- dosym "${I2P_ROOT}/eepget" /usr/bin/eepget |
| 283 |
- |
| 284 |
- # Install main files and basic documentation |
| 285 |
- exeinto "${I2P_ROOT}" |
| 286 |
- insinto "${I2P_ROOT}" |
| 287 |
- doins blocklist.txt hosts.txt *.config |
| 288 |
- doexe eepget i2prouter runplain.sh |
| 289 |
- dodoc history.txt INSTALL-headless.txt LICENSE.txt |
| 290 |
- doman man/* |
| 291 |
- |
| 292 |
- # Install other directories |
| 293 |
- doins -r certificates docs eepsite geoip scripts |
| 294 |
- dodoc -r licenses |
| 295 |
- java-pkg_dowar webapps/*.war |
| 296 |
- |
| 297 |
- # Install daemon files |
| 298 |
- newinitd "${FILESDIR}/${PN}-0.9.25-initd" i2p |
| 299 |
- systemd_newunit "${FILESDIR}"/i2p.service i2p.service |
| 300 |
- |
| 301 |
- # setup user |
| 302 |
- dodir "${I2P_CONFIG_DIR}" |
| 303 |
- fowners -R i2p:i2p "${I2P_CONFIG_DIR}" |
| 304 |
-} |
| 305 |
- |
| 306 |
-pkg_postinst() { |
| 307 |
- elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten." |
| 308 |
- elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp" |
| 309 |
- |
| 310 |
- ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and' |
| 311 |
- ewarn 'more pushed. To help the network, you are recommended to have either:' |
| 312 |
- ewarn ' dev-java/icedtea[-sunec,nss]' |
| 313 |
- ewarn ' dev-java/icedtea-bin[nss]' |
| 314 |
- ewarn ' dev-java/icedtea[-sunec] and bouncycastle (bcprov)' |
| 315 |
- ewarn ' dev-java/icedtea-bin and bouncycastle (bcprov)' |
| 316 |
- ewarn ' dev-java/oracle-jre-bin' |
| 317 |
- ewarn ' dev-java/oracle-jdk-bin' |
| 318 |
- ewarn 'Alternatively you can just use Ed25519 keys - which is a stronger algorithm anyways.' |
| 319 |
- ewarn |
| 320 |
- ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" |
| 321 |
- ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' |
| 322 |
- ewarn 'as the one you built with.' |
| 323 |
- |
| 324 |
-} |
Archives