* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2017-05-23 14:28 Patrice Clement
0 siblings, 0 replies; 8+ messages in thread
From: Patrice Clement @ 2017-05-23 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 70afa77a8c8a4624174e7d1b7ce9a58f812b1f69
Author: Yifeng Li <tomli <AT> tomli <DOT> me>
AuthorDate: Tue May 9 14:42:54 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue May 23 14:28:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70afa77a
net-vpn/i2p: remove 0.9.28.
Signed-off-by: Yifeng Li <tomli <AT> tomli.me>
Closes: https://github.com/gentoo/gentoo/pull/4571
net-vpn/i2p/files/i2p-0.9.28-add_libs.patch | 22 ----
net-vpn/i2p/files/i2p-0.9.28.initd | 35 -------
net-vpn/i2p/files/i2p-0.9.28.service | 13 ---
net-vpn/i2p/i2p-0.9.28.ebuild | 152 ----------------------------
4 files changed, 222 deletions(-)
diff --git a/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch
deleted file mode 100644
index 0ea3149a362..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.28-add_libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.28.initd b/net-vpn/i2p/files/i2p-0.9.28.initd
deleted file mode 100644
index 216d19474cb..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.28.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 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"
- sleep 1
- [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ]
- 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.28.service b/net-vpn/i2p/files/i2p-0.9.28.service
deleted file mode 100644
index ccbadbd4d16..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.28.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[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.28.ebuild b/net-vpn/i2p/i2p-0.9.28.ebuild
deleted file mode 100644
index 103ad6ed5e1..00000000000
--- a/net-vpn/i2p/i2p-0.9.28.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2016 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; 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2018-02-11 18:38 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-02-11 18:38 UTC (permalink / raw
To: gentoo-commits
commit: eca2467d3fa41470edfeb493a68876e20f91e51c
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Feb 9 15:40:02 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 18:38:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca2467d
net-vpn/i2p: remove 0.9.30
Closes: https://github.com/gentoo/gentoo/pull/7008
Package-Manager: Portage-2.3.13, Repoman-2.3.3
net-vpn/i2p/Manifest | 1 -
net-vpn/i2p/files/i2p-0.9.30-add_libs.patch | 22 ----
net-vpn/i2p/files/i2p-0.9.30.initd | 35 -------
net-vpn/i2p/files/i2p-0.9.30.service | 13 ---
net-vpn/i2p/i2p-0.9.30-r1.ebuild | 152 ----------------------------
net-vpn/i2p/i2p-0.9.30.ebuild | 149 ---------------------------
6 files changed, 372 deletions(-)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index fced4eedf7f..c04dc1e1d47 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,3 +1,2 @@
-DIST i2psource_0.9.30.tar.bz2 28035272 BLAKE2B 1e1b14b3126b8fd73489ddc99f7f83ea1b501d7c7ce31e11bbdb8e4a4fe33e06bf906277b7f10e912bdf54de8511c3c3d0eccf2607dcfaacb36ed89875425471 SHA512 59819125fd6aca9fd5ae25a424e78f25bd2e8f9ba995256f9bf7c1fb2a99cebf26a1dcaf1f202276f5656b4582c4b86fdcf9d23011f809b99764b0023fd243f8
DIST i2psource_0.9.31.tar.bz2 28745769 BLAKE2B e7766eceffb44c7c40ce176c3d98ed9a62472058c90adf1b07bbab11628d6ca4c8c62ca52526a204a6e8f47a182a59e07ccbdef65b6d2c5122d8e64e1df75406 SHA512 ffeb74d02c783febc122580b64561722de04c903e2d33fdeaf74bf3b7d725b8b7ce6556f53a12f0ae0d6c6deb413839e222bc2b8093952e5ecaf1bf96f0d1103
DIST i2psource_0.9.33.tar.bz2 28985659 BLAKE2B 51b9697271c506de8d34b42ff208a12c9f0409c9aff456aa928dc2d411aceb0473878e9ed0d6ccf3684a7432c64700eec798535b4a4f4e01a2297e3d3ef7603a SHA512 ad772a422923636731350e590a14631209503c3d82db32410cb3002c790c60f9f7d950f94bb4d65ced1c2126e67a92ad65e9cd65ae3f045fc5279f57217066e2
diff --git a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch
deleted file mode 100644
index 0ea3149a362..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.30-add_libs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.30.initd b/net-vpn/i2p/files/i2p-0.9.30.initd
deleted file mode 100644
index 216d19474cb..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.30.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 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"
- sleep 1
- [ -e "$PIDFILE" -a -e /proc/$(cat "$PIDFILE") ]
- 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.30.service b/net-vpn/i2p/files/i2p-0.9.30.service
deleted file mode 100644
index ccbadbd4d16..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.30.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[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.30-r1.ebuild b/net-vpn/i2p/i2p-0.9.30-r1.ebuild
deleted file mode 100644
index d64a1c13eda..00000000000
--- a/net-vpn/i2p/i2p-0.9.30-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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
-}
diff --git a/net-vpn/i2p/i2p-0.9.30.ebuild b/net-vpn/i2p/i2p-0.9.30.ebuild
deleted file mode 100644
index 54eab04b7fe..00000000000
--- a/net-vpn/i2p/i2p-0.9.30.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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="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}
- || (
- 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
- )"
-
-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; 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'
- elog
-
- ewarn "The router will migrate the jetty.xml for each Jetty website to the new Jetty 9 setup during startup."
- ewarn "This should work for recent, unmodified configurations but may not work for modified or"
- ewarn "very old setups. Verify that your Jetty website works after upgrading, and contact i2p"
- ewarn "developers on IRC if you need assistance"
- ewarn
- ewarn "Several plugins are not compatible with Jetty 9 and must be updated if you use them."
- ewarn "New updated version avaliable: i2pbote 0.4.6, zzzot 0.15.0."
- ewarn "No new version so far: BwSchedule 0.0.36, i2pcontrol 0.11."
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2018-10-14 10:33 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-10-14 10:33 UTC (permalink / raw
To: gentoo-commits
commit: 70d699adf34f0736b03231a8e8c926570c9dbe96
Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Oct 12 10:26:16 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 10:33:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d699ad
net-vpn/i2p: bump to 0.9.37
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-vpn/i2p/Manifest | 1 +
net-vpn/i2p/files/0.9.37-add-cp-to-tests | 33 ++++++
net-vpn/i2p/i2p-0.9.37.ebuild | 179 +++++++++++++++++++++++++++++++
3 files changed, 213 insertions(+)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 018ac01d087..2b1d3223e69 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
DIST i2psource_0.9.34.tar.bz2 29332692 BLAKE2B 16b15ac2c7eaa594fc6398105d7e22442fafc4036a54a66c91b3ca9bd98095a9192ae5c28123882ddc6acc7c68fb5eeed3ef1ed632a4b4b96a1abe28dff2286c SHA512 71c80710098ead34c159c6a6873c397048afc76974917e7b65d7846203900ab8bfb4840fec3c7d09ade48e93329b06ec33d9f367dae33a4708b4ea14268beefa
DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
+DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
new file mode 100644
index 00000000000..b8e967dd31d
--- /dev/null
+++ b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
@@ -0,0 +1,33 @@
+diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
+--- a/apps/ministreaming/java/build.xml 2018-10-04 12:05:09.000000000 +0200
++++ b/apps/ministreaming/java/build.xml 2018-10-12 08:15:16.481532093 +0200
+@@ -194,6 +194,7 @@
+ includeAntRuntime="false"
+ destdir="./build/obj" >
+ <classpath>
++ <pathelement path="${javac.classpath}" />
+ <pathelement location="../../../core/java/build/i2p.jar" />
+ <pathelement location="${junit.home}/junit4.jar" />
+ <pathelement location="${hamcrest.home}/hamcrest.jar" />
+diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
+--- a/apps/streaming/java/build.xml 2018-10-04 12:05:09.000000000 +0200
++++ b/apps/streaming/java/build.xml 2018-10-12 11:17:22.814404049 +0200
+@@ -62,6 +62,7 @@
+ includeAntRuntime="false"
+ destdir="./build/obj" >
+ <classpath>
++ <pathelement path="${javac.classpath}" />
+ <pathelement location="../../../core/java/build/i2p.jar" />
+ <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
+ <pathelement location="${junit.home}/junit4.jar" />
+diff -Naur a/router/java/build.xml b/router/java/build.xml
+--- a/router/java/build.xml 2018-10-04 12:05:14.000000000 +0200
++++ b/router/java/build.xml 2018-10-12 08:14:52.921530213 +0200
+@@ -162,6 +162,7 @@
+ includeAntRuntime="true"
+ destdir="./build/obj">
+ <classpath>
++ <pathelement path="${javac.classpath}" />
+ <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+ <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+ <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
diff --git a/net-vpn/i2p/i2p-0.9.37.ebuild b/net-vpn/i2p/i2p-0.9.37.ebuild
new file mode 100644
index 00000000000..b12699fa669
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.37.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit 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 test"
+
+# 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
+ dev-java/commons-logging:0
+ dev-java/slf4j-simple:0
+ java-virtuals/servlet-api:3.1
+'
+
+DEPEND="${CP_DEPEND}
+ dev-java/eclipse-ecj:*
+ nls? ( >=sys-devel/gettext-0.19 )
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ ecdsa? (
+ || (
+ dev-java/icedtea:8[-sunec]
+ dev-java/icedtea-bin:8
+ dev-java/oracle-jre-bin
+ dev-java/oracle-jdk-bin
+ )
+ )
+ !ecdsa? ( virtual/jre:1.8 )
+ net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET='junit.test'
+JAVA_ANT_ENCODING="UTF-8"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-add-cp-to-tests"
+)
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+
+ enewgroup i2p
+ enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
+}
+
+src_prepare() {
+ # as early as possible to allow generic patches to be applied
+ default
+
+ java-ant_rewrite-classpath
+
+ 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|' \
+ 'installer/resources/clients.config' || die
+
+ # generate wrapper classpath, keeping the default to be replaced later
+ i2p_cp='' # global forced by java-pkg_gen-cp
+ java-pkg_gen-cp i2p_cp
+ local lib cp i=2
+ for lib in ${i2p_cp//,/ }
+ do
+ cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+ done
+
+ # add generated cp and hardcode system VM
+ sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
+ -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+ -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
+ -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
+ -i 'installer/resources/wrapper.config' || die
+
+ # replace paths as the installer would
+ sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
+ -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
+ -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
+ -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
+
+ if use test; then
+ # no *streaming as requiring >dev-java/mockito-1.9.5
+ sed -e '/junit\.test.*streaming/d' \
+ -i build.xml ||
+ die 'unable to remove ministreaming tests'
+ fi
+}
+
+src_test() {
+ # store built version of jars, overwritten by testing
+ mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+ die 'unable to save jars before tests'
+
+ # generate test classpath
+ local cp
+ cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
+ EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
+
+ # redo work undone by testing
+ mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+ die 'unable to restore jars after tests'
+}
+
+src_install() {
+ # cd into pkg-temp.
+ cd "${S}/pkg-temp" || die
+
+ # we remove system installed jar and install the others
+ rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+ die 'unable to remove locally built jar already found in system'
+ java-pkg_dojar lib/*.jar
+
+ # create own launcher
+ java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+ # Install main files and basic documentation
+ insinto '/usr/share/i2p'
+ doins blocklist.txt hosts.txt *.config
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt
+ doman man/*
+
+ # Install other directories
+ doins -r certificates docs eepsite geoip scripts
+ java-pkg_dowar webapps/*.war
+
+ # Install daemon files
+ newinitd "${FILESDIR}/i2p.init" i2p
+ systemd_dounit "${FILESDIR}/i2p.service"
+
+ # setup user
+ keepdir '/var/lib/i2p/.i2p'
+ fowners i2p:i2p '/var/lib/i2p/.i2p'
+}
+
+pkg_postinst() {
+ elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p 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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2019-04-22 10:17 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2019-04-22 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 781c446ea87431fa75a501089155068a7521d7b9
Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Wed Apr 17 16:25:21 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 10:08:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781c446e
net-vpn/i2p: drop 0.9.3[67]
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/11722
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-vpn/i2p/Manifest | 2 -
net-vpn/i2p/files/0.9.37-add-cp-to-tests | 33 ------
net-vpn/i2p/i2p-0.9.36.ebuild | 140 ------------------------
net-vpn/i2p/i2p-0.9.37.ebuild | 179 -------------------------------
net-vpn/i2p/metadata.xml | 1 -
5 files changed, 355 deletions(-)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 8443cbbb6d3..07694666fec 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,4 +1,2 @@
-DIST i2psource_0.9.36.tar.bz2 29856168 BLAKE2B 0f10101b874bf6fc8415f10b08282947962a6fb8c3eaefde67d3f250d65a159551c24038625aa6712e88b368ccae38d136314025ac19fcb9dd9145251283b357 SHA512 e9023cae1c7dbdd92c9c4823497dfa8497cee3683de1232deddbdc548ba08edefe218bd81e00e952d8a95037c32de8359daaf43c2d5f25c75aba65554d2d47b4
-DIST i2psource_0.9.37.tar.bz2 30277506 BLAKE2B 2c0fe601b3a8967c23f00bd29aef197389039efbf1a3fc0847f819dea44f98e38b9b53b749763dccca740a50d467d5d079b0e4aad707347cc7c7a576fcc44407 SHA512 ce0d320810faaebe2926d988a40f4df968583edbc488b995a32cfd806550a8cf75d2c2397bfd9f3fd443cb462567cc2cdbf08d1de59b6806888724254faebf09
DIST i2psource_0.9.38.tar.bz2 30702106 BLAKE2B c0fd4ea21643edff06853825b9b09dbd648176b6a2318c6bb3846b7c198cac88f89525df0868affbc337e31ec3459f08235cd8a52d38b8551d235c9ef2ca4a4c SHA512 148cd1504dbf0a86367b6dc120a27b2d0d936857eb8cf524e86982d6499c5a831a40aacb3ed67570ad2c323be6545e9a66c12dfc4be2377b80f4d7152e04452d
DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
diff --git a/net-vpn/i2p/files/0.9.37-add-cp-to-tests b/net-vpn/i2p/files/0.9.37-add-cp-to-tests
deleted file mode 100644
index b8e967dd31d..00000000000
--- a/net-vpn/i2p/files/0.9.37-add-cp-to-tests
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
---- a/apps/ministreaming/java/build.xml 2018-10-04 12:05:09.000000000 +0200
-+++ b/apps/ministreaming/java/build.xml 2018-10-12 08:15:16.481532093 +0200
-@@ -194,6 +194,7 @@
- includeAntRuntime="false"
- destdir="./build/obj" >
- <classpath>
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="../../../core/java/build/i2p.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
- <pathelement location="${hamcrest.home}/hamcrest.jar" />
-diff -Naur a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
---- a/apps/streaming/java/build.xml 2018-10-04 12:05:09.000000000 +0200
-+++ b/apps/streaming/java/build.xml 2018-10-12 11:17:22.814404049 +0200
-@@ -62,6 +62,7 @@
- includeAntRuntime="false"
- destdir="./build/obj" >
- <classpath>
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="../../../core/java/build/i2p.jar" />
- <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
-diff -Naur a/router/java/build.xml b/router/java/build.xml
---- a/router/java/build.xml 2018-10-04 12:05:14.000000000 +0200
-+++ b/router/java/build.xml 2018-10-12 08:14:52.921530213 +0200
-@@ -162,6 +162,7 @@
- includeAntRuntime="true"
- destdir="./build/obj">
- <classpath>
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
diff --git a/net-vpn/i2p/i2p-0.9.36.ebuild b/net-vpn/i2p/i2p-0.9.36.ebuild
deleted file mode 100644
index 5bedf3debbf..00000000000
--- a/net-vpn/i2p/i2p-0.9.36.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit java-pkg-2 java-ant-2 multilib 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:*
- nls? ( >=sys-devel/gettext-0.19 )
- >=virtual/jdk-1.7"
-
-RDEPEND="${CP_DEPEND}
- ecdsa? (
- || (
- dev-java/icedtea:8[-sunec]
- dev-java/icedtea-bin:8
- dev-java/oracle-jre-bin
- dev-java/oracle-jdk-bin
- )
- )
- !ecdsa? ( >=virtual/jre-1.7 )
- net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-JAVA_ANT_ENCODING="UTF-8"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- enewgroup i2p
- enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
-}
-
-src_prepare() {
- # as early as possible to allow generic patches to be applied
- default
-
- java-ant_rewrite-classpath
-
- 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|' \
- 'installer/resources/clients.config' || die
-
- # generate wrapper classpath, keeping the default to be replaced later
- i2p_cp='' # global forced by java-pkg_gen-cp
- java-pkg_gen-cp i2p_cp
- local lib cp i=2
- for lib in ${i2p_cp//,/ }
- do
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
- done
-
- # add generated cp and hardcode system VM
- sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
- -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
- -i 'installer/resources/wrapper.config' || die
-
- # replace paths as the installer would
- sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
- -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
- -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
- -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
-}
-
-src_install() {
- # cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # we remove system installed jar and install the others
- rm lib/{jrobin.jar,wrapper.jar,jbigi.jar} || \
- die 'unable to remove locally built jar already found in system'
- java-pkg_dojar lib/*.jar
-
- # create own launcher
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
- # Install main files and basic documentation
- insinto '/usr/share/i2p'
- doins blocklist.txt hosts.txt *.config
- dodoc history.txt INSTALL-headless.txt LICENSE.txt
- doman man/*
-
- # Install other directories
- doins -r certificates docs eepsite geoip scripts
- java-pkg_dowar webapps/*.war
-
- # Install daemon files
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
-
- # setup user
- keepdir '/var/lib/i2p/.i2p'
- fowners i2p:i2p '/var/lib/i2p/.i2p'
-}
-
-pkg_postinst() {
- elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p 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
-}
diff --git a/net-vpn/i2p/i2p-0.9.37.ebuild b/net-vpn/i2p/i2p-0.9.37.ebuild
deleted file mode 100644
index b12699fa669..00000000000
--- a/net-vpn/i2p/i2p-0.9.37.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit 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 test"
-
-# 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
- dev-java/commons-logging:0
- dev-java/slf4j-simple:0
- java-virtuals/servlet-api:3.1
-'
-
-DEPEND="${CP_DEPEND}
- dev-java/eclipse-ecj:*
- nls? ( >=sys-devel/gettext-0.19 )
- virtual/jdk:1.8
- test? (
- dev-java/ant-junit4:0
- dev-java/hamcrest-core:1.3
- dev-java/hamcrest-library:1.3
- dev-java/junit:4
- )
-"
-
-RDEPEND="${CP_DEPEND}
- ecdsa? (
- || (
- dev-java/icedtea:8[-sunec]
- dev-java/icedtea-bin:8
- dev-java/oracle-jre-bin
- dev-java/oracle-jdk-bin
- )
- )
- !ecdsa? ( virtual/jre:1.8 )
- net-libs/nativebiginteger:0
-"
-
-EANT_BUILD_TARGET="pkg"
-# no scala as depending on antlib.xml not installed by dev-lang/scala
-EANT_TEST_TARGET='junit.test'
-JAVA_ANT_ENCODING="UTF-8"
-
-PATCHES=(
- "${FILESDIR}/${PV}-add-cp-to-tests"
-)
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-
- enewgroup i2p
- enewuser i2p -1 -1 "${EPREFIX}/var/lib/i2p" i2p
-}
-
-src_prepare() {
- # as early as possible to allow generic patches to be applied
- default
-
- java-ant_rewrite-classpath
-
- 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|' \
- 'installer/resources/clients.config' || die
-
- # generate wrapper classpath, keeping the default to be replaced later
- i2p_cp='' # global forced by java-pkg_gen-cp
- java-pkg_gen-cp i2p_cp
- local lib cp i=2
- for lib in ${i2p_cp//,/ }
- do
- cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
- done
-
- # add generated cp and hardcode system VM
- sed -e "s|\(wrapper\.java\.classpath\.1=.*\)|\1\n${cp}|" \
- -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
- -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/lib/java-service-wrapper|" \
- -e "s|\(wrapper\.java\.library\.path\.2\)=.*|\0\nwrapper.java.library.path.3=/usr/$(get_libdir)|" \
- -i 'installer/resources/wrapper.config' || die
-
- # replace paths as the installer would
- sed -e "s|[\$%]INSTALL_PATH|${EPREFIX}/usr/share/i2p|" \
- -e "s|%SYSTEM_java_io_tmpdir|${EPREFIX}/var/lib/i2p/.i2p|" \
- -e "s|%USER_HOME|${EPREFIX}/var/lib/i2p|" \
- -i 'installer/resources/'{eepget,runplain.sh,wrapper.config} || die
-
- if use test; then
- # no *streaming as requiring >dev-java/mockito-1.9.5
- sed -e '/junit\.test.*streaming/d' \
- -i build.xml ||
- die 'unable to remove ministreaming tests'
- fi
-}
-
-src_test() {
- # store built version of jars, overwritten by testing
- mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
- die 'unable to save jars before tests'
-
- # generate test classpath
- local cp
- cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
- EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
-
- # redo work undone by testing
- mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
- die 'unable to restore jars after tests'
-}
-
-src_install() {
- # cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # we remove system installed jar and install the others
- rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
- die 'unable to remove locally built jar already found in system'
- java-pkg_dojar lib/*.jar
-
- # create own launcher
- java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
-
- # Install main files and basic documentation
- insinto '/usr/share/i2p'
- doins blocklist.txt hosts.txt *.config
- dodoc history.txt INSTALL-headless.txt LICENSE.txt
- doman man/*
-
- # Install other directories
- doins -r certificates docs eepsite geoip scripts
- java-pkg_dowar webapps/*.war
-
- # Install daemon files
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
-
- # setup user
- keepdir '/var/lib/i2p/.i2p'
- fowners i2p:i2p '/var/lib/i2p/.i2p'
-}
-
-pkg_postinst() {
- elog "Custom configuration belongs in ${EPREFIX}/var/lib/i2p/.i2p 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
-}
diff --git a/net-vpn/i2p/metadata.xml b/net-vpn/i2p/metadata.xml
index 71d052d100f..47d301c7bc1 100644
--- a/net-vpn/i2p/metadata.xml
+++ b/net-vpn/i2p/metadata.xml
@@ -15,7 +15,6 @@
</maintainer>
<longdescription>I2P is an anonymous network, exposing a simple layer that applications can use to anonymously and securely send messages to each other.</longdescription>
<use>
- <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>
<flag name="nls">Adds Native Language Support using GNU gettext.</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2019-11-13 6:03 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2019-11-13 6:03 UTC (permalink / raw
To: gentoo-commits
commit: 297bc664c5e11bf178ff894e1a68f751de9b8c0c
Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Aug 23 19:12:16 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 05:46:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297bc664
net-vpn/i2p: bump to 0.9.42
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-vpn/i2p/Manifest | 1 +
net-vpn/i2p/files/i2p.init | 8 +-
net-vpn/i2p/i2p-0.9.42.ebuild | 213 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 217 insertions(+), 5 deletions(-)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 5220fda265b..12d424f1f91 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
DIST i2psource_0.9.39.tar.bz2 30518064 BLAKE2B da5f4f74db38e932a8d1504dd454f308b6a47e0b308ecb646aafc349c20696d5f18107b393a7a5c3e5a7a24c1f2463657ede1ae6629023d9f817cc5bf0b00d85 SHA512 03ae294a2dbb1c7267484e8b0700ea112820e767ce7e90bc50dc90a1ed621586bd507c6ea80ba177d3498c0959fc1c9d71b51821d527fa48c34847ffbf5c466c
DIST i2psource_0.9.40.tar.bz2 30808508 BLAKE2B b4b81800c4fdcd1c9318e884d6a06f442c28cc902c1aa67a35343b3d61cf95a02186b8e56e455d3896de081d44fd9fa7c2fac1f21f176be3c0b1ca473b6416fa SHA512 297b0bf92405c6e564c5e8c9708bf5b99b8eac721cec04fc74bebac1ff0cd7eae2795cc9788357fb7a9c60d7af37766ae343456203a81b9c2444cda39f3fe46d
+DIST i2psource_0.9.42.tar.bz2 31523717 BLAKE2B 7f110f282a91fa0de700bfaee95968bb534f6f2c7d097c2d70fc9e6bda3ac583762b6b974b38b5947b15a77f91a8d595c957b35838456280236cd88c25d3d47b SHA512 bf8d83c1b1607f5ecf16d33d16cc760eb982d65ef0f89ebd5c61208a38a23f08f465e04889b8ef1d05df4d02a095d85a80077a5b10253d96023f056d01efacef
diff --git a/net-vpn/i2p/files/i2p.init b/net-vpn/i2p/files/i2p.init
index bbc73b47005..eb901676bd4 100644
--- a/net-vpn/i2p/files/i2p.init
+++ b/net-vpn/i2p/files/i2p.init
@@ -6,14 +6,12 @@ depend() {
need net
}
-CONFIG_PATH="/var/lib/i2p/.i2p"
-INSTALL_PATH="/usr/share/i2p"
-WRAPPER_CONF="$INSTALL_PATH/wrapper.config"
+readonly WRAPPER_CONF="/usr/share/i2p/wrapper.config"
command=wrapper
-command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p wrapper.logfile=$CONFIG_PATH/wrapper.log"
+command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p"
command_background=true
command_progress=true
command_user=i2p
-pidfile="/var/run/i2p.pid"
+pidfile=/var/run/i2p.pid
retry='SIGTERM/20 SIGKILL/20'
diff --git a/net-vpn/i2p/i2p-0.9.42.ebuild b/net-vpn/i2p/i2p-0.9.42.ebuild
new file mode 100644
index 00000000000..01cba74bdfb
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.42.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2 systemd
+
+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="nls test"
+RESTRICT="!test? ( test )"
+
+# 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
+ dev-java/commons-logging:0
+ dev-java/slf4j-simple:0
+ java-virtuals/servlet-api:3.1
+"
+
+DEPEND="${CP_DEPEND}
+ dev-java/eclipse-ecj:*
+ nls? ( >=sys-devel/gettext-0.19 )
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ acct-user/i2p
+ acct-group/i2p
+ virtual/jre:1.8
+ net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+
+src_prepare() {
+ # as early as possible to allow generic patches to be applied
+ default
+
+ java-ant_rewrite-classpath
+
+ 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|" \
+ "installer/resources/clients.config" || die
+
+ # generate wrapper classpath, keeping the default to be replaced later
+ i2p_cp="" # global forced by java-pkg_gen-cp
+ java-pkg_gen-cp i2p_cp
+ local lib i=2
+ local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
+ for lib in ${i2p_cp//,/ }
+ do
+ cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+ done
+
+ # add generated cp, hardcode system VM, setting system's conf
+ sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \
+ -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+ -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
+ -e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
+ -e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
+ -e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
+ -e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
+ -i installer/resources/wrapper.config ||
+ die "unable to apply gentoo config"
+ local prop i=2
+ for prop in \
+ "i2p.dir.base=${EPREFIX}/usr/share/i2p" \
+ "i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
+ "i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
+ "i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
+ "i2p.dir.log=${EPREFIX}/var/log/i2p" \
+ "i2p.dir.pid=${EPREFIX}/tmp" \
+ "i2p.dir.temp=${EPREFIX}/tmp"
+ do
+ echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
+ die "unable to apply gentoo config"
+ done
+
+ if use test; then
+ # no *streaming as requiring >dev-java/mockito-1.9.5
+ sed -e "/junit\.test.*streaming/d" \
+ -i build.xml ||
+ die "unable to remove ministreaming tests"
+ fi
+}
+
+src_test() {
+ # store built version of jars, overwritten by testing
+ mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+ die "unable to save jars before tests"
+
+ # generate test classpath
+ local cp
+ cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
+ EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
+
+ # redo work undone by testing
+ mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+ die "unable to restore jars after tests"
+}
+
+src_install() {
+ # cd into pkg-temp.
+ cd "${S}/pkg-temp" || die
+
+ # we remove system installed jar and install the others
+ rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+ die "unable to remove locally built jar already found in system"
+ java-pkg_dojar lib/*.jar
+
+ # create own launcher
+ java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+ # Install main files and basic documentation
+ insinto "/usr/share/i2p"
+ doins blocklist.txt hosts.txt *.config
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt
+ doman man/*
+
+ # Install other directories
+ doins -r certificates docs eepsite geoip scripts
+ java-pkg_dowar webapps/*.war
+
+ # Install daemon files
+ newinitd "${FILESDIR}/i2p.init" i2p
+ systemd_dounit "${FILESDIR}/i2p.service"
+
+ # setup log
+ keepdir /var/log/i2p
+ fowners i2p:i2p /var/log/i2p
+
+ # setup user
+ keepdir /var/lib/i2p
+ keepdir /var/lib/i2p/app
+ keepdir /var/lib/i2p/router
+ keepdir /var/lib/i2p/config
+ fowners i2p:i2p /var/lib/i2p
+}
+
+pkg_postinst() {
+ local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
+
+ [ -e "${old_i2pdir}" ] || return
+
+ elog "User is now delegated to acct-user, ${new_i2pdir} is split"
+ elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
+
+ migrate() {
+ local dest="${1}"
+ shift
+
+ local ret=true
+ for src
+ do
+ [ -e "${src}" ] || continue
+ mv "${src}" "${dest}" || ret=false
+ done
+
+ $ret
+ }
+
+ ebegin "Migrating"
+ local ret=0
+ chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
+ migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
+ migrate "${new_i2pdir}/config" \
+ "${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
+ ret=1
+ migrate "${new_i2pdir}/router" \
+ "${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
+ ret=1
+ migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
+ ret=1
+ rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
+ rmdir "${old_i2pdir}" || ret=1
+
+ if ! eend $ret
+ then
+ ewarn "There was some file remaining in ${old_i2pdir}."
+ ewarn "Please check it there is something of value there."
+ ewarn "remove it when migration is done."
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2020-09-13 0:44 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2020-09-13 0:44 UTC (permalink / raw
To: gentoo-commits
commit: f6dacb7a6f9a04445313879ccd2a318613dcd28b
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Aug 31 22:57:40 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 00:43:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dacb7a
net-vpn/i2p: bump to 0.9.47
Closes: https://bugs.gentoo.org/735624
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-vpn/i2p/Manifest | 1 +
...47-DataHelper-decompress-fix-length-check.patch | 25 +++
net-vpn/i2p/i2p-0.9.47.ebuild | 214 +++++++++++++++++++++
3 files changed, 240 insertions(+)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index 21a9f3ef153..205dfbe00af 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
DIST i2psource_0.9.44.tar.bz2 32016076 BLAKE2B 5803935cdebd18af48c4f00232cbbae02979c5ccebb68a4bddeb9cf60b6d02b734b72075ac7f9a57713f48cfd2bc0d14598e35df4ff7cdd590be57c68f5737b4 SHA512 a98129dde7d467e77ee37d16f9add3a0a4e602da84e1133c1b4b787133f185ad834cb1c52857e54946e424bd73a56200e48d6cd96856c87c748f53ca26af922e
DIST i2psource_0.9.45.tar.bz2 31921025 BLAKE2B 2d37777f77784ff93de4d7442eddf46b9a541902412bf5fb24cf96baba73851cc17d01649a7b4b41a710ccde5690036a890b8f84de00f4c615ed2e23da8fa510 SHA512 d4cf354f0a807d132fae75d4bad3e2e788e1ed03d6f625feb0f1369bb2c9e1a6e2758645acf2017c61dbc47d75e6d834b87455adbead1077f206025686548ae9
+DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
diff --git a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
new file mode 100644
index 00000000000..b728cc28cb1
--- /dev/null
+++ b/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
@@ -0,0 +1,25 @@
+# from https://trac.i2p2.de/ticket/2770
+From ceb0749e0d5c3c496b4a91bc3a9d3b5e296fc456 Mon Sep 17 00:00:00 2001
+From: zzz <zzz@mail.i2p>
+Date: Wed, 2 Sep 2020 15:57:04 +0000
+Subject: [PATCH] Util: Fix decompression of compressed zero bytes (ticket
+ #2770)
+
+---
+ core/java/src/net/i2p/data/DataHelper.java | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
+index aaa47797c3..39f766e6fa 100644
+--- a/core/java/src/net/i2p/data/DataHelper.java
++++ b/core/java/src/net/i2p/data/DataHelper.java
+@@ -1902,7 +1902,8 @@ public static String unescapeHTML(String escaped) {
+ */
+ public static byte[] decompress(byte orig[], int offset, int length) throws IOException {
+ if (orig == null) return orig;
+- if (length < 23)
++ // normal overhead is 23 bytes, but a compress of zero bytes is 20 bytes
++ if (length < 20)
+ throw new IOException("length");
+ if (length < 65559 && orig[offset + 10] == 0x01)
+ return zeroDecompress(orig, offset, length);
diff --git a/net-vpn/i2p/i2p-0.9.47.ebuild b/net-vpn/i2p/i2p-0.9.47.ebuild
new file mode 100644
index 00000000000..a775e06556d
--- /dev/null
+++ b/net-vpn/i2p/i2p-0.9.47.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2 systemd
+
+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="nls test"
+RESTRICT="!test? ( test )"
+
+# 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
+ dev-java/commons-logging:0
+ dev-java/slf4j-simple:0
+ java-virtuals/servlet-api:3.1
+"
+
+DEPEND="${CP_DEPEND}
+ dev-java/eclipse-ecj:*
+ nls? ( >=sys-devel/gettext-0.19 )
+ virtual/jdk:1.8
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/hamcrest-core:1.3
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )
+"
+
+RDEPEND="${CP_DEPEND}
+ acct-user/i2p
+ acct-group/i2p
+ virtual/jre:1.8
+ net-libs/nativebiginteger:0
+"
+
+EANT_BUILD_TARGET="pkg"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+
+PATCHES=(
+ "${FILESDIR}/${P}-DataHelper-decompress-fix-length-check.patch"
+)
+
+src_prepare() {
+ if use test; then
+ # no *streaming as requiring >dev-java/mockito-1.9.5
+ sed -e "/streaming.*junit\.test/d" \
+ -i build.xml ||
+ die "unable to remove ministreaming tests"
+ fi
+
+ # as early as possible to allow generic patches to be applied
+ default
+
+ java-ant_rewrite-classpath
+
+ 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|" \
+ "installer/resources/clients.config" || die
+
+ # generate wrapper classpath, keeping the default to be replaced later
+ i2p_cp="" # global forced by java-pkg_gen-cp
+ java-pkg_gen-cp i2p_cp
+ local lib i=2
+ local cp="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
+ for lib in ${i2p_cp//,/ }
+ do
+ cp+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
+ done
+
+ # add generated cp, hardcode system VM, setting system's conf
+ sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${cp}|" \
+ -e "s|\(wrapper\.java\.command\)=.*|\1=/etc/java-config-2/current-system-vm/bin/java|" \
+ -e "s|\(wrapper\.java\.library\.path\.1\)=.*|\1=/usr/$(get_libdir)/java-service-wrapper|" \
+ -e "s|\(wrapper\.java\.library\.path\)\.2=.*|\1.2=${EPREFIX}/usr/share/i2p/lib\n\1.3=/usr/$(get_libdir)|" \
+ -e "s|\(wrapper\.java\.additional\.1=-DloggerFilenameOverride\)=.*|\1=${EPREFIX}/var/log/i2p/router-@|" \
+ -e "s|\(wrapper\.logfile\)=.*|\1=${EPREFIX}/var/log/i2p/wrapper|" \
+ -e "/wrapper\.java\.additional\.2\(\.stripquote\|\)/d" \
+ -i installer/resources/wrapper.config ||
+ die "unable to apply gentoo config"
+ local prop i=2
+ for prop in \
+ "i2p.dir.base=${EPREFIX}/usr/share/i2p" \
+ "i2p.dir.app=${EPREFIX}/var/lib/i2p/app" \
+ "i2p.dir.config=${EPREFIX}/var/lib/i2p/config" \
+ "i2p.dir.router=${EPREFIX}/var/lib/i2p/router" \
+ "i2p.dir.log=${EPREFIX}/var/log/i2p" \
+ "i2p.dir.pid=${EPREFIX}/tmp" \
+ "i2p.dir.temp=${EPREFIX}/tmp"
+ do
+ echo "wrapper.java.additional.$((i++))=-D$prop" >> installer/resources/wrapper.config ||
+ die "unable to apply gentoo config"
+ done
+}
+
+src_test() {
+ # store built version of jars, overwritten by testing
+ mv "${S}/pkg-temp/lib/"{i2p,router}.jar "${T}" ||
+ die "unable to save jars before tests"
+
+ # generate test classpath
+ local cp
+ cp="$(java-pkg_getjars --build-only junit-4,hamcrest-core-1.3,hamcrest-library-1.3)"
+ EANT_TEST_EXTRA_ARGS="-Djavac.classpath=${cp}" java-pkg-2_src_test
+
+ # redo work undone by testing
+ mv "${T}/"{i2p,router}.jar "${S}/pkg-temp/lib/" ||
+ die "unable to restore jars after tests"
+}
+
+src_install() {
+ # cd into pkg-temp.
+ cd "${S}/pkg-temp" || die
+
+ # we remove system installed jar and install the others
+ rm lib/{jrobin,wrapper,jbigi,commons-logging,javax.servlet}.jar || \
+ die "unable to remove locally built jar already found in system"
+ java-pkg_dojar lib/*.jar
+
+ # create own launcher
+ java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+
+ # Install main files and basic documentation
+ insinto "/usr/share/i2p"
+ doins blocklist.txt hosts.txt *.config
+ dodoc history.txt INSTALL-headless.txt LICENSE.txt
+ doman man/*
+
+ # Install other directories
+ doins -r certificates docs eepsite geoip scripts
+ java-pkg_dowar webapps/*.war
+
+ # Install daemon files
+ newinitd "${FILESDIR}/i2p.init" i2p
+ systemd_dounit "${FILESDIR}/i2p.service"
+
+ # setup log
+ keepdir /var/log/i2p
+ fowners i2p:i2p /var/log/i2p
+
+ # setup user
+ keepdir /var/lib/i2p
+ fowners i2p:i2p /var/lib/i2p
+}
+
+pkg_postinst() {
+ local old_i2pdir="${EPREFIX}/var/lib/i2p/.i2p" new_i2pdir="${EPREFIX}/var/lib/i2p"
+
+ [ -e "${old_i2pdir}" ] || return
+
+ elog "User is now delegated to acct-user, ${new_i2pdir} is split"
+ elog "into subdirs. It will now try to split ${old_i2pdir} accordingly."
+
+ migrate() {
+ local dest="${1}"
+ shift
+
+ local ret=true
+ for src
+ do
+ [ -e "${src}" ] || continue
+ mv "${src}" "${dest}" || ret=false
+ done
+
+ $ret
+ }
+
+ ebegin "Migrating"
+ local ret=0
+ chown -R i2p:i2p "${EPREFIX}/var/lib/i2p" || ret=1
+ migrate "${new_i2pdir}/app" "${old_i2pdir}/i2psnark" || ret=1
+ migrate "${new_i2pdir}/config" \
+ "${old_i2pdir}/"{docs,eepsite,hosts.txt,prngseed.rnd,*.config*} ||
+ ret=1
+ migrate "${new_i2pdir}/router" \
+ "${old_i2pdir}/"{addressbook,eventlog.txt,hostsdb.blockfile,keyBackup,netDb,peerProfiles,router.*,rrd} ||
+ ret=1
+ migrate "${EPREFIX}/var/log/i2p" "${old_i2pdir}/"{logs/*,wrapper.log*} ||
+ ret=1
+ rm -fr "${old_i2pdir}/"{hostsdb.blockfile.*.corrupt,logs}
+ rmdir "${old_i2pdir}" || ret=1
+
+ if ! eend $ret
+ then
+ ewarn "There was some file remaining in ${old_i2pdir}."
+ ewarn "Please check it there is something of value there."
+ ewarn "remove it when migration is done."
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2023-05-20 9:28 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-05-20 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 916696fbb950678c7b9dc06e4c7346fe0499f609
Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Apr 14 20:01:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 09:21:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916696fb
net-vpn/i2p: revbump 1.7.0-r1
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/29290
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-vpn/i2p/files/1.7.0-i2p.init | 17 +++++++++++++++++
net-vpn/i2p/files/1.7.0-i2p.service | 10 ++++++++++
net-vpn/i2p/{i2p-1.7.0.ebuild => i2p-1.7.0-r1.ebuild} | 14 ++++----------
3 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/net-vpn/i2p/files/1.7.0-i2p.init b/net-vpn/i2p/files/1.7.0-i2p.init
new file mode 100644
index 000000000000..d59899b899e9
--- /dev/null
+++ b/net-vpn/i2p/files/1.7.0-i2p.init
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+readonly WRAPPER_CONF="/usr/share/i2p/wrapper.config"
+
+command=wrapper
+command_args="$WRAPPER_CONF wrapper.syslog.ident=i2p"
+command_background=true
+command_progress=true
+command_user=i2p
+pidfile=/var/run/i2p.pid
+retry='SIGTERM/20 SIGKILL/20'
diff --git a/net-vpn/i2p/files/1.7.0-i2p.service b/net-vpn/i2p/files/1.7.0-i2p.service
new file mode 100644
index 000000000000..87c218075a1c
--- /dev/null
+++ b/net-vpn/i2p/files/1.7.0-i2p.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Invisible Internet Project
+After=network.target
+
+[Service]
+User=i2p
+ExecStart=/usr/bin/wrapper /usr/share/i2p/wrapper.config wrapper.syslog.ident=i2p wrapper.logfile=/var/lib/i2p/.i2p/wrapper.log
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/i2p/i2p-1.7.0.ebuild b/net-vpn/i2p/i2p-1.7.0-r1.ebuild
similarity index 92%
rename from net-vpn/i2p/i2p-1.7.0.ebuild
rename to net-vpn/i2p/i2p-1.7.0-r1.ebuild
index 5914fa6ea733..16802953f72a 100644
--- a/net-vpn/i2p/i2p-1.7.0.ebuild
+++ b/net-vpn/i2p/i2p-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -69,14 +69,8 @@ src_prepare() {
installer/resources/clients.config || die
# generate wrapper classpath, keeping the default to be replaced later
- i2p_cp="" # global forced by java-pkg_gen-cp
- java-pkg_gen-cp i2p_cp
- local lib i=2
local classpath="wrapper.java.classpath.1=${EPREFIX}/usr/share/i2p/lib/*\n"
- for lib in ${i2p_cp//,/ }
- do
- classpath+="wrapper.java.classpath.$((i++))=$(java-pkg_getjars ${lib})\n"
- done
+ classpath+="wrapper.java.classpath.2=$(java-pkg_getjars java-service-wrapper)\n"
# add generated classpath, hardcode system VM, setting system's conf
sed -e "s|\(wrapper\.java\.classpath\.1\)=.*|${classpath}|" \
@@ -132,8 +126,8 @@ src_install() {
java-pkg_dowar webapps/*.war
# Install daemon files
- newinitd "${FILESDIR}/i2p.init" i2p
- systemd_dounit "${FILESDIR}/i2p.service"
+ newinitd "${FILESDIR}/${PV}-i2p.init" i2p
+ systemd_dounit "${FILESDIR}/${PV}-i2p.service"
# setup log
keepdir /var/log/i2p
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/
@ 2023-06-14 4:17 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-06-14 4:17 UTC (permalink / raw
To: gentoo-commits
commit: dd1ef40c9adf86cec9376946000accd5dcada4b0
Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sat Jun 3 16:42:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 04:16:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1ef40c
net-vpn/i2p: add 2.2.1
Closes: https://bugs.gentoo.org/906820
Bug: https://bugs.gentoo.org/906882
Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/31291
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-vpn/i2p/Manifest | 1 +
net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch | 122 ++++++++++
net-vpn/i2p/i2p-2.2.1.ebuild | 266 ++++++++++++++++++++++
3 files changed, 389 insertions(+)
diff --git a/net-vpn/i2p/Manifest b/net-vpn/i2p/Manifest
index f90387e3f132..d566fee0b1f8 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1,3 @@
DIST i2psource_1.7.0.tar.bz2 33300522 BLAKE2B dcb83477f6d066b707632f8db44bc811558b0bc52368ce992aaf14d0d21acc1fb9bce1dfa8171fca8cf3819765f0b7993ae4a2566a6f65786cca84c02ea4336a SHA512 a27c448246538f152355ecfdf781e39bf9e57b5d0f7ea139ce06d800ce3eed7fa4e375210e6545da2a75245b45282bc8d8e7453d96729f940c34daa75bdc588f
DIST i2psource_2.1.0.tar.bz2 32817295 BLAKE2B d37463522143c02e04c96d58578312b536ab5e2842e5647dbe5ba3d5c139329c447f16de7e326ef48ef4c6b3c11631e23300b5327cc31d9da5288240f86c926f SHA512 e8639c2b2869d3c7856b598d4cd3505458ed5cab5dce3570cafdaec3ccd77dbaec35787cccc6782acc75adb423b7baaab724ac3c98e5b91b41cf4c76f3614355
+DIST i2psource_2.2.1.tar.bz2 33349391 BLAKE2B 45c681fd64c638e78033efbc025f8ddd0200dd79da45d7af539f7553d792f03b9978a62dac0f4763c4589939e1b220efb13d1e4dca03c143cf3b2de31af818a9 SHA512 98ea0b86fcf879b5e4e415d106c446be73441aa03c91f3b9ac02589a332cafad1bf899d381b5986fb78efc550deceedd2da5514c46fbb70f5928d85a76be5ced
diff --git a/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch b/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
new file mode 100644
index 000000000000..95211bf9cad0
--- /dev/null
+++ b/net-vpn/i2p/files/2.2.1-fix-junit-classpath.patch
@@ -0,0 +1,122 @@
+diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
+index b8d8b24a9..cfcf2d5a1 100644
+--- a/apps/i2ptunnel/java/build.xml
++++ b/apps/i2ptunnel/java/build.xml
+@@ -465,7 +465,7 @@
+ <target name="test" depends="clean, compileTest">
+ <junit printsummary="on" fork="yes">
+ <classpath>
+- <pathelement path="${classpath}" />
++ <pathelement path="${gentoo.classpath}" />
+ <pathelement location="./build/obj" />
+ <pathelement location="../../../core/java/build/i2p.jar" />
+ </classpath>
+diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
+index 72944b25c..cef8a091f 100644
+--- a/apps/ministreaming/java/build.xml
++++ b/apps/ministreaming/java/build.xml
+@@ -310,22 +310,12 @@
+ <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
+ <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+ <classpath>
+- <pathelement path="${javac.classpath}" />
+- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+- <pathelement location="${mockito.home}/byte-buddy.jar" />
+- <pathelement location="${mockito.home}/objenesis.jar" />
+- <pathelement location="${mockito.home}/mockito-core.jar" />
+- <pathelement location="${junit.home}/junit4.jar" />
++ <pathelement path="${gentoo.classpath}" />
+ <pathelement location="./build/obj_cobertura" />
+ <pathelement location="./build/obj" />
+ <pathelement location="../../../core/java/build/i2ptest.jar" />
+ <pathelement location="../../../core/java/build/i2p.jar" />
+ <pathelement location="../../build/jbigi.jar" />
+- <pathelement location="${with.clover}" />
+- <pathelement location="${with.cobertura}" />
+ </classpath>
+ <batchtest todir="../../../reports/ministreaming/junit/">
+ <fileset dir="./test/junit">
+diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
+index ecfa0ebfd..395bc5aeb 100644
+--- a/apps/streaming/java/build.xml
++++ b/apps/streaming/java/build.xml
+@@ -126,23 +126,13 @@
+ <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
+ <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+ <classpath>
+- <pathelement path="${javac.classpath}" />
+- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+- <pathelement location="${mockito.home}/byte-buddy.jar" />
+- <pathelement location="${mockito.home}/objenesis.jar" />
+- <pathelement location="${mockito.home}/mockito-core.jar" />
+- <pathelement location="${junit.home}/junit4.jar" />
++ <pathelement path="${gentoo.classpath}" />
+ <pathelement location="./build/obj_cobertura" />
+ <pathelement location="./build/obj" />
+ <pathelement location="../../../core/java/build/i2ptest.jar" />
+ <pathelement location="../../../core/java/build/i2p.jar" />
+ <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
+ <pathelement location="../../build/jbigi.jar" />
+- <pathelement location="${with.clover}" />
+- <pathelement location="${with.cobertura}" />
+ </classpath>
+ <batchtest todir="../../../reports/streaming/junit/">
+ <fileset dir="./test/junit">
+diff --git a/core/java/build.xml b/core/java/build.xml
+index 8b36ce5f0..305ddd6ee 100644
+--- a/core/java/build.xml
++++ b/core/java/build.xml
+@@ -469,22 +469,12 @@
+ <junit printsummary="withOutAndErr" fork="yes" maxmemory="384m" showoutput="yes" >
+ <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+ <classpath>
++ <pathelement path="${gentoo.classpath}" />
+ <pathelement location="../../installer/resources/" />
+- <pathelement path="${javac.classpath.mod}" />
+- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+- <pathelement location="${mockito.home}/byte-buddy.jar" />
+- <pathelement location="${mockito.home}/objenesis.jar" />
+- <pathelement location="${mockito.home}/mockito-core.jar" />
+- <pathelement location="${junit.home}/junit4.jar" />
+ <pathelement location="./build/obj_cobertura" />
+ <pathelement location="./build/obj" />
+ <pathelement location="./test/resources" />
+ <pathelement location="../../build/jbigi.jar" />
+- <pathelement location="${with.clover}" />
+- <pathelement location="${with.cobertura}" />
+ </classpath>
+ <batchtest todir="../../reports/core/junit/">
+ <fileset dir="./test/junit/">
+diff --git a/router/java/build.xml b/router/java/build.xml
+index 4b0cedf2b..0385926ac 100644
+--- a/router/java/build.xml
++++ b/router/java/build.xml
+@@ -419,18 +419,11 @@
+ <junit printsummary="withOutAndErr" fork="yes" showoutput="yes" >
+ <sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
+ <classpath>
+- <pathelement path="${javac.classpath}" />
+- <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
+- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
+- <pathelement location="${junit.home}/junit4.jar" />
++ <pathelement path="${gentoo.classpath}" />
+ <pathelement location="./build/obj_cobertura" />
+ <pathelement location="./build/obj" />
+ <pathelement location="../../core/java/build/i2ptest.jar" />
+ <pathelement location="../../build/jbigi.jar" />
+- <pathelement location="${with.clover}" />
+- <pathelement location="${with.cobertura}" />
+ </classpath>
+ <batchtest todir="../../reports/router/junit/">
+ <fileset dir="./test/junit">
diff --git a/net-vpn/i2p/i2p-2.2.1.ebuild b/net-vpn/i2p/i2p-2.2.1.ebuild
new file mode 100644
index 000000000000..e665690f55bf
--- /dev/null
+++ b/net-vpn/i2p/i2p-2.2.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2 systemd toolchain-funcs
+
+DESCRIPTION="A privacy-centric, anonymous network"
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://files.i2p-projekt.de/${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"
+
+KEYWORDS="~amd64 ~x86"
+LANGS=(
+ ar az bg ca cs da de el en es es-AR et fa fi fr gl he hi hr hu id it ja ko ku mg nb nl nn pl pt pt-BR ro ru sk sl sq
+ sr sv tk tr uk vi zh zh-TW
+)
+IUSE="${LANGS[@]/#/l10n_}"
+
+CP_DEPEND="
+ dev-java/bcprov:0
+ dev-java/hashcash:1
+ dev-java/httpcomponents-client:4
+ dev-java/identicon:1
+ dev-java/java-getopt:1
+ dev-java/java-service-wrapper:0
+ dev-java/jbcrypt:0
+ dev-java/json-simple:2.3
+ dev-java/json-smart:1
+ dev-java/jsonrpc2-base:1
+ dev-java/jsonrpc2-server:1
+ dev-java/jstl:0
+ dev-java/jstl-api:0
+ dev-java/minidns-core:1
+ dev-java/zxing-core:3
+ dev-java/zxing-javase:3
+ sys-devel/gettext:0[java]
+ >=www-servers/tomcat-9.0.73:9
+"
+DEPEND="
+ dev-libs/gmp:0=
+ ${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/hamcrest:0
+ dev-java/junit:4
+ dev-java/mockito:4
+ )
+"
+RDEPEND="
+ ${CP_DEPEND}
+ acct-user/i2p
+ acct-group/i2p
+ >=virtual/jre-1.8:*
+"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-fix-junit-classpath.patch"
+)
+
+EANT_BUILD_TARGET="preppkg-base"
+# no scala as depending on antlib.xml not installed by dev-lang/scala
+EANT_TEST_TARGET="junit.test"
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_CLASSPATH_TAGS="javac java"
+# built locally
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/core/java/build/i2p.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/router/java/build/router.jar"
+EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/apps/ministreaming/java/build/mstreaming.jar"
+
+DOCS=( README.md history.txt )
+
+pkg_pretend() {
+ # see https://bugs.gentoo.org/831290
+ if [[ "`java-config --show-active-vm`" = *-8 ]] &&
+ [[ "`java-config --query MERGE_VM --package=ant-core`" != *-8 ]]
+ then
+ eerror "dev-java/ant-core was emerged with a newer version of the JDK."
+ eerror "It will fail to build with virtual/jdk:1.8 due to #831290."
+ eerror "Please switch to a newer JDK"
+ eerror " eselect java-vm set system ..."
+ eerror "Or remerge dev-java/ant-core with virtual/jdk:1.8"
+ eerror " emerge dev-java/ant-core"
+ die 'bad JDK for ant-core'
+ fi
+}
+
+src_prepare() {
+ default # apply PATCHES
+ java-pkg-2_src_prepare
+
+ # add our classpath
+ for f in `find -name build.xml`
+ do
+ java-ant_rewrite-classpath "$f"
+ done
+
+ # remove most bundled
+ # apps/addressbook/java/src/net/metanotion too much code drift
+ # apps/i2psnark/java/src/org/klomp/snark too much code drift
+ # apps/jrobin need rrd4j ebuild
+ # apps/routerconsole/java/src/{com,edu} too much code drift
+ # {core,router}/java/src/com/southernstorm/noise use internal symbols
+ # core/java/src/freenet too much code drift
+ # core/java/src/gnu/crypto too much code drift
+ # router/java/src/com/maxmind changed interface
+ # router/java/src/org/cybergarage unable to find version 3
+ # router/java/src/org/freenetproject too big to pull
+ # router/java/src/org/xlattice changed interface
+ java-pkg_clean ! \
+ -path "./apps/jetty/jetty-distribution-*" # need to package jetty
+ ( cat >> override.properties || die 'set unbundled properties' ) <<- EOF
+ require.gettext=true
+ with-libgetopt-java=true
+ with-libjakarta-taglibs-standard-java=true
+ with-libjson-simple-java=true
+ with-libtomcat9-java=true
+ with-gettext-base=true
+ # with-geoip-database=true need std geoip use
+ # with-libjetty9-java=true needs a jetty ebuild
+ EOF
+
+ # bcprov
+ rm -r core/java/src/net/i2p/crypto/elgamal || die 'unbundle bcprov'
+ sed -e 's,net\.i2p\.crypto\.elgamal\.impl,org.bouncycastle.jce.provider,' \
+ -e 's,net\.i2p\.crypto\.elgamal\.spec,org.bouncycastle.jce.spec,' \
+ -i core/java/src/net/i2p/crypto/{provider/I2PProvider,CryptoConstants}.java ||
+ die 'redirect imports of bcprov'
+ # getopt, gettext
+ rm -r core/java/src/gnu/{getopt,gettext} || die 'unbundle GNU code'
+ # httpcomponents-client
+ rm -r core/java/src/net/i2p/apache || die 'unbundle httpcomponents-client'
+ sed -e 's,net\.i2p\.apache,org.apache,' \
+ -i core/java/src/net/i2p/util/{Addresses,I2PSSLSocketFactory}.java \
+ apps/i2pcontrol/java/net/i2p/i2pcontrol/HostCheckHandler.java ||
+ die 'redirect imports of httpcomponents-client'
+ # identicon, zxing
+ rm -r apps/imagegen/{identicon,zxing} || die 'unbundle identicon & zxing'
+ sed -e '/LICENSE-Identicon.txt/d' -i build.xml &&
+ sed -E '/dir="[^"]*(identicon|zxing)/d' -i apps/imagegen{/imagegen,}/build.xml &&
+ sed -E '/(todir="build\/WEB-INF\/classes"|<\/copy>)/d' -i apps/imagegen/imagegen/build.xml ||
+ die 'do not depend on unbundled'
+ # hashcash
+ rm core/java/src/com/nettgryppa/security/HashCash.java ||
+ die 'unbundle hashcash'
+ # jbcrypt, jsonrpc2-*
+ rm -r apps/i2pcontrol/java/{com,org} || die 'unbundle jbcrypt & jsonrpc2-*'
+ # jstl*
+ sed -E '/"apps\/susidns\/src\/lib\/(jstl|standard).jar"/d' -i build.xml ||
+ die 'unbundle jstl*'
+ # minidns-core, json-simple
+ rm -r core/java/src/org || die 'unbundle minidns-core & json-simple'
+
+ # keep only enabled locales
+ local lang
+ for lang in ${LANGS[@]}
+ do
+ if ! use "l10n_${lang}"
+ then
+ find -regextype egrep \
+ -regex ".*[_\\./]${lang/-/_}.(html|po|1)" \
+ -delete || die "unbundling ${lang} translations"
+ fi
+ done
+
+ # fix some locale names
+ find -name '*_in.*' -exec rename --no-overwrite _in. _id. {} \; &&
+ find -name '*_iw.*' -exec rename --no-overwrite _iw. _he. {} \; ||
+ die 'fix some locale names'
+}
+
+src_configure() {
+ java-ant-2_src_configure
+
+ # deamon shouldn't start GUI
+ sed -i 's|\(clientApp.4.startOnLoad\)=true|\1=false|' \
+ installer/resources/clients.config ||
+ die 'avoid auto starting browser'
+
+ # yep, that's us
+ echo "build.built-by=Gentoo" >> override.properties ||
+ die 'bragging failed'
+}
+
+src_compile() {
+ java-pkg-2_src_compile
+
+ local compile_lib
+ compile_lib() {
+ local name="${1}"
+ local file="${2}"
+ shift 2
+
+ "$(tc-getCC)" "${@}" ${CFLAGS} $(java-pkg_get-jni-cflags) \
+ ${LDFLAGS} -shared -fPIC "-Wl,-soname,lib${name}.so" \
+ "${file}" -o "lib${name}.so"
+ }
+
+ cd "${S}/core/c/jbigi/jbigi" || die "unable to cd to jbigi"
+ compile_lib jbigi src/jbigi.c -Iinclude -lgmp ||
+ die "unable to build jbigi"
+
+ if use amd64 || use x86; then
+ cd "${S}/core/c/jcpuid" || die "unable to cd to jcpuid"
+ compile_lib jcpuid src/jcpuid.c -Iinclude ||
+ die "unable to build jcpuid"
+ fi
+}
+
+src_test() {
+ # avoid rebuilding
+ sed -e '/<delete dir=".\/build" \/>/d' -i core/java/build.xml ||
+ die 'avoid building twice'
+
+ # halt on error
+ find -name build.xml \
+ -execdir sed -e 's/<junit /\0haltonerror="yes" /' -i {} + ||
+ die 'ensure test failures propagate'
+
+ EANT_GENTOO_CLASSPATH+=",hamcrest,junit-4,mockito-4"
+ java-pkg-2_src_test
+}
+
+src_install() {
+ # install basic documentation
+ einstalldocs
+ doman installer/resources/man/eepget.*
+
+ # install main files
+ java-pkg_doso core/c/jbigi/jbigi/libjbigi.so
+ if use amd64 || use x86; then
+ java-pkg_doso core/c/jcpuid/libjcpuid.so
+ fi
+ cd "${S}/pkg-temp" || die 'unable to change dir to built artifacts'
+ java-pkg_dojar lib/*.jar
+ java-pkg_dowar webapps/*.war
+
+ # install shared
+ insinto /usr/share/i2p
+ doins blocklist.txt hosts.txt {clients,i2p*}.config
+ doins -r certificates docs eepsite geoip scripts
+
+ # install daemons
+ newinitd "${FILESDIR}/i2p.init" i2p
+ systemd_dounit "${FILESDIR}/i2p.service"
+
+ # setup dirs
+ keepdir /var/log/i2p /var/lib/i2p
+ fowners i2p:i2p /var/lib/i2p /var/log/i2p
+
+ # create own launchers
+ java-pkg_dolauncher i2prouter --main net.i2p.router.Router --jar i2p.jar \
+ --pwd "${EPREFIX}/usr/share/i2p" \
+ --java_args "\
+ -Di2p.dir.app=${EPREFIX}/var/lib/i2p/app \
+ -Di2p.dir.config=${EPREFIX}/var/lib/i2p/config \
+ -Di2p.dir.router=${EPREFIX}/var/lib/i2p/router \
+ -Di2p.dir.log=${EPREFIX}/var/log/i2p \
+ -DloggerFilenameOverride=${EPREFIX}/var/log/i2p/router-@"
+ java-pkg_dolauncher eepget --main net.i2p.util.EepGet --jar i2p.jar
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-06-14 4:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-14 10:33 [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/, net-vpn/i2p/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-06-14 4:17 Sam James
2023-05-20 9:28 Sam James
2020-09-13 0:44 Sam James
2019-11-13 6:03 Joonas Niilola
2019-04-22 10:17 Michał Górny
2018-02-11 18:38 Michał Górny
2017-05-23 14:28 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox