From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH] dnsmasq: version bump 2.76 -> 2.77
Date: Wed, 28 Jun 2017 23:32:38 +0200 [thread overview]
Message-ID: <20170628213238.6482-4-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <20170628213238.6482-1-r.schwebel@pengutronix.de>
Patches have been ported, one patch needed to be adapted.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
patches/dnsmasq-2.76/series | 4 ----
.../0001-the-pkg-config-file-is-lua-no-lua5.2.patch} | 14 +++++++-------
patches/dnsmasq-2.77/series | 4 ++++
rules/dnsmasq.make | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 patches/dnsmasq-2.76/series
rename patches/{dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch => dnsmasq-2.77/0001-the-pkg-config-file-is-lua-no-lua5.2.patch} (73%)
create mode 100644 patches/dnsmasq-2.77/series
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
similarity index 73%
rename from patches/dnsmasq-2.76/0001-the-pkg-config-file-is-lua-no-lua5.1.patch
rename to 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
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 8b682d447..76aad2156 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
#
# Paths and names
#
-DNSMASQ_VERSION := 2.76
-DNSMASQ_MD5 := 00f5ee66b4e4b7f14538bf62ae3c9461
+DNSMASQ_VERSION := 2.77
+DNSMASQ_MD5 := 5b973fea8e66e76a0e6bb44adefc6f9b
DNSMASQ := dnsmasq-$(DNSMASQ_VERSION)
DNSMASQ_SUFFIX := tar.xz
DNSMASQ_URL := http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
--
2.13.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-06-28 21:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 21:32 [ptxdist] [PATCH] alfred: version bump 2016.2 -> 2017.1 Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] batctl: whitespace cleanup Robert Schwebel
2017-06-28 21:32 ` [ptxdist] [PATCH] batctl: version bump 2016.2 -> 2017.1 Robert Schwebel
2017-06-28 21:32 ` Robert Schwebel [this message]
2017-06-30 8:08 ` [ptxdist] [PATCH] alfred: " Michael Olbrich
2017-07-02 15:46 ` Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170628213238.6482-4-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox