From nobody Sat Dec 31 17:17:14 2022 X-Original-To: dev-commits-ports-main@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 4Nkphq0SRhz2kqXJ; Sat, 31 Dec 2022 17:17:15 +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 4Nkphp73lVz3KmD; Sat, 31 Dec 2022 17:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672507035; 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=FhzIxszL+HdS6bHnGe74FtTk4rmzOO1gWiDlwfQYroI=; b=CG+BsS2INPberE7S0B0tN0U7bP74hQL14q2Xs+afWBWUTuaoKyBp3RZtXAMvM0JNjM3BFa zU8PgkU1k4uX9iuujHcQ0ycDuslOD/qjnwiBwskQcBMwEgKgb91M0T3+YIX6X111B1DEu8 bJ9CIKmbdI3u7kK7gD+tOLLI1korMX2N1T9nbYmJFG8ps5rpsyNgRtfAdpqtSTJkHK5WI0 KZzD979ZEJ8mpHODSYieEcaIAG1sXWtXhL2yNIZ9m/4NYOg1RvKWkI8ZzScVMimDLBHWN1 /pfSH74eJzlsqefPNugJ1aCFGRnLUMDmP5bjGFYSzh1ZZAw0ELn9SVgwgEpkXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672507035; 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=FhzIxszL+HdS6bHnGe74FtTk4rmzOO1gWiDlwfQYroI=; b=gFcMl8gIRqk54OzMWbgbAx7xrhreWNYwzOMqTpDwivPpETEAe1m8QFzycCDFg7GdlUnRV3 w1VRgMPdU6DjLuNVgMEeyqmQmT1qpEM4FHB7HOaucSpeyYB/g3Eb/Xa4xPQPB7q5Acebib oEgt476EHXg4ujuFu+lZe9xyMFN0tEp1syLkiR9ZolfIEXZ+qccTFgVg5t2BAtlcyUPXWb fwAa3NMWXkVVjVOsmYdw08/GYwsL8S2wURRVWX2GUIW6kwxPqBvvMcSJpZlg9cHjhzHH4c m8BmlnYDlgogqWLVb4sU3/YuSNTgbQTCo3UBCdh+s8b+sU7v2NE4wa+ZdZU8gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672507035; a=rsa-sha256; cv=none; b=CPDIwUcPLRbQR2WHS5Cvk+1dhgF1iyjXU7AkP9wd27fwwK74Cm5r+Vny4MqEWvfQ7Gvt7A INNaXHuH1cKHz+ZrI0SN0sS+j+ftGTPpUc0LUYumCHG60FTP6VVPfifXJcwil53psbjrwc z1nV3lHNsvO+BaN1vReSyqDyyCN3yt9HFRFOslHrmeRsvMCFzTp0F42LbMyoQM2N33esrn 8dYiuPHBcaBqt3sFNmZenHTt0NK3TmIskrqfeexdbKiEDaVdKNgkN9AsGnFBnY9lDQiTz1 AcVt+M27S4P8YV5AyhsL/v6yf+nylQDMIakz115RpO6qRFofWbgpFgDBXVWqFw== 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 4Nkphp67DMzwJF; Sat, 31 Dec 2022 17:17:14 +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 2BVHHEPR084714; Sat, 31 Dec 2022 17:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVHHEhS084713; Sat, 31 Dec 2022 17:17:14 GMT (envelope-from git) Date: Sat, 31 Dec 2022 17:17:14 GMT Message-Id: <202212311717.2BVHHEhS084713@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: 6c11c9f48a51 - main - net/quagga: use MORE=-E implicitly within vtysh List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6c11c9f48a511b4097e532fd678726b5d3e17e8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c11c9f48a511b4097e532fd678726b5d3e17e8b commit 6c11c9f48a511b4097e532fd678726b5d3e17e8b Author: Eugene Grosbein AuthorDate: 2022-12-31 17:09:38 +0000 Commit: Eugene Grosbein CommitDate: 2022-12-31 17:17:05 +0000 net/quagga: use MORE=-E implicitly within vtysh quagga's vtysh utility defaults to "more" as PAGER that is less(1) under FreeBSD and its current behaviour is not suitable for vtysh. Generally, setting MORE=-E in user environment makes it behave better but due to collateral damage in bash version 5+ this setting may be ignored. Let's make it work out of the box while still allowing users to change or restore pager behaviour with custom MORE settings. --- net/quagga/Makefile | 2 +- net/quagga/files/patch-vtysh.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/net/quagga/Makefile b/net/quagga/Makefile index b9ac0900006e..edce72330110 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,6 +1,6 @@ PORTNAME= quagga PORTVERSION= 1.2.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net MASTER_SITES= https://github.com/Quagga/quagga/releases/download/${DISTNAME}/ diff --git a/net/quagga/files/patch-vtysh.c b/net/quagga/files/patch-vtysh.c new file mode 100644 index 000000000000..e5779a1de11d --- /dev/null +++ b/net/quagga/files/patch-vtysh.c @@ -0,0 +1,29 @@ +--- vtysh/vtysh.c.orig 2018-02-20 00:24:55.000000000 +0300 ++++ vtysh/vtysh.c 2022-12-31 19:56:32.203501000 +0300 +@@ -246,7 +246,7 @@ vtysh_client_execute (struct vtysh_client *vclient, co + void + vtysh_pager_init (void) + { +- char *pager_defined; ++ char *pager_defined, *s; + + pager_defined = getenv ("VTYSH_PAGER"); + +@@ -254,6 +254,17 @@ vtysh_pager_init (void) + vtysh_pager_name = strdup (pager_defined); + else + vtysh_pager_name = strdup ("more"); ++ ++ s = getenv("MORE"); ++ if (s != NULL) ++ return; ++ ++ s = strrchr(vtysh_pager_name, '/'); ++ s = (s == NULL ? vtysh_pager_name : s++); ++ if (strcmp(s, "more") != 0 && strcmp(s, "less") != 0) ++ return; ++ ++ putenv("MORE=-E"); + } + + /* Command execution over the vty interface. */