From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 30 Jun 2024 11:57:39 +0000 (+0100)
Subject: Merge version 4.1.11-1+rpi1+deb10u1 and 4.1.11-1+deb10u2 to produce 4.1.11-1+rpi1... 
X-Git-Tag: raspbian/4.1.11-1+rpi1+deb10u2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f63cd2e207f393054940e16819957289dad7afb0;p=pdns-recursor.git

Merge version 4.1.11-1+rpi1+deb10u1 and 4.1.11-1+deb10u2 to produce 4.1.11-1+rpi1+deb10u2
---

5054104131a4566ba3db376126693920e548792f
diff --cc debian/changelog
index 06f5be0,7af388f..48c3aed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- pdns-recursor (4.1.11-1+rpi1+deb10u1) buster-staging; urgency=medium
++pdns-recursor (4.1.11-1+rpi1+deb10u2) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4.1.4-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 31 Oct 2018 01:49:15 +0000]
 +  * Add -latomic to ldflags.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 23 May 2020 08:57:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 30 Jun 2024 11:57:39 +0000
++
+ pdns-recursor (4.1.11-1+deb10u2) buster; urgency=medium
+ 
+   * Non-maintainer upload by the Debian LTS Team.
+   * debian/patches/CVE-2020-14196.patch: Added (CVE-2020-14196).
+     - Add patch to enforce 'webserver-allow-from' ACL (closes: #964103).
+   * debian/patches/CVE-2020-25829.patch: Added (CVE-2020-25829).
+     - Add patch to fix DoS (closes: #972159).
+ 
+  -- Daniel Leidert <dleidert@debian.org>  Mon, 18 Mar 2024 23:34:27 +0100
  
  pdns-recursor (4.1.11-1+deb10u1) buster-security; urgency=high