From owner-dev-commits-ports-all@freebsd.org Mon Aug 16 17:45:53 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 389F5651F8A; Mon, 16 Aug 2021 17:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GpM5Y15gGz4rlW; Mon, 16 Aug 2021 17:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E1715E43; Mon, 16 Aug 2021 17:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17GHjqJl070103; Mon, 16 Aug 2021 17:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17GHjqiK070102; Mon, 16 Aug 2021 17:45:52 GMT (envelope-from git) Date: Mon, 16 Aug 2021 17:45:52 GMT Message-Id: <202108161745.17GHjqiK070102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: b56d8629d171 - main - net/stone: update to 2.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b56d8629d1719d03010b5bc444e6ddee63eaf82b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2021 17:45:53 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b56d8629d1719d03010b5bc444e6ddee63eaf82b commit b56d8629d1719d03010b5bc444e6ddee63eaf82b Author: Fernando Apesteguía AuthorDate: 2021-08-16 16:43:10 +0000 Commit: Fernando Apesteguía CommitDate: 2021-08-16 17:41:07 +0000 net/stone: update to 2.4 While here, pet linters. --- net/stone/Makefile | 6 ++--- net/stone/distinfo | 5 +++-- net/stone/files/patch-stone.c | 51 ++----------------------------------------- 3 files changed, 7 insertions(+), 55 deletions(-) diff --git a/net/stone/Makefile b/net/stone/Makefile index 2c01b21cbcda..0dd188d8421b 100644 --- a/net/stone/Makefile +++ b/net/stone/Makefile @@ -1,7 +1,7 @@ # Created by: Yoshihiko Sarumaru PORTNAME= stone -PORTVERSION= 2.3e +PORTVERSION= 2.4 CATEGORIES= net MASTER_SITES= http://www.gcd.org/sengoku/stone/ @@ -10,12 +10,10 @@ COMMENT= TCP/IP packet repeater in the application layer LICENSE= GPLv2 -WRKSRC= ${WRKDIR}/${PORTNAME}-2.3d-2.3.2.7 - -USE_RC_SUBR= stone .if !defined(WITHOUT_SSL) USES= ssl .endif +USE_RC_SUBR= stone .include diff --git a/net/stone/distinfo b/net/stone/distinfo index 21d1ffe283bb..435a3914dc82 100644 --- a/net/stone/distinfo +++ b/net/stone/distinfo @@ -1,2 +1,3 @@ -SHA256 (stone-2.3e.tar.gz) = b2b664ee6771847672e078e7870e56b886be70d9ff3d7b20d0b3d26ee950c670 -SIZE (stone-2.3e.tar.gz) = 92587 +TIMESTAMP = 1629131937 +SHA256 (stone-2.4.tar.gz) = d5dc1af6ec5da503f2a40b3df3fe19a8fbf9d3ce696b8f46f4d53d2ac8d8eb6f +SIZE (stone-2.4.tar.gz) = 95960 diff --git a/net/stone/files/patch-stone.c b/net/stone/files/patch-stone.c index 53f38e704d36..5b7ec3474104 100644 --- a/net/stone/files/patch-stone.c +++ b/net/stone/files/patch-stone.c @@ -1,53 +1,6 @@ ---- stone.c.orig 2008-02-04 23:00:00 UTC +--- stone.c.orig 2019-02-15 07:01:05 UTC +++ stone.c -@@ -2452,15 +2452,16 @@ int modPairDest(Pair *p1, struct sockaddr *dst, sockle - unsigned char **match; - if (Debug > 2) { - char str[SSL_MAX_SSL_SESSION_ID_LENGTH * 2 + 1]; -- int len = sess->session_id_length; -+ const unsigned char *sid; unsigned len; -+ sid = SSL_SESSION_get_id(sess, &len); - int i; - if (len > SSL_MAX_SSL_SESSION_ID_LENGTH) - len = SSL_MAX_SSL_SESSION_ID_LENGTH; - for (i=0; i < len; i++) -- sprintf(&str[i*2], "%02x", sess->session_id[i]); -+ sprintf(&str[i*2], "%02x", sid[i]); - str[i*2] = '\0'; - message(LOG_DEBUG, "%d TCP %d: SSL session ID=%s len=%d", -- p2->stone->sd, p2->sd, str, sess->session_id_length); -+ p2->stone->sd, p2->sd, str, len); - } - match = SSL_SESSION_get_ex_data(sess, MatchIndex); - if (match && p2->stone->ssl_server) { -@@ -3265,7 +3266,7 @@ int doSSL_accept(Pair *pair) { - if (Debug > 7) - message(LOG_DEBUG, "%d TCP %d: SSL_accept ret=%d, state=%x, " - "finished=%x, in_init=%x/%x", pair->stone->sd, -- sd, ret, SSL_state(ssl), SSL_is_init_finished(ssl), -+ sd, ret, SSL_get_state(ssl), SSL_is_init_finished(ssl), - SSL_in_init(ssl), SSL_in_accept_init(ssl)); - if (ret > 0) { /* success */ - if (SSL_in_accept_init(ssl)) { -@@ -8875,7 +8876,7 @@ void sslopts_default(SSLOpts *opts, int isserver) { - opts->meth = SSLv23_server_method(); - #elif !defined(OPENSSL_NO_SSL3) - opts->meth = SSLv3_server_method(); --#elif !defined(OPENSSL_NO_SSL2) -+#elif !defined(OPENSSL_NO_SSL2) && OPENSSL_VERSION_NUMBER < 0x10100000L - opts->meth = SSLv2_server_method(); - #endif - } else { -@@ -8885,7 +8886,7 @@ void sslopts_default(SSLOpts *opts, int isserver) { - opts->meth = SSLv23_client_method(); - #elif !defined(OPENSSL_NO_SSL3) - opts->meth = SSLv3_client_method(); --#elif !defined(OPENSSL_NO_SSL2) -+#elif !defined(OPENSSL_NO_SSL2) && OPENSSL_VERSION_NUMBER < 0x10100000L - opts->meth = SSLv2_client_method(); - #endif - } -@@ -8976,7 +8977,7 @@ int sslopts(int argc, int argi, char *argv[], SSLOpts +@@ -9382,7 +9382,7 @@ int sslopts(int argc, int argi, char *argv[], SSLOpts if (isserver) opts->meth = SSLv3_server_method(); else opts->meth = SSLv3_client_method(); #endif