Where was ipfilter supposed to end up in the tree?

[Ulrich Spörlein]

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.

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)

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

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.


------------------------------------------------------------------------
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.