security/i2p:

- Update to 0.9.45
- Pass maintainership to submitter
- Update Makefile to make portlint happy
- Disabled unused java-doc
- Add pkg-message for usage notes, since current wrapper implementation is broken
- Removed couple of MASTERSITES since most do not offer the source anymore

PR:		245656
Submitted by:	Michael Muenz <m.muenz@gmail.com> (maintainer)

8 files changed, 35 insertions, 102 deletions

diff --git a/security/i2p/Makefile b/security/i2p/Makefile
index fcf2f4d75d0f..d182c23231dc 100644
--- a/security/i2p/Makefile
+++ b/security/i2p/Makefile
@@ -2,18 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	i2p
-DISTVERSION=	0.9.40
+DISTVERSION=	0.9.45
 CATEGORIES=	security java net-p2p
-MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION} \
-		http://download.i2p2.no/releases/${PORTVERSION}/ \
-		http://download2.geti2p.com/${PORTVERSION}/ \
-		http://download.geti2p.com/${PORTVERSION}/ \
-		http://download.i2p2.de/releases/${PORTVERSION}/ \
-		https://launchpad.net/i2p/trunk/${PORTVERSION}/+download/ \
-		https://googledrive.com/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/${PORTVERSION}/
+MASTER_SITES=	http://download.i2p2.de/releases/${PORTVERSION}/
 DISTNAME=	i2psource_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	m.muenz@gmail.com
 COMMENT=	Anonymizing network
 
 LICENSE=	EULA
@@ -28,9 +22,10 @@ ONLY_FOR_ARCHS_REASON=	i2p libwrapper.so library binary only available for i386
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:math/gmp
 LIB_DEPENDS=	libiconv.so:converters/libiconv
 
+USES=		gettext tar:bz2
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-USES=		gettext tar:bzip2
 USE_RC_SUBR=	i2p
 USE_ANT=	yes
 USE_JAVA=	yes
@@ -42,13 +37,8 @@ ALL_TARGET=	updater tarball
 SUB_FILES=	wrapper.sh
 
 PORTDATA=	*
-PORTDOCS=	*
 PLIST_FILES=	sbin/i2prouter
 
-OPTIONS_DEFINE=	DOCS
-
-DOCS_ALL_TARGET=	javadoc
-
 post-patch:
 # postinstall.sh SHOULD only do post installation house keeping
 	@${REINPLACE_CMD} -E \
@@ -66,9 +56,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip ${STAGEDIR}${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/sbin/i2prouter
 
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/installer/resources/readme/readme*.html ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/build/javadoc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.mk>
diff --git a/security/i2p/distinfo b/security/i2p/distinfo
index b4d44f7f9166..a714bbb55505 100644
--- a/security/i2p/distinfo
+++ b/security/i2p/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557365594
-SHA256 (i2psource_0.9.40.tar.bz2) = 5d31e0a324dfe429135ac17595b3cab3e81d85d4aa7a720db402dec47bfeda23
-SIZE (i2psource_0.9.40.tar.bz2) = 30808508
+TIMESTAMP = 1586771166
+SHA256 (i2psource_0.9.45.tar.bz2) = e65c7dbbf464b6bc64afb228306fbfed0f1e67ffec74f96852b82acade53921c
+SIZE (i2psource_0.9.45.tar.bz2) = 31921025
diff --git a/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java b/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java
deleted file mode 100644
index 28e8bcbe9e2d..000000000000
--- a/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/package-info.java.orig	2019-04-17 11:52:29.174848000 -0400
-+++ apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/package-info.java	2019-04-17 11:55:57.085931000 -0400
-@@ -13,7 +13,7 @@
-  * exception of <i>batching / multicall</i>. This feature is deliberately left
-  * out as it tends to confuse users (judging by posts in the JSON-RPC forum).
-  *
-- * <p>See the <a href="http://www.jsonrpc.org/specification"></a>JSON-RPC 2.0
-+ * <p>See the <a href="http://www.jsonrpc.org/specification">JSON-RPC 2.0
-  * specification</a> for more information or write to the
-  * <a href="https://groups.google.com/forum/#!forum/json-rpc">user group</a> if
-  * you have questions.
diff --git a/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java b/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java
deleted file mode 100644
index d8878d217e5f..000000000000
--- a/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java
+++ /dev/null
@@ -1,35 +0,0 @@
---- apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java.orig	2019-04-17 11:58:51.939865000 -0400
-+++ apps/i2pcontrol/java/org/mindrot/jbcrypt/BCrypt.java	2019-04-17 11:58:57.299331000 -0400
-@@ -32,25 +32,25 @@
-  * call the hashpw method with a random salt, like this:
-  * <p>
-  * <code>
-- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
-+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
-  * </code>
-  * <p>
-  * To check whether a plaintext password matches one that has been
-  * hashed previously, use the checkpw method:
-  * <p>
-  * <code>
-- * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
-- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
-- * else<br />
-- * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
-+ * if (BCrypt.checkpw(candidate_password, stored_hash))
-+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");
-+ * else
-+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");
-  * </code>
-  * <p>
-  * The gensalt() method takes an optional parameter (log_rounds)
-  * that determines the computational complexity of the hashing:
-  * <p>
-  * <code>
-- * String strong_salt = BCrypt.gensalt(10)<br />
-- * String stronger_salt = BCrypt.gensalt(12)<br />
-+ * String strong_salt = BCrypt.gensalt(10)
-+ * String stronger_salt = BCrypt.gensalt(12)
-  * </code>
-  * <p>
-  * The amount of work increases exponentially (2**log_rounds), so 
diff --git a/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java b/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java
deleted file mode 100644
index 5276b6f2ce44..000000000000
--- a/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java
+++ /dev/null
@@ -1,19 +0,0 @@
---- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java.orig	2018-06-26 11:12:11 UTC
-+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
-@@ -8,6 +8,7 @@ import net.i2p.client.streaming.AcceptingChannel;
- import net.i2p.client.streaming.I2PServerSocket;
- import net.i2p.client.streaming.I2PSocket;
- import net.i2p.client.streaming.I2PSocketManager;
-+import net.i2p.client.streaming.RouterRestartException;
- 
- /**
-  * Bridge to allow accepting new connections
-@@ -35,7 +36,7 @@ class I2PServerSocketFull implements I2PServerSocket {
-      *         Not actually thrown through 0.9.16; thrown as of 0.9.17
-      * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
-      */
--    public I2PSocket accept() throws I2PException, ConnectException, SocketTimeoutException {
-+    public I2PSocket accept() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
-         return _socketManager.receiveSocket();
-     }
- 
diff --git a/security/i2p/files/patch-installer-resources-clients.config b/security/i2p/files/patch-installer-resources-clients.config
deleted file mode 100644
index 8aa6daf0446a..000000000000
--- a/security/i2p/files/patch-installer-resources-clients.config
+++ /dev/null
@@ -1,11 +0,0 @@
---- installer/resources/clients.config.orig	2014-07-28 20:53:18.000000000 +0200
-+++ installer/resources/clients.config	2014-07-28 20:53:58.000000000 +0200
-@@ -57,7 +57,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 --git a/security/i2p/files/patch-installer-resources-postinstall.sh b/security/i2p/files/patch-installer_resources_postinstall.sh
index 99f40b2f1706..32697f4221df 100644
--- a/security/i2p/files/patch-installer-resources-postinstall.sh
+++ b/security/i2p/files/patch-installer_resources_postinstall.sh
@@ -1,6 +1,6 @@
---- installer/resources/postinstall.sh.orig	2014-07-28 20:57:21.000000000 +0200
-+++ installer/resources/postinstall.sh	2014-07-28 20:58:49.000000000 +0200
-@@ -53,7 +53,7 @@
+--- installer/resources/postinstall.sh.orig	2020-02-24 17:37:40 UTC
++++ installer/resources/postinstall.sh
+@@ -57,7 +57,7 @@ case $HOST_OS in
          else
              wrapperpath="./lib/wrapper/linux64"
              # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
diff --git a/security/i2p/pkg-message b/security/i2p/pkg-message
new file mode 100644
index 000000000000..91c837769ce4
--- /dev/null
+++ b/security/i2p/pkg-message
@@ -0,0 +1,24 @@
+[
+{ type: install
+  message: <<EOM
+
+The wrapper and rc script are currently broken and under review,
+so you have to install and run i2p in the following way:
+
+- Install security/i2p port (which you might have now)
+- As normal user run /usr/local/sbin/i2prouter install (root is not allowed)
+  to extract all data into $HOME/i2p.
+- Go to users home i2p/ and edit runplain.sh to map I2PTEMP to the same 
+  directory as I2P
+- Now you can start the process in I2P home directory with ./runplain.sh
+
+You first have to walk through an initial setup via 
+
+http://localhost:7657
+
+Follow the instructions and map your browser to the configured ports.
+You can also host hidden services and many more via the UI.
+
+EOM
+}
+]