On Sun, Sep 13 2020, [email protected] wrote: > Hello > > I ran into a bug with the 1.2.3 port of quagga. The bug is documented here: > > https://github.com/FRRouting/frr/pull/312 > > This patch (inline) corrects that bug. I also updated the port to 1.2.4. > This was made against -current.
The update looked very minor (looking at the tarball diff) and the getgrouplist fix is correct. Note that the Makefile diff did not apply (tabs vs spaces), and REVISION should be dropped when updating to a newer version. Committed with a few tweaks. Thanks! > Regards > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/quagga/Makefile,v > retrieving revision 1.59 > diff -u -p -r1.59 Makefile > --- Makefile 12 Jul 2019 20:48:47 -0000 1.59 > +++ Makefile 27 Aug 2020 00:45:03 -0000 > @@ -2,7 +2,7 @@ > > COMMENT= multi-threaded routing daemon > > -DISTNAME= quagga-1.2.3 > +DISTNAME= quagga-1.2.4 > REVISION= 0 > CATEGORIES= net > MASTER_SITES= http://download.savannah.gnu.org/releases/quagga/ > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/quagga/distinfo,v > retrieving revision 1.23 > diff -u -p -r1.23 distinfo > --- distinfo 16 Feb 2018 21:20:05 -0000 1.23 > +++ distinfo 27 Aug 2020 00:45:03 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (quagga-1.2.3.tar.gz) = 7iwJB6EGkCq73K9jtPKMZyQcTzOWmJ7VTae0l27srTE= > -SIZE (quagga-1.2.3.tar.gz) = 2925444 > +SHA256 (quagga-1.2.4.tar.gz) = 42TAgsMwmRDh63sGi/Oe4pji8vPzGmQxpcEVGTvWU9M= > +SIZE (quagga-1.2.4.tar.gz) = 2925847 > Index: patches/patch-lib_privs_c > =================================================================== > RCS file: patches/patch-lib_privs_c > diff -N patches/patch-lib_privs_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-lib_privs_c 27 Aug 2020 00:45:03 -0000 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > + > +Index: lib/privs.c > +--- lib/privs.c.orig > ++++ lib/privs.c > +@@ -718,7 +718,7 @@ zprivs_init(struct zebra_privs_t *zprivs) > + if (zprivs->user) > + { > + ngroups = sizeof(groups); > +- if ( (ngroups = getgrouplist (zprivs->user, zprivs_state.zgid, > groups, &ngroups )) < 0 ) > ++ 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", > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
