19 files changed, 18 insertions, 44 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index c5e1ec9bf63..1e59a409e56 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.214 2010/07/03 02:32:45 phessler Exp $
+# $OpenBSD: Makefile,v 1.215 2011/07/07 01:58:12 mcbride Exp $
 
 # TARGETS
 # pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
@@ -14,7 +14,7 @@
 
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
 PFTESTS+=28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
-PFTESTS+=51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
+PFTESTS+=52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
 PFTESTS+=74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
 PFTESTS+=97 98 99 100
 PFFAIL=1 2 3 4 5 6 7 8 11 12 13 14 15 16 17 18 19 20 23 25 27
@@ -35,6 +35,8 @@ PFIF2IP=1 2 3
 PFCHKSUM=1 2 3
 PFCMD=1
 
+MAKEOBJDIRPREFIX=
+
 SHELL=/bin/sh
 
 .MAIN: all
diff --git a/regress/sbin/pfctl/pf22.in b/regress/sbin/pfctl/pf22.in
index d301e1de611..602a085c59f 100644
--- a/regress/sbin/pfctl/pf22.in
+++ b/regress/sbin/pfctl/pf22.in
@@ -6,5 +6,3 @@ set limit {states 1000,frags 1000}
 set loginterface lo0
 set loginterface none
 set hostid 1
-set require-order no
-set require-order yes
diff --git a/regress/sbin/pfctl/pf22.ok b/regress/sbin/pfctl/pf22.ok
index 1dce2148953..76940552aa3 100644
--- a/regress/sbin/pfctl/pf22.ok
+++ b/regress/sbin/pfctl/pf22.ok
@@ -8,5 +8,3 @@ set limit frags 1000
 set loginterface lo0
 set loginterface none
 set hostid 0x00000001
-set require-order no
-set require-order yes
diff --git a/regress/sbin/pfctl/pf31.in b/regress/sbin/pfctl/pf31.in
index 1968852f69b..54544d37107 100644
--- a/regress/sbin/pfctl/pf31.in
+++ b/regress/sbin/pfctl/pf31.in
@@ -8,7 +8,6 @@ block drop in on lo0 inet6 all
 block in on lo0 all
 block in on lo0 inet all
 block in on lo0 inet6 all
-set require-order no
 set block-policy return
 block return in on lo0 all
 block return in on lo0 inet all
diff --git a/regress/sbin/pfctl/pf31.ok b/regress/sbin/pfctl/pf31.ok
index d04aebc51e1..e4da20dea12 100644
--- a/regress/sbin/pfctl/pf31.ok
+++ b/regress/sbin/pfctl/pf31.ok
@@ -1,5 +1,4 @@
 set block-policy drop
-set require-order no
 set block-policy return
 block return in on lo0 all
 block return in on lo0 inet all
diff --git a/regress/sbin/pfctl/pf51.in b/regress/sbin/pfctl/pf51.in
deleted file mode 100644
index 542d4089163..00000000000
--- a/regress/sbin/pfctl/pf51.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# test require-order
-
-pass in on lo0 all
-set require-order no
-match out on lo0 from any to any nat-to 127.0.0.1
-altq on lo0 tbrsize 1824 cbq bandwidth 10Mb queue { toad, frog }
-queue toad bandwidth 1Mb
-queue frog bandwidth 90% cbq(default)
-
diff --git a/regress/sbin/pfctl/pf51.ok b/regress/sbin/pfctl/pf51.ok
deleted file mode 100644
index 2573c2c88e3..00000000000
--- a/regress/sbin/pfctl/pf51.ok
+++ /dev/null
@@ -1,6 +0,0 @@
-set require-order no
-altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { toad frog }
-queue toad bandwidth 1Mb 
-queue frog bandwidth 90% cbq( default ) 
-pass in on lo0 all flags S/SA keep state
-match out on lo0 inet all nat-to 127.0.0.1
diff --git a/regress/sbin/pfctl/pf55.in b/regress/sbin/pfctl/pf55.in
index 008c229f5f7..849221e316a 100644
--- a/regress/sbin/pfctl/pf55.in
+++ b/regress/sbin/pfctl/pf55.in
@@ -11,7 +11,6 @@ set loginterface lo0
 set hostid 1
 set optimization normal
 set block-policy drop
-set require-order yes
 
 set limit states 43254
 set limit frags 34557
diff --git a/regress/sbin/pfctl/pf55.ok b/regress/sbin/pfctl/pf55.ok
index 7cb023b1ad4..2281ca82abd 100644
--- a/regress/sbin/pfctl/pf55.ok
+++ b/regress/sbin/pfctl/pf55.ok
@@ -22,7 +22,6 @@ set loginterface lo0
 set hostid 0x00000001
 set optimization normal
 set block-policy drop
-set require-order yes
 set limit states 43254
 set limit frags 34557
 set timeout interval 344
