Fwd: Where was ipfilter supposed to end up in the tree?

Cy Schubert Cy.Schubert at cschubert.com
Wed May 6 15:09:41 UTC 2020 

In message <CAPyFy2CXGyeLZg8pP6ZdP58FQSUNpZiJsa7T-XGFHstzPtuFdA at mail.gmail.c
om>
, Ed Maste writes:
> Hi Cy, a question on the FreeBSD-git mailing list about ipfilter
> vendor branching:
>
> ---------- Forwarded message ---------
> From: Ulrich Spörlein <uqs at freebsd.org>
> Date: Wed, 6 May 2020 at 07:35
> Subject: Where was ipfilter supposed to end up in the tree?
> To: <freebsd-git at freebsd.org>
>
>
> Hey folks, another vendor branch oddity I need some guidance on.
>
> vendor-sys/ipfilter did most imports into `dist` *and* `dist-old`. The
> merges into head are recorded from dist-old for the early parts of the
> history, so I can collapse this into 1 dist branch easily.

dist-old was before my time. I've never questioned why. Looking at the 
history today it appears that vendor/dist was split into vendor-sys/dist 
and vendor/dist.

>
> But looking at it, it is a bit more strange than that. The merges to
> head merge into 2 different places, and I wonder what the correct
> place is (so I can blacklist the other)

dist is the authoritative directory. I cannot answer why darrenr@ chose to 
import into dist-old. One would think that a clean break should have been 
made at the point peter@ created it.

>
> Is /head/sys/contrib/ipfilter/netinet correct, or /head/sys/netinet/
> (and: was it maybe repo-copied at some point?)

For kernel sources, head/sys/contrib/ipfilter/inet is the correct location. 

>
> It currently lives in sys/contrib/ipfilter/netinet, but for example
> the tagging of releng/6.3 still deleted it, so it likely was
> repo-copied.

It likely was. I wasn't a src comitter (or even a ports committer) then. 
But looking at svn history peter@ moved it from head/sys/netinet to 
head/sys/contrib/ipfilter/netinet in r2328: 23283 | peter | 1997-03-02 
07:49:41 -0800 (Sun, 02 Mar 1997).

The reason for the change is that darrenr@ changed the ipfilter license at 
about that time when he was employed by Sun. And ipfilter became part of 
Solaris (7 or 8, my memory is foggy about this). This is also when OpenBSD 
ripped ipfilter out of their sources and wrote pf, in response to the 
license change. Though I wasn't a committer at that time I do recall 
discussions on the mailing lists to move ipfilter to contrib.

Merging dist-old into dist would be logical.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  https://FreeBSD.org
NTP:           <cy at nwtime.org>    Web:  https://nwtime.org

	The need of the many outweighs the greed of the few.


>
>
> ------------------------------------------------------------------------
> r23282 | peter | 1997-03-02 16:49:41 +0100 (Sun, 02 Mar 1997) | 3 lines
> Changed paths:
>    A /vendor-sys/ipfilter
>    A /vendor-sys/ipfilter/dist
>    A /vendor-sys/ipfilter/dist/sys
>    A /vendor-sys/ipfilter/dist/sys/contrib
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/fil.c
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_compat.h
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.c
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.h
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.c
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.h
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.c
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.h
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.c
>    A /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.h
>    A /vendor-sys/ipfilter/dist-old
>    A /vendor-sys/ipfilter/dist-old/sys
>    A /vendor-sys/ipfilter/dist-old/sys/netinet
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/fil.c
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_compat.h
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.c
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.h
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.c
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.h
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.c
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.h
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.c
>    A /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.h
>
> Replacement import of ipfilter 3.1.7 components used in kernel.
> (This is to repair the vendor branching)
>
> ------------------------------------------------------------------------
> r23283 | peter | 1997-03-02 16:49:41 +0100 (Sun, 02 Mar 1997) | 3 lines
> Changed paths:
>    A /head/sys/contrib
>    A /head/sys/contrib/ipfilter
>    A /head/sys/contrib/ipfilter/netinet
>    A /head/sys/contrib/ipfilter/netinet/fil.c (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/fil.c:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_compat.h (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_compat.h:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_fil.c (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.c:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_fil.h (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_fil.h:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_frag.c (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.c:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_frag.h (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_frag.h:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_nat.c (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.c:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_nat.h (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_nat.h:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_state.c (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.c:23282)
>    A /head/sys/contrib/ipfilter/netinet/ip_state.h (from
> /vendor-sys/ipfilter/dist/sys/contrib/ipfilter/netinet/ip_state.h:23282)
>    A /head/sys/netinet/fil.c (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/fil.c:23282)
>    A /head/sys/netinet/ip_compat.h (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_compat.h:23282)
>    A /head/sys/netinet/ip_fil.c (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.c:23282)
>    A /head/sys/netinet/ip_fil.h (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_fil.h:23282)
>    A /head/sys/netinet/ip_frag.c (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.c:23282)
>    A /head/sys/netinet/ip_frag.h (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_frag.h:23282)
>    A /head/sys/netinet/ip_nat.c (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.c:23282)
>    A /head/sys/netinet/ip_nat.h (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_nat.h:23282)
>    A /head/sys/netinet/ip_state.c (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.c:23282)
>    A /head/sys/netinet/ip_state.h (from
> /vendor-sys/ipfilter/dist-old/sys/netinet/ip_state.h:23282)
>
> This commit was generated by cvs2svn to compensate for changes in r23282,
> which included commits to RCS files with non-trunk default branches.
>
> ------------------------------------------------------------------------
> r23284 | cvs2svn | 1997-03-02 16:49:42 +0100 (Sun, 02 Mar 1997) | 2 lines
> Changed paths:
>    A /vendor-sys/ipfilter/ipfilter3_1_7 (from
> /vendor-sys/ipfilter/dist-old:23282)
>
> This commit was manufactured by cvs2svn to create tag
> 'ipfilter3_1_7'.
> ------------------------------------------------------------------------
>
>
>
> Ah, some more spelunking finds:
>
> r77859 | jlemon | 2001-06-07 07:13:35 +0200 (Thu, 07 Jun 2001) | 2
> lines
> Changed paths:
>    D /head/sys/netinet/fil.c
>    D /head/sys/netinet/ip_auth.c
>    D /head/sys/netinet/ip_auth.h
>    D /head/sys/netinet/ip_compat.h
>    D /head/sys/netinet/ip_fil.c
>    D /head/sys/netinet/ip_fil.h
>    D /head/sys/netinet/ip_frag.c
>    D /head/sys/netinet/ip_frag.h
>    D /head/sys/netinet/ip_ftp_pxy.c
>    D /head/sys/netinet/ip_log.c
>    D /head/sys/netinet/ip_nat.c
>    D /head/sys/netinet/ip_nat.h
>    D /head/sys/netinet/ip_proxy.c
>    D /head/sys/netinet/ip_proxy.h
>    D /head/sys/netinet/ip_raudio_pxy.c
>    D /head/sys/netinet/ip_rcmd_pxy.c
>    D /head/sys/netinet/ip_state.c
>    D /head/sys/netinet/ip_state.h
>    D /head/sys/netinet/ipl.h
>    D /head/sys/netinet/mlfk_ipl.c
>
> Move IPFilter into contrib.
> _______________________________________________
> freebsd-git at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-git
> To unsubscribe, send any mail to "freebsd-git-unsubscribe at freebsd.org"
>

More information about the freebsd-git mailing list