* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/
@ 2018-09-21 18:25 James Le Cuirot
0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2018-09-21 18:25 UTC (permalink / raw
To: gentoo-commits
commit: 9e4861349d2f7b614879eb4b345838da524a5dbe
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Sep 19 17:33:09 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 18:25:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e486134
net-vpn/i2p: remove unused patch/files
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/9918
net-vpn/i2p/files/i2p-0.9.31-add_libs.patch | 22 -------------------
net-vpn/i2p/files/i2p-0.9.31.initd | 33 -----------------------------
net-vpn/i2p/files/i2p-0.9.31.service | 13 ------------
3 files changed, 68 deletions(-)
diff --git a/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch b/net-vpn/i2p/files/i2p-0.9.31-add_libs.patch
deleted file mode 100644
index 0ea3149a362..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.31-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.31.initd b/net-vpn/i2p/files/i2p-0.9.31.initd
deleted file mode 100644
index 122d64f4919..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.31.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-HOME="/var/lib/i2p"
-USER_HOME="$HOME"
-JAVABINARY="/etc/java-config-2/current-system-vm/bin/java"
-INSTALL_PATH="/usr/share/i2p"
-I2P="$INSTALL_PATH"
-I2P_CONFIG_DIR="$USER_HOME/.i2p"
-SYSTEM_java_io_tmpdir="$I2P_CONFIG_DIR"
-I2PTEMP="$SYSTEM_java_io_tmpdir"
-LOGFILE="$I2P_CONFIG_DIR/wrapper.log"
-PIDFILE="/var/run/i2p.pid"
-WRAPPER_CMD="$I2P/i2psvc"
-WRAPPER_CONF="$I2P/wrapper.config"
-
-start() {
- ebegin "Starting I2P"
- start-stop-daemon --start -b -m -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -- -c $WRAPPER_CONF wrapper.daemonize=FALSE wrapper.syslog.ident=i2p wrapper.java.command="$JAVABINARY" wrapper.name=i2p wrapper.displayname="I2P Service" wrapper.statusfile="$I2P_CONFIG_DIR/i2p.status" wrapper.java.statusfile="$I2P_CONFIG_DIR/i2p.java.status" wrapper.logfile="$LOGFILE"
- eend $?
-}
-
-stop() {
- ebegin "Stopping I2P"
- start-stop-daemon --stop -u i2p --pidfile "$PIDFILE" --quiet --exec $WRAPPER_CMD -R SIGTERM/20 SIGKILL/20 -P
- eend $?
-}
-
diff --git a/net-vpn/i2p/files/i2p-0.9.31.service b/net-vpn/i2p/files/i2p-0.9.31.service
deleted file mode 100644
index ccbadbd4d16..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.31.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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/
@ 2019-06-18 0:35 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2019-06-18 0:35 UTC (permalink / raw
To: gentoo-commits
commit: d0cc093e6a8f2d5a626b07ca8d899deb00dd4dc3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jun 10 15:40:27 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 00:34:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cc093e
net-vpn/i2p: remove unused file
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12234
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-vpn/i2p/files/0.9.38-add-cp-to-tests | 45 --------------------------------
1 file changed, 45 deletions(-)
diff --git a/net-vpn/i2p/files/0.9.38-add-cp-to-tests b/net-vpn/i2p/files/0.9.38-add-cp-to-tests
deleted file mode 100644
index ddf2f7d5fca..00000000000
--- a/net-vpn/i2p/files/0.9.38-add-cp-to-tests
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
---- a/apps/ministreaming/java/build.xml 2019-01-30 13:31:14.958832623 +0100
-+++ b/apps/ministreaming/java/build.xml 2019-01-30 13:39:00.050869739 +0100
-@@ -173,7 +173,7 @@
-
- <javac debug="true" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="false" source="1.8" srcdir="./test/junit" target="1.8">
- <classpath>
-- <pathelement location="${javac.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 2019-01-30 13:31:14.953832622 +0100
-+++ b/apps/streaming/java/build.xml 2019-01-30 13:38:56.683869470 +0100
-@@ -49,7 +49,7 @@
-
- <javac debug="true" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="false" source="1.8" srcdir="./test/junit" target="1.8">
- <classpath>
-- <pathelement location="${javac.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 2019-01-30 13:31:22.905833257 +0100
-+++ b/router/java/build.xml 2019-01-30 13:39:04.133870065 +0100
-@@ -130,7 +130,7 @@
- <mkdir dir="./build/obj_scala" />
- <scalac deprecation="on" destdir="./build/obj_scala" srcdir="./test/scalatest">
- <classpath>
-- <pathelement location="${javac.classpath}" />
-+ <pathelement path="${javac.classpath}" />
- <pathelement location="${scala-library.jar}" />
- <pathelement location="${scalactic.jar}" />
- <pathelement location="${scalatest.jar}" />
-@@ -148,7 +148,7 @@
- <property name="junit.home" value="${ant.home}/lib/" />
- <javac debug="true" debuglevel="lines,vars,source" deprecation="on" destdir="./build/obj" encoding="UTF-8" includeAntRuntime="true" source="1.8" srcdir="./test/junit" target="1.8">
- <classpath>
-- <pathelement location="${javac.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" />
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/
@ 2021-07-14 20:05 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2021-07-14 20:05 UTC (permalink / raw
To: gentoo-commits
commit: f6fbe74a87c4108a4fe5567e60cd8fed06003746
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jul 14 19:25:18 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 20:03:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6fbe74a
net-vpn/i2p: remove unused patch
Bug: https://github.com/gentoo/gentoo/pull/21641
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
...47-DataHelper-decompress-fix-length-check.patch | 25 ----------------------
1 file changed, 25 deletions(-)
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
deleted file mode 100644
index b728cc28cb1..00000000000
--- a/net-vpn/i2p/files/i2p-0.9.47-DataHelper-decompress-fix-length-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/
@ 2023-05-22 21:27 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2023-05-22 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 2ffe425c17bd394cb06649a77eb92ad54ed4065b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 22 17:17:11 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 22 21:26:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffe425c
net-vpn/i2p: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31133
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch b/net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch
deleted file mode 100644
index a67b43ba08da..000000000000
--- a/net-vpn/i2p/files/2.1.0-fix-getopt-classpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
-index 48f9245..2fba5e4 100644
---- a/apps/routerconsole/java/build.xml
-+++ b/apps/routerconsole/java/build.xml
-@@ -85,6 +85,7 @@
- <!-- following jars only present for debian builds -->
- <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
- <pathelement location="../../../core/java/build/json-simple.jar" />
-+ <pathelement location="../../../core/java/build/gnu-getopt.jar" />
- </classpath>
- </javac>
- </target>
-diff --git a/router/java/build.xml b/router/java/build.xml
-index 3449609..bcd9602 100644
---- a/router/java/build.xml
-+++ b/router/java/build.xml
-@@ -277,6 +277,7 @@
- <pathelement location="${hamcrest.home}/hamcrest-all.jar" />
- <pathelement location="${junit.home}/junit4.jar" />
- <pathelement location="../../core/java/build/i2ptest.jar" />
-+ <pathelement location="../../core/java/build/gnu-getopt.jar" />
- </classpath>
- <compilerarg line="${javac.compilerargs}" />
- </javac>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/
@ 2024-10-04 20:23 Florian Schmaus
0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2024-10-04 20:23 UTC (permalink / raw
To: gentoo-commits
commit: 7d73bff0b90dec8cea75bd4c69db1f7ce2029010
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 3 15:47:28 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 20:22:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d73bff0
net-vpn/i2p: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-vpn/i2p/files/fix-junit-classpath.patch | 112 ----------------------------
1 file changed, 112 deletions(-)
diff --git a/net-vpn/i2p/files/fix-junit-classpath.patch b/net-vpn/i2p/files/fix-junit-classpath.patch
deleted file mode 100644
index 15a87e2681f6..000000000000
--- a/net-vpn/i2p/files/fix-junit-classpath.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- 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>
---- 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">
---- 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">
---- 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/">
---- 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">
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-04 20:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-18 0:35 [gentoo-commits] repo/gentoo:master commit in: net-vpn/i2p/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2024-10-04 20:23 Florian Schmaus
2023-05-22 21:27 Conrad Kostecki
2021-07-14 20:05 Conrad Kostecki
2018-09-21 18:25 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox