From 632e70dcdeaca742ed5b08ad615937b6d62549dc984df0a01ba2b5f9411b3862 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 6 Feb 2023 17:47:21 +0000 Subject: [PATCH] Accepting request 1063373 from home:polslinux:branches:network - update to 2.89: * Fix bug introduced in 2.88 (commit fe91134b) which can result in corruption of the DNS cache internal data structures and logging of "cache internal error". This has only been seen in one place in the wild, and it took considerable effort to even generate a test case to reproduce it, but there's no way to be sure it won't strike, and the effect is to break the cache badly. Installations with DNSSEC enabled are more likely to see the problem, but not running DNSSEC does not guarantee that it won't happen. Thanks to Timo van Roermund for reporting the bug and for his great efforts in chasing it down. - remove no longer needed rpmlintrc filters OBS-URL: https://build.opensuse.org/request/show/1063373 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=155 --- dnsmasq-2.88.tar.xz | 3 --- dnsmasq-2.88.tar.xz.asc | 16 ---------------- dnsmasq-2.89.tar.xz | 3 +++ dnsmasq-2.89.tar.xz.asc | 16 ++++++++++++++++ dnsmasq-groups.patch | 4 ++-- dnsmasq-rpmlintrc | 4 ---- dnsmasq.changes | 17 +++++++++++++++++ dnsmasq.spec | 8 +++----- 8 files changed, 41 insertions(+), 30 deletions(-) delete mode 100644 dnsmasq-2.88.tar.xz delete mode 100644 dnsmasq-2.88.tar.xz.asc create mode 100644 dnsmasq-2.89.tar.xz create mode 100644 dnsmasq-2.89.tar.xz.asc delete mode 100644 dnsmasq-rpmlintrc diff --git a/dnsmasq-2.88.tar.xz b/dnsmasq-2.88.tar.xz deleted file mode 100644 index 8257c0c..0000000 --- a/dnsmasq-2.88.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23544deda10340c053bea6f15a93fed6ea7f5aaa85316bfc671ffa6d22fbc1b3 -size 560640 diff --git a/dnsmasq-2.88.tar.xz.asc b/dnsmasq-2.88.tar.xz.asc deleted file mode 100644 index 6164baa..0000000 --- a/dnsmasq-2.88.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE1urL1u5GuDQkjRESFc3aauGRNaIFAmONGYIACgkQFc3aauGR -NaJUgxAAk1sPS5B4An/yaX0aemahJh5tXILlgqywB3/BMj15tCcZRt5gNQvxmeu8 -/Joh3tvl2pL3IuOZVW5E5VzEx8Uw2nTC6KkK78H++j+vO7jH2Zhz7C1gM8TuCifC -0F1IN3rveVN7NtEjJSleQ2BkkToo64lPnvuPWTtVI72zvuFp7urRga5Dfu+MlQs2 -pBqzZ5L5/34oNsMdALndrsm6aYAbPR8vApC7ZPy61oBLCb8U72VoBxpY2r0BoMQp -cmCWh8fGzZvW7LbTYxOzglrXbMduMlgEG4qGdBjLtRNSekeD+cSZcP1B64WEyEsb -PbuRRW32QGZyYIr0HiFDkoOk//27qx9tPDRGrBHoXvcI0R5uZ9ZFWvIIPXH3CjPY -CRuWmMnkupVuiNSbp+Mh2J6/7PpMnmntZjoXpjUPBomeoLpRHgpkXnxJxYmeO63J -DHXtgPfK/TveTSM0cdlEkPMdxzqqzs0+NtJc/u2O8IIUYAJ4dv8/5AAMHi2Yb3Q+ -G9hKUBzDm1nE5K2M4tBIII6SJ5K+Slhf+4O9mS90lLE8vhmc5GSjtYfZYKSLIlmH -ORVCLA9iflUuzlghIFFCw3ztcPT16rckr+NtJbIYFCHFKrO7G16Imu0VPc3rX/tX -80AQURFmopSDkOGtVgfn8DpUeIqSkQrwh3B3OEZ486z6My7TaGI= -=tFGf ------END PGP SIGNATURE----- diff --git a/dnsmasq-2.89.tar.xz b/dnsmasq-2.89.tar.xz new file mode 100644 index 0000000..0ce2ae2 --- /dev/null +++ b/dnsmasq-2.89.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 +size 562700 diff --git a/dnsmasq-2.89.tar.xz.asc b/dnsmasq-2.89.tar.xz.asc new file mode 100644 index 0000000..58ae11e --- /dev/null +++ b/dnsmasq-2.89.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE1urL1u5GuDQkjRESFc3aauGRNaIFAmPe36kACgkQFc3aauGR +NaLJZg/+K/gk5uLUH48BCNAVNtffC1jGLIxQ2usJbXvJ02n9WcidN3dX6MlVBYNq +s5ouNuDZdIgydJjFWgIIqxtsVdeYhJ6sd9fSDX+8iT4zDLw0N1puDE5YZvvqHxFD +0gYuIcu4ukr5tsBL5ClWoVtTDGEi8NZ+PaGCZrnPVuZWPAnNrf3MbiUqPaJxCgA6 +GNnfqm9LKEL5sPwQlErhf1GLFG7UOPXyjfIQilI6+ShCajDmDjvsPs8Y3JqC66rt +6OEFDKbNVoZQDVA53PswLa1mb5gryB6r7gU5ofwS6jr34BNFfkBGFk6wjhZfZenu +OGU3Adk36l5HykAH5fjDs95bVBLoq+N+gG1Yor4qgUmdgSlLvh8lwArXwweWW2Q5 +k/Nkk/MZaIEL+3nqdIMptfGG82rhCuS1jse2DyYcTmJiJdew2Mv+AQAVIm/Km7oa +3HrpxQJ88LLRtWwfKbW9yRipt+JkzrrZun5VftQ85Xn9nELgU5n5rdHUCzXrpu0r +/dFw5JoTfcIsPGQ8a2IIMW6SyWOEkv8EWAq+10mNokpnQMv5RFHmZoGQhx1PmHWy ++mqHh9T2B9KYGHKRjP4apQkX+JSuqmsdLt1sNfzcnwjQQ0nEq0FMub2hNJ8V0S/4 +h/QpdO6qLn9RYSx0Be31BTAZNq71ow6HPjV62i4l+xTpYq9q1Ik= +=yXEY +-----END PGP SIGNATURE----- diff --git a/dnsmasq-groups.patch b/dnsmasq-groups.patch index 953c323..6b8825b 100644 --- a/dnsmasq-groups.patch +++ b/dnsmasq-groups.patch @@ -1,5 +1,5 @@ ---- src/dnsmasq.c.orig -+++ src/dnsmasq.c +--- a/src/dnsmasq.c.orig ++++ b/src/dnsmasq.c @@ -581,11 +581,10 @@ int main (int argc, char **argv) if (!option_bool(OPT_DEBUG) && getuid() == 0) { diff --git a/dnsmasq-rpmlintrc b/dnsmasq-rpmlintrc deleted file mode 100644 index 91aa7a2..0000000 --- a/dnsmasq-rpmlintrc +++ /dev/null @@ -1,4 +0,0 @@ -# This are example scripts -addFilter("doc-file-dependency") -# This is correct user -addFilter("non-standard-uid") diff --git a/dnsmasq.changes b/dnsmasq.changes index 6a9550f..2eb1d05 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 6 09:27:27 UTC 2023 - Paolo Stivanin + +- update to 2.89: + * Fix bug introduced in 2.88 (commit fe91134b) which can result + in corruption of the DNS cache internal data structures and + logging of "cache internal error". This has only been seen + in one place in the wild, and it took considerable effort + to even generate a test case to reproduce it, but there's + no way to be sure it won't strike, and the effect is to break + the cache badly. Installations with DNSSEC enabled are more + likely to see the problem, but not running DNSSEC does not + guarantee that it won't happen. Thanks to Timo van Roermund + for reporting the bug and for his great efforts in chasing + it down. +- remove no longer needed rpmlintrc filters + ------------------------------------------------------------------- Fri Dec 23 07:48:29 UTC 2022 - Dirk Müller diff --git a/dnsmasq.spec b/dnsmasq.spec index 998d41f..76ccfa6 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -1,7 +1,7 @@ # # spec file for package dnsmasq # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %bcond_with tftp_user_package %endif Name: dnsmasq -Version: 2.88 +Version: 2.89 Release: 0 Summary: DNS Forwarder and DHCP Server License: GPL-2.0-only OR GPL-3.0-only @@ -35,7 +35,6 @@ Source3: dnsmasq.reg Source4: dnsmasq.service Source5: rc.dnsmasq-suse Source6: system-user-dnsmasq.conf -Source8: %{name}-rpmlintrc Patch0: dnsmasq-groups.patch BuildRequires: dbus-1-devel BuildRequires: dos2unix @@ -72,8 +71,7 @@ Utilities that use the standard DHCP protocol to query/remove a DHCP server's leases. %prep -%setup -q -%patch0 +%autosetup -p1 # Remove the executable bit from python example files to # avoid unwanted automatic dependencies