diff -Naur i2p/Makefile i2p-new/Makefile --- i2p/Makefile 2020-03-28 12:26:58.000000000 +0100 +++ i2p-new/Makefile 2020-04-16 09:08:43.476441000 +0200 @@ -2,18 +2,12 @@ # $FreeBSD: head/security/i2p/Makefile 529327 2020-03-28 11:26:58Z rene $ 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 @@ 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 @@ 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 \ @@ -65,10 +55,5 @@ ${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 diff -Naur i2p/distinfo i2p-new/distinfo --- i2p/distinfo 2019-05-09 22:09:07.000000000 +0200 +++ i2p-new/distinfo 2020-04-13 21:43:05.810779000 +0200 @@ -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 -Naur i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java i2p-new/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java --- i2p/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java 2019-05-09 22:09:07.000000000 +0200 +++ i2p-new/files/patch-apps_i2pcontrol_java_com_thetransactioncompany_jsonrpc2_package-info.java 1970-01-01 01:00:00.000000000 +0100 @@ -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 batching / multicall. This feature is deliberately left - * out as it tends to confuse users (judging by posts in the JSON-RPC forum). - * -- *

See the JSON-RPC 2.0 -+ *

See the JSON-RPC 2.0 - * specification for more information or write to the - * user group if - * you have questions. diff -Naur i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java i2p-new/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java --- i2p/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java 2019-05-09 22:09:07.000000000 +0200 +++ i2p-new/files/patch-apps_i2pcontrol_java_org_mindrot_jbcrypt_BCrypt.java 1970-01-01 01:00:00.000000000 +0100 @@ -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: - *

- * -- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
-+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); - * - *

- * To check whether a plaintext password matches one that has been - * hashed previously, use the checkpw method: - *

- * -- * if (BCrypt.checkpw(candidate_password, stored_hash))
-- *     System.out.println("It matches");
-- * else
-- *     System.out.println("It does not match");
-+ * if (BCrypt.checkpw(candidate_password, stored_hash)) -+ *     System.out.println("It matches"); -+ * else -+ *     System.out.println("It does not match"); - * - *

- * The gensalt() method takes an optional parameter (log_rounds) - * that determines the computational complexity of the hashing: - *

- * -- * String strong_salt = BCrypt.gensalt(10)
-- * String stronger_salt = BCrypt.gensalt(12)
-+ * String strong_salt = BCrypt.gensalt(10) -+ * String stronger_salt = BCrypt.gensalt(12) - * - *

- * The amount of work increases exponentially (2**log_rounds), so diff -Naur i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java i2p-new/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java --- i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java 2018-07-05 17:16:33.000000000 +0200 +++ i2p-new/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java 1970-01-01 01:00:00.000000000 +0100 @@ -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 -Naur i2p/files/patch-installer-resources-clients.config i2p-new/files/patch-installer-resources-clients.config --- i2p/files/patch-installer-resources-clients.config 2014-07-29 22:35:38.000000000 +0200 +++ i2p-new/files/patch-installer-resources-clients.config 1970-01-01 01:00:00.000000000 +0100 @@ -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 -Naur i2p/files/patch-installer-resources-postinstall.sh i2p-new/files/patch-installer-resources-postinstall.sh --- i2p/files/patch-installer-resources-postinstall.sh 2014-07-29 22:35:38.000000000 +0200 +++ i2p-new/files/patch-installer-resources-postinstall.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 @@ - else - wrapperpath="./lib/wrapper/linux64" - # the 32bit libwrapper.so will be needed if a 32 bit jvm is used -- cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so -+ cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so - fi - cp ${wrapperpath}/libwrapper.so ./lib/ - ;; diff -Naur i2p/files/patch-installer_resources_postinstall.sh i2p-new/files/patch-installer_resources_postinstall.sh --- i2p/files/patch-installer_resources_postinstall.sh 1970-01-01 01:00:00.000000000 +0100 +++ i2p-new/files/patch-installer_resources_postinstall.sh 2020-04-16 09:07:54.231070000 +0200 @@ -0,0 +1,11 @@ +--- 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 +- cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so ++ cp ./lib/wrapper/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so + fi + cp ${wrapperpath}/libwrapper.so ./lib/ + ;; diff -Naur i2p/pkg-message i2p-new/pkg-message --- i2p/pkg-message 1970-01-01 01:00:00.000000000 +0100 +++ i2p-new/pkg-message 2020-04-16 10:33:06.246608000 +0200 @@ -0,0 +1,24 @@ +[ +{ type: install + message: <