use readline explicitly as vtysh line editing is more usable. correct chown command in zebra.sh.in - hardcoding quagga.quagga is not a good idea.

[Frank Kardel <kardel%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Frank Kardel <kardel%NetBSD.org@localhost>
Pushed By:	kardel
Date:		Mon Oct 12 10:30:15 2020 +0200
Changeset:	173a5acab2d24260fce3806620346466ce2b5fea

Modified Files:
	frr/Makefile
	frr/distinfo
Added Files:
	frr/patches/patch-pkgsrc_zebra.sh.in

Log Message:
use readline explicitly as vtysh line editing is more usable.
correct chown command in zebra.sh.in - hardcoding quagga.quagga
is not a good idea.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=173a5acab2d24260fce3806620346466ce2b5fea

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 frr/Makefile                         | 11 +++++++----
 frr/distinfo                         |  1 +
 frr/patches/patch-pkgsrc_zebra.sh.in | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diffs:
diff --git a/frr/Makefile b/frr/Makefile
index c6c66b8d54..02ef1b8a20 100644
--- a/frr/Makefile
+++ b/frr/Makefile
@@ -49,6 +49,12 @@ REPLACE_BASH=	tools/frr.in tools/*.sh.in
 
 REPLACE_PYTHON=	tools/generate_support_bundle.py tools/frr-reload.py
 
+SUBST_CLASSES+=		ids
+SUBST_STAGE.ids=	pre-configure
+SUBST_MESSAGE.ids=	Fixing user/group references.
+SUBST_FILES.ids=	pkgsrc/zebra.sh.in
+SUBST_VARS.ids=		FRR_USER FRR_GROUP
+
 SUBST_CLASSES+=		workdir
 SUBST_STAGE.workdir=	post-configure
 SUBST_MESSAGE.workdir=	Fixing absolute workdir references.
@@ -60,7 +66,6 @@ CONFIGURE_ARGS?=	--sysconfdir=${PREFIX}/etc/${PKG_SYSCONFSUBDIR}
 CONFIGURE_ARGS+=	--enable-user=${FRR_USER}
 CONFIGURE_ARGS+=	--enable-group=${FRR_GROUP}
 CONFIGURE_ARGS+=	--enable-exampledir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
-# CONFIGURE_ARGS+=	--enable-pkgsrcrcdir=${PREFIX}/share/examples/rc.d
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run/frr
 CONFIGURE_ARGS+=	--enable-multipath=64
 CONFIGURE_ARGS+=	--enable-vty-group=${FRR_VTY_GROUP}
@@ -77,7 +82,7 @@ pre-configure:
 .include "../../wip/libyang/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 
@@ -89,5 +94,3 @@ CONF_FILES?=
 CONF_FILES_PERMS+=	/dev/null ${PKG_SYSCONFDIR}${l:C/^${CONFIG_TEMPLATE_PATH}(.*)\.sample/\1/} \
 			${FRR_USER} ${FRR_GROUP} ${FRR_CONF_MODE}
 .endfor
-
-# .include "../../mk/bsd.pkg.mk"
diff --git a/frr/distinfo b/frr/distinfo
index 39d570f4c9..f619b5f643 100644
--- a/frr/distinfo
+++ b/frr/distinfo
@@ -5,4 +5,5 @@ RMD160 (frr-7.4.tar.gz) = 6c8dbf18b9d59c6518d57b2a1869d827ff194448
 SHA512 (frr-7.4.tar.gz) = d5c4e3bf7527bc094a65b24fda1b7a86f87e996fb3d98abe646e878274e0ca30f45aefca76816414b9d44607616cd2eb8ad118045b8986a92dd130f3a704162f
 Size (frr-7.4.tar.gz) = 6074854 bytes
 SHA1 (patch-lib_zlog.c) = 00e70b92eae8e399ac3083fec815350463a6b0e0
+SHA1 (patch-pkgsrc_zebra.sh.in) = b692068722ee5a06e4fd975edbf0a724dfc03ac9
 SHA1 (patch-zebra_ioctl.c) = 99b7606564f4dc620df997889156b5c09f7fb396
diff --git a/frr/patches/patch-pkgsrc_zebra.sh.in b/frr/patches/patch-pkgsrc_zebra.sh.in
new file mode 100644
index 0000000000..27b893a3c9
--- /dev/null
+++ b/frr/patches/patch-pkgsrc_zebra.sh.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+	don't hard-code quagga.quagga in chown command in
+	pkgsrc/zebra.sh.in.
+
+--- pkgsrc/zebra.sh.in.orig	2020-06-30 11:08:57.000000000 +0000
++++ pkgsrc/zebra.sh.in
+@@ -28,7 +28,7 @@ pidfile="${socket_dir}/${name}.pid"
+ zebra_precmd()
+ {
+     mkdir -p "${socket_dir}"
+-    chown quagga.quagga "${socket_dir}"
++    chown @FRR_USER@.@FRR_GROUP@ "${socket_dir}"
+     chmod 750 "${socket_dir}"
+     rc_flags="$(
+ 	set -- $rc_flags