As per the developers handbook (5.3.1 step 1), prepare the vendor trees for

import of new ipfilter vendor sources by flattening them.

To keep the tags consistent with dist, the tags are also flattened.

Approved by:	glebius (Mentor)

43 files changed, 0 insertions, 0 deletions

diff --git a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE b/netinet/IPFILTER.LICENCE
index 41c151c..41c151c 100644
--- a/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE
+++ b/netinet/IPFILTER.LICENCE
diff --git a/sys/contrib/ipfilter/netinet/QNX_OCL.txt b/netinet/QNX_OCL.txt
index 6aa33ea..6aa33ea 100644
--- a/sys/contrib/ipfilter/netinet/QNX_OCL.txt
+++ b/netinet/QNX_OCL.txt
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/netinet/fil.c
index 3183dd1..3183dd1 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/netinet/fil.c
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/netinet/ip_auth.c
index 11bd07b..11bd07b 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.c
+++ b/netinet/ip_auth.c
diff --git a/sys/contrib/ipfilter/netinet/ip_auth.h b/netinet/ip_auth.h
index 818497b..818497b 100644
--- a/sys/contrib/ipfilter/netinet/ip_auth.h
+++ b/netinet/ip_auth.h
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/netinet/ip_compat.h
index 901d21b..901d21b 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/netinet/ip_compat.h
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/netinet/ip_fil.c
index 00e8565..00e8565 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.c
+++ b/netinet/ip_fil.c
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/netinet/ip_fil.h
index 8236cef..8236cef 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil.h
+++ b/netinet/ip_fil.h
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/netinet/ip_fil_freebsd.c
index fbecdad..fbecdad 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/netinet/ip_fil_freebsd.c
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/netinet/ip_frag.c
index fd738f2..fd738f2 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/netinet/ip_frag.c
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.h b/netinet/ip_frag.h
index d3e89005..d3e89005 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.h
+++ b/netinet/ip_frag.h
diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/netinet/ip_ftp_pxy.c
index c352027..c352027 100644
--- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c
+++ b/netinet/ip_ftp_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_h323_pxy.c b/netinet/ip_h323_pxy.c
index 7fc6227..7fc6227 100644
--- a/sys/contrib/ipfilter/netinet/ip_h323_pxy.c
+++ b/netinet/ip_h323_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_htable.c b/netinet/ip_htable.c
index 1bed371..1bed371 100644
--- a/sys/contrib/ipfilter/netinet/ip_htable.c
+++ b/netinet/ip_htable.c
diff --git a/sys/contrib/ipfilter/netinet/ip_htable.h b/netinet/ip_htable.h
index 2c08812..2c08812 100644
--- a/sys/contrib/ipfilter/netinet/ip_htable.h
+++ b/netinet/ip_htable.h
diff --git a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c b/netinet/ip_ipsec_pxy.c
index e88a6b9..e88a6b9 100644
--- a/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c
+++ b/netinet/ip_ipsec_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c b/netinet/ip_irc_pxy.c
index 5bb252a..5bb252a 100644
--- a/sys/contrib/ipfilter/netinet/ip_irc_pxy.c
+++ b/netinet/ip_irc_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/netinet/ip_log.c
index aed828e..aed828e 100644
--- a/sys/contrib/ipfilter/netinet/ip_log.c
+++ b/netinet/ip_log.c
diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.c b/netinet/ip_lookup.c
index e33a6fe..e33a6fe 100644
--- a/sys/contrib/ipfilter/netinet/ip_lookup.c
+++ b/netinet/ip_lookup.c
diff --git a/sys/contrib/ipfilter/netinet/ip_lookup.h b/netinet/ip_lookup.h
index 3886df1..3886df1 100644
--- a/sys/contrib/ipfilter/netinet/ip_lookup.h
+++ b/netinet/ip_lookup.h
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/netinet/ip_nat.c
index 3df1850..3df1850 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.c
+++ b/netinet/ip_nat.c
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.h b/netinet/ip_nat.h
index f25c0d8..f25c0d8 100644
--- a/sys/contrib/ipfilter/netinet/ip_nat.h
+++ b/netinet/ip_nat.h
diff --git a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c b/netinet/ip_netbios_pxy.c
index 1a0b2a2..1a0b2a2 100644
--- a/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c
+++ b/netinet/ip_netbios_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_pool.c b/netinet/ip_pool.c
index eab3310..eab3310 100644
--- a/sys/contrib/ipfilter/netinet/ip_pool.c
+++ b/netinet/ip_pool.c
diff --git a/sys/contrib/ipfilter/netinet/ip_pool.h b/netinet/ip_pool.h
index 9968ef0..9968ef0 100644
--- a/sys/contrib/ipfilter/netinet/ip_pool.h
+++ b/netinet/ip_pool.h
diff --git a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c b/netinet/ip_pptp_pxy.c
index 3924d4b..3924d4b 100644
--- a/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c
+++ b/netinet/ip_pptp_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/netinet/ip_proxy.c
index 04e9f89..04e9f89 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/netinet/ip_proxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.h b/netinet/ip_proxy.h
index e370022..e370022 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.h
+++ b/netinet/ip_proxy.h
diff --git a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c b/netinet/ip_raudio_pxy.c
index 76e8b9f..76e8b9f 100644
--- a/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c
+++ b/netinet/ip_raudio_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/netinet/ip_rcmd_pxy.c
index 0af3f9b..0af3f9b 100644
--- a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/netinet/ip_rcmd_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c b/netinet/ip_rpcb_pxy.c
index da76fde..da76fde 100644
--- a/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c
+++ b/netinet/ip_rpcb_pxy.c
diff --git a/sys/contrib/ipfilter/netinet/ip_rules.c b/netinet/ip_rules.c
index f080ec5b..f080ec5b 100644
--- a/sys/contrib/ipfilter/netinet/ip_rules.c
+++ b/netinet/ip_rules.c
diff --git a/sys/contrib/ipfilter/netinet/ip_rules.h b/netinet/ip_rules.h
index 37e3646..37e3646 100644
--- a/sys/contrib/ipfilter/netinet/ip_rules.h
+++ b/netinet/ip_rules.h
diff --git a/sys/contrib/ipfilter/netinet/ip_scan.c b/netinet/ip_scan.c
index 54acb2a..54acb2a 100644
--- a/sys/contrib/ipfilter/netinet/ip_scan.c
+++ b/netinet/ip_scan.c
diff --git a/sys/contrib/ipfilter/netinet/ip_scan.h b/netinet/ip_scan.h
index 4772d28..4772d28 100644
--- a/sys/contrib/ipfilter/netinet/ip_scan.h
+++ b/netinet/ip_scan.h
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/netinet/ip_state.c
index a63f924..a63f924 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/netinet/ip_state.c
diff --git a/sys/contrib/ipfilter/netinet/ip_state.h b/netinet/ip_state.h
index 71dae1d..71dae1d 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.h
+++ b/netinet/ip_state.h
diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/netinet/ip_sync.c
index b145539..b145539 100644
--- a/sys/contrib/ipfilter/netinet/ip_sync.c
+++ b/netinet/ip_sync.c
diff --git a/sys/contrib/ipfilter/netinet/ip_sync.h b/netinet/ip_sync.h
index 8104db3..8104db3 100644
--- a/sys/contrib/ipfilter/netinet/ip_sync.h
+++ b/netinet/ip_sync.h
diff --git a/sys/contrib/ipfilter/netinet/ipl.h b/netinet/ipl.h
index 614250a..614250a 100644
--- a/sys/contrib/ipfilter/netinet/ipl.h
+++ b/netinet/ipl.h
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/netinet/mlfk_ipl.c
index 7718bd9..7718bd9 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/netinet/mlfk_ipl.c
diff --git a/sys/contrib/ipfilter/netinet/y b/netinet/y
index d9aa671..d9aa671 100644
--- a/sys/contrib/ipfilter/netinet/y
+++ b/netinet/y
diff --git a/sys/contrib/ipfilter/netinet/y.pub b/netinet/y.pub
index a225f39..a225f39 100644
--- a/sys/contrib/ipfilter/netinet/y.pub
+++ b/netinet/y.pub