From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 08 Jul 2025 18:54:26 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uZBaM-00FQMi-2B for lore@lore.pengutronix.de; Tue, 08 Jul 2025 18:54:26 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uZBaM-0006wa-CH; Tue, 08 Jul 2025 18:54:26 +0200 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1uZBZz-0006wR-L4 for ptxdist@pengutronix.de; Tue, 08 Jul 2025 18:54:04 +0200 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-ae36e88a5daso911506266b.1 for ; Tue, 08 Jul 2025 09:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751993643; x=1752598443; darn=pengutronix.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bMH/NOE58nmcuY8zwFVSKe79vgU2u9FtA24kbknbDic=; b=dMot/H4F2WQY4JZtNFZYsB7+kukrlTbef/jB6ToVENw6iWZOA9LfRkcgE5In1h+hFY kqOoasStUSu1BNm9P6HADl7A+iazkYGbvR2QmOExnSEkNJWTXCNugFoydc/kQIM2pj2g Sa1aMOi0kVHcDCvaiumDBFguqbKjrccyJ+WL5+FTJYZSWUANTLvSMCFcVIE1kDgqmB2N yiw4q6ah/n3r13HqnIg2lerz4SFyaQubvtsCZPcEK2g7+zAGhaCyc/9rSdtXFP+83cvA iW33Ex/x2HjPuNmn04/kgvldfxUAlrwNoWAQBFgizw9rYh5mQr0aQ5I9MnedeSlZbvJ5 +F5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751993643; x=1752598443; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bMH/NOE58nmcuY8zwFVSKe79vgU2u9FtA24kbknbDic=; b=mJPvflz+Qezx8jfa5mnfxMOeSRN0kON39vZWmLDjbawPt7rS943PraufA3/zb3cLu2 OKflcFnV2yq71nPG44999lDONeI/emR3Ai17fYb89IYeiDY2DgV5OuRdfraooptYDONz 8sPS/4+11/1go11d5xBJgbzjbOiPwaqw2RnKqwpLJ767JEbDL5R/UKj1dHUQLYP7sa7w NGuqGwX/GL2pGedfbH+IwZwQzJSZQN+qN7qF0xbgDPB+6yabHBIHitqQ65iHZVjunlr0 rtwyywfhDTPHHf235pnWB6WhS8CKGn4fK87fcLd8wphWc8QE92Wyv1XPKlcsqqHrvylz 0j+w== X-Gm-Message-State: AOJu0Yy6xmyWq83wEzIPIGy1glNH/Ze5kY+vWTQqZWTa2O8HCASWTk64 3lIQuYBGQBsYN4zg3LGPK8wgtNAJUn5GCPuX5C68hqy9jA4B3qVsiGF3nQyskA== X-Gm-Gg: ASbGncupQmFbmH07/avr/xghbVXdaezevnRdW79n+O575gx1fHWKfTfFdMuxFdiGoPd XZyF532at/gi7s/Duv63dIOa15lC+3E8kvOBfZF0EmpOOU46e7KkDwjMO8I1dcl9mL7gu5SZJnE HH2LPG77zop38C6418c2sy2/jaion5fOa4HGmCkhagQcFOgJf82dkPp6yEnn8fYq5OK9KxQvw93 oWnHJ5PrtucaLilZWORwIczP2JKG63F52sAkoaMtIl+hbuPgDZnwfMj4GZ3p0Ta5O4wa4pMhJJN dS+ym8a8JTV7WtsVmhTZ12TSLmq9x5knjXJgBbq3vHGDh/ViOXAf3gQqbSBwhpLmQk82iDA0CMx c47ceR+U/sddgiHhJhjh8/BYvUwZBtnqSAhziMzMOmi8= X-Google-Smtp-Source: AGHT+IEcP6gV7EGGrjxYVaWiKaodcz13PB7sqcG25s2kXkL/2XZtzX3wsn98go9WXq7eEsOE8MIUGA== X-Received: by 2002:a17:906:3c43:b0:ae3:6651:58ba with SMTP id a640c23a62f3a-ae3fbda2f7cmr1498485266b.35.1751993642499; Tue, 08 Jul 2025 09:54:02 -0700 (PDT) Received: from fedora.tux.internal (85.191.78.244.dynamic.dhcp.aura-net.dk. [85.191.78.244]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae3f66d942bsm922550866b.24.2025.07.08.09.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jul 2025 09:54:01 -0700 (PDT) From: Bruno Thomsen To: ptxdist@pengutronix.de Date: Tue, 8 Jul 2025 18:53:59 +0200 Message-ID: <20250708165359.4262-1-bruno.thomsen@gmail.com> X-Mailer: git-send-email 2.50.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] dnsmasq: version bump 2.89 -> 2.91 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: bruno.thomsen@gmail.com Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false https://thekelleys.org.uk/dnsmasq/CHANGELOG Makefile lua issue has been fixed upstream. Signed-off-by: Bruno Thomsen --- ...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 -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 ---- - 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