-
Notifications
You must be signed in to change notification settings - Fork 474
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #623 from DamianSawicki/dnsmasq_v2.90
Upgrade to dnsmasq v2.90
- Loading branch information
Showing
1 changed file
with
10 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]>" [unknown] | ||
# gpg: aka "Simon Kelley <[email protected]>" [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 <[email protected]>" [unknown] | ||
# $ gpg: aka "Simon Kelley <[email protected]>" [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 | ||
|