diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-10-03 14:58:03 +1300 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-02-09 10:37:06 +0530 |
commit | a9c2ab5e7527c2ccdb9fc375a9bf3b1faa57bb57 (patch) | |
tree | 6beead5b98143eac3ca80dcaea1cd4f0c8930c8c | |
parent | 14ab9699e9b8e596c69bd5c6758f47bff3e8e033 (diff) | |
download | meta-openembedded-contrib-a9c2ab5e7527c2ccdb9fc375a9bf3b1faa57bb57.tar.gz |
dnsmasq: upgrade to 2.78
This update fixes a number of bugs including the following
vulnerabilities:
CVE-2017-13704
CVE-2017-14491
CVE-2017-14492
CVE-2017-14493
CVE-2017-14494
CVE-2017-14495
CVE-2017-14496
Further details can be found in the changelog here:
http://www.thekelleys.org.uk/dnsmasq/CHANGELOG
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
3 files changed, 18 insertions, 17 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch index 918c0b6d56..0991dd8b95 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -1,29 +1,30 @@ -From 1e5be0a0bcf85913d63408030dec038d360a5fa6 Mon Sep 17 00:00:00 2001 +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 ++-- + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index fc38393..a79f8bf 100644 +index 73ea23e..ed3eeb9 100644 --- a/Makefile +++ b/Makefile -@@ -57,8 +57,8 @@ idn_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) - - idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` +@@ -59,8 +59,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.1` --lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1` +-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` 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 $(PKG_CONFIG) --copy -lgmp` + gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp` -- -1.7.9.5 +2.9.5 diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb deleted file mode 100644 index 41573d9dd6..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI += "\ - file://lua.patch \ -" - -SRC_URI[dnsmasq-2.76.md5sum] = "6610f8233ca89b15a1bb47c788ffb84f" -SRC_URI[dnsmasq-2.76.sha256sum] = "777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32" diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb new file mode 100644 index 0000000000..4d1dc6e69e --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI += "\ + file://lua.patch \ +" + +SRC_URI[dnsmasq-2.78.md5sum] = "3bb97f264c73853f802bf70610150788" +SRC_URI[dnsmasq-2.78.sha256sum] = "c92e5d78aa6353354d02aabf74590d08980bb1385d8a00b80ef9bc80430aa1dc" |