From owner-freebsd-current@FreeBSD.ORG  Tue Jul  9 20:42:39 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 44FB9A87;
 Tue,  9 Jul 2013 20:42:39 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id BDE9B1B2A;
 Tue,  9 Jul 2013 20:42:38 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id r69KgaVj097150;
 Wed, 10 Jul 2013 00:42:36 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id r69KgZQe097149;
 Wed, 10 Jul 2013 00:42:35 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Wed, 10 Jul 2013 00:42:35 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: John Baldwin <jhb@freebsd.org>
Subject: Re: Ipfilter pre-Vendor Import Issue
Message-ID: <20130709204235.GU67810@glebius.int.ru>
References: <glebius@FreeBSD.org>
 <201307082000.r68K02Ef063517@slippy.cwsent.com>
 <20130709092136.GL67810@glebius.int.ru>
 <201307091249.36403.jhb@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <201307091249.36403.jhb@freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: freebsd-current@freebsd.org, current@freebsd.org
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jul 2013 20:42:39 -0000

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 => contrib/ipfilter.  You then put suitable
J> Makefiles/build glue that uses .PATH in usr.bin|sbin|whatever.
J> 
J> vendor-sys/ipfilter == kernel bits => sys/contrib/ipfilter.  You then fix
J> sys/conf/files, etc. as appropriate.
J> 
J> This is our _standard_ practice for dealing with this stuff.  This is how all
J> the OpenSolaris bits for Dtrace and ZFS are handled (except that they end up
J> in a cddl directory instead of contrib).  GENERIC / LINT builds can include
J> things from sys/contrib just fine, so ipfilter won't be missed by builds, etc.

Okay, let it be so.

My initial intention was to "own" ipfilter by FreeBSD, since for the
last years it was unmaintained, and its contrib status prevented people
from touching its sources.

Now, that Darren responded on this thread and promises to take our
patches upstream, I am fine with having it in contrib.

-- 
Totus tuus, Glebius.