From nobody Wed Apr 27 11:30:08 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 A478A19902D6; Wed, 27 Apr 2022 11:30:08 +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 4KpGkm4Fplz3wHk; Wed, 27 Apr 2022 11:30:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651059008; 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=5dfJdVVb7GKQryXRHm+L78zazwiyDnk+0PJ3lMnx3Ek=; b=KOkalP3bifi10QMIroT2SRKnrGAxK9KG1DBVGlHlZZh1VsfMeXEmRhDs5hwTaHch0WgVh9 merG4NHj1bxDSy+T8F/nKj8LAzuIP14ojsVcTrLqFR5dnksBrYC6uHDwJZrB1H21GQjx8o V432Ib7UrJzpg+CWBFhlZl2gwLzH1/O/yF+h+1qmId30LLuS/EkWYQzqqURy4aRsHpShZ9 R44y/mbjyZpuTVKAMl8vkQIowkV+k2pILSHys0J/QRVHM/77yLAX0PIPa7ycrL7N7eirPk ZqWZ9H5bhfF/J0Qy5RXET9s8xWYc8x3RI5g8vbvYdP98yrrB1jLFXBM9FWMi4Q== 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 68A2E2318C; Wed, 27 Apr 2022 11:30:08 +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 23RBU8Wo098569; Wed, 27 Apr 2022 11:30:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RBU8ox098567; Wed, 27 Apr 2022 11:30:08 GMT (envelope-from git) Date: Wed, 27 Apr 2022 11:30:08 GMT Message-Id: <202204271130.23RBU8ox098567@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: 2c6ad754f623 - main - net/mpd5: install dictionary.mpd and add fix r2441 from upstream 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: 2c6ad754f623bc68636202835929cc159f0d65c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651059008; 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=5dfJdVVb7GKQryXRHm+L78zazwiyDnk+0PJ3lMnx3Ek=; b=hUTpn49CMgwvB8Wf8L/CgQYmzdwR7tcmHRIcTblqFbpTwWVzo5Tk8qFzTGUIX65Nd6IZ32 DqcXZi18efwiJgj+u04bFP1cy59WhGTHd909W6VwOUDJiCY8b+1DPv1uqIyfPejKovJit6 MWJR0jizAK020G/H8+dwIK0oEtRS5pinVXH3VC3CrZxGtMAVNoixhEFTqAXx6Zo2rXh5U/ L5Q2DoNDC+uPmHVtxwdKROtcZXV0scUsRyN8IWGu1BTQg4E6dnZoQ5+GFeSjzJOq8rLo3d Kzf7ohcIYA4d++MkKOPzFFubPZLKVgaWGjitQHfzhigQIz6seEuX4egzwa7ghA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651059008; a=rsa-sha256; cv=none; b=ZTCG3DRag0CrukRb1cg0hH+zANdjKtFMAVth5R2lKGbSzjnnyxqU5xIkcN7FxhsPg7YiZn Yyrlpzov/lwfWmmqi6NolUXCopBAHeo1G28F/5UxVkC2hvYOpbaQ4hbLYO9fljo1Wajb/j Zy/DJt2VwLIpw8Q6qisNRCY6Xhy6aMIY60B0T5+jyn8pW1++edlgGf9VWUuohto+brUh5f 7f1UvnYPJxAI0HmpoGShlSqgJ09CRbBIutTnGobdTS3AYfWn5zofjNXPy0KBprREkb7y9V N1dBD2439d1X1lytlYZzpSCF6UBqH2wGnnOHcSfsuYZefoGnQ55J+TupifQZSg== 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=2c6ad754f623bc68636202835929cc159f0d65c0 commit 2c6ad754f623bc68636202835929cc159f0d65c0 Author: Eugene Grosbein AuthorDate: 2022-04-27 11:19:11 +0000 Commit: Eugene Grosbein CommitDate: 2022-04-27 11:19:11 +0000 net/mpd5: install dictionary.mpd and add fix r2441 from upstream * Add dictionary.mpd to default package build and install it to /usr/local/share/mpd/dictionary.mpd. Thanks Dmitry Luhtionov who noted this omission. * If parent interface of PPPoE link (vlan, detachable USB ethernet etc.) got destroyed and re-added, detect that and continue automatically; manual interference was required before this import of upstream r2441. --- net/mpd5/Makefile | 12 +++++++++--- net/mpd5/files/patch-fixparent | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index e0ed5e8ac0c8..344ea9198ce7 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -2,7 +2,7 @@ PORTNAME= mpd DISTVERSION= 5.9 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 @@ -41,7 +41,13 @@ CONFIGURE_ENV+= USE_NG_IPACCT=no MAKE_ARGS+= USE_NG_IPACCT=no .endif -.if ! ${PORT_OPTIONS:MRADIUS} +.if ${PORT_OPTIONS:MRADIUS} +PLIST_FILES= ${DATADIR}/dictionary.mpd + +post-install: + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/conf/dictionary.mpd ${STAGEDIR}${DATADIR} +.else CONFIGURE_ENV+= USE_RADIUS=no MAKE_ARGS+= USE_RADIUS=no .endif @@ -50,7 +56,7 @@ USE_RC_SUBR= mpd5 CONFSUF= conf secret script DOCSDIR= ${PREFIX}/share/doc/mpd5 PORTDOCS= README mpd* -PLIST_FILES= ${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \ +PLIST_FILES+= ${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \ sbin/mpd5 .if !defined(WITHOUT_MAN) diff --git a/net/mpd5/files/patch-fixparent b/net/mpd5/files/patch-fixparent new file mode 100644 index 000000000000..a21ddf72ff6d --- /dev/null +++ b/net/mpd5/files/patch-fixparent @@ -0,0 +1,15 @@ +Index: pppoe.c +=================================================================== +--- src/pppoe.c (revision 2430) ++++ src/pppoe.c (working copy) +@@ -408,6 +408,10 @@ PppoeOpen(Link l) + &cn, sizeof(cn)) < 0) { + Perror("[%s] PPPoE: can't connect \"%s\"->\"%s\" and \"%s\"->\"%s\"", + l->name, path, cn.ourhook, cn.path, cn.peerhook); ++ if (errno == ENOENT) { ++ PppoeReleaseNode(l); ++ goto fail; ++ } + goto fail2; + } +