- remove useless bind-9.3.3rc2-rndckey.patchbind-9_6_1-4_fc12

2 files changed, 4 insertions, 61 deletions

diff --git a/bind-9.3.3rc2-rndckey.patch b/bind-9.3.3rc2-rndckey.patch
deleted file mode 100644
index 42f0e26..0000000
--- a/bind-9.3.3rc2-rndckey.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- bind-9.4.0/bin/rndc/rndc-confgen.8.key	2007-01-30 01:23:44.000000000 +0100
-+++ bind-9.4.0/bin/rndc/rndc-confgen.8	2007-03-06 12:42:15.000000000 +0100
-@@ -125,7 +125,7 @@
- \-k \fIkeyname\fR
- .RS 4
- Specifies the key name of the rndc authentication key. This must be a valid domain name. The default is
--\fBrndc\-key\fR.
-+\fBrndckey\fR.
- .RE
- .PP
- \-p \fIport\fR
---- bind-9.4.0/bin/rndc/rndc-confgen.c.key	2005-04-29 02:15:40.000000000 +0200
-+++ bind-9.4.0/bin/rndc/rndc-confgen.c	2007-03-06 12:41:33.000000000 +0100
-@@ -57,7 +57,7 @@
- #include "util.h"
- 
- #define DEFAULT_KEYLENGTH	128		/*% Bits. */
--#define DEFAULT_KEYNAME		"rndc-key"
-+#define DEFAULT_KEYNAME		"rndckey"
- #define DEFAULT_SERVER		"127.0.0.1"
- #define DEFAULT_PORT		953
- 
---- bind-9.4.0/bin/rndc/rndc.conf.key	2004-06-18 06:39:39.000000000 +0200
-+++ bind-9.4.0/bin/rndc/rndc.conf	2007-03-06 12:44:06.000000000 +0100
-@@ -23,11 +23,11 @@
- 
- options {
-         default-server  localhost;
--        default-key     "key";
-+        default-key     "rndckey";
- };
- 
- server localhost {
--        key     "key";
-+        key     "rndckey";
- };
- 
- key "cc64b3d1db63fc88d7cb5d2f9f57d258" {
-@@ -41,7 +41,4 @@
-         addresses { 10.53.0.1; };
- };
- 
--key "key" {
--        algorithm       hmac-md5;
--        secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K";
--};
-+include "/etc/rndc.key";
---- bind-9.4.0/bin/rndc/rndc-confgen.docbook.key	2007-01-30 00:57:20.000000000 +0100
-+++ bind-9.4.0/bin/rndc/rndc-confgen.docbook	2007-03-06 12:44:45.000000000 +0100
-@@ -163,7 +163,7 @@
-           <para>
-             Specifies the key name of the rndc authentication key.
-             This must be a valid domain name.
--            The default is <constant>rndc-key</constant>.
-+            The default is <constant>rndckey</constant>.
-           </para>
-         </listitem>
-       </varlistentry>
diff --git a/bind.spec b/bind.spec
index abe0121..1d2fe3e 100644
--- a/bind.spec
+++ b/bind.spec
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.6.1
-Release:  3%{?dist}
+Release:  4%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,7 +40,6 @@ Source28: config-4.tar.bz2
 Source30: ldap2zone.c
 
 # Common patches
-Patch1:  bind-9.3.3rc2-rndckey.patch
 Patch5:  bind-nonexec.patch
 Patch10: bind-9.5-PIE.patch
 Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch
@@ -165,7 +164,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %setup -q -n %{name}-%{VERSION}
 
 # Common patches
-%patch1 -p1 -b .key
 %patch5 -p1 -b .nonexec
 %patch10 -p1 -b .PIE
 %patch16 -p1 -b .redhat_doc
@@ -583,6 +581,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Jul 20 2009 Adam Tkac <atkac redhat com> 32:9.6.1-4
+- remove useless bind-9.3.3rc2-rndckey.patch
+
 * Mon Jul 13 2009 Adam Tkac <atkac redhat com> 32:9.6.1-3
 - fix broken symlinks in bind-libs (#509635)
 - fix typos in /etc/sysconfig/named (#509650)