diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-31 20:51:35 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-06-01 07:47:04 +0200 |
commit | 389c32f2e28f4fe9eb1ad9319ed6e2c3ca10344d (patch) | |
tree | 7c6ec5aa1cdcf3294cdbe87f1782069384cbe254 | |
parent | ceb38482bb56acf72df46cb7af47b6e0d6f7d6ec (diff) | |
download | ptxdist-389c32f2e28f4fe9eb1ad9319ed6e2c3ca10344d.tar.gz ptxdist-389c32f2e28f4fe9eb1ad9319ed6e2c3ca10344d.tar.xz |
dnsmasq: version bump 2.80 -> 2.81ptxdist-2020.06.0
The year in the copyright statement changed. So skip that line now to avoid
this problem in the future.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/dnsmasq-2.81/0001-the-pkg-config-file-is-lua-no-lua5.2.patch (renamed from patches/dnsmasq-2.80/0001-the-pkg-config-file-is-lua-no-lua5.2.patch) | 2 | ||||
-rw-r--r-- | patches/dnsmasq-2.81/series (renamed from patches/dnsmasq-2.80/series) | 0 | ||||
-rw-r--r-- | rules/dnsmasq.make | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/dnsmasq-2.80/0001-the-pkg-config-file-is-lua-no-lua5.2.patch b/patches/dnsmasq-2.81/0001-the-pkg-config-file-is-lua-no-lua5.2.patch index a30a5755f..c26cec2bb 100644 --- a/patches/dnsmasq-2.80/0001-the-pkg-config-file-is-lua-no-lua5.2.patch +++ b/patches/dnsmasq-2.81/0001-the-pkg-config-file-is-lua-no-lua5.2.patch @@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index e71cf86908d3..c4945c0b44e8 100644 +index 78e25f053bf2..9511893615e3 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI diff --git a/patches/dnsmasq-2.80/series b/patches/dnsmasq-2.81/series index bdbf61ed5..bdbf61ed5 100644 --- a/patches/dnsmasq-2.80/series +++ b/patches/dnsmasq-2.81/series diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index 07268e6de..86488e1e7 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq # # Paths and names # -DNSMASQ_VERSION := 2.80 -DNSMASQ_MD5 := e040e72e6f377a784493c36f9e788502 +DNSMASQ_VERSION := 2.81 +DNSMASQ_MD5 := 2642c3f17f4a9762a83dd70daa6cfeb6 DNSMASQ := dnsmasq-$(DNSMASQ_VERSION) DNSMASQ_SUFFIX := tar.xz DNSMASQ_URL := http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX) @@ -26,7 +26,7 @@ DNSMASQ_LICENSE := GPL-2.0-only OR GPL-3.0-only DNSMASQ_LICENSE_FILES := \ file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/dnsmasq.c;startline=1;endline=15;md5=9142b2fc6c71d7fad3af5ba18b26f0f1 + file://src/dnsmasq.c;startline=2;endline=15;md5=0da70ade5c9cf3c1edf1f8dc6ab8aa9f # ---------------------------------------------------------------------------- |