From 13c85ce5c199370a989696baf4663b2eb5caf773 Mon Sep 17 00:00:00 2001
From: Daniel Roethlisberger <daniel@roe.ch>
Date: Mon, 23 Dec 2013 14:27:39 +0100
Subject: [PATCH] Also build ipfw if pf is detected

OpenBSD 4.7+ and FreeBSD 9.0+ also include ipfw-style divert-to in pf,
so build ipfw NAT engine as well if pf is detected.

Reported by:	Stuart Henderson
---
 GNUmakefile | 2 ++
 TODO        | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 48bfd54..cbabae1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -46,6 +46,8 @@ DEBUG_CFLAGS?=	-g
 # Autodetect pf
 ifneq ($(wildcard /usr/include/net/pfvar.h),)
 FEATURES+=	-DHAVE_PF
+# OpenBSD 4.7+ and FreeBSD 9.0+ also include ipfw-style divert-to in pf
+FEATURES+=	-DHAVE_IPFW
 endif
 
 # Autodetect ipfw
diff --git a/TODO b/TODO
index 040b856..7121f6a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
--   Rename "ipfw" into more generic "divert" while keeping ipfw for compat
 -   Control SSL_OP_SINGLE_ECDH_USE and other de-optimizations by a
     "prefer speed to security" command line option
 -   Optionally add ephemeral RSA key to SSL_CTX to allow export cipher suites