Merge remote-tracking branch 'origin' into emergency

* origin:
  local.m4: A new network for the SGO VPN.
  functions.m4, classify.m4: Handle negative address ranges.
  Make FW_NOACT work properly.

Conflicts:
	local.m4

diff --cc bookends.m4
Simple merge

diff --cc functions.m4
Simple merge

diff --cc local.m4
index 3a52c1b,357043b..ba09c39
--- 1/local.m4
--- 2/local.m4
+++ b/local.m4
@@@ -86,15 -86,15 +86,15 @@@ defhost artis
        iface eth0 dmz unsafe
        iface eth1 dmz unsafe
  defhost vampire
 -      router
 -      iface eth0.0 dmz unsafe safe
 -      iface eth0.1 dmz unsafe safe
 +      hosttype router
 +      iface eth0.0 dmz unsafe safe default
 +      iface eth0.1 dmz unsafe safe default
        iface eth0.2 safe
 -      iface eth0.3 untrusted
 +      iface eth0.3 untrusted default
-       iface dns0 dns
-       iface vpn-+ vpn
+       iface dns0 iodine
        iface vpn-precision colobdry vpn
-       iface t6-he default
+       iface vpn-chiark sgo
+       iface vpn-+ vpn
  defhost ibanez
        iface br-dmz dmz unsafe
        iface br-unsafe unsafe
@@@ -121,11 -120,12 +121,12 @@@ defhost fende
        iface br-jump jump colo
        iface br-colo jump colo
  defhost precision
 -      router
 +      hosttype router
        iface eth0 jump colo
        iface eth1 jump colo
-       iface vpn-+ vpn
        iface vpn-vampire housebdry vpn
+       iface vpn-chiark sgo
+       iface vpn-+ vpn
  defhost telecaster
        iface eth0 jump colo
        iface eth1 jump colo