From b507dd340772c21d93e36ae2479d0026158c0832 Mon Sep 17 00:00:00 2001 From: Damian Sawicki Date: Wed, 14 Feb 2024 11:58:00 +0000 Subject: [PATCH] Upgrade to dnsmasq v2.90 Among other things, the new version * enables increasing the number of concurrent TCP connections, previously hardcoded as 20 (commit 416390f9962e455769aa8ab6df0e105cae07ae55), * fixes the bug causing memory leaks for records with TTL=0 (commit 8b606543a3fb687f0e49d4e832f98be9a08924d0). --- images/dnsmasq/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile index 1a376ee1..1d95ac2a 100644 --- a/images/dnsmasq/Makefile +++ b/images/dnsmasq/Makefile @@ -15,7 +15,7 @@ VERSION ?= $(shell git describe --tags --always --dirty) REGISTRY ?= gcr.io/k8s-staging-dns ARCH ?= amd64 -DNSMASQ_VERSION ?= dnsmasq-2.88 +DNSMASQ_VERSION ?= dnsmasq-2.90 CONTAINER_PREFIX ?= k8s-dns ALL_ARCH := amd64 arm arm64 ppc64le s390x @@ -50,16 +50,17 @@ endif DNSMASQ_URL := http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ_VERSION).tar.xz # SHA-256 computed from GPG-verified download: -# $ gpg --recv 15CDDA6AE19135A2 +# $ gpg --recv-keys --keyserver keyring.debian.org D6EACBD6EE46B834248D111215CDDA6AE19135A2 # ... -# $ gpg --verify dnsmasq-2.88.tar.xz.asc dnsmasq-2.88.tar.xz -# gpg: Signature made Sun 04 Dec 2022 10:04:50 PM UTC -# gpg: using RSA key D6EACBD6EE46B834248D111215CDDA6AE19135A2 -# gpg: Good signature from "Simon Kelley " [unknown] -# gpg: aka "Simon Kelley " [unknown] +# $ gpg --verify dnsmasq-2.90.tar.xz.asc dnsmasq-2.90.tar.xz +# $ gpg: Signature made Tue 13 Feb 2024 01:50:43 PM UTC +# $ gpg: using RSA key D6EACBD6EE46B834248D111215CDDA6AE19135A2 +# $ gpg: Good signature from "Simon Kelley " [unknown] +# $ gpg: aka "Simon Kelley " [unknown] +# $ gpg: WARNING: This key is not certified with a trusted signature! # ... -# $ sha256sum dnsmasq-2.88.tar.xz -DNSMASQ_SHA256 := 23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 +# $ sha256sum dnsmasq-2.90.tar.xz +DNSMASQ_SHA256 := 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 DNSMASQ_ARCHIVE := $(OUTPUT_DIR)/dnsmasq.tar.xz MULTIARCH_CONTAINER := multiarch/qemu-user-static:register