Date: Wed, 24 Dec 2014 14:56:31 -0700 From: Kim Shrier <kim@westryn.net> To: Alfred Perlstein <alfred@freebsd.org> Cc: Marcel Moolenaar <marcel@freebsd.org>, Phil Shafer <phil@juniper.net>, John-Mark Gurney <jmg@funkthat.com>, "Simon J. Gerraty" <sjg@juniper.net>, arch@freebsd.org, Poul-Henning Kamp <phk@phk.freebsd.dk>, freebsd-arch <freebsd-arch@freebsd.org>, Konstantin Belousov <kostikbel@gmail.com> Subject: Re: XML Output: libxo - provide single API to output TXT, XML, JSON and HTML Message-ID: <AFE71480-B9DE-4C6E-B2FF-9A33C5387D96@westryn.net> In-Reply-To: <549B3509.9090502@freebsd.org> References: <201410210217.s9L2HECn097421@idle.juniper.net> <549A5D1E.7020700@freebsd.org> <549A69E4.7020508@freebsd.org> <D97F69F7-7C0F-4093-821F-B2A065D964DB@westryn.net> <549B2237.5040701@freebsd.org> <70E1870D-39D0-4578-8FB4-D24CB41562A5@westryn.net> <549B3509.9090502@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
If I have time, are there other utilities that need merging? Kim > On Dec 24, 2014, at 2:50 PM, Alfred Perlstein <alfred@freebsd.org> = wrote: >=20 > Kim, nice!! >=20 > I'm doing some testing, I need to do some cleanup. >=20 > Already took your changes on github. I'll push the combined changes = shortly. >=20 > On 12/24/14 1:14 PM, Kim Shrier wrote: >> I just did unix.c.rej and am starting on route.c.rej. >>=20 >> Kim >>=20 >>> On Dec 24, 2014, at 1:29 PM, Alfred Perlstein <alfred@freebsd.org> = wrote: >>>=20 >>> Kim, all I have left for netstat at this point is: >>>=20 >>> netgraph.c.rej >>> route.c.rej >>> unix.c.rej >>>=20 >>> I believe this will just be a few more hours of work, I'm off to get = final gifts for girlfriend, I'll be back and let you know how I'm doing. >>>=20 >>> did you decide to work on netstat or one of the other programs? >>>=20 >>> On 12/24/14 11:44 AM, Kim Shrier wrote: >>>>> On Dec 24, 2014, at 12:23 AM, Alfred Perlstein = <alfred@freebsd.org> wrote: >>>>>=20 >>>>> I have a github branch where I've started to merge the netstat = patch in. >>>>>=20 >>>>> I'm not sure I'm going to finish this one, if someone wants to = pick it up, send me a pull request. >>>>>=20 >>>>> The patch's .rej files are checked in so that it's easy to merge = via a side-by-side editor of the file and .rej file. >>>>>=20 >>>>> https://github.com/splbio/freebsd/tree/ap_libxo_netstat >>>>>=20 >>>>> = https://github.com/splbio/freebsd/compare/ap_libxo_netstat?expand=3D1 >>>>>=20 >>>>> -Alfred >>>>>=20 >>>> I have some time to look at this. >>>>=20 >>>> Just to make sure I understand what is needed. I have cloned your = repository and checked out the ap_libxo_netstat branch. I see the = following files in usr.bin/netstat: >>>>=20 >>>> inet.c.rej >>>> inet6.c.rej >>>> main.c.rej >>>> mroute.c.rej >>>> netgraph.c.rej >>>> route.c.rej >>>> unix.c.rej >>>>=20 >>>> Is all you need is to have these rejected patches merged in or is = there more? >>>>=20 >>>> Kim >>>>=20 >> _______________________________________________ >> freebsd-arch@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-arch >> To unsubscribe, send any mail to = "freebsd-arch-unsubscribe@freebsd.org" >>=20 >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AFE71480-B9DE-4C6E-B2FF-9A33C5387D96>