From d80825c53b8a16d8745037c8c8e64692955ade26 Mon Sep 17 00:00:00 2001 From: tharvik Date: Mon, 11 Sep 2017 20:56:28 +0200 Subject: net-vpn/i2p: version bump to 0.9.31. Package-Manager: Portage-2.3.6, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/5690 --- net-vpn/i2p/Manifest | 1 + net-vpn/i2p/files/i2p-0.9.31-add_libs.patch | 22 ++++ net-vpn/i2p/files/i2p-0.9.31.initd | 33 ++++++ net-vpn/i2p/files/i2p-0.9.31.service | 13 +++ net-vpn/i2p/i2p-0.9.31.ebuild | 152 ++++++++++++++++++++++++++++ 5 files changed, 221 insertions(+) create mode 100644 net-vpn/i2p/files/i2p-0.9.31-add_libs.patch create mode 100644 net-vpn/i2p/files/i2p-0.9.31.initd create mode 100644 net-vpn/i2p/files/i2p-0.9.31.service create mode 100644 net-vpn/i2p/i2p-0.9.31.ebuild (limited to 'net-vpn/i2p') diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest index f2495a14e8e0..502f5760fdee 100644 --- a/net-vpn/i2p/Manifest +++ b/net-vpn/i2p/Manifest @@ -1,2 +1,3 @@ DIST i2psource_0.9.29.tar.bz2 27289093 SHA256 67da4ce224fef2b190ffeed5dba102a3b7724f061b1c168255625c028a97c3a7 SHA512 21f81ef1aa16bd6fa645a4fac243ec84c27ae4e8b58ac526d70001bb50ad63116010334d63e6188e5aedb197d1bd41646fca1964e33e976e7395d3f61c5798de WHIRLPOOL 8eaee1630decd047e852bd335d5d359818f52d06be177bb4cfdbe26604b838c5c5b832e5ec7c0cc7cc950ab8bdb73fda70bcbbc5a468bc76d4ba3b983fc6ee6e DIST i2psource_0.9.30.tar.bz2 28035272 SHA256 fa18a31c56ce9dbce492d800fda8c947612199427f64f544b81e290dde1fce8f SHA512 59819125fd6aca9fd5ae25a424e78f25bd2e8f9ba995256f9bf7c1fb2a99cebf26a1dcaf1f202276f5656b4582c4b86fdcf9d23011f809b99764b0023fd243f8 WHIRLPOOL bfedf05b58b929d27f408c33048f2de4f355fe2427d1b36a6ef8db147b5df8d1ab62c69ecb42bbdc4cd51d93e64a2ae39a66f607a724156ee2ebb215600a054c +DIST i2psource_0.9.31.tar.bz2 28745769 SHA256 94867fc8ac91eb561598736f6d51773375110db546f8b057c29758b0045931d8 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103 WHIRLPOOL 891eb0100cf44a90b674e8786655b225339fbd0dc53ca57831a1997886a0f434d0ebd1a420d612435540eebd683a7027d6cb33d989066e9a0616d9729e68855d 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 new file mode 100644 index 000000000000..0ea3149a3628 --- /dev/null +++ b/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch @@ -0,0 +1,22 @@ +diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config +--- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100 ++++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +0100 +@@ -61,12 +61,18 @@ + # Be sure there are no other duplicate classes. + # + wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar ++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar ++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar ++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar ++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar ++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar + # uncomment this to use the system classpath as well (e.g. to get tools.jar) + # wrapper.java.classpath.2=%CLASSPATH% + + # Java Library Path (location of Wrapper.DLL or libwrapper.so) + wrapper.java.library.path.1=$INSTALL_PATH + wrapper.java.library.path.2=$INSTALL_PATH/lib ++wrapper.java.library.path.3=/usr/lib/java-service-wrapper + + # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. + wrapper.java.additional.auto_bits=TRUE diff --git a/net-vpn/i2p/files/i2p-0.9.31.initd b/net-vpn/i2p/files/i2p-0.9.31.initd new file mode 100644 index 000000000000..122d64f4919e --- /dev/null +++ b/net-vpn/i2p/files/i2p-0.9.31.initd @@ -0,0 +1,33 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +HOME="/var/lib/i2p" +USER_HOME="$HOME" +JAVABINARY="/etc/java-config-2/current-system-vm/bin/java" +INSTALL_PATH="/usr/share/i2p" +I2P="$INSTALL_PATH" +I2P_CONFIG_DIR="$USER_HOME/.i2p" +SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR" +I2PTEMP="$SYSTEM_java_io_tmpdir" +LOGFILE="$I2P_CONFIG_DIR/wrapper.log" +PIDFILE="/var/run/i2p.pid" +WRAPPER_CMD="$I2P/i2psvc" +WRAPPER_CONF="$I2P/wrapper.config" + +start() { + ebegin "Starting I2P" + 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" + eend $? +} + +stop() { + ebegin "Stopping I2P" + start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P + eend $? +} + diff --git a/net-vpn/i2p/files/i2p-0.9.31.service b/net-vpn/i2p/files/i2p-0.9.31.service new file mode 100644 index 000000000000..ccbadbd4d167 --- /dev/null +++ b/net-vpn/i2p/files/i2p-0.9.31.service @@ -0,0 +1,13 @@ +[Unit] +Description=Invisible Internet Project +After=network.target + +[Service] +User=i2p +Type=forking +ExecReload=/usr/bin/i2prouter restart +ExecStart=/usr/bin/i2prouter start +ExecStop=/usr/bin/i2prouter stop + +[Install] +WantedBy=multi-user.target diff --git a/net-vpn/i2p/i2p-0.9.31.ebuild b/net-vpn/i2p/i2p-0.9.31.ebuild new file mode 100644 index 000000000000..d64a1c13eda1 --- /dev/null +++ b/net-vpn/i2p/i2p-0.9.31.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils java-pkg-2 java-ant-2 systemd user + +DESCRIPTION="A privacy-centric, anonymous network." +HOMEPAGE="https://geti2p.net" +SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2" + +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" +SLOT="0" + +# Until the deps reach other arches +KEYWORDS="~amd64 ~x86" +IUSE="+ecdsa nls" + +# dev-java/ant-core is automatically added due to java-ant-2.eclass +CP_DEPEND="dev-java/bcprov:1.50 + dev-java/jrobin:0 + dev-java/slf4j-api:0 + dev-java/tomcat-jstl-impl:0 + dev-java/tomcat-jstl-spec:0 + dev-java/java-service-wrapper:0" + +DEPEND="${CP_DEPEND} + dev-java/eclipse-ecj:* + dev-libs/gmp:0 + nls? ( >=sys-devel/gettext-0.19 ) + >=virtual/jdk-1.7" + +RDEPEND="${CP_DEPEND} + ecdsa? ( + || ( + dev-java/icedtea:7[-sunec] + dev-java/icedtea:8[-sunec] + dev-java/icedtea-bin:7 + dev-java/icedtea-bin:8 + dev-java/oracle-jre-bin + dev-java/oracle-jdk-bin + ) + ) + !ecdsa? ( >=virtual/jre-1.7 )" + +EANT_BUILD_TARGET="pkg" +JAVA_ANT_ENCODING="UTF-8" + +I2P_ROOT='/usr/share/i2p' +I2P_CONFIG_HOME='/var/lib/i2p' +I2P_CONFIG_DIR="${I2P_CONFIG_HOME}/.i2p" + +RES_DIR='installer/resources' + +PATCHES=( + "${FILESDIR}/${P}-add_libs.patch" +) + +pkg_setup() { + java-pkg-2_pkg_setup + + enewgroup i2p + enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p +} + +src_unpack() { + unpack ${A} + cd "${S}" || die + java-ant_rewrite-classpath +} + +src_prepare() { + java-pkg-2_src_prepare + + # We're on GNU/Linux, we don't need .exe files + echo "noExe=true" > override.properties || die + if ! use nls; then + echo "require.gettext=false" >> override.properties || die + fi + + # avoid auto starting browser + sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \ + "${RES_DIR}/clients.config" || die + + # we do it now so we can resolve path after + default + + # replace paths as the installer would + sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \ + "${RES_DIR}/"{eepget,i2prouter,runplain.sh} || die + sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" "${RES_DIR}/wrapper.config" || die + sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \ + "${RES_DIR}/"{i2prouter,runplain.sh} || die + sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" "${RES_DIR}/i2prouter" || die +} + +src_install() { + # cd into pkg-temp. + cd "${S}/pkg-temp" || die + + # This is ugly, but to satisfy all non-system .jar dependencies, jetty + # would need to be packaged. It would be too large a task + # for an unseasoned developer. This seems to be the most pragmatic solution + java-pkg_jarinto "${I2P_ROOT}/lib" + local i + for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \ + jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \ + sam standard streaming systray addressbook; do + java-pkg_dojar lib/${i}.jar + done + + # Set up symlinks for binaries + dosym /usr/bin/wrapper "${I2P_ROOT}/i2psvc" + dosym "${I2P_ROOT}/i2prouter" /usr/bin/i2prouter + dosym "${I2P_ROOT}/eepget" /usr/bin/eepget + + # Install main files and basic documentation + exeinto "${I2P_ROOT}" + insinto "${I2P_ROOT}" + doins blocklist.txt hosts.txt *.config + doexe eepget i2prouter runplain.sh + dodoc history.txt INSTALL-headless.txt LICENSE.txt + doman man/* + + # Install other directories + doins -r certificates docs eepsite geoip scripts + dodoc -r licenses + java-pkg_dowar webapps/*.war + + # Install daemon files + newinitd "${FILESDIR}/${P}.initd" i2p + systemd_newunit "${FILESDIR}/${P}.service" i2p.service + + # setup user + keepdir "${I2P_CONFIG_DIR}" + fowners -R i2p:i2p "${I2P_CONFIG_DIR}" +} + +pkg_postinst() { + elog "Custom configuration belongs in ${I2P_CONFIG_DIR} to avoid being overwritten." + elog 'I2P can be configured through the web interface at http://localhost:7657/console' + + if use !ecdsa + then + ewarn 'Currently, the i2p team does not enforce to use ECDSA keys. But it is more and' + ewarn 'more pushed. To help the network, you are recommended to have the ecdsa USE.' + ewarn + ewarn "This is purely a run-time issue. You're free to build i2p with any JDK, as long as" + ewarn 'the JVM you run it with is one of the above listed and from the same or a newer generation' + ewarn 'as the one you built with.' + fi +} -- cgit v1.2.3-65-gdbad