From nobody Thu Oct 6 07:17:05 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MjjS14r3Fz4fCWw; Thu, 6 Oct 2022 07:17:05 +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 4MjjS146G8z3tVh; Thu, 6 Oct 2022 07:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665040625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7GhJbrujzXKBsfSxP0eZr8w8nlZALaHyTpanOeEDVM=; b=kgqxYu0ldtDNcZSHiX9jWgMCTWjuZL2Ks1Pfz1o9k9Nictd/X0KqBi+YmF231FGeWSGAvd v2/y2AaQqNmlm4pDxRVbjPRjexE1iroCEMjVnj/0yb2FKDlDZ0LbBP/lwXSKR7JI5qNyqa 0wq7URJUdB57tv0/NT9+DIB3miHbhwn7DlhjUzWrFchO20bM6HbOTIjc+WYaSvRrYXCrid j/pIUK+KG1b/KvD0dw78ZqRVNIhCBpUH+mUQPcMre0vUopYRTS6MFC4P03rYg14Rv6cTy+ 2WdOzbFWeJqgLSXtzbAOqcMcMVb5sy6xAqp94QbQsvg0dVrA32SxOp6HglT3+A== 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 4MjjS12vkzz19gV; Thu, 6 Oct 2022 07:17:05 +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 2967H5lZ045825; Thu, 6 Oct 2022 07:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2967H5Hr045824; Thu, 6 Oct 2022 07:17:05 GMT (envelope-from git) Date: Thu, 6 Oct 2022 07:17:05 GMT Message-Id: <202210060717.2967H5Hr045824@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: 15c9b10e294e - main - net/mpd5: unbreak incoming L2TP connections List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 15c9b10e294e33112d57f3007bcdd7f3efa47a41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665040625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q7GhJbrujzXKBsfSxP0eZr8w8nlZALaHyTpanOeEDVM=; b=Qul4RgfLz2brhl5ljDNsVteVX/zuutq2f2t2VSJkMXnnHlvIYPUdFuxT1xg2DYYHFzxWQV Y5LSMqgtxqHC/ohv6/fJwRJMwSAIOI1It+bncBJ02TcpK0GvKY4tyjn0XaJy84u1ftz9iH D6ltmaVS2mpvn/1pikQ3Y5hg3uWJKqkkXemfE6dkj/SHBzMB5GfEr77kUJYzP1j1k2hUWd VtL1rAho14s0A485oyf1WYZpBoUDu/nKbWi3aRys2NLsHjkNRmleXgsqvK6MchCpZgGkJ1 XeE9UCrqlG5B0P9PqIwa+lbikLNZZmxYlYfcgS1WHy5v/bCcnbqIKBQaJa5mfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665040625; a=rsa-sha256; cv=none; b=DuU1bkiFumhe7c9YEWa7u+QJ79l8iOfTGvaHYbutu5pS8XwMZkSNXxXMh2K8sHmCtaSl1d X1XK+u8CX2c29hKX55LmtdX7cohmXP+fbJWqux03e/neclj5sZEdWABNkN1UOmqsxgWA0G bwapWUwNcmlRLfMNLX9Wd16Us845n5V38u5lBVVX7nBVWN/ZAlFRopMpmnBRDUEo35RpHU Agg2J5GereSBUsst2w/nBQMRnjPU8g3ooQfAzv6xU5+mdvc6i7iQuV6FPf9KHwktruzeRa 8bqRF1Q4P55YRxC+wKGbX6y9lE42nUQu3xTCh8ASbWIommfyKdPAG85gXoWRCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=15c9b10e294e33112d57f3007bcdd7f3efa47a41 commit 15c9b10e294e33112d57f3007bcdd7f3efa47a41 Author: Eugene Grosbein AuthorDate: 2022-10-06 07:11:55 +0000 Commit: Eugene Grosbein CommitDate: 2022-10-06 07:16:58 +0000 net/mpd5: unbreak incoming L2TP connections The revision mpd5-5.9_10 broke incoming L2TP connections. Fix it. PR: 266838 --- net/mpd5/Makefile | 2 +- net/mpd5/files/patch-redial | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index b85ddf6f2ec7..8ecb88614119 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -1,6 +1,6 @@ PORTNAME= mpd DISTVERSION= 5.9 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 diff --git a/net/mpd5/files/patch-redial b/net/mpd5/files/patch-redial index b8f8c18d28c1..525e13836a56 100644 --- a/net/mpd5/files/patch-redial +++ b/net/mpd5/files/patch-redial @@ -146,7 +146,7 @@ Index: src/link.h Index: src/phys.c =================================================================== --- src/phys.c (revision 2452) -+++ src/phys.c (revision 2454) ++++ src/phys.c (revision 2461) @@ -590,8 +590,8 @@ PhysMsg(int type, void *arg) UNREF(l); return; @@ -164,7 +164,7 @@ Index: src/phys.c } - (*l->type->open)(l); + /* Redial may result in MSG_OPEN for just opened device */ -+ if (l->state == PHYS_STATE_DOWN) ++ if (l->state == PHYS_STATE_DOWN || l->state == PHYS_STATE_CONNECTING) + (*l->type->open)(l); + else + Log(LG_PHYS2, ("[%s] device: OPEN event ignored",