aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-01-30 04:36:16 +0800
committerArmin Kuster <akuster808@gmail.com>2021-02-09 10:35:43 -0800
commit5eb538cd50a365f3df0c36f6fe75787c7c1a5a2e (patch)
treec61784298dc89c5f33cdf0217dfccf1cb1899535
parent6950684345120770aefda36e1064860d9b3710a4 (diff)
downloadmeta-openembedded-contrib-5eb538cd50a365f3df0c36f6fe75787c7c1a5a2e.tar.gz
meta-openembedded-contrib-5eb538cd50a365f3df0c36f6fe75787c7c1a5a2e.tar.bz2
meta-openembedded-contrib-5eb538cd50a365f3df0c36f6fe75787c7c1a5a2e.zip
dnsmasq: upgrade 2.82 -> 2.84
Refresh the following patch: lua.patch Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 3e28a31bb479f292b9a052a3d2eee84c49319ee3) [ Bug fix only changes mostly CVEs CVE-2020-25681, CVE-2020-25682, CVE-2020-25683 CVE-2020-25687, CVE-2020-25684, CVE-2020-25685 CVE-2020-25686 ] Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch9
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb8
-rw-r--r--meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb8
3 files changed, 13 insertions, 12 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
index 1bf0f75c12..be2bb42fc2 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
@@ -14,7 +14,7 @@ diff --git a/Makefile b/Makefile
index 73ea23e..ed3eeb9 100644
--- a/Makefile
+++ b/Makefile
-@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI
+@@ -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`
@@ -22,9 +22,10 @@ index 73ea23e..ed3eeb9 100644
-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`
- nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
- gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
+ nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \
+ HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \
+ HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
+
--
2.9.5
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb
deleted file mode 100644
index 4ca1f3cc91..0000000000
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require dnsmasq.inc
-
-SRC_URI[dnsmasq-2.82.md5sum] = "3c710dee3edba510ed11a6e3d9e0d9cb"
-SRC_URI[dnsmasq-2.82.sha256sum] = "62f33bfac1a1b4a5dab8461b4664e414f7d6ced1d2cf141e9cdf9c3c2a424f65"
-SRC_URI += "\
- file://lua.patch \
-"
-
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb
new file mode 100644
index 0000000000..3dd9154f3d
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.84.bb
@@ -0,0 +1,8 @@
+require dnsmasq.inc
+
+SRC_URI[dnsmasq-2.84.md5sum] = "6bf24b5bcf9293db2941fbdb545c1133"
+SRC_URI[dnsmasq-2.84.sha256sum] = "4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36"
+SRC_URI += "\
+ file://lua.patch \
+"
+