Refer 3.3 + 3.4 recursor to EOL statement

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

diff --git a/docs/secpoll.zone b/docs/secpoll.zone
index af85ccae1da552b1b643484a7ad86189b1ef656f..20c44ec6557d6a93aeaa5440aee9d8ca0dc29be5 100644 (file)
--- a/docs/secpoll.zone
+++ b/docs/secpoll.zone
@@ -218,18 +218,18 @@ auth-3.4.1-1.el7.fedora.security-status                 60 IN TXT "3 Upgrade now
 ; From here on security polling has been disabled for this distribution.
 
 ; Recursor
-recursor-3.6.0.security-status                          60 IN TXT "3 Upgrade now, see http://doc.powerdns.com/html/powerdns-advisory-2014-01.html and https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.1.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.3.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.4.security-status                          60 IN TXT "3 Patch now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-
-recursor-3.7.0-rc1.security-status                      60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.0-rc2.security-status                      60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.0.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.1.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.2.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.3.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
+recursor-3.6.0.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.1.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.3.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.4.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+
+recursor-3.7.0-rc1.security-status                      60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.0-rc2.security-status                      60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.0.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.1.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.2.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.3.security-status                          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 recursor-3.7.4.security-status                          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2017-06.html"
 
 recursor-4.0.0-alpha1.security-status                   60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-02.html https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-04.html and https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2017-08.html"
@@ -413,21 +413,21 @@ recursor-5.2.1.security-status                          60 IN TXT "1 OK"
 recursor-5.2.2.security-status                          60 IN TXT "1 OK"
 
 ; Recursor Debian
-recursor-3.6.2-2.debian.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.6.2-2_bpo70_2.debian.security-status         60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.6.2-2_deb8u1.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.6.2-2_deb8u1_bpo70_1.debian.security-status  60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.6.2-2_deb8u2.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.6.2-2_deb8u2_bpo70_1.debian.security-status  60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.6.2-2_deb8u3.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2017-06.html"
-
-recursor-3.7.2-1.debian.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.2-1_bpo8_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.2-1_bpo7_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-
-recursor-3.7.3-1.debian.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.3-1_bpo8_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.3-1_bpo7_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
+recursor-3.6.2-2.debian.security-status                 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_bpo70_2.debian.security-status         60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_deb8u1.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_deb8u1_bpo70_1.debian.security-status  60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_deb8u2.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_deb8u2_bpo70_1.debian.security-status  60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_deb8u3.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+
+recursor-3.7.2-1.debian.security-status                 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.2-1_bpo8_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.2-1_bpo7_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+
+recursor-3.7.3-1.debian.security-status                 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.3-1_bpo8_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.3-1_bpo7_1.debian.security-status          60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
 recursor-4.0.0_alpha1-1.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-02.html and https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-04.html"
 recursor-4.0.0_alpha1-3.debian.security-status          60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-02.html and https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-04.html"
@@ -459,28 +459,28 @@ recursor-4.0.5-2.debian.security-status                 60 IN TXT "3 Upgrade now
 ; From here on security polling has been disabled for this distribution.
 
 ; Recursor Raspbian
-recursor-3.6.2-2.raspbian.security-status               60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2-2_bpo70_2.raspbian.security-status       60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
+recursor-3.6.2-2.raspbian.security-status               60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-2_bpo70_2.raspbian.security-status       60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 ; From here on security polling has been disabled for this distribution.
 
 ; Recursor Ubuntu
-recursor-3.6.2-2.ubuntu.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.7.2-1.ubuntu.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
-recursor-3.7.3-1.ubuntu.security-status                 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/"
+recursor-3.6.2-2.ubuntu.security-status                 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.2-1.ubuntu.security-status                 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.7.3-1.ubuntu.security-status                 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
 auth-4.0.0_alpha1-1.ubuntu.security-status              60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-02.html and https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-04.html"
 auth-4.0.0_alpha2-2.ubuntu.security-status              60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-02.html and https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2016-04.html"
 ; From here on security polling has been disabled for this distribution.
 
 ; Recursor Fedora, EL
-recursor-3.6.2-1.fc19.fedora.security-status            60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2-1.fc20.fedora.security-status            60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2-1.fc21.fedora.security-status            60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2-1.fc22.fedora.security-status            60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-
-recursor-3.6.2-1.el5.fedora.security-status             60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2-1.el6.fedora.security-status             60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
-recursor-3.6.2-1.el7.fedora.security-status             60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2015-01/"
+recursor-3.6.2-1.fc19.fedora.security-status            60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-1.fc20.fedora.security-status            60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-1.fc21.fedora.security-status            60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-1.fc22.fedora.security-status            60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+
+recursor-3.6.2-1.el5.fedora.security-status             60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-1.el6.fedora.security-status             60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-3.6.2-1.el7.fedora.security-status             60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 ; From here on security polling has been disabled for this distribution.
 
 ;; Builder Generated packages (auth)
@@ -505,27 +505,27 @@ auth-4.0.0_beta1-1pdns.jessie.raspbian.security-status 60 IN TXT "3 Upgrade now,
 ;; Builder Generated packages (recursor)
 
 ; Debian
-recursor-4.0.0_alpha1-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_alpha2-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_alpha3-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_beta1-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
+recursor-4.0.0_alpha1-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_alpha2-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_alpha3-1pdns.jessie.debian.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_beta1-1pdns.jessie.debian.security-status  60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
 ; Ubuntu
-recursor-4.0.0_alpha2-1pdns.trusty.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_alpha3-1pdns.trusty.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_beta1-1pdns.trusty.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
+recursor-4.0.0_alpha2-1pdns.trusty.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_alpha3-1pdns.trusty.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_beta1-1pdns.trusty.ubuntu.security-status  60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
-recursor-4.0.0_alpha2-1pdns.wily.ubuntu.security-status   60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_alpha3-1pdns.wily.ubuntu.security-status   60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_beta1-1pdns.wily.ubuntu.security-status   60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
+recursor-4.0.0_alpha2-1pdns.wily.ubuntu.security-status   60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_alpha3-1pdns.wily.ubuntu.security-status   60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_beta1-1pdns.wily.ubuntu.security-status    60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
-recursor-4.0.0_alpha3-1pdns.xenial.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_beta1-1pdns.xenial.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
+recursor-4.0.0_alpha3-1pdns.xenial.ubuntu.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_beta1-1pdns.xenial.ubuntu.security-status  60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
 ; Raspbian
-recursor-4.0.0_alpha2-1pdns.jessie.raspbian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_alpha3-1pdns.jessie.raspbian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
-recursor-4.0.0_beta1-1pdns.jessie.raspbian.security-status 60 IN TXT "3 Upgrade now, see https://doc.powerdns.com/3/security/powerdns-advisory-2016-02/ and https://doc.powerdns.com/3/security/powerdns-advisory-2016-04/"
+recursor-4.0.0_alpha2-1pdns.jessie.raspbian.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_alpha3-1pdns.jessie.raspbian.security-status 60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
+recursor-4.0.0_beta1-1pdns.jessie.raspbian.security-status  60 IN TXT "3 Upgrade now, see https://docs.powerdns.com/recursor/appendices/EOL.html"
 
 ; dnsdist
 dnsdist-1.3.3.security-status                              60 IN TXT "1 OK"