* [gentoo-commits] repo/gentoo:master commit in: net-p2p/i2p/, net-p2p/i2p/files/
@ 2015-10-19 7:28 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2015-10-19 7:28 UTC (permalink / raw
To: gentoo-commits
commit: c85acc4bd0e9f3df8690db1348db80e42a31e805
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 07:26:01 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 07:26:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c85acc4b
net-p2p/i2p: Add back version 0.9.18.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
net-p2p/i2p/Manifest | 1 +
net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch | 137 +++++++++++++++++++++
.../{i2p-0.9.22-r1.ebuild => i2p-0.9.18.ebuild} | 40 +++---
net-p2p/i2p/i2p-0.9.22-r1.ebuild | 5 +-
net-p2p/i2p/i2p-0.9.22.ebuild | 5 +-
5 files changed, 160 insertions(+), 28 deletions(-)
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index 94ddc36..7d3f2e2 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1 +1,2 @@
+DIST i2psource_0.9.18.tar.bz2 24147960 SHA256 6f02f38c933662874c485cb52ca800a9e07c36e74a26fdfeece65e25979beb4b SHA512 6cc336f94f8e4331b26d6e42958808f193ad3709ab6098981077c9390749233fb3d20df5c8fea34ec7810bc8846fd2e11ed7a79bf7c1ec68402b1ccacae999d6 WHIRLPOOL 467285b189af69b300c56756992e53979aa049515cb89ce0d5cbff80b9270c4ab1188f419dd0206b2406780b36ddde73861b5e2e69c7b2e7d8ed00b7bcaaa7a7
DIST i2psource_0.9.22.tar.bz2 24338146 SHA256 91ac91f7a3e202d248f5294f4951f6b7d8b9bde32991adf7a813ae1bb9188898 SHA512 0fdcd0369f79cc143c449774cb205d2fb4fa5ad32e0b5bd3ed0dee5b24402cc21b1c5650d535518e68aaa98cee5380bf0af041df8b3e1724698aebf61cfb5583 WHIRLPOOL bd36ce760f7a7b942651de576662b3fadbf19bbdb84a020a16783689f3ae4919bf9441762f2d951ed1c02781e62131370b5cc36cd257c187185862901454e971
diff --git a/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch
new file mode 100644
index 0000000..d1c207f
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.18_fix-paths.patch
@@ -0,0 +1,137 @@
+--- clients.config 2015-03-15 02:02:29.021408673 -0700
++++ clients.config 2015-03-15 02:24:33.460308396 -0700
+@@ -60,7 +60,7 @@
+ clientApp.4.name=Open Router Console in web browser at startup
+ clientApp.4.args=http://127.0.0.1:7657/
+ clientApp.4.delay=3
+-clientApp.4.startOnLoad=true
++clientApp.4.startOnLoad=false
+
+ # BOB bridge
+ clientApp.5.args=
+--- eepget 2015-03-15 02:02:29.078407997 -0700
++++ eepget 2015-03-15 02:17:51.441075791 -0700
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-I2P="%INSTALL_PATH"
++I2P="/usr/share/i2p"
+ java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
+--- i2prouter 2015-03-15 02:02:29.079407985 -0700
++++ i2prouter 2015-03-15 02:11:13.023194731 -0700
+@@ -28,20 +28,22 @@
+ # Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir
+ # should have been replaced by the izpack installer.
+ # If you did not run the installer, replace them with the appropriate paths.
+-I2P="%INSTALL_PATH"
++USER_HOME="$HOME"
++SYSTEM_java_io_tmpdir="$USER_HOME/.i2p"
++I2P="/usr/share/i2p"
+ if [ "`uname -s`" = "Darwin" ]; then
+- if [ -d "%USER_HOME/Library/Application Support" ]; then
+- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
++ if [ -d "$USER_HOME/Library/Application Support" ]; then
++ I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p"
+ else
+- I2P_CONFIG_DIR="%USER_HOME/.i2p"
++ I2P_CONFIG_DIR="$USER_HOME/.i2p"
+ fi
+ else
+- I2P_CONFIG_DIR="%USER_HOME/.i2p"
++ I2P_CONFIG_DIR="$USER_HOME/.i2p"
+ fi
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2PTEMP="$SYSTEM_java_io_tmpdir"
+ # PORTABLE installation:
+ # Use the following instead.
+-#I2PTEMP="%INSTALL_PATH"
++#I2PTEMP="/usr/share/i2p"
+
+ # Application
+ APP_NAME="i2p"
+--- runplain.sh 2015-03-15 02:02:29.078407997 -0700
++++ runplain.sh 2015-03-15 02:18:46.530422508 -0700
+@@ -11,8 +11,8 @@
+ # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
+ # should have been replaced by the izpack installer.
+ # If you did not run the installer, replace them with the appropriate path.
+-I2P="%INSTALL_PATH"
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2P="/usr/share/i2p"
++I2PTEMP="$SYSTEM_java_io_tmpdir"
+
+ # Having IPv6 enabled can cause problems with certain configurations. Changing the
+ # next value to true may help.
+--- wrapper.config 2015-03-15 02:02:29.022408661 -0700
++++ wrapper.config 2015-03-15 02:21:50.666238909 -0700
+@@ -60,13 +60,17 @@
+ # classes, or all the classes of i2p.jar, are in a different directory).
+ # Be sure there are no other duplicate classes.
+ #
+-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
++wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
++wrapper.java.classpath.2=/usr/share/jakarta-jstl/lib/*.jar
++wrapper.java.classpath.3=/usr/share/java-service-wrapper/lib/*.jar
++wrapper.java.classpath.4=/usr/share/bcprov/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.1=/usr/share/i2p
++wrapper.java.library.path.2=/usr/share/i2p/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
+@@ -76,7 +80,7 @@
+ wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
+ wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
+ wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
+-wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
++wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
+ wrapper.java.additional.4.stripquotes=TRUE
+
+ # On some IPv6 enabled systems, I2P and other network-enabled java applications
+@@ -96,11 +100,11 @@
+ # wrapper.java.additional.7=-Dorg.mortbay.util.FileResource.checkAliases=false
+ # PORTABLE installation:
+ # uncomment the following
+-#wrapper.java.additional.7=-Di2p.dir.pid="$INSTALL_PATH"
++#wrapper.java.additional.7=-Di2p.dir.pid="/usr/share/i2p"
+ #wrapper.java.additional.7.stripquotes=TRUE
+-#wrapper.java.additional.8=-Di2p.dir.temp="$INSTALL_PATH"
++#wrapper.java.additional.8=-Di2p.dir.temp="/usr/share/i2p"
+ #wrapper.java.additional.8.stripquotes=TRUE
+-#wrapper.java.additional.9=-Di2p.dir.config="$INSTALL_PATH"
++#wrapper.java.additional.9=-Di2p.dir.config="/usr/share/i2p"
+ #wrapper.java.additional.9.stripquotes=TRUE
+ #
+ # Uncomment this for better performance.
+@@ -147,7 +151,7 @@
+ # PORTABLE installation:
+ # Use the following instead. I2P will find the logfile here,
+ # no need for a wrapper.java.additional line too.
+-#wrapper.logfile=$INSTALL_PATH/wrapper.log
++#wrapper.logfile=/usr/share/i2p/wrapper.log
+
+ # Format of output for the log file.
+ # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
+@@ -220,7 +224,7 @@
+ #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
+ # PORTABLE installation:
+ # Use the following instead.
+-#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
++#wrapper.java.pidfile=/usr/share/i2p/routerjvm.pid
+ # pid file for the service monitoring the JVM
+ #
+ # From i2prouter:
+@@ -238,7 +242,7 @@
+ #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
+ # PORTABLE installation:
+ # Use the following instead.
+-#wrapper.pidfile=$INSTALL_PATH/i2p.pid
++#wrapper.pidfile=/usr/share/i2p/i2p.pid
+
+ #********************************************************************
+ # Wrapper General Properties
diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.18.ebuild
similarity index 81%
copy from net-p2p/i2p/i2p-0.9.22-r1.ebuild
copy to net-p2p/i2p/i2p-0.9.18.ebuild
index 879f632..c675496 100644
--- a/net-p2p/i2p/i2p-0.9.22-r1.ebuild
+++ b/net-p2p/i2p/i2p-0.9.18.ebuild
@@ -12,27 +12,23 @@ 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"
+KEYWORDS=""
IUSE="nls"
-
# dev-java/ant-core is automatically added due to java-ant-2.eclass
-CDEPEND="dev-java/jrobin:0
- dev-java/slf4j-api:0
- dev-java/java-service-wrapper:0"
-
-DEPEND="${CDEPEND}
- dev-java/eclipse-ecj:*
- dev-libs/gmp:*
- nls? ( sys-devel/gettext )
- >=virtual/jdk-1.6"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+DEPEND=">=dev-java/bcprov-1.50
+ dev-java/eclipse-ecj:*
+ dev-java/jakarta-jstl
+ dev-java/java-service-wrapper
+ dev-java/jrobin
+ dev-java/slf4j-api
+ dev-libs/gmp:*
+ nls? ( sys-devel/gettext )
+ >=virtual/jdk-1.6:="
+RDEPEND="${DEPEND} >=virtual/jre-1.6"
EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
+EANT_GENTOO_CLASSPATH="jakarta-jstl,java-service-wrapper,jrobin,slf4j-api"
pkg_setup() {
enewgroup i2p
@@ -54,14 +50,12 @@ src_prepare() {
}
src_install() {
- # Cd into pkg-temp.
- cd "${S}/pkg-temp" || die
-
- # Apply patch.
- epatch "${FILESDIR}/${P}_fix-paths.patch"
-
# Using ${D} here results in an error. Docs say use $ROOT
i2p_home="${ROOT}/usr/share/i2p"
+ # Patch the relevant files. This needs to be in src_install due to
+ # preinst() generating the files we're patching
+ cd pkg-temp
+ epatch "${FILESDIR}/i2p-0.9.18_fix-paths.patch"
# 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
@@ -82,7 +76,7 @@ src_install() {
# Install main files and basic documentation
exeinto ${i2p_home}
insinto ${i2p_home}
- #doins blocklist.txt hosts.txt *.config
+ doins blocklist.txt hosts.txt *.config
doexe eepget i2prouter runplain.sh
dodoc history.txt INSTALL-headless.txt LICENSE.txt
doman man/*
diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
index 879f632..7bcfaff 100644
--- a/net-p2p/i2p/i2p-0.9.22-r1.ebuild
+++ b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
@@ -19,7 +19,10 @@ IUSE="nls"
# dev-java/ant-core is automatically added due to java-ant-2.eclass
CDEPEND="dev-java/jrobin:0
+ dev-java/bcprov:1.50
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}
@@ -32,7 +35,7 @@ RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov"
pkg_setup() {
enewgroup i2p
diff --git a/net-p2p/i2p/i2p-0.9.22.ebuild b/net-p2p/i2p/i2p-0.9.22.ebuild
index d5c00b6..879f632 100644
--- a/net-p2p/i2p/i2p-0.9.22.ebuild
+++ b/net-p2p/i2p/i2p-0.9.22.ebuild
@@ -19,10 +19,7 @@ IUSE="nls"
# dev-java/ant-core is automatically added due to java-ant-2.eclass
CDEPEND="dev-java/jrobin:0
- dev-java/bcprov:1.50
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}
@@ -35,7 +32,7 @@ RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
pkg_setup() {
enewgroup i2p
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/i2p/, net-p2p/i2p/files/
@ 2016-01-07 7:58 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-01-07 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 11ca0196734779eb6f896fa1e6125bc0263e8b08
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jan 7 00:04:28 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 07:54:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ca0196
net-p2p/i2p: version bump
net-p2p/i2p/Manifest | 1 +
net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch | 43 +++++++++
net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch | 102 ++++++++++++++++++++
net-p2p/i2p/files/i2p-0.9.23_initd | 36 +++++++
net-p2p/i2p/i2p-0.9.23.ebuild | 122 ++++++++++++++++++++++++
5 files changed, 304 insertions(+)
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index 7d3f2e2..ffff7c1 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1,2 +1,3 @@
DIST i2psource_0.9.18.tar.bz2 24147960 SHA256 6f02f38c933662874c485cb52ca800a9e07c36e74a26fdfeece65e25979beb4b SHA512 6cc336f94f8e4331b26d6e42958808f193ad3709ab6098981077c9390749233fb3d20df5c8fea34ec7810bc8846fd2e11ed7a79bf7c1ec68402b1ccacae999d6 WHIRLPOOL 467285b189af69b300c56756992e53979aa049515cb89ce0d5cbff80b9270c4ab1188f419dd0206b2406780b36ddde73861b5e2e69c7b2e7d8ed00b7bcaaa7a7
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
diff --git a/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch b/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch
new file mode 100644
index 0000000..4c542b5
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.23_fix-encoding.patch
@@ -0,0 +1,43 @@
+diff -Naur a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java
+--- a/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java 2016-01-07 01:40:50.225460721 +0100
++++ b/core/java/src/net/i2p/crypto/eddsa/math/GroupElement.java 2016-01-07 01:41:19.960462373 +0100
+@@ -216,9 +216,9 @@
+ * x is recovered in the following way:
+ * <p><ul>
+ * <li>x = sign(x) * sqrt((y^2 - 1) / (d * y^2 + 1)) = sign(x) * sqrt(u / v) with u = y^2 - 1 and v = d * y^2 + 1.
+- * <li>Setting β = (u * v^3) * (u * v^7)^((q - 5) / 8) one has β^2 = +-(u / v).
+- * <li>If v * β = -u multiply β with i=sqrt(-1).
+- * <li>Set x := β.
++ * <li>Setting b = (u * v^3) * (u * v^7)^((q - 5) / 8) one has b^2 = +-(u / v).
++ * <li>If v * b = -u multiply b with i=sqrt(-1).
++ * <li>Set x := b.
+ * <li>If sign(x) != bit 255 of s then negate x.
+ *
+ * @param curve The curve.
+@@ -511,10 +511,10 @@
+ * Formula for the P^2 representation is in agreement with the formula given in [4] page 12 (with a = -1)
+ * up to a common factor -1 which does not matter:
+ * <p>
+- * B = (X + Y)^2; C = X^2; D = Y^2; E = -C = -X^2; F := E + D = Y^2 - X^2; H = Z^2; J = F − 2 * H;
+- * X3 = (B − C − D) · J = X' * (-T');
+- * Y3 = F · (E − D) = Z' * (-Y');
+- * Z3 = F · J = Z' * (-T').
++ * B = (X + Y)^2; C = X^2; D = Y^2; E = -C = -X^2; F := E + D = Y^2 - X^2; H = Z^2; J = F - 2 * H;
++ * X3 = (B - C - D) . J = X' * (-T');
++ * Y3 = F . (E - D) = Z' * (-Y');
++ * Z3 = F . J = Z' * (-T').
+ *
+ * @return The P1P1 representation
+ */
+diff -Naur a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
+--- a/core/java/src/net/i2p/data/DataHelper.java 2016-01-07 01:40:50.214460721 +0100
++++ b/core/java/src/net/i2p/data/DataHelper.java 2016-01-07 01:41:02.491461403 +0100
+@@ -1577,7 +1577,7 @@
+ } else if (adms < 0.001d) {
+ t = ngettext("1 ns", "{0,number,###} ns", (int) Math.round(ms * 1000000d));
+ } else if (adms < 1.0d) {
+- t = ngettext("1 μs", "{0,number,###} μs", (int) Math.round(ms * 1000d));
++ t = ngettext("1 us", "{0,number,###} us", (int) Math.round(ms * 1000d));
+ } else if (ams < 3 * 1000) {
+ t = ngettext("1 ms", "{0,number,####} ms", (int) Math.round(ms));
+ } else if (ams < 2 * 60 * 1000) {
diff --git a/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch
new file mode 100644
index 0000000..c30e208
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.23_fix-paths.patch
@@ -0,0 +1,102 @@
+diff -Naur a/clients.config b/clients.config
+--- a/clients.config 2016-01-07 00:44:46.721273819 +0100
++++ b/clients.config 2016-01-07 00:44:52.185274122 +0100
+@@ -60,7 +60,7 @@
+ clientApp.4.name=Open Router Console in web browser at startup
+ clientApp.4.args=http://127.0.0.1:7657/
+ clientApp.4.delay=3
+-clientApp.4.startOnLoad=true
++clientApp.4.startOnLoad=false
+
+ # BOB bridge
+ clientApp.5.args=
+diff -Naur a/eepget b/eepget
+--- a/eepget 2016-01-07 00:44:46.721273819 +0100
++++ b/eepget 2016-01-07 00:44:52.186274123 +0100
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-I2P="%INSTALL_PATH"
++I2P="/usr/share/i2p"
+ java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
+diff -Naur a/i2prouter b/i2prouter
+--- a/i2prouter 2016-01-07 00:44:46.721273819 +0100
++++ b/i2prouter 2016-01-07 00:44:52.188274123 +0100
+@@ -28,20 +28,22 @@
+ # Note that (percent)INSTALL_PATH, (percent)USER_HOME, and (percent)SYSTEM_java_io_tmpdir
+ # should have been replaced by the izpack installer.
+ # If you did not run the installer, replace them with the appropriate paths.
+-I2P="%INSTALL_PATH"
++USER_HOME="$HOME"
++SYSTEM_java_io_tmpdir="$USER_HOME/.i2p"
++I2P="/usr/share/i2p"
+ if [ "`uname -s`" = "Darwin" ]; then
+- if [ -d "%USER_HOME/Library/Application Support" ]; then
+- I2P_CONFIG_DIR="%USER_HOME/Library/Application Support/i2p"
++ if [ -d "$USER_HOME/Library/Application Support" ]; then
++ I2P_CONFIG_DIR="$USER_HOME/Library/Application Support/i2p"
+ else
+- I2P_CONFIG_DIR="%USER_HOME/.i2p"
++ I2P_CONFIG_DIR="$USER_HOME/.i2p"
+ fi
+ else
+- I2P_CONFIG_DIR="%USER_HOME/.i2p"
++ I2P_CONFIG_DIR="$USER_HOME/.i2p"
+ fi
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2PTEMP="$SYSTEM_java_io_tmpdir"
+ # PORTABLE installation:
+ # Use the following instead.
+-#I2PTEMP="%INSTALL_PATH"
++#I2PTEMP="/usr/share/i2p"
+
+ # Application
+ APP_NAME="i2p"
+diff -Naur a/runplain.sh b/runplain.sh
+--- a/runplain.sh 2016-01-07 00:44:46.721273819 +0100
++++ b/runplain.sh 2016-01-07 00:44:52.189274123 +0100
+@@ -11,8 +11,8 @@
+ # Note that (percent)INSTALL_PATH and (percent)SYSTEM_java_io_tmpdir
+ # should have been replaced by the izpack installer.
+ # If you did not run the installer, replace them with the appropriate path.
+-I2P="%INSTALL_PATH"
+-I2PTEMP="%SYSTEM_java_io_tmpdir"
++I2P="/usr/share/i2p"
++I2PTEMP="$SYSTEM_java_io_tmpdir"
+
+ # Having IPv6 enabled can cause problems with certain configurations. Changing the
+ # next value to true may help.
+diff -Naur a/wrapper.config b/wrapper.config
+--- a/wrapper.config 2016-01-07 00:44:46.714273818 +0100
++++ b/wrapper.config 2016-01-07 00:46:24.151279233 +0100
+@@ -60,13 +60,19 @@
+ # classes, or all the classes of i2p.jar, are in a different directory).
+ # Be sure there are no other duplicate classes.
+ #
+-wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
++wrapper.java.classpath.1=/usr/share/i2p/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.1=/usr/share/i2p
++wrapper.java.library.path.2=/usr/share/i2p/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
+@@ -74,7 +80,7 @@
+ # Java Additional Parameters
+ # Numbers must be consecutive (except for stripquotes)
+ wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
+-wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH"
++wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p"
+ wrapper.java.additional.2.stripquotes=TRUE
+
+ # Prevent the JVM from exporting stats (and thereby causing hundreds of
diff --git a/net-p2p/i2p/files/i2p-0.9.23_initd b/net-p2p/i2p/files/i2p-0.9.23_initd
new file mode 100644
index 0000000..ca39586
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.23_initd
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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 $?
+}
+
diff --git a/net-p2p/i2p/i2p-0.9.23.ebuild b/net-p2p/i2p/i2p-0.9.23.ebuild
new file mode 100644
index 0000000..52e9cc0
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.23.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+CDEPEND="dev-java/jrobin:0
+ dev-java/bcprov:1.50
+ 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.6"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+EANT_BUILD_TARGET="pkg"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec,bcprov-1.50"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+
+ enewgroup i2p
+ enewuser i2p -1 -1 /var/lib/i2p i2p -m
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ 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
+
+ #epatch "${FILESDIR}/${P}_fix-encoding.patch"
+}
+
+src_install() {
+ # Cd into pkg-temp.
+ cd "${S}/pkg-temp" || die
+
+ # Apply patch.
+ epatch "${FILESDIR}/${P}_fix-paths.patch"
+
+ # Using ${D} here results in an error. Docs say use $ROOT
+ i2p_home="${ROOT}/usr/share/i2p"
+
+ # 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_home}/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_home}/i2psvc
+ dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
+ dosym ${i2p_home}/eepget /usr/bin/eepget
+
+ # Install main files and basic documentation
+ exeinto ${i2p_home}
+ insinto ${i2p_home}
+ 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}"/i2p.service i2p.service
+
+ # setup user
+ dodir /var/lib/i2p/.i2p
+ fowners -R i2p:i2p /var/lib/i2p/.i2p
+}
+
+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 do 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/oracle-jre-bin'
+ ewarn ' dev-java/oracle-jdk-bin'
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/i2p/, net-p2p/i2p/files/
@ 2016-02-08 9:28 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-02-08 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 281b2c224c416b0689019d6ae0c7fe06ad05626e
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Feb 8 09:01:42 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 09:01:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281b2c22
net-p2p/i2p: QA: update copyrights
net-p2p/i2p/files/i2p-0.9.24_initd | 2 +-
net-p2p/i2p/i2p-0.9.24.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-p2p/i2p/files/i2p-0.9.24_initd b/net-p2p/i2p/files/i2p-0.9.24_initd
index ca39586..00e91ac 100644
--- a/net-p2p/i2p/files/i2p-0.9.24_initd
+++ b/net-p2p/i2p/files/i2p-0.9.24_initd
@@ -1,5 +1,5 @@
#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-p2p/i2p/i2p-0.9.24.ebuild b/net-p2p/i2p/i2p-0.9.24.ebuild
index cbb064f..dd695e9 100644
--- a/net-p2p/i2p/i2p-0.9.24.ebuild
+++ b/net-p2p/i2p/i2p-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/i2p/, net-p2p/i2p/files/
@ 2016-11-25 22:01 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2016-11-25 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 4b9f5c510455763918ea3d9bbecf4f33e5233dc6
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon Nov 7 11:16:47 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 22:01:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9f5c51
net-p2p/i2p: version bump to 0.9.27.
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2769
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
net-p2p/i2p/Manifest | 1 +
net-p2p/i2p/files/i2p-0.9.27-add_libs.patch | 22 ++++
net-p2p/i2p/files/i2p-0.9.27.initd | 36 +++++++
net-p2p/i2p/files/i2p-0.9.27.service | 13 +++
net-p2p/i2p/i2p-0.9.27.ebuild | 160 ++++++++++++++++++++++++++++
5 files changed, 232 insertions(+)
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index d437335..16a150e 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1 +1,2 @@
DIST i2psource_0.9.26.tar.bz2 27039859 SHA256 49fbaea7f4d5ea0606de68ebb270fc3d4380631ecfd5c9ad82ed9356e29df937 SHA512 2b3f96fe97418c176b4e0058817bde81909e46d136ed5cadf9f8fb4323b0a35e0a5d3fc0eaadacbfe8f9578376d8a6c6757121452cd9f7c1c3c7d019169a914d WHIRLPOOL b8161e77a491d26f24e786bf185f9eba35aa4421ba17e668f3a8f73fc481c6c8b7ea630b8c860f4cb2c877660a703aaa0dfa2d03d8163ea98a151302067e1600
+DIST i2psource_0.9.27.tar.bz2 27339726 SHA256 89808fa062735fc880d28d232fae27028d9ecdc13b1695a251ecfec119bc15da SHA512 44825a638c0867701825e3098ca570d240db7bce761261ce6b3ebf0d781d096969275e27774a0fdf65fde11231e4f762b113abb40b9cd4edcadfd696397c719f WHIRLPOOL ae3d10635c1f508ca6e9d58a2bdaa258d62f1b6841d7555c86ae5551faaf5ef12ac620c3f6be65e1104115dbcfdde3768df97d2242852081d1ee48f497e044c0
diff --git a/net-p2p/i2p/files/i2p-0.9.27-add_libs.patch b/net-p2p/i2p/files/i2p-0.9.27-add_libs.patch
new file mode 100644
index 00000000..0ea3149
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.27-add_libs.patch
@@ -0,0 +1,22 @@
+diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config
+--- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100
++++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +0100
+@@ -61,12 +61,18 @@
+ # Be sure there are no other duplicate classes.
+ #
+ wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar
++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar
+ # uncomment this to use the system classpath as well (e.g. to get tools.jar)
+ # wrapper.java.classpath.2=%CLASSPATH%
+
+ # Java Library Path (location of Wrapper.DLL or libwrapper.so)
+ wrapper.java.library.path.1=$INSTALL_PATH
+ wrapper.java.library.path.2=$INSTALL_PATH/lib
++wrapper.java.library.path.3=/usr/lib/java-service-wrapper
+
+ # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+ wrapper.java.additional.auto_bits=TRUE
diff --git a/net-p2p/i2p/files/i2p-0.9.27.initd b/net-p2p/i2p/files/i2p-0.9.27.initd
new file mode 100644
index 00000000..bd00917
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.27.initd
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# 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 $?
+}
+
diff --git a/net-p2p/i2p/files/i2p-0.9.27.service b/net-p2p/i2p/files/i2p-0.9.27.service
new file mode 100644
index 00000000..ccbadbd
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.27.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Invisible Internet Project
+After=network.target
+
+[Service]
+User=i2p
+Type=forking
+ExecReload=/usr/bin/i2prouter restart
+ExecStart=/usr/bin/i2prouter start
+ExecStop=/usr/bin/i2prouter stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/i2p/i2p-0.9.27.ebuild b/net-p2p/i2p/i2p-0.9.27.ebuild
new file mode 100644
index 00000000..fc39f4c
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.27.ebuild
@@ -0,0 +1,160 @@
+# 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:0
+ nls? ( >=sys-devel/gettext-0.19 )
+ >=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"
+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 /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.'
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/i2p/, net-p2p/i2p/files/
@ 2017-01-25 23:32 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2017-01-25 23:32 UTC (permalink / raw
To: gentoo-commits
commit: ff2302488759f1ac69b827068b49ee4f666c250a
Author: tharvik <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Dec 15 11:30:52 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 23:32:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff230248
net-p2p/i2p: version bump to 0.9.28.
Gentoo-Bug: https://bugs.gentoo.org/602642
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3125
net-p2p/i2p/Manifest | 1 +
net-p2p/i2p/files/i2p-0.9.28-add_libs.patch | 22 ++++
net-p2p/i2p/files/i2p-0.9.28.initd | 36 +++++++
net-p2p/i2p/files/i2p-0.9.28.service | 13 +++
net-p2p/i2p/i2p-0.9.28.ebuild | 153 ++++++++++++++++++++++++++++
5 files changed, 225 insertions(+)
diff --git a/net-p2p/i2p/Manifest b/net-p2p/i2p/Manifest
index 16a150e..b9bde31 100644
--- a/net-p2p/i2p/Manifest
+++ b/net-p2p/i2p/Manifest
@@ -1,2 +1,3 @@
DIST i2psource_0.9.26.tar.bz2 27039859 SHA256 49fbaea7f4d5ea0606de68ebb270fc3d4380631ecfd5c9ad82ed9356e29df937 SHA512 2b3f96fe97418c176b4e0058817bde81909e46d136ed5cadf9f8fb4323b0a35e0a5d3fc0eaadacbfe8f9578376d8a6c6757121452cd9f7c1c3c7d019169a914d WHIRLPOOL b8161e77a491d26f24e786bf185f9eba35aa4421ba17e668f3a8f73fc481c6c8b7ea630b8c860f4cb2c877660a703aaa0dfa2d03d8163ea98a151302067e1600
DIST i2psource_0.9.27.tar.bz2 27339726 SHA256 89808fa062735fc880d28d232fae27028d9ecdc13b1695a251ecfec119bc15da SHA512 44825a638c0867701825e3098ca570d240db7bce761261ce6b3ebf0d781d096969275e27774a0fdf65fde11231e4f762b113abb40b9cd4edcadfd696397c719f WHIRLPOOL ae3d10635c1f508ca6e9d58a2bdaa258d62f1b6841d7555c86ae5551faaf5ef12ac620c3f6be65e1104115dbcfdde3768df97d2242852081d1ee48f497e044c0
+DIST i2psource_0.9.28.tar.bz2 27137199 SHA256 7bb27444bd1074a0f670276ad07e0b5b2a7a29ed6d25d93e6f95646981cd0aaf SHA512 95510e391e2b594c87b61cf6915d69f4f8cd08e7791b3710b5da28b1df8ec63a7e6829d37b1242fc603398495445e7024522f3554266aaf0028a6f82569660f6 WHIRLPOOL 2d7b82c64570d17e7484a51745cabeedbb54a219610d1b82e9c3f276e6c204be335d73bfe0cb05b1fbd50eee0e4d7dcc7ec1c124831d7b5cfd81a2dcc6b6807a
diff --git a/net-p2p/i2p/files/i2p-0.9.28-add_libs.patch b/net-p2p/i2p/files/i2p-0.9.28-add_libs.patch
new file mode 100644
index 00000000..0ea3149
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.28-add_libs.patch
@@ -0,0 +1,22 @@
+diff -Naur a/installer/resources/wrapper.config b/installer/resources/wrapper.config
+--- a/installer/resources/wrapper.config 2016-11-07 11:42:42.503030002 +0100
++++ b/installer/resources/wrapper.config 2016-11-07 11:43:11.873031594 +0100
+@@ -61,12 +61,18 @@
+ # Be sure there are no other duplicate classes.
+ #
+ wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar
++wrapper.java.classpath.6=/usr/share/jrobin/lib/*.jar
+ # uncomment this to use the system classpath as well (e.g. to get tools.jar)
+ # wrapper.java.classpath.2=%CLASSPATH%
+
+ # Java Library Path (location of Wrapper.DLL or libwrapper.so)
+ wrapper.java.library.path.1=$INSTALL_PATH
+ wrapper.java.library.path.2=$INSTALL_PATH/lib
++wrapper.java.library.path.3=/usr/lib/java-service-wrapper
+
+ # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+ wrapper.java.additional.auto_bits=TRUE
diff --git a/net-p2p/i2p/files/i2p-0.9.28.initd b/net-p2p/i2p/files/i2p-0.9.28.initd
new file mode 100644
index 00000000..bd00917
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.28.initd
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# 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 $?
+}
+
diff --git a/net-p2p/i2p/files/i2p-0.9.28.service b/net-p2p/i2p/files/i2p-0.9.28.service
new file mode 100644
index 00000000..ccbadbd
--- /dev/null
+++ b/net-p2p/i2p/files/i2p-0.9.28.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Invisible Internet Project
+After=network.target
+
+[Service]
+User=i2p
+Type=forking
+ExecReload=/usr/bin/i2prouter restart
+ExecStart=/usr/bin/i2prouter start
+ExecStop=/usr/bin/i2prouter stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/i2p/i2p-0.9.28.ebuild b/net-p2p/i2p/i2p-0.9.28.ebuild
new file mode 100644
index 00000000..dfe4fb5
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.28.ebuild
@@ -0,0 +1,153 @@
+# 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
+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] 5+ messages in thread
end of thread, other threads:[~2017-01-25 23:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-07 7:58 [gentoo-commits] repo/gentoo:master commit in: net-p2p/i2p/, net-p2p/i2p/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2017-01-25 23:32 Patrice Clement
2016-11-25 22:01 Patrice Clement
2016-02-08 9:28 Patrice Clement
2015-10-19 7: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