diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2017-06-28 23:32:38 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-06-30 14:21:29 +0200 |
| commit | 4308bb7d8886148da48850bf888b29759ae03d7e (patch) | |
| tree | 1de95040a7746f74c6df5d8b659f0cbef4fe4ebb /patches | |
| parent | 2d0bbb912c0bb1fa9efcc79b6b889c1cc5fb0534 (diff) | |
| download | ptxdist-4308bb7d8886148da48850bf888b29759ae03d7e.tar.gz ptxdist-4308bb7d8886148da48850bf888b29759ae03d7e.tar.xz | |
dnsmasq: version bump 2.76 -> 2.77
Patches have been ported, one patch needed to be adapted.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/dnsmasq-2.76/series | 4 | ||||
| -rw-r--r-- | patches/dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch (renamed from patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch) | 14 | ||||
| -rw-r--r-- | patches/dnsmasq-2.77/series | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/patches/dnsmasq-2.76/series b/patches/dnsmasq-2.76/series deleted file mode 100644 index d7b1936fe..000000000 --- a/patches/dnsmasq-2.76/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-the-pkg-config-file-is-lua-no-lua5.1.patch -# 180d55f55eebd3126d06018dcf79ed5a - git-ptx-patches magic diff --git a/patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch b/patches/dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch index 4ae6f1225..42fe46a88 100644 --- a/patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch +++ b/patches/dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch @@ -1,6 +1,6 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Sat, 28 Jun 2014 16:37:34 +0200 -Subject: [PATCH] the pkg-config file is 'lua' no 'lua5.1' +Subject: [PATCH] the pkg-config file is 'lua' no 'lua5.2' Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- @@ -8,17 +8,17 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 292c8bd..77e8001 100644 +index 73ea23e11d07..1dba188f9c30 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` diff --git a/patches/dnsmasq-2.77/series b/patches/dnsmasq-2.77/series new file mode 100644 index 000000000..bdbf61ed5 --- /dev/null +++ b/patches/dnsmasq-2.77/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-the-pkg-config-file-is-lua-no-lua5.2.patch +# e26535bce3c0926f9bcb6b388a2b95ab - git-ptx-patches magic |