From 3b73eb19b05ac6c0b75a1ddb6f70a5a8d0c92b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
Date: Sun, 8 Jan 2017 19:50:50 +0100
Subject: [PATCH] bcp38: Add note about IPv6 to package description and help
 text

Fixes #3793.
---
 net/bcp38/Makefile                     | 8 ++++++--
 net/bcp38/files/bcp38.config           | 4 ++++
 net/luci-app-bcp38/Makefile            | 2 +-
 net/luci-app-bcp38/files/bcp38-cbi.lua | 4 +++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/net/bcp38/Makefile b/net/bcp38/Makefile
index 9ca19109e1..4677a29729 100644
--- a/net/bcp38/Makefile
+++ b/net/bcp38/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcp38
 PKG_VERSION:=5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENCE:=GPL-3.0+
 
 include $(INCLUDE_DIR)/package.mk
@@ -23,7 +23,11 @@ define Package/bcp38
 endef
 
 define Package/bcp38/description
- bcp38 implements IETF BCP38 for home routers. See https://tools.ietf.org/html/bcp38.
+ bcp38 implements IETF BCP38 for home routers.
+ See https://tools.ietf.org/html/bcp38.
+
+ This package provides BCP38 for IPv4 only - IPv6 uses source 
+ specific default routes, so no firewall configuration is needed.
 endef
 
 define Package/bcp38/conffiles
diff --git a/net/bcp38/files/bcp38.config b/net/bcp38/files/bcp38.config
index 08e8e20b35..fc785ebe71 100644
--- a/net/bcp38/files/bcp38.config
+++ b/net/bcp38/files/bcp38.config
@@ -17,6 +17,10 @@ config bcp38
 #	There is a dhcp trigger to do this for the netmask of a 
 #	double natted connection needed
 
+#       You can only specify IPv4 addresses here - for IPv6, only source
+#       specific default routes will be installed, which achieves the same
+#       without needing any firewall routes.
+
 #	I will argue that this level of indirection doesn't scale
 # 	very well - see how to block china as an example
 #	http://www.okean.com/china.txt
diff --git a/net/luci-app-bcp38/Makefile b/net/luci-app-bcp38/Makefile
index d42916cf06..ecf84fdf1d 100644
--- a/net/luci-app-bcp38/Makefile
+++ b/net/luci-app-bcp38/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-bcp38
 PKG_VERSION:=2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 LUCI_DIR:=/usr/lib/lua/luci
 
diff --git a/net/luci-app-bcp38/files/bcp38-cbi.lua b/net/luci-app-bcp38/files/bcp38-cbi.lua
index b0b8f38791..632074a56f 100644
--- a/net/luci-app-bcp38/files/bcp38-cbi.lua
+++ b/net/luci-app-bcp38/files/bcp38-cbi.lua
@@ -19,7 +19,9 @@ local ifaces = net:get_interfaces()
 m = Map("bcp38", translate("BCP38"),
 	translate("This function blocks packets with private address destinations " ..
 		"from going out onto the internet as per " ..
-		"<a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>."))
+		"<a href=\"http://tools.ietf.org/html/bcp38\">BCP 38</a>. " ..
+		"For IPv6, only source specific default routes are installed, so " ..
+		"no BCP38 firewall routes are needed."))
 
 s = m:section(TypedSection, "bcp38", translate("BCP38 config"))
 s.anonymous = true