diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-09-03 12:38:33 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-09-03 12:38:33 +0000 |
| commit | 697ef4f42073d380c8c8f4756fe15c754b04e59c (patch) | |
| tree | 9b849bfc74fb144429f7f982373a42853206cacc /regress/sbin/pfctl | |
| parent | 8dd157a434231d8008ff91c5a8f850bfbffc4bd8 (diff) | |
Adapt to new pfctl, remove use of -Fn and -sn
Thanks to phessler for pointing out that the show command was
buried in '-gvvsn'
ok henning
Diffstat (limited to 'regress/sbin/pfctl')
| -rw-r--r-- | regress/sbin/pfctl/Makefile | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile index 027e8fca8c1..f363b34412c 100644 --- a/regress/sbin/pfctl/Makefile +++ b/regress/sbin/pfctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.206 2009/09/03 12:07:56 jsg Exp $ +# $OpenBSD: Makefile,v 1.207 2009/09/03 12:38:32 jsg Exp $ # TARGETS # pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok @@ -124,17 +124,13 @@ PFLOAD_UPDATES+=pfload${n}-update pfload${n}: ${SUDO} pfctl -o none -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a 'regress/*' -gvvsn; \ - ${SUDO} pfctl -o none -a 'regress/*' -gvvsr) | \ + (${SUDO} pfctl -o none -a 'regress/*' -gvvsr) | \ diff -u ${.CURDIR}/pf${n}.loaded /dev/stdin - ${SUDO} pfctl -o none -a regress -Fn >/dev/null 2>&1 ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 pfload${n}-update: ${SUDO} pfctl -o none -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a 'regress/*' -gvvsn; \ - ${SUDO} pfctl -o none -a 'regress/*' -gvvsr) > ${.CURDIR}/pf${n}.loaded - ${SUDO} pfctl -o none -a regress -Fn >/dev/null 2>&1 + (${SUDO} pfctl -o none -a 'regress/*' -gvvsr) > ${.CURDIR}/pf${n}.loaded ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 .endfor @@ -151,17 +147,13 @@ PFOPTIMIZE_UPDATES+=pfoptimize${n}-update pfoptimize${n}: ${SUDO} pfctl -obasic -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a regress -gvvsn; \ - ${SUDO} pfctl -o none -a regress -gvvsr) | \ + (${SUDO} pfctl -o none -a regress -gvvsr) | \ diff -u ${.CURDIR}/pf${n}.optimized /dev/stdin - ${SUDO} pfctl -o none -a regress -Fn >/dev/null 2>&1 ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 pfoptimize${n}-update: ${SUDO} pfctl -obasic -a regress -f - < ${.CURDIR}/pf${n}.in - (${SUDO} pfctl -o none -a regress -gvvsn; \ - ${SUDO} pfctl -o none -a regress -gvvsr) > ${.CURDIR}/pf${n}.optimized - ${SUDO} pfctl -o none -a regress -Fn >/dev/null 2>&1 + (${SUDO} pfctl -o none -a regress -gvvsr) > ${.CURDIR}/pf${n}.optimized ${SUDO} pfctl -o none -a regress -Fr >/dev/null 2>&1 .endfor |