From nobody Fri Dec 30 06:26:48 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 4NjwJm32pkz1LnJ5; Fri, 30 Dec 2022 06:26:48 +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 4NjwJm2Wzyz3MSd; Fri, 30 Dec 2022 06:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672381608; 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=b5YmjKhnT1aNB7BQezZ+SKYZcTderhvR4ymCYam5wwo=; b=dIB34vQR2x1uvqg4k/sLeYIFqNHn6JUyH7VhOFC+58W/De5OLc/teQO4x79sWCrUfh1QMC izWJgGHeMZLouRcwmM21DQZEZbtfJLkVSR+A2Rn42eW43Yxr6PWbhGgGRD3Bm/r14yjia4 /bVAO/Rz6ufnrCq3BsAEqKThjHygWeVsFO7TjdBhp0lKRcutJpvvx+FC0Zk+ApfFAvp1jy hgjopaOcK+4a3aP/IbgIqXD39RVFij8VjmL+/yaMbvEPGRkqQ1g1MeQnnbh7IvVmdpBUan udMJnMlENURxU8VnTeKDqpoG2oRsShCzkggsczjA6PrdEXvTVViKWddMskrW3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672381608; 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=b5YmjKhnT1aNB7BQezZ+SKYZcTderhvR4ymCYam5wwo=; b=h43e0nWXKk2on2d5XF94A6s9Glmj5lAP5+CqG4pzrFXJS5ieRJiQiWo70ArxjRolT8PTil B5zKHjW7Jq6ozgjpXDSl4BCuGdLE7G4q47kQNYRU/LaKAmc+12HLvyeSa60d+QLWHJ2IC4 D/kQzk2yLQ571eBm62xPS+tEYr9T+1vfdzkgkr2q1bOB7pUK+v4xDybOR7QSrLSIdFLqCr Wg4roTmSMU/IeUVs0vcQ7VrRf8+lXfnPAH8MnafhDHmxfLyD1YqSyY5S+ovS88LneQRecS G+j073zrp0fsHUlGsfzFFIiu+dIE9PoIs2Rj69rw9t7T0X+Gn5+FXhKZMIwSJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672381608; a=rsa-sha256; cv=none; b=MnLuGg69D1D7C0ZUEnULlw2rYqOXqrKwia41SwgBuz/zDklg9RCXEV71PpWc2Y65WxgwdG mCG3HI2JYaTqncY3EJ3dlVkbgbOT6jE2Y4WsHR24dRLy2Mua/fv1jg3Z0MY2NiITU4lAEH v0B9OzJrL5xrov393PZbkbJ+RTtv6gqdq80H/T3OAcs1oTdDufAEBomfSblxIO4Xnj96pW TJQfI3WFrBXRI3smsJZbEgyYwzrGNSUx7FjpNkZXGDC75WhTrcs9raOIAD86vWIDEpgaQy D9aX4eeWDSXrTCO+Az8K2gIUpOvQrKzu2G7neSRHPe2jm8BTdv6HKv/6KFRQUg== 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 4NjwJm1b1wzxsf; Fri, 30 Dec 2022 06:26:48 +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 2BU6QmtF065024; Fri, 30 Dec 2022 06:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU6QmwI065023; Fri, 30 Dec 2022 06:26:48 GMT (envelope-from git) Date: Fri, 30 Dec 2022 06:26:48 GMT Message-Id: <202212300626.2BU6QmwI065023@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: ab2ae6b17c84 - main - net/mpd5: Fix incoming connections for static links (site-to-site VPN) 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: ab2ae6b17c84a453269b780ec461ac382f7ce6e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab2ae6b17c84a453269b780ec461ac382f7ce6e1 commit ab2ae6b17c84a453269b780ec461ac382f7ce6e1 Author: Eugene Grosbein AuthorDate: 2022-12-30 06:23:31 +0000 Commit: Eugene Grosbein CommitDate: 2022-12-30 06:23:31 +0000 net/mpd5: Fix incoming connections for static links (site-to-site VPN) The change in 5.9_11 was incomplete as it did not fix broken handling of incoming connections for static links, f.e. site-to-site VPN. Import r2474 from upstream to fix it, too. --- net/mpd5/Makefile | 2 +- net/mpd5/files/patch-redial | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index 2d605bfabff0..a2d7c85e8dad 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -1,6 +1,6 @@ PORTNAME= mpd DISTVERSION= 5.9 -PORTREVISION= 12 +PORTREVISION= 13 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 525e13836a56..6bd5be6ad6e4 100644 --- a/net/mpd5/files/patch-redial +++ b/net/mpd5/files/patch-redial @@ -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 || l->state == PHYS_STATE_CONNECTING) ++ if (l->state != PHYS_STATE_UP) + (*l->type->open)(l); + else + Log(LG_PHYS2, ("[%s] device: OPEN event ignored",