From owner-dev-commits-ports-all@freebsd.org Wed Aug 18 12:52:32 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 978F6677313; Wed, 18 Aug 2021 12:52:32 +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 4GqSV83tQjz4SwS; Wed, 18 Aug 2021 12:52:32 +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 6D1D711E22; Wed, 18 Aug 2021 12:52:32 +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 17ICqW5R029670; Wed, 18 Aug 2021 12:52:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17ICqWwM029669; Wed, 18 Aug 2021 12:52:32 GMT (envelope-from git) Date: Wed, 18 Aug 2021 12:52:32 GMT Message-Id: <202108181252.17ICqWwM029669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: fe1375b13d3a - main - net/mpd5: add L2TP fix from upstream (r2410, r2411). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe1375b13d3a9fab5f818fe0502db86e76107405 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: Wed, 18 Aug 2021 12:52:32 -0000 The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe1375b13d3a9fab5f818fe0502db86e76107405 commit fe1375b13d3a9fab5f818fe0502db86e76107405 Author: Eugene Grosbein AuthorDate: 2021-08-18 12:50:26 +0000 Commit: Eugene Grosbein CommitDate: 2021-08-18 12:50:26 +0000 net/mpd5: add L2TP fix from upstream (r2410, r2411). This change should fix the problem reported in bugs #38 #47 #74. It is L2TP interoperability issue with some Juniper, Cisco and YAMAHA RTX routers having strict protocol checks. Move USES to pet portlint. Reported by: Kikuchan at SourceForge (based on) --- net/mpd5/Makefile | 5 ++- net/mpd5/files/patch-l2tp-ctrl-c.diff | 71 +++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index 25f30d3f3cf0..1955acfe1817 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -2,6 +2,7 @@ PORTNAME= mpd DISTVERSION= 5.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 @@ -12,14 +13,14 @@ COMMENT= Multi-link PPP daemon based on netgraph(4) LICENSE= BSD3CLAUSE +USES= ssl + OPTIONS_DEFINE= DOCS NG_IPACCT NG_IPACCT_DESC= Use ng_ipacct kernel module from port HAS_CONFIGURE= YES CONFIGURE_WRKSRC= "${WRKSRC}/src" -USES= ssl - .include MAKE_ARGS+= OSVERSION=${OSVERSION} diff --git a/net/mpd5/files/patch-l2tp-ctrl-c.diff b/net/mpd5/files/patch-l2tp-ctrl-c.diff new file mode 100644 index 000000000000..3d7668732aae --- /dev/null +++ b/net/mpd5/files/patch-l2tp-ctrl-c.diff @@ -0,0 +1,71 @@ +Index: src/l2tp_ctrl.c +=================================================================== +--- src/l2tp_ctrl.c (revision 2409) ++++ src/l2tp_ctrl.c (revision 2411) +@@ -244,7 +244,8 @@ Notes + ************************************************************************/ + + static int ppp_l2tp_ctrl_setup_1(struct ppp_l2tp_ctrl *ctrl, +- struct ppp_l2tp_avp_ptrs *ptrs); ++ struct ppp_l2tp_avp_ptrs *ptrs, ++ struct ppp_l2tp_avp_list *avps); + static int ppp_l2tp_ctrl_setup_2(struct ppp_l2tp_ctrl *ctrl, + struct ppp_l2tp_avp_ptrs *ptrs); + static void ppp_l2tp_ctrl_send(struct ppp_l2tp_ctrl *ctrl, +@@ -1031,7 +1032,8 @@ ppp_l2tp_sess_hooked(struct ppp_l2tp_sess *sess) { + */ + static int + ppp_l2tp_ctrl_setup_1(struct ppp_l2tp_ctrl *ctrl, +- struct ppp_l2tp_avp_ptrs *ptrs) ++ struct ppp_l2tp_avp_ptrs *ptrs, ++ struct ppp_l2tp_avp_list *avps) + { + /* Log */ + Log(LOG_INFO, ("L2TP: connected to \"%s\", version=%u.%u", +@@ -1092,7 +1094,7 @@ ppp_l2tp_ctrl_setup_1(struct ppp_l2tp_ctrl *ctrl, + MD5_Update(&md5ctx, &ptrs->challenge->value, ptrs->challenge->length); + MD5_Final(hash, &md5ctx); + +- if (ppp_l2tp_avp_list_append(ctrl->avps, 0, ++ if (ppp_l2tp_avp_list_append(avps, 0, + 0, AVP_CHALLENGE_RESPONSE, hash, sizeof(hash)) == -1) + return (0); + } +@@ -2085,7 +2087,7 @@ ppp_l2tp_handle_SCCRQ(struct ppp_l2tp_ctrl *ctrl, + + ok: + /* Do control connection setup */ +- if (ppp_l2tp_ctrl_setup_1(ctrl, ptrs) == -1) ++ if (ppp_l2tp_ctrl_setup_1(ctrl, ptrs, ctrl->avps) == -1) + return (-1); + + /* Send response and update state */ +@@ -2098,18 +2100,24 @@ static int + ppp_l2tp_handle_SCCRP(struct ppp_l2tp_ctrl *ctrl, + const struct ppp_l2tp_avp_list *avps, struct ppp_l2tp_avp_ptrs *ptrs) + { ++ struct ppp_l2tp_avp_list *avps0; ++ + (void)avps; ++ avps0 = ppp_l2tp_avp_list_create(); ++ + /* Do control connection setup */ +- if (ppp_l2tp_ctrl_setup_1(ctrl, ptrs) == -1) ++ if ((ppp_l2tp_ctrl_setup_1(ctrl, ptrs, avps0) == -1) || ++ (ppp_l2tp_ctrl_setup_2(ctrl, ptrs) == -1)) { ++ ppp_l2tp_avp_list_destroy(&avps0); + return (-1); +- if (ppp_l2tp_ctrl_setup_2(ctrl, ptrs) == -1) +- return (-1); ++ } + + /* Send response and update state */ + ctrl->state = CS_ESTABLISHED; +- ppp_l2tp_ctrl_send(ctrl, 0, SCCCN, ctrl->avps); ++ ppp_l2tp_ctrl_send(ctrl, 0, SCCCN, avps0); + if (*ctrl->cb->ctrl_connected != NULL) + (*ctrl->cb->ctrl_connected)(ctrl); ++ ppp_l2tp_avp_list_destroy(&avps0); + return (0); + } +