From 460bee9b363963c88c11e6c6b3de92be27259932 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@redhat.com>
Date: Dec 09 2014 18:01:49 +0000
Subject: Update to 9.9.6-P1 (CVE-2014-8500)


Signed-off-by: Tomas Hozza <thozza@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index d0931c1..3d42daf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ bind-9.7.2b1.tar.gz
 /bind-9.9.5.tar.gz
 /bind-9.9.5-P1.tar.gz
 /bind-9.9.6.tar.gz
+/bind-9.9.6-P1.tar.gz
diff --git a/bind-9.9-native-pkcs11.patch b/bind-9.9-native-pkcs11.patch
index fca6cb4..98d7ce4 100644
--- a/bind-9.9-native-pkcs11.patch
+++ b/bind-9.9-native-pkcs11.patch
@@ -17133,7 +17133,7 @@ diff -up bind-9.9.6/lib/isc/Makefile.in.native_pkcs11 bind-9.9.6/lib/isc/Makefil
 +OBJS =		@ISC_EXTRA_OBJS@ @ISC_PK11_O@ @ISC_PK11_RESULT_O@ \
  		assertions.@O@ backtrace.@O@ base32.@O@ base64.@O@ \
  		bitstring.@O@ buffer.@O@ bufferlist.@O@ commandline.@O@ \
- 		error.@O@ event.@O@ \
+ 		counter.@O@ error.@O@ event.@O@ \
 @@ -69,7 +73,7 @@ OBJS =		@ISC_EXTRA_OBJS@ \
  SYMTBLOBJS =	backtrace-emptytbl.@O@
  
@@ -17141,8 +17141,8 @@ diff -up bind-9.9.6/lib/isc/Makefile.in.native_pkcs11 bind-9.9.6/lib/isc/Makefil
 -SRCS =		@ISC_EXTRA_SRCS@ \
 +SRCS =		@ISC_EXTRA_SRCS@ @ISC_PK11_C@ @ISC_PK11_RESULT_C@ \
  		assertions.c backtrace.c base32.c base64.c bitstring.c \
- 		buffer.c bufferlist.c commandline.c error.c event.c \
- 		heap.c hex.c hmacmd5.c hmacsha.c \
+ 		buffer.c bufferlist.c commandline.c counter.c \
+ 		error.c event.c heap.c hex.c hmacmd5.c hmacsha.c \
 diff -up bind-9.9.6/lib/isc/md5.c.native_pkcs11 bind-9.9.6/lib/isc/md5.c
 --- bind-9.9.6/lib/isc/md5.c.native_pkcs11	2014-09-16 21:27:20.000000000 +0200
 +++ bind-9.9.6/lib/isc/md5.c	2014-10-09 13:30:47.841302943 +0200
diff --git a/bind.spec b/bind.spec
index b47355e..eb69cd8 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,7 +2,7 @@
 # Red Hat BIND package .spec file
 #
 
-#%%global PATCHVER P1
+%global PATCHVER P1
 #%%global PREVER rc2
 %global VERSION %{version}%{?PREVER}%{?PATCHVER:-%{PATCHVER}}
 
@@ -24,7 +24,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.9.6
-Release:  4%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
+Release:  5%{?PATCHVER:.%{PATCHVER}}%{?PREVER:.%{PREVER}}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -1022,6 +1022,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue Dec 09 2014 Tomas Hozza <thozza@redhat.com> - 32:9.9.6-5.P1
+- Update to 9.9.6-P1 (CVE-2014-8500)
+
 * Fri Nov 14 2014 Tomas Hozza <thozza@redhat.com> - 32:9.9.6-4
 - Fixed systemctl path in logrotate configuration (#1148360)
 - drop engine_pkcs11 dependency, since we use native PKCS#11 implementation
diff --git a/sources b/sources
index d04c84a..c7303ef 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-db10e0700c6a7adb1382c5623742bcbc  bind-9.9.6.tar.gz
 e4315fdea56983570d3a33702e925088  config-12.tar.bz2
+ca9d8f4d26e740668d361bfc50d90fc7  bind-9.9.6-P1.tar.gz