Index: head/security/i2p/Makefile =================================================================== --- head/security/i2p/Makefile (revision 473971) +++ head/security/i2p/Makefile (revision 473972) @@ -1,73 +1,75 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= i2p -DISTVERSION= 0.9.33 +DISTVERSION= 0.9.35 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}/ -DISTFILES= i2psource_${PORTVERSION}${EXTRACT_SUFX} +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 -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= i2p libwrapper.so library binary only available for i386 and amd64 +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 Index: head/security/i2p/distinfo =================================================================== --- head/security/i2p/distinfo (revision 473971) +++ head/security/i2p/distinfo (revision 473972) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518416518 -SHA256 (i2psource_0.9.33.tar.bz2) = 843345a85e021408e4cbeff8ee94b3842e9c4b5295bef374d5f2026872dae114 -SIZE (i2psource_0.9.33.tar.bz2) = 28985659 +TIMESTAMP = 1530364987 +SHA256 (i2psource_0.9.35.tar.bz2) = 8bb88d3db355ebfa5be65d48089db60919875ac298b7217b7f8150048ea5079e +SIZE (i2psource_0.9.35.tar.bz2) = 29313321 Index: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java =================================================================== --- head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java (nonexistent) +++ head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java (revision 473972) @@ -0,0 +1,19 @@ +--- 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(); + } + Property changes on: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.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_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 (nonexistent) +++ head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java (revision 473972) @@ -0,0 +1,19 @@ +--- 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 ___________________________________________________________________ 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