[v9_8] prepare 9.8.5rc1

diff --git a/CHANGES b/CHANGES
index 6f1fb0b954738b386fca7665066626df6f209616..107025801d0e7fd8ab6745d5e712025f242a35fb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-3538.  [test]  Running "make test" now requires loopback interfaces to be 
-                       set up. [RT #32452]
+       --- 9.8.5rc1 released ---
+
+3538.  [test]          Running "make test" now requires loopback interfaces
+                       to be set up. [RT #32452]
 
 3537.  [tuning]        Slave zones, when updated, now send NOTIFY messages
                        to peers before being dumped to disk rather than
@@ -48,8 +50,10 @@
 
 3503.  [doc]           Clarify size_spec syntax. [RT #32449]
 
-3500.  [port]          Support NAPTR regular expression validation on
-                       all platforms.  [RT #32688]
+3500.  [security]      Support NAPTR regular expression validation on
+                       all platforms without using libregex, which
+                       can be vulnerable to memory exhaustion attack
+                       (CVE-2013-2266). [RT #32688]
 
 3499.  [doc]           Corrected ARM documentation of built-in zones.
                        [RT #32694]

diff --git a/README b/README
index 87e5b8c16df3bf572a6e2ece349b841d2441c6bb..9d839b49fce8052770475f87ea72e99aa97340ab 100644 (file)
--- a/README
+++ b/README
@@ -54,7 +54,7 @@ BIND 9
 BIND 9.8.5
 
         BIND 9.8.5 includes several bug fixes and patches security
-        flaws described in CVE-2012-5688 and CVE-2012-5689.
+        flaws described in CVE-2012-5688, CVE-2012-5689 and CVE-2013-2266.
 
 BIND 9.8.4
 

diff --git a/lib/bind9/api b/lib/bind9/api
index b3e08e703ae80901c2e50205b36627b2c14a62e8..99f8d317f469d0176ff7ca1e3520465976e89d71 100644 (file)
--- a/lib/bind9/api
+++ b/lib/bind9/api
@@ -1,8 +1,9 @@
 # LIBINTERFACE ranges
 # 9.6: 50-59, 110-119
 # 9.7: 60-79
-# 9.8: 80-89
+# 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 80
 LIBREVISION = 8
 LIBAGE = 0

diff --git a/lib/dns/api b/lib/dns/api
index d449cf6ddee15b3c862a34be2e99c633cf3501df..00c77d3f3b7d256ce9cd80f89768c2296b14f0e6 100644 (file)
--- a/lib/dns/api
+++ b/lib/dns/api
@@ -3,6 +3,7 @@
 # 9.7: 60-79
 # 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 121
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 0

diff --git a/lib/irs/api b/lib/irs/api
index 74bc33868809c3319df56145f9748d289259b059..5c8dd5e14db7945b6cd9e95fe9becb74d05f5845 100644 (file)
--- a/lib/irs/api
+++ b/lib/irs/api
@@ -1,8 +1,9 @@
 # LIBINTERFACE ranges
 # 9.6: 50-59, 110-119
 # 9.7: 60-79
-# 9.8: 80-89
+# 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 80
 LIBREVISION = 4
 LIBAGE = 0

diff --git a/lib/isc/api b/lib/isc/api
index 80b0f43f00858807440b8c43c7345c330c87718c..c7d281344cf1389b33c382e2508c1f92f6991ca9 100644 (file)
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -1,8 +1,9 @@
 # LIBINTERFACE ranges
 # 9.6: 50-59, 110-119
 # 9.7: 60-79
-# 9.8: 80-89
+# 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 87
-LIBREVISION = 0
+LIBREVISION = 1
 LIBAGE = 3

diff --git a/lib/isccc/api b/lib/isccc/api
index 1e51baab5d46389df86bdba0236ffda78843c270..461b9ac31a9bd51810b15ac96b027a37d29a7df3 100644 (file)
--- a/lib/isccc/api
+++ b/lib/isccc/api
@@ -1,8 +1,9 @@
 # LIBINTERFACE ranges
 # 9.6: 50-59, 110-119
 # 9.7: 60-79
-# 9.8: 80-89
+# 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 80
 LIBREVISION = 3
 LIBAGE = 0

diff --git a/lib/isccfg/api b/lib/isccfg/api
index f905e5053f4d573d905fc5e3407cd4c45e6fa4f3..43c928d9f53f3b3d080a2cb4df6957ac50dfa7be 100644 (file)
--- a/lib/isccfg/api
+++ b/lib/isccfg/api
@@ -1,8 +1,9 @@
 # LIBINTERFACE ranges
 # 9.6: 50-59, 110-119
 # 9.7: 60-79
-# 9.8: 80-89
+# 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 82
-LIBREVISION = 5
+LIBREVISION = 6
 LIBAGE = 0

diff --git a/lib/lwres/api b/lib/lwres/api
index 089e7828a71b507dc5f2113287ddb2407b3fdff4..2a5c388460ce6fe1ce8277174fe566cb2885f1d3 100644 (file)
--- a/lib/lwres/api
+++ b/lib/lwres/api
@@ -1,8 +1,9 @@
 # LIBINTERFACE ranges
 # 9.6: 50-59, 110-119
 # 9.7: 60-79
-# 9.8: 80-89
+# 9.8: 80-89, 120-129
 # 9.9: 90-109
+# 9.9-sub: 130-139
 LIBINTERFACE = 80
-LIBREVISION = 5
+LIBREVISION = 6
 LIBAGE = 0

diff --git a/version b/version
index 46c17ad4e489002d912429ccef6dd9cf0b93358e..69a5d0505ec44a4953c8f2206e5f768b719508ad 100644 (file)
--- a/version
+++ b/version
@@ -7,5 +7,5 @@ PRODUCT=BIND
 MAJORVER=9
 MINORVER=8
 PATCHVER=5
-RELEASETYPE=b
-RELEASEVER=2
+RELEASETYPE=rc
+RELEASEVER=1