Revert "Revert "Merge PR #507 (pflua upgrade) into next""

Reintroduce the pflua upgrade that had been reverted. The problem was a bug introduced in LuaJIT that has since been resolved. This reverts commit 9f5f1ad.
snabbco · Jun 16, 2015 · e7c8d6d · e7c8d6d
1 parent b699be8
commit e7c8d6d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deps/pflua b/deps/pflua
diff --git a/src/Makefile b/src/Makefile
@@ -8,7 +8,7 @@ E= @echo
 # Defined here to detect version mismatches at build time.
 LUAJIT_VSN    := "v2.0.4-306-gfe56522"
 LJSYSCALL_VSN := "v0.10-65-g7081d97"
-PFLUA_VSN     := "13b194e7a214faae5c3d2916a998418fc841dbc2"
+PFLUA_VSN     := "27523953c03745d4c4fbbcf81f676bc774e4329e"
 
 TEST_SKIPPED="43"
+2 −2		doc/icmp-or-tcp-or-udp.md
+3 −2		doc/icmp6-or-ip.md
+14 −2		doc/proto-47.md
+4 −4		doc/src-host-192.68.1.1-and-less-100.md
+1 −0		env
+6 −4		src/pf/anf.lua
+8 −4		src/pf/backend.lua
+62 −50		src/pf/expand.lua
+20 −3		src/pf/libpcap.lua
+68 −53		src/pf/optimize.lua
+151 −79		src/pf/parse.lua
+2 −0		src/pf/ssa.lua
+9 −0		src/pf/utils.lua
+9 −1		tests/Makefile
+6 −0		tests/ir-reg/opt-bug120-rangecheck-opt.ir
+17 −0		tests/ir-reg/opt-bug120-rangecheck-unopt.ir
+7 −0		tests/ir-reg/opt-bug120-rangecheck.sh
+6 −0		tests/ir-reg/opt-bug126-invalidopt.sh
+90 −0		tests/ir-reg/opt-bug126-opt.ir
+238 −0		tests/ir-reg/opt-bug126-unopt.ir
+3 −0		tests/pflang-reg/pl-bug129-flipportrange.sh
+3 −0		tests/pflang-reg/pl-bug130-allreject
+3 −0		tests/pflang-reg/pl-bug131-notlen-igrp
+3 −0		tests/pflang-reg/pl-bug131-notlen-rarp
+3 −0		tests/pflang-reg/pl-bug131-notlen-tcpport
+1 −1		tests/pflang-reg/pl-bug132-icmp6_or_ip
+1 −1		tests/pflang-reg/pl-bug132-icmp6_or_portrange
+1 −1		tests/pflang-reg/pl-bug132-not_icmp6
+3 −0		tests/pflang-reg/pl-bug139-multioctet.sh
+3 −0		tests/pflang-reg/pl-bug171-arpindexing_or_tcp
+1 −1		tests/pflang-reg/pl-bug182-icmp_or_arp
+3 −0		tests/pflang-reg/pl-bug205-greater1_or_less1
+262 −0		tests/pfquickcheck/pflang.lua
+45 −0		tests/properties/pflua_pipelines_match.lua
+9 −1		tools/Makefile
+3 −2		tools/pflua-expand
+174 −0		tools/pflua-pipelines-match
+0 −52		tools/pipe-lua-libpcap-match
+0 −85		tools/pipe-unopt-opt-match