* [ptxdist] [PATCH] dnsmasq: version bump 2.89 -> 2.91
@ 2025-07-08 16:53 Bruno Thomsen
2025-07-12 15:48 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Bruno Thomsen @ 2025-07-08 16:53 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
https://thekelleys.org.uk/dnsmasq/CHANGELOG
Makefile lua issue has been fixed upstream.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
...the-pkg-config-file-is-lua-no-lua5.2.patch | 24 -------------------
patches/dnsmasq-2.89/series | 4 ----
rules/dnsmasq.make | 4 ++--
3 files changed, 2 insertions(+), 30 deletions(-)
delete mode 100644 patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
delete mode 100644 patches/dnsmasq-2.89/series
diff --git a/patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch b/patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
deleted file mode 100644
index ec0952173..000000000
--- a/patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.2'
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 48e8d3b40ee4..5c0e748280c7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -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`
--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' \
- HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \
- HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
diff --git a/patches/dnsmasq-2.89/series b/patches/dnsmasq-2.89/series
deleted file mode 100644
index bdbf61ed5..000000000
--- a/patches/dnsmasq-2.89/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.2.patch
-# e26535bce3c0926f9bcb6b388a2b95ab - git-ptx-patches magic
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 2c6262308..1959eccb4 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
#
# Paths and names
#
-DNSMASQ_VERSION := 2.89
-DNSMASQ_MD5 := a227ce79d772c8a49f94335cdb041e77
+DNSMASQ_VERSION := 2.91
+DNSMASQ_MD5 := d0f47ffc680a4697f6bbf988dcb75a31
DNSMASQ := dnsmasq-$(DNSMASQ_VERSION)
DNSMASQ_SUFFIX := tar.xz
DNSMASQ_URL := https://thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
base-commit: 51f6fea554acb994e4f082af28077e82aab221cc
--
2.50.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] dnsmasq: version bump 2.89 -> 2.91
2025-07-08 16:53 [ptxdist] [PATCH] dnsmasq: version bump 2.89 -> 2.91 Bruno Thomsen
@ 2025-07-12 15:48 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-07-12 15:48 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 5b01c3a113638a04bdbf749af78e2e02b574483f.
Michael
[sent from post-receive hook]
On Sat, 12 Jul 2025 17:48:18 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> https://thekelleys.org.uk/dnsmasq/CHANGELOG
>
> Makefile lua issue has been fixed upstream.
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20250708165359.4262-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch b/patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
> deleted file mode 100644
> index ec095217318d..000000000000
> --- a/patches/dnsmasq-2.89/0001-the-pkg-config-file-is-lua-no-lua5.2.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -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.2'
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - Makefile | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 48e8d3b40ee4..5c0e748280c7 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -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`
> --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' \
> - HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \
> - HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
> diff --git a/patches/dnsmasq-2.89/series b/patches/dnsmasq-2.89/series
> deleted file mode 100644
> index bdbf61ed564e..000000000000
> --- a/patches/dnsmasq-2.89/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.2.patch
> -# e26535bce3c0926f9bcb6b388a2b95ab - git-ptx-patches magic
> diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
> index 2c6262308511..1959eccb406d 100644
> --- a/rules/dnsmasq.make
> +++ b/rules/dnsmasq.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
> #
> # Paths and names
> #
> -DNSMASQ_VERSION := 2.89
> -DNSMASQ_MD5 := a227ce79d772c8a49f94335cdb041e77
> +DNSMASQ_VERSION := 2.91
> +DNSMASQ_MD5 := d0f47ffc680a4697f6bbf988dcb75a31
> DNSMASQ := dnsmasq-$(DNSMASQ_VERSION)
> DNSMASQ_SUFFIX := tar.xz
> DNSMASQ_URL := https://thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-12 15:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-08 16:53 [ptxdist] [PATCH] dnsmasq: version bump 2.89 -> 2.91 Bruno Thomsen
2025-07-12 15:48 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox