From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Wed, 12 Dec 2018 11:51:02 +0000 (+0000)
Subject: dnsmasq: fix ipv6 ipset bug
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ad8a5aa06a58b22657f7628c3d5eb4aae2db47f1;p=openwrt%2Fstaging%2Fyousong.git

dnsmasq: fix ipv6 ipset bug

During upstream removal of conditional ipv6 support an order swap error
was made in a ternary operator usage.

This patch sent upstream.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 85c43505e0..229d9eb4a0 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.80
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/network/services/dnsmasq/patches/0013-ipset-fix-ternary-order-swap.patch b/package/network/services/dnsmasq/patches/0013-ipset-fix-ternary-order-swap.patch
new file mode 100644
index 0000000000..e93e6240a8
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0013-ipset-fix-ternary-order-swap.patch
@@ -0,0 +1,21 @@
+From 46de5d4954b470db155098001cffc357b51e50f4 Mon Sep 17 00:00:00 2001
+From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+Date: Wed, 12 Dec 2018 11:35:12 +0000
+Subject: [PATCH] ipset fix ternary order swap
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -120,7 +120,7 @@ static int new_add_to_ipset(const char *
+   struct my_nfgenmsg *nfg;
+   struct my_nlattr *nested[2];
+   uint8_t proto;
+-  int addrsz = (af == AF_INET6) ? INADDRSZ : IN6ADDRSZ;
++  int addrsz = (af == AF_INET6) ? IN6ADDRSZ : INADDRSZ;
+ 
+   if (strlen(setname) >= IPSET_MAXNAMELEN) 
+     {