Index: head/security/i2p/Makefile
===================================================================
--- head/security/i2p/Makefile	(revision 501143)
+++ head/security/i2p/Makefile	(revision 501144)
@@ -1,75 +1,75 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	i2p
-DISTVERSION=	0.9.38
+DISTVERSION=	0.9.40
 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}/
 DISTNAME=	i2psource_${PORTVERSION}
 
 MAINTAINER=	neel@neelc.org
 COMMENT=	Anonymizing network
 
 LICENSE=	EULA
 LICENSE_NAME=	End User License Agreement
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_DISTFILES=	i2psource_${PORTVERSION}${EXTRACT_SUFX}
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	i2p libwrapper.so library binary only available for i386 and amd64
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:math/gmp
 LIB_DEPENDS=	libiconv.so:converters/libiconv
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 USES=		gettext tar:bzip2
 USE_RC_SUBR=	i2p
 USE_ANT=	yes
 USE_JAVA=	yes
 NO_ARCH=	yes
 JAVA_BUILD=	jdk
 JAVA_VERSION=	1.6+
 USE_LOCALE=	en_US.UTF-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 \
 		-e 's|./i2prouter[[:space:]]+start||' \
 		${WRKSRC}/installer/resources/postinstall.sh
 	@${REINPLACE_CMD} -E \
 		-e 's|%INSTALL_PATH|$${HOME}/i2p|' \
 		-e 's|%USER_HOME|$${HOME}|' \
 		${WRKSRC}/installer/resources/i2prouter \
 		${WRKSRC}/installer/resources/runplain.sh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 ${STAGEDIR}${DATADIR}/
 	${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>
Index: head/security/i2p/distinfo
===================================================================
--- head/security/i2p/distinfo	(revision 501143)
+++ head/security/i2p/distinfo	(revision 501144)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548602826
-SHA256 (i2psource_0.9.38.tar.bz2) = 65fe327fdd11272a764c9e1c6ae1f38b151cea9003216b861c7ff2b281ca2970
-SIZE (i2psource_0.9.38.tar.bz2) = 30702106
+TIMESTAMP = 1557365594
+SHA256 (i2psource_0.9.40.tar.bz2) = 5d31e0a324dfe429135ac17595b3cab3e81d85d4aa7a720db402dec47bfeda23
+SIZE (i2psource_0.9.40.tar.bz2) = 30808508
Index: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java
===================================================================
--- head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java	(revision 501143)
+++ head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java	(nonexistent)
@@ -1,19 +0,0 @@
---- apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java.orig	2018-06-26 11:12:11 UTC
-+++ apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
-@@ -28,6 +28,7 @@ import net.i2p.client.streaming.I2PServerSocket;
- import net.i2p.client.streaming.I2PSocket;
- import net.i2p.client.streaming.I2PSocketManager;
- import net.i2p.client.streaming.I2PSocketOptions;
-+import net.i2p.client.streaming.RouterRestartException;
- import net.i2p.crypto.SigAlgo;
- import net.i2p.crypto.SigType;
- import net.i2p.data.Certificate;
-@@ -354,7 +355,7 @@ public class I2PSocketManagerFull implements I2PSocket
-      * @throws ConnectException (since 0.9.17; I2PServerSocket interface always declared it)
-      * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and the timeout has been reached.
-      */
--    public I2PSocket receiveSocket() throws I2PException, ConnectException, SocketTimeoutException {
-+    public I2PSocket receiveSocket() throws I2PException, RouterRestartException, ConnectException, SocketTimeoutException {
-         verifySession();
-         Connection con = _connectionManager.getConnectionHandler().accept(_connectionManager.getSoTimeout());
-         I2PSocketFull sock = new I2PSocketFull(con, _context);

Property changes on: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java
===================================================================
--- head/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java	(nonexistent)
+++ head/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java	(revision 501144)
@@ -0,0 +1,11 @@
+--- 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.

Property changes on: head/security/i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java
===================================================================
--- head/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java	(nonexistent)
+++ head/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java	(revision 501144)
@@ -0,0 +1,35 @@
+--- 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 

Property changes on: head/security/i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property