Re: Ipfilter pre-Vendor Import Issue

2013-07-09 Thread Gleb Smirnoff
On Tue, Jul 09, 2013 at 12:49:36PM -0400, John Baldwin wrote: J> Let's not make ipfilter some random one-off vendor source that imports code J> into random places. The remaining instances of that that we have (such as J> stdtime) are a PITA to deal with. J> J> vendor/ipfilter == userland bits =>

Re: Ipfilter pre-Vendor Import Issue

2013-07-09 Thread John Baldwin
On Tuesday, July 09, 2013 5:21:36 am Gleb Smirnoff wrote: > On Mon, Jul 08, 2013 at 01:00:02PM -0700, Cy Schubert wrote: > C> > The BSD license allows us to put the code into FreeBSD w/o any separation. > C> > > C> > So the question is: what is more handy to us? > C> > > C> > What do we actually

Re: Ipfilter pre-Vendor Import Issue

2013-07-09 Thread John Baldwin
On Friday, July 05, 2013 4:46:49 am Gleb Smirnoff wrote: > Cy, > > On Thu, Jul 04, 2013 at 03:10:14PM -0700, Cy Schubert wrote: > C> Unfortunately it doesn't work any more. Here is what svn spit out at me. > C> > C> slippy$ cd $MY_WORK_DIR/current/contrib/ipfilter > C> slippy$ svn merge --recor

Re: Ipfilter pre-Vendor Import Issue

2013-07-09 Thread Darren Reed
On Tue, Jul 9, 2013, at 11:21 AM, Gleb Smirnoff wrote: ... > No, userland tools should be placed in bin|sbin|usr.bin|usr.sbin, > according to the place where they are installed. An exlusion can be made > adding a intermediate subdir (like this is already done for ipfilter > tools), > to group all r

Re: Ipfilter pre-Vendor Import Issue

2013-07-09 Thread Darren Reed
On Mon, Jul 8, 2013, at 11:26 AM, Andre Oppermann wrote: > I think the main distinction here is whether the adaptions to > FreeBSD are kept local (resulting in almost a fork) or are fed > upstream so that successive updates require less or no local > changes. > > Having the kernel part in sys/netp

Re: Ipfilter pre-Vendor Import Issue

2013-07-09 Thread Gleb Smirnoff
On Mon, Jul 08, 2013 at 01:00:02PM -0700, Cy Schubert wrote: C> > The BSD license allows us to put the code into FreeBSD w/o any separation. C> > C> > So the question is: what is more handy to us? C> > C> > What do we actually gain having contrib/ipf, assuming we got vendor branch C> > already? C

Re: Ipfilter pre-Vendor Import Issue

2013-07-08 Thread Cy Schubert
In message <20130708134400.gh67...@glebius.int.ru>, Gleb Smirnoff writes: > Cy, > > On Fri, Jul 05, 2013 at 11:38:21AM -0700, Cy Schubert wrote: > C> > What I'd prefer to see is the following: > C> > > C> > - commit new ipfilter untouched to vendor-sys/ipfilter > C> > - nuke sys/contrib/ipfilte

Re: Ipfilter pre-Vendor Import Issue

2013-07-08 Thread Cy Schubert
In message <51da85cf.3000...@freebsd.org>, Andre Oppermann writes: > On 05.07.2013 20:38, Cy Schubert wrote: > > In message <20130705084649.gc67...@freebsd.org>, Gleb Smirnoff writes: > >> What I'd prefer to see is the following: > >> > >> - commit new ipfilter untouched to vendor-sys/ipfilter > >>

Re: Ipfilter pre-Vendor Import Issue

2013-07-08 Thread Gleb Smirnoff
Cy, On Fri, Jul 05, 2013 at 11:38:21AM -0700, Cy Schubert wrote: C> > What I'd prefer to see is the following: C> > C> > - commit new ipfilter untouched to vendor-sys/ipfilter C> > - nuke sys/contrib/ipfilter C> > - svn copy vendor-sys/ipfilter to sys/netpfil/ipfilter C> C> Having ipfilter in

Re: Ipfilter pre-Vendor Import Issue

2013-07-08 Thread Andre Oppermann
On 05.07.2013 20:38, Cy Schubert wrote: In message <20130705084649.gc67...@freebsd.org>, Gleb Smirnoff writes: What I'd prefer to see is the following: - commit new ipfilter untouched to vendor-sys/ipfilter - nuke sys/contrib/ipfilter - svn copy vendor-sys/ipfilter to sys/netpfil/ipfilter Hav

Re: Ipfilter pre-Vendor Import Issue

2013-07-05 Thread Cy Schubert
In message <20130705084649.gc67...@freebsd.org>, Gleb Smirnoff writes: > Cy, > > On Thu, Jul 04, 2013 at 03:10:14PM -0700, Cy Schubert wrote: > C> Unfortunately it doesn't work any more. Here is what svn spit out at me. > C> > C> slippy$ cd $MY_WORK_DIR/current/contrib/ipfilter > C> slippy$ svn

Re: Ipfilter pre-Vendor Import Issue

2013-07-05 Thread Gleb Smirnoff
Cy, On Thu, Jul 04, 2013 at 03:10:14PM -0700, Cy Schubert wrote: C> Unfortunately it doesn't work any more. Here is what svn spit out at me. C> C> slippy$ cd $MY_WORK_DIR/current/contrib/ipfilter C> slippy$ svn merge --record-only file:///tank/wrepos/wsvn/base/vendor/ipfilte C> r/dist@252548 C>

Ipfilter pre-Vendor Import Issue

2013-07-04 Thread Cy Schubert
Hi, Originally this email was a here is how I'm planning on doing it kind of email but now that svn 1.8 broke the third step I need some help. I've been getting the flattening of the ipfilter vendor branch right and working on the importation of ipfilter 5.1.2 into my own test SVN repo. (Now t