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)

1 files changed, 0 insertions, 68 deletions

diff --git a/contrib/ipfilter/test/expected/ip1 b/contrib/ipfilter/test/expected/ip1
deleted file mode 100644
index b04fa9d..0000000
--- a/contrib/ipfilter/test/expected/ip1
+++ /dev/null
@@ -1,68 +0,0 @@
-table role = ipf type = tree number = 1
-	{; };
-table role = ipf type = tree number = 100
-	{ 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role = ipf type = tree number = 110
-	{ 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role = ipf type = tree number = 120
-	{ 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role = ipf type = tree number = 130
-	{ 2.2.2.0/24; ! 2.2.0.0/16; 1.2.3.4/32; };
-table role = ipf type = hash number = 2 size = 1
-	{; };
-table role = ipf type = hash number = 200 size = 5
-	{ 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 210 size = 5
-	{ 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 220 size = 5
-	{ 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 230 size = 5
-	{ 0/0; 4/32; 1.2.3.4/32; };
-table role = ipf type = hash number = 240 size = 5 seed = 101
-	{ 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 250 size = 5 seed = 101
-	{ 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 260 size = 5 seed = 101
-	{ 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 270 size = 5 seed = 101
-	{ 0/0; 4/32; 1.2.3.4/32; };
-table role = ipf type = hash number = 2000 size = 1001
-	{ 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 2000 size = 1001
-	{ 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 2000 size = 1001
-	{ 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 2000 size = 1001
-	{ 0/0; 4/32; 1.2.3.4/32; };
-table role = ipf type = hash number = 100 size = 1001 seed = 101
-	{ 0/0; 1/32; 1.2.3.4/32; };
-table role = nat type = hash number = 100 size = 1001 seed = 101
-	{ 0/0; 2/32; 1.2.3.4/32; };
-table role = auth type = hash number = 100 size = 1001 seed = 101
-	{ 0/0; 3/32; 1.2.3.4/32; };
-table role = count type = hash number = 100 size = 1001 seed = 101
-	{ 0/0; 4/32; 1.2.3.4/32; };
-group-map in role = ipf number = 300 size = 5
-	{ 0/0, group = 303; 5/32, group = 303; 1.2.3.4/32, group = 303; };
-group-map in role = nat number = 300 size = 5
-	{ 0/0, group = 303; 6/32, group = 303; 1.2.3.4/32, group = 303; };
-group-map in role = auth number = 300 size = 5
-	{ 0/0, group = 303; 7/32, group = 303; 1.2.3.4/32, group = 303; };
-group-map in role = count number = 300 size = 5
-	{ 0/0, group = 303; 8/32, group = 303; 1.2.3.4/32, group = 303; };
-group-map out role = ipf number = 400 size = 5
-	{ 0/0, group = 303; 5/32, group = 303; 1.2.3.4/32, group = 606; };
-group-map out role = nat number = 400 size = 5
-	{ 0/0, group = 303; 6/32, group = 303; 1.2.3.4/32, group = 606; };
-group-map out role = auth number = 400 size = 5
-	{ 0/0, group = 303; 7/32, group = 303; 1.2.3.4/32, group = 606; };
-group-map out role = count number = 400 size = 5
-	{ 0/0, group = 303; 8/32, group = 303; 1.2.3.4/32, group = 606; };
-group-map in role = ipf number = 500 size = 5
-	{ 0/0, group = 10; 5/32, group = 800; 1.2.3.4/32, group = 606; };
-group-map in role = nat number = 500 size = 5
-	{ 0/0, group = 10; 6/32, group = 800; 1.2.3.4/32, group = 606; };
-group-map in role = auth number = 500 size = 5
-	{ 0/0, group = 10; 7/32, group = 800; 1.2.3.4/32, group = 606; };
-group-map in role = count number = 500 size = 5
-	{ 0/0, group = 10; 8/32, group = 800; 1.2.3.4/32, group = 606; };