diff --git a/regress/sbin/pfctl/pf95.in b/regress/sbin/pfctl/pf95.in
index ca93c7391ea..dc1b8f56c8c 100644
--- a/regress/sbin/pfctl/pf95.in
+++ b/regress/sbin/pfctl/pf95.in
@@ -1,4 +1,4 @@
-set require-order no
 
-include "pf95.include"
+include "./pf95.include"
 
+block out proto tcp
diff --git a/regress/sbin/pfctl/pf95.include b/regress/sbin/pfctl/pf95.include
index 983d29a4138..f852a7169cf 100644
--- a/regress/sbin/pfctl/pf95.include
+++ b/regress/sbin/pfctl/pf95.include
@@ -1 +1,2 @@
-set require-order yes
+
+block in proto udp
diff --git a/regress/sbin/pfctl/pf95.ok b/regress/sbin/pfctl/pf95.ok
index 99168388bc4..004e1787865 100644
--- a/regress/sbin/pfctl/pf95.ok
+++ b/regress/sbin/pfctl/pf95.ok
@@ -1,2 +1,2 @@
-set require-order no
-set require-order yes
+block drop in proto udp all
+block drop out proto tcp all
diff --git a/regress/sbin/pfctl/pf98.in b/regress/sbin/pfctl/pf98.in
index bea0b7cb163..a18a4916caa 100644
--- a/regress/sbin/pfctl/pf98.in
+++ b/regress/sbin/pfctl/pf98.in
@@ -1,4 +1,4 @@
-# Test rule order processing: should pass with require-order defaulting to no.
+# Test rule order processing should pass (require-order no longer required)
 pass in on lo1000000 all
 match out on lo0 all nat-to lo0
 
diff --git a/regress/sbin/pfctl/pfail11.in b/regress/sbin/pfctl/pfail11.in
index 2f001e390ee..94ae234e976 100644
--- a/regress/sbin/pfctl/pfail11.in
+++ b/regress/sbin/pfctl/pfail11.in
@@ -1,4 +1,3 @@
-set require-order yes
 set optimization aggressive
 set timeout tcp.closing 6, tcp.opening 6
 pass in all
diff --git a/regress/sbin/pfctl/pfail11.ok b/regress/sbin/pfctl/pfail11.ok
index 366a70049d2..c640808a374 100644
--- a/regress/sbin/pfctl/pfail11.ok
+++ b/regress/sbin/pfctl/pfail11.ok
@@ -1,6 +1,6 @@
-stdin:3: syntax error
-stdin:5: Rules must be in order: options, normalization, queueing, translation, filtering
-stdin:6: Rules must be in order: options, normalization, queueing, translation, filtering
-set require-order yes
+stdin:2: syntax error
+stdin:4: syntax error
 set optimization aggressive
 set timeout tcp.closing 6
+set limit states 1000
+set loginterface lo0
diff --git a/regress/sbin/pfctl/pfail53.in b/regress/sbin/pfctl/pfail53.in
index 076154692af..8ce29a2e9cd 100644
--- a/regress/sbin/pfctl/pfail53.in
+++ b/regress/sbin/pfctl/pfail53.in
@@ -1,5 +1,3 @@
-set require-order no
-
 # queuenames cannot be numbers
 altq on lo0 tbrsize 1824 bandwidth 10Mb priq queue 80
 queue 80 priority 2 priq(default)
diff --git a/regress/sbin/pfctl/pfail53.ok b/regress/sbin/pfctl/pfail53.ok
index 4f106b21dd1..530df79a8d1 100644
--- a/regress/sbin/pfctl/pfail53.ok
+++ b/regress/sbin/pfctl/pfail53.ok
@@ -1,6 +1,5 @@
-stdin:4: syntax error
+stdin:2: syntax error
+stdin:15: syntax error
+stdin:16: syntax error
 stdin:17: syntax error
-stdin:18: syntax error
-stdin:19: syntax error
-set require-order no
 table <444> { 1.2.3.4 }
diff --git a/regress/sbin/pfctl/pfopt2.in b/regress/sbin/pfctl/pfopt2.in
index c10ff6663d1..b80e5c6b5c8 100644
--- a/regress/sbin/pfctl/pfopt2.in
+++ b/regress/sbin/pfctl/pfopt2.in
@@ -5,4 +5,3 @@ set timeout tcp.established 3600
 set limit states 100
 set optimization normal
 set block-policy drop
-set require-order yes
diff --git a/regress/sbin/pfctl/pfopt2.ok b/regress/sbin/pfctl/pfopt2.ok
index 9550e3c990c..4bd1fb48876 100644
--- a/regress/sbin/pfctl/pfopt2.ok
+++ b/regress/sbin/pfctl/pfopt2.ok
@@ -4,4 +4,3 @@ set timeout tcp.established 3600
 set limit states 100
 set optimization normal
 set block-policy drop
-set require-order yes