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
+}
