From owner-svn-ports-head@freebsd.org Thu Jul 5 15:16:35 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48D5A103253F; Thu, 5 Jul 2018 15:16:35 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EB86781F07; Thu, 5 Jul 2018 15:16:34 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B25481B9F6; Thu, 5 Jul 2018 15:16:34 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w65FGY5p002899; Thu, 5 Jul 2018 15:16:34 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w65FGXbH002895; Thu, 5 Jul 2018 15:16:33 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201807051516.w65FGXbH002895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 5 Jul 2018 15:16:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473972 - in head/security/i2p: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/security/i2p: . files X-SVN-Commit-Revision: 473972 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 15:16:35 -0000 Author: joneum Date: Thu Jul 5 15:16:33 2018 New Revision: 473972 URL: https://svnweb.freebsd.org/changeset/ports/473972 Log: security/i2p: Update to 0.9.35 PR: 229427 Submitted by: Neel Chauhan (maintainer) Added: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java (contents, props changed) head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java (contents, props changed) Modified: head/security/i2p/Makefile head/security/i2p/distinfo Modified: head/security/i2p/Makefile ============================================================================== --- head/security/i2p/Makefile Thu Jul 5 14:07:03 2018 (r473971) +++ head/security/i2p/Makefile Thu Jul 5 15:16:33 2018 (r473972) @@ -2,7 +2,7 @@ # $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}/ \ @@ -11,7 +11,7 @@ MASTER_SITES= SF/${PORTNAME:tl}/${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 @@ -22,11 +22,13 @@ 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 Modified: head/security/i2p/distinfo ============================================================================== --- head/security/i2p/distinfo Thu Jul 5 14:07:03 2018 (r473971) +++ head/security/i2p/distinfo Thu Jul 5 15:16:33 2018 (r473972) @@ -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 Added: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PServerSocketFull.java Thu Jul 5 15:16:33 2018 (r473972) @@ -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(); + } + Added: head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/i2p/files/patch-apps_streaming_java_src_net_i2p_client_streaming_impl_I2PSocketManagerFull.java Thu Jul 5 15:16:33 2018 (r473972) @@ -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);