Skip to content

Commit

Permalink
Revert "Merge PR snabbco#507 (pflua upgrade) into next"
Browse files Browse the repository at this point in the history
This reverts commit 8ac912d, reversing
changes made to 7fe1a45.

This change triggered a regression when combined with the LuaJIT
upgrade in PR snabbco#506. See Igalia/pflua#225 for details.

pflua can be upgraded when we resolve the compatibility problem.
  • Loading branch information
lukego committed Jun 2, 2015
1 parent 8ac912d commit 9f5f1ad
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deps/pflua
Submodule pflua updated 39 files
+2 −2 doc/icmp-or-tcp-or-udp.md
+2 −3 doc/icmp6-or-ip.md
+2 −14 doc/proto-47.md
+4 −4 doc/src-host-192.68.1.1-and-less-100.md
+0 −1 env
+4 −6 src/pf/anf.lua
+4 −8 src/pf/backend.lua
+50 −62 src/pf/expand.lua
+3 −20 src/pf/libpcap.lua
+53 −68 src/pf/optimize.lua
+79 −151 src/pf/parse.lua
+0 −2 src/pf/ssa.lua
+0 −9 src/pf/utils.lua
+1 −9 tests/Makefile
+0 −6 tests/ir-reg/opt-bug120-rangecheck-opt.ir
+0 −17 tests/ir-reg/opt-bug120-rangecheck-unopt.ir
+0 −7 tests/ir-reg/opt-bug120-rangecheck.sh
+0 −6 tests/ir-reg/opt-bug126-invalidopt.sh
+0 −90 tests/ir-reg/opt-bug126-opt.ir
+0 −238 tests/ir-reg/opt-bug126-unopt.ir
+0 −3 tests/pflang-reg/pl-bug129-flipportrange.sh
+0 −3 tests/pflang-reg/pl-bug130-allreject
+0 −3 tests/pflang-reg/pl-bug131-notlen-igrp
+0 −3 tests/pflang-reg/pl-bug131-notlen-rarp
+0 −3 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
+0 −3 tests/pflang-reg/pl-bug139-multioctet.sh
+0 −3 tests/pflang-reg/pl-bug171-arpindexing_or_tcp
+1 −1 tests/pflang-reg/pl-bug182-icmp_or_arp
+0 −3 tests/pflang-reg/pl-bug205-greater1_or_less1
+0 −262 tests/pfquickcheck/pflang.lua
+0 −45 tests/properties/pflua_pipelines_match.lua
+1 −9 tools/Makefile
+2 −3 tools/pflua-expand
+0 −174 tools/pflua-pipelines-match
+52 −0 tools/pipe-lua-libpcap-match
+85 −0 tools/pipe-unopt-opt-match
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ E= @echo
# Defined here to detect version mismatches at build time.
LUAJIT_VSN := "v2.0.4-296-g5de95ed"
LJSYSCALL_VSN := "v0.10-65-g7081d97"
PFLUA_VSN := "27523953c03745d4c4fbbcf81f676bc774e4329e"
PFLUA_VSN := "13b194e7a214faae5c3d2916a998418fc841dbc2"

TEST_SKIPPED="43"

Expand Down

0 comments on commit 9f5f1ad

Please sign in to comment.