From 42e4d177fe4880414fe0707c2839845165b80646 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 31 Jan 2022 11:16:40 +0100
Subject: [PATCH] dnsmasq: remove v2.83 recipe to use the latest available
 version

We originally included this recipe to fix some vulnerabilities in the dnsmasq
version used in zeus (v2.80), but the recipe has been updated since then. The
current version used by default in hardknott is v2.85.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-support/dnsmasq/dnsmasq/lua.patch | 30 -------------------
 .../recipes-support/dnsmasq/dnsmasq_2.83.bb   | 10 -------
 2 files changed, 40 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch
 delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb

diff --git a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch
deleted file mode 100644
index b8d1062a2..000000000
--- a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq/lua.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From be1b3d2d0f1608cba5efee73d6aac5ad0709041b Mon Sep 17 00:00:00 2001
-From: Joe MacDonald <joe_macdonald@mentor.com>
-Date: Tue, 9 Sep 2014 10:24:58 -0400
-Subject: [PATCH] Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 73ea23e..ed3eeb9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,8 +60,8 @@ idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI
- idn2_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
- ct_cflags =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
- ct_libs =       `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
--lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` 
--lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` 
-+lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua`
-+lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua`
- nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC     $(PKG_CONFIG) --cflags 'nettle hogweed' \
-                                                         HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
- nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC     $(PKG_CONFIG) --libs 'nettle hogweed' \
--- 
-2.9.5
-
diff --git a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb
deleted file mode 100644
index db7ee0df2..000000000
--- a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_2.83.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require recipes-support/dnsmasq/dnsmasq.inc
-
-# To avoid duplicating files, re-use the original ones from meta-openembedded.
-FILESEXTRAPATHS_prepend := "${COREBASE}/../meta-openembedded/meta-networking/recipes-support/${PN}/files:"
-
-SRC_URI[dnsmasq-2.83.md5sum] = "c87d5af020d12984d2ab9fbf04e2dcca"
-SRC_URI[dnsmasq-2.83.sha256sum] = "6b67955873acc931bfff61a0a1e0dc239f8b52e31df50e9164d3a4537571342f"
-SRC_URI += "\
-    file://lua.patch \
-"