From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Sun, 24 Jan 2021 22:19:33 +0000 (+0000)
Subject: dnsmasq: Bump to v2.84
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db00f312d3ae700adbecc4d1b5d7476cc8ef7f92;p=openwrt%2Fstaging%2Frobimarko.git

dnsmasq: Bump to v2.84

dnsmasq v2.84rc2 has been promoted to release.

No functional difference between v2.83test3 and v2.84/v2.84rc2

Backport 2 patches to fix the version reporting

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 45badd31dc..bc70931400 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_UPSTREAM_VERSION:=2.84test3
+PKG_UPSTREAM_VERSION:=2.84
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases
-PKG_HASH:=20d1109c991ca08778ea20322b8f3245f2e974688d494b59b2e6ae096ec592b1
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_HASH:=603195c64b73137609b07e1024ae0b37f652b2f5fe467dce66985b3d1850050c
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
diff --git a/package/network/services/dnsmasq/patches/0001-Tweak-sort-order-of-tags-in-get-version.patch b/package/network/services/dnsmasq/patches/0001-Tweak-sort-order-of-tags-in-get-version.patch
new file mode 100644
index 0000000000..d7659ea037
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0001-Tweak-sort-order-of-tags-in-get-version.patch
@@ -0,0 +1,45 @@
+From f1204a875e0f16fd645df965db346fc56d2ab1dd Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 29 Jan 2021 23:20:06 +0000
+Subject: [PATCH 1/2] Tweak sort order of tags in get-version.
+
+We want to sort such that the most recent/relevant tag is first
+and gets used to set the compiled-in version.
+
+The solution is far from general, but works for the tag formats
+used by dnsmasq. v2.84 sorts before v2.83, but v2.83 sorts
+before v2.83rc1 and 2.83rc1 sorts before v2.83test1
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ bld/get-version | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/bld/get-version b/bld/get-version
+index e472aab..1d7e7f0 100755
+--- a/bld/get-version
++++ b/bld/get-version
+@@ -9,7 +9,10 @@
+ # If we can find one which matches $v[0-9].* then we assume it's
+ # a version-number tag, else we just use the whole string.
+ # If there is more than one v[0-9].* tag, sort them and use the
+-# first. This favours, eg v2.63 over 2.63rc6.
++# first. The insane arguments to the sort command are to ensure
++# that, eg v2.64 comes before v2.63, but v2.63 comes before v2.63rc1
++# and v2.63rc1 comes before v2.63test1
++
+ 
+ # Change directory to the toplevel source directory.
+ if test -z "$1" || ! test -d "$1" || ! cd "$1"; then
+@@ -28,7 +31,7 @@ else
+      vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
+ 
+      if [ $? -eq 0 ]; then
+-         echo "${vers}" | sort -r | head -n 1 | sed 's/^v//'
++         echo "${vers}" | sort -k1.2,1.5r -k 1.6,1.6 -k1.8,1.9r -k1.10,1.11r | head -n 1 | sed 's/^v//'
+      else
+          cat $1/VERSION
+      fi
+-- 
+2.24.3 (Apple Git-128)
+
diff --git a/package/network/services/dnsmasq/patches/0002-Tweak-f1204a875e0f16fd645df965db346fc56d2ab1dd.patch b/package/network/services/dnsmasq/patches/0002-Tweak-f1204a875e0f16fd645df965db346fc56d2ab1dd.patch
new file mode 100644
index 0000000000..255507ced9
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0002-Tweak-f1204a875e0f16fd645df965db346fc56d2ab1dd.patch
@@ -0,0 +1,28 @@
+From cfcafdd27c74dc187fe96a9cfa88b1aef53540a0 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Mon, 1 Feb 2021 23:46:43 +0000
+Subject: [PATCH 2/2] Tweak f1204a875e0f16fd645df965db346fc56d2ab1dd
+
+This gets, eg, v2.65test1 and v2.65test11 in the correct order.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ bld/get-version | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bld/get-version b/bld/get-version
+index 1d7e7f0..1f51768 100755
+--- a/bld/get-version
++++ b/bld/get-version
+@@ -31,7 +31,7 @@ else
+      vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
+ 
+      if [ $? -eq 0 ]; then
+-         echo "${vers}" | sort -k1.2,1.5r -k 1.6,1.6 -k1.8,1.9r -k1.10,1.11r | head -n 1 | sed 's/^v//'
++         echo "${vers}" | sort -k1.2,1.5Vr -k1.6,1.6 -k1.8,1.9Vr -k1.10,1.11Vr | head -n 1 | sed 's/^v//'
+      else
+          cat $1/VERSION
+      fi
+-- 
+2.24.3 (Apple Git-128)
+