From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
Subject: Re: [ptxdist] [APPLIED] dnsmasq: version bump 2.89 -> 2.91
Date: Sat, 12 Jul 2025 17:48:18 +0200 [thread overview]
Message-ID: <20250712154818.3675588-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20250708165359.4262-1-bruno.thomsen@gmail.com>
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)
prev parent reply other threads:[~2025-07-12 15:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-08 16:53 [ptxdist] [PATCH] " Bruno Thomsen
2025-07-12 15:48 ` Michael Olbrich [this message]
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=20250712154818.3675588-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=bruno.thomsen@gmail.com \
--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