net-p2p/i2p: version bump to 0.9.25.

This version bump also enables the ecdsa USE flag.

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
Acked-By: Valérian Rousset <tharvik@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/1123
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Matthew Brewer
2016-03-26 18:58:04 +00:00
committed by Patrice Clement
parent 47500b64f0
commit 1c4e83ecab
5 changed files with 216 additions and 1 deletions
+1
View File
@@ -1,3 +1,4 @@
DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971
DIST i2psource_0.9.23.tar.bz2 24427211 SHA256 24e303f2af1b7b14ed3a6e17cc7d1b6432ec99d8d00246a88486922941c72345 SHA512 1697ee03c5b09c7653f4e30e976062908e0c0ece7ee9651979384fce0d5c887d7cfbd841522d31203f23d7f5dc97d8f8ef238784199b22fe5452299587038f82 WHIRLPOOL a2141b8d9d5f8b552e354678294364bedde9cef5aa39aa95a06dbe19f5f7996b6d5eb0e1b43ad8ce5c2f9e20dc4dda792b994004a95ea1dc83c5541f46de5b89
DIST i2psource_0.9.24.tar.bz2 24468215 SHA256 134481ae5ef934a411545330d1b22e768189c424a65db47058db0f7d9cf51e7d SHA512 9029ea06640a937385499fd308232f2c3b04308cc834e2e2491a567c47be4aa128d509b2058735cb8cf088a0b9273b418efbca05d70944ef9e95c3d15d96a47a WHIRLPOOL d7211cf46bf4bbaa54340de0dadcb255f2321d75b3d968401612c1bc0926f91f1d248e634c97c8d6948f78cd4a68c9a79ca4a65102e205a56c704a2409416cf3
DIST i2psource_0.9.25.tar.bz2 24652935 SHA256 daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236 SHA512 a50f00d9ad32993da30529339e3ffd425d5e97d5120d9e4e446f6fa7ac0cbb6ee4f35c013b0815802ff6c72e188b00d408c7fa398c8ee1ae71be57383a1411f6 WHIRLPOOL a851f6505155201d872774407dc71c9dd03a4683b3ce35d2fff74fd3f7f17d12cc1cc72dfcc2c7c4f0d82b86333bd0424066ae41330e603ba07872d56c257e27
@@ -0,0 +1,22 @@
diff -Naur a/wrapper.config b/wrapper.config
--- a/pkg-temp/wrapper.config 2016-02-07 23:19:48.714569016 +0100
+++ b/pkg-temp/wrapper.config 2016-02-07 23:20:37.523566840 +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
+36
View File
@@ -0,0 +1,36 @@
#!/sbin/runscript
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
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 $?
}
+155
View File
@@ -0,0 +1,155 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
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
CDEPEND="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="${CDEPEND}
dev-java/eclipse-ecj:*
dev-libs/gmp:*
nls? ( sys-devel/gettext )
>=virtual/jdk-1.7"
RDEPEND="${CDEPEND}
ecdsa? (
|| (
dev-java/icedtea:7[-sunec]
dev-java/icedtea:8[-sunec]
dev-java/icedtea:7[nss,-sunec]
dev-java/icedtea-bin:7[nss]
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"
EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
I2P_ROOT='/usr/share/i2p'
I2P_CONFIG_HOME='/var/lib/i2p'
I2P_CONFIG_DIR="${I2P_HOME}/.i2p"
pkg_setup() {
java-pkg-2_pkg_setup
enewgroup i2p
enewuser i2p -1 -1 "${I2P_CONFIG_HOME}" i2p -m
}
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
if ! use nls; then
echo "require.gettext=false" >> override.properties
fi
eapply_user
}
src_install() {
# add libs
eapply "${FILESDIR}/${PN}-0.9.25-add_libs.patch"
# Cd into pkg-temp.
cd "${S}/pkg-temp" || die
# avoid auto starting browser
sed -i 's|clientApp.4.startOnLoad=true|clientApp.4.startOnLoad=false|' \
clients.config || die
# replace paths as the installer would
sed -i "s|%INSTALL_PATH|${I2P_ROOT}|" \
eepget i2prouter runplain.sh || die
sed -i "s|\$INSTALL_PATH|${I2P_ROOT}|" wrapper.config || die
sed -i "s|%SYSTEM_java_io_tmpdir|${I2P_CONFIG_DIR}|" \
i2prouter runplain.sh || die
sed -i "s|%USER_HOME|${I2P_CONFIG_HOME}|" i2prouter || die
# This is ugly, but to satisfy all non-system .jar dependencies, jetty and
# systray4j would need to be packaged. The former would be too large a task
# for an unseasoned developer and systray4j hasn't been touched in over 10
# years. This seems to be the most pragmatic solution
java-pkg_jarinto "${I2P_ROOT}/lib"
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 systray4j; 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}/${PN}-0.9.25-initd" i2p
systemd_newunit "${FILESDIR}"/i2p.service i2p.service
# setup user
dodir "${I2P_CONFIG_DIR}"
fowners -R i2p:i2p "${I2P_CONFIG_DIR}"
}
pkg_postinst() {
elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten."
elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp"
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 either:'
ewarn ' dev-java/icedtea[-sunec,nss]'
ewarn ' dev-java/icedtea-bin[nss]'
ewarn ' dev-java/icedtea[-sunec] and bouncycastle (bcprov)'
ewarn ' dev-java/icedtea-bin and bouncycastle (bcprov)'
ewarn ' dev-java/oracle-jre-bin'
ewarn ' dev-java/oracle-jdk-bin'
ewarn 'Alternatively you can just use Ed25519 keys - which is a stronger algorithm anyways.'
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.'
}
+2 -1
View File
@@ -21,6 +21,7 @@
</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="nls">Adds Native Language Support using GNU gettext.</flag>
<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>