From owner-freebsd-arch@FreeBSD.ORG Wed Dec 24 19:54:06 2014 Return-Path: Delivered-To: arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6479020C; Wed, 24 Dec 2014 19:54:06 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 4CAE62E2D; Wed, 24 Dec 2014 19:54:06 +0000 (UTC) Received: from AlfredMacbookAir.local (c-76-21-10-192.hsd1.ca.comcast.net [76.21.10.192]) by elvis.mu.org (Postfix) with ESMTPSA id 39F04341F85F; Wed, 24 Dec 2014 11:54:05 -0800 (PST) Message-ID: <549B19E2.7020300@freebsd.org> Date: Wed, 24 Dec 2014 11:54:10 -0800 From: Alfred Perlstein Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Kim Shrier Subject: Re: XML Output: libxo - provide single API to output TXT, XML, JSON and HTML References: <201410210217.s9L2HECn097421@idle.juniper.net> <549A5D1E.7020700@freebsd.org> <549A69E4.7020508@freebsd.org> In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: Marcel Moolenaar , Phil Shafer , John-Mark Gurney , "Simon J. Gerraty" , arch@freebsd.org, Poul-Henning Kamp , freebsd-arch , Konstantin Belousov X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Dec 2014 19:54:06 -0000 On 12/24/14 11:44 AM, Kim Shrier wrote: >> On Dec 24, 2014, at 12:23 AM, Alfred Perlstein wrote: >> >> I have a github branch where I've started to merge the netstat patch in. >> >> I'm not sure I'm going to finish this one, if someone wants to pick it up, send me a pull request. >> >> 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. >> >> https://github.com/splbio/freebsd/tree/ap_libxo_netstat >> >> https://github.com/splbio/freebsd/compare/ap_libxo_netstat?expand=1 >> >> -Alfred >> > I have some time to look at this. > > 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: > > inet.c.rej > inet6.c.rej > main.c.rej > mroute.c.rej > netgraph.c.rej > route.c.rej > unix.c.rej > > Is all you need is to have these rejected patches merged in or is there more? > > Kim > Kim, Yes. I am actually blowing through this today, I have inet.c.rej merged and inet6.c.rej almost merged. If you want to start at unix.c.rej and work your way towards me that would be cool. I'll email to this list as I make progress and cc you. Other option would be to grab a different utility and start merging that? You can grab other utilities here: https://github.com/Juniper/libxo/tree/master/patches I have commit access, so if you want to send pull requests to my branch I can incorporate your changes into the upstream later. Let me know which direction you want to take. thank you! -Alfred