Index: head/security/i2pd/Makefile =================================================================== --- head/security/i2pd/Makefile (revision 496826) +++ head/security/i2pd/Makefile (revision 496827) @@ -1,62 +1,58 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= i2pd -PORTVERSION= 2.23.0 -PORTREVISION= 1 +PORTVERSION= 2.24.0 CATEGORIES= security net-p2p - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= fc84d6c4b728.patch:-p1 MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ implementation of I2P client LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_thread.so:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= PurpleI2P USES= cmake:insource compiler:c++11-lib ssl CMAKE_ARGS= -DWITH_GUI=OFF CMAKE_SOURCE_PATH= ${WRKSRC}/build USE_RC_SUBR= ${PORTNAME} PORTDOCS= * USERS= _i2pd GROUPS= _i2pd PLIST_SUB= USER="${USERS}" GROUP="${GROUPS}" SUB_LIST= USER="${USERS}" GROUP="${GROUPS}" SUB_FILES= i2pd.newsyslog.conf OPTIONS_DEFINE= AESNI AVX UPNP DOCS HARDENING AESNI_DESC= Use AES-NI instructions set AESNI_CMAKE_BOOL= WITH_AESNI AVX_DESC= Use AVX instructions AVX_CMAKE_BOOL= WITH_AVX UPNP_DESC= Include support for UPnP client UPNP_CMAKE_BOOL= WITH_UPNP UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc HARDENING_CMAKE_BOOL= WITH_HARDENING HARDENING_DESC= Use hardening compiler flags do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf @${MKDIR} ${STAGEDIR}/var/run/i2pd @${MKDIR} ${STAGEDIR}/var/log/i2pd @${MKDIR} ${STAGEDIR}/var/db/i2pd do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Index: head/security/i2pd/distinfo =================================================================== --- head/security/i2pd/distinfo (revision 496826) +++ head/security/i2pd/distinfo (revision 496827) @@ -1,5 +1,3 @@ -TIMESTAMP = 1548175954 -SHA256 (PurpleI2P-i2pd-2.23.0_GH0.tar.gz) = 19e8573b44b94ce83bd5705569934049cb1dc39db11449abcb9e4b36afe5a279 -SIZE (PurpleI2P-i2pd-2.23.0_GH0.tar.gz) = 1008677 -SHA256 (fc84d6c4b728.patch) = 1a5253c9cfdc4674866454c149d9fb8b4cc121c32fab1d79c44ba09acffea6d3 -SIZE (fc84d6c4b728.patch) = 1239 +TIMESTAMP = 1553269200 +SHA256 (PurpleI2P-i2pd-2.24.0_GH0.tar.gz) = 809b37100f0f176432b01ab6edee96dc62b0f65d5bf7531e008a87117e742566 +SIZE (PurpleI2P-i2pd-2.24.0_GH0.tar.gz) = 1063751 Index: head/security/i2pd/files/patch-bc3f02cb6b89cb00b83439330c942006039e1cba =================================================================== --- head/security/i2pd/files/patch-bc3f02cb6b89cb00b83439330c942006039e1cba (revision 496826) +++ head/security/i2pd/files/patch-bc3f02cb6b89cb00b83439330c942006039e1cba (nonexistent) @@ -1,52 +0,0 @@ -From bc3f02cb6b89cb00b83439330c942006039e1cba Mon Sep 17 00:00:00 2001 -From: orignal -Date: Thu, 31 Jan 2019 16:03:10 -0500 -Subject: [PATCH] fix #1290. copy correct size if message didn't fit previous - ---- - libi2pd/TunnelGateway.cpp | 25 +++++++++++++------------ - 1 file changed, 13 insertions(+), 12 deletions(-) - -diff --git a/libi2pd/TunnelGateway.cpp b/libi2pd/TunnelGateway.cpp -index e6bfdd844..7d0069a93 100644 ---- libi2pd/TunnelGateway.cpp -+++ libi2pd/TunnelGateway.cpp -@@ -51,6 +51,19 @@ namespace tunnel - // create fragments - const std::shared_ptr & msg = block.data; - size_t fullMsgLen = diLen + msg->GetLength () + 2; // delivery instructions + payload + 2 bytes length -+ -+ if (!messageCreated && fullMsgLen > m_RemainingSize) // check if we should complete previous message -+ { -+ size_t numFollowOnFragments = fullMsgLen / TUNNEL_DATA_MAX_PAYLOAD_SIZE; -+ // length of bytes doesn't fit full tunnel message -+ // every follow-on fragment adds 7 bytes -+ size_t nonFit = (fullMsgLen + numFollowOnFragments*7) % TUNNEL_DATA_MAX_PAYLOAD_SIZE; -+ if (!nonFit || nonFit > m_RemainingSize) -+ { -+ CompleteCurrentTunnelDataMessage (); -+ CreateCurrentTunnelDataMessage (); -+ } -+ } - if (fullMsgLen <= m_RemainingSize) - { - // message fits. First and last fragment -@@ -65,18 +78,6 @@ namespace tunnel - } - else - { -- if (!messageCreated) // check if we should complete previous message -- { -- size_t numFollowOnFragments = fullMsgLen / TUNNEL_DATA_MAX_PAYLOAD_SIZE; -- // length of bytes don't fit full tunnel message -- // every follow-on fragment adds 7 bytes -- size_t nonFit = (fullMsgLen + numFollowOnFragments*7) % TUNNEL_DATA_MAX_PAYLOAD_SIZE; -- if (!nonFit || nonFit > m_RemainingSize) -- { -- CompleteCurrentTunnelDataMessage (); -- CreateCurrentTunnelDataMessage (); -- } -- } - if (diLen + 6 <= m_RemainingSize) - { - // delivery instructions fit Property changes on: head/security/i2pd/files/patch-bc3f02cb6b89cb00b83439330c942006039e1cba ___________________________________________________________________ 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