From nobody Mon May 6 12:36:06 2024 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 4VY19M0GX9z5K7Xg; Mon, 06 May 2024 12:36:07 +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 4VY19L6mHxz48dd; Mon, 6 May 2024 12:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714998966; 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=+8E6MQERsiDB8XDNzyh/9f/0L14XKBbwWNI+vqajMeI=; b=LB+g5CjzW4KJKFvU1aRmy4d4lrZzeNogTaloAoszCnE4XEY2YecFM2ZfnLftaCwsqZ8WZP w0USxiiQ9x3LdT8F+UgZhoqxYbPXY+kwuL31fk1Py6QK7Rr86y+NTnQGd5vy4+SG+KLTuT /xFQ1QR/O10D6IyTB1hfZviWer1tsNGYkTQqHa4UeNUm0EZBsHTx3WUureOJPGNAej9iBm te+zfZ015jgnj7KcTr3WwjyGA1NQVyRrKNpthQiAyWHzXyMFigb83XjwTbBITe/z5btZuO LXPaTKyV7hSLuyfjk9mSYQltKlqB2D8oyv3basg7CwIMZvMrIowA98rWgpLWXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714998966; a=rsa-sha256; cv=none; b=Lhha8Z0wWo+KtWx2cvjcPTINxidWpMRoMnmfEhVl4w73rIkqksbyzcVYBqhywrwA1cnHtD SiEheMPXMTCEaMJHg+jwPHmR/Xrrmm4xjK628FLg3FAkyzzVJSVCNRnkf58lv3K0cmhbNn OTVVYsblnoPcXiOL6HrYdZ18LGJSnuSo8pIHo3mOi0O4tOW+44WsBYdw7smUb9Qfb352f0 UND50faI6i6Qo5KLixcciQo9dWjBPCh7y661m+QaSLxDq6Z+RP5ls+6334XlclMewU0TGV y7OyDwwJVN+Rf7PWEHYhxJa97lD/W/c7uQAcpUw9LAb5UVucmWTSchkPiiyfvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714998966; 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=+8E6MQERsiDB8XDNzyh/9f/0L14XKBbwWNI+vqajMeI=; b=LR1wRJphXldcfl52rGFI6/K/9+VluXkwuqWplcGx9bUccNmDvVWWD8kWPM8ROuzCcsuyvU WyDmqFfJSX+2prcynjeCk7Ft1tDR8oCS41GG8p8TcSOijpZAM63pd8ywof6oEm0CMz1vfk 34y2Z7jiFB50pmLmAN7dDLo4PCqoebaMDH/jIzV3Wqw7X6sdRrDTCn0B91/QssKKqVRXEn b5TZbwexj0N1q0+TgcGpQ+gkm3n2QcSl76ZVxBX5OjorjQBidpFGRPoLK1dyMUIsVNRYvc rWJazEa3Ka/vak5RrwcFCKUc4R4GXpYBIBuBHFYonQoXOlPLR1ndQhVVbCmFww== 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 4VY19L6JXRzxsw; Mon, 6 May 2024 12:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 446Ca6PS049509; Mon, 6 May 2024 12:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 446Ca6RZ049506; Mon, 6 May 2024 12:36:06 GMT (envelope-from git) Date: Mon, 6 May 2024 12:36:06 GMT Message-Id: <202405061236.446Ca6RZ049506@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: 7e66e3b58f23 - main - net/quagga: minor fixes 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 7e66e3b58f23a30957b0b002809bc91965736a4d Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e66e3b58f23a30957b0b002809bc91965736a4d commit 7e66e3b58f23a30957b0b002809bc91965736a4d Author: Eugene Grosbein AuthorDate: 2024-05-06 12:31:53 +0000 Commit: Eugene Grosbein CommitDate: 2024-05-06 12:36:01 +0000 net/quagga: minor fixes - generalize CONFLICTS; - fix subtle bug in my patch-vtysh.c; - fix call to getgrouplist() function, this part based on submission by Alexander Mitrokhin. Bump PORTREVISION. --- net/quagga/Makefile | 4 ++-- net/quagga/files/patch-lib_privs.c | 13 +++++++++++++ net/quagga/files/patch-vtysh.c | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 9417f6677533..ad20890eef83 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,6 +1,6 @@ PORTNAME= quagga PORTVERSION= 1.2.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net MASTER_SITES= https://github.com/Quagga/quagga/releases/download/${DISTNAME}/ \ http://www.grosbein.net/freebsd/distfiles/ \ @@ -116,7 +116,7 @@ post-install: .include .if ${PORT_OPTIONS:MLEGACY} -CONFLICTS= frr7 openbgpd pimd +CONFLICTS= frr* openbgpd pimd USE_LDCONFIG= yes .else PKGNAMESUFFIX= -compat diff --git a/net/quagga/files/patch-lib_privs.c b/net/quagga/files/patch-lib_privs.c new file mode 100644 index 000000000000..159920b4cb6a --- /dev/null +++ b/net/quagga/files/patch-lib_privs.c @@ -0,0 +1,13 @@ +--- lib/privs.c.orig 2018-02-20 04:24:55.000000000 +0700 ++++ lib/privs.c 2024-05-06 19:00:18.907694000 +0700 +@@ -717,8 +717,8 @@ zprivs_init(struct zebra_privs_t *zprivs) + + if (zprivs->user) + { +- ngroups = sizeof(groups); +- if ( (ngroups = getgrouplist (zprivs->user, zprivs_state.zgid, groups, &ngroups )) < 0 ) ++ ngroups = nitems(groups); ++ if (getgrouplist (zprivs->user, zprivs_state.zgid, groups, &ngroups) < 0 ) + { + /* cant use log.h here as it depends on vty */ + fprintf (stderr, "privs_init: could not getgrouplist for user %s\n", diff --git a/net/quagga/files/patch-vtysh.c b/net/quagga/files/patch-vtysh.c index e5779a1de11d..2e0b1b6cd4cb 100644 --- a/net/quagga/files/patch-vtysh.c +++ b/net/quagga/files/patch-vtysh.c @@ -19,7 +19,7 @@ + return; + + s = strrchr(vtysh_pager_name, '/'); -+ s = (s == NULL ? vtysh_pager_name : s++); ++ s = (s == NULL ? vtysh_pager_name : s + 1); + if (strcmp(s, "more") != 0 && strcmp(s, "less") != 0) + return; +