From 9f750f68163326faee81e9895c26434b51a78886 Mon Sep 17 00:00:00 2001
From: Ondrej Dvoracek <odvorace@fedoraproject.org>
Date: Apr 03 2007 09:59:02 +0000
Subject: some bug fixes


---

diff --git a/system-config-bind-4.0.2-SSHFPrecord.patch b/system-config-bind-4.0.2-SSHFPrecord.patch
new file mode 100644
index 0000000..b1ef20e
--- /dev/null
+++ b/system-config-bind-4.0.2-SSHFPrecord.patch
@@ -0,0 +1,27 @@
+--- system-config-bind-4.0.2/RR.py.old	2007-03-13 12:06:10.000000000 +0100
++++ system-config-bind-4.0.2/RR.py	2007-03-13 14:46:28.000000000 +0100
+@@ -767,6 +767,15 @@
+          }
+     types=[ DNS.FORWARD ]
+ 
++class SSHFP(RR):
++   attrs=[ ['ALTYPE', int], ['FPTYPE', int], ['FP', str] ]
++   desc={'':_('SSH Fingerprint'),
++               'ALTYPE':_('Algorithm type'),
++               'FPTYPE':_('Fingerprint type'),
++               'FP':_('Fingerprint')
++              }
++   types=[ DNS.FORWARD ]
++
+ class TXT(RR):
+     attrs=[ ['TXT', str] ]
+     desc={'': _('Associated Text'),
+@@ -894,7 +903,7 @@
+         'DNSKEY':DNSKEY, 'DS': DS,
+         'HINFO':HINFO, 'ISDN': ISDN, 'KEY':KEY, 'KX': KX, 'LOC': LOC, 'MB': MB, 'MD':MD,'MF':MF,'MG':MG,'MINFO':MINFO,
+         'MR':MR, 'MX':MX, 'NAPTR':NAPTR, 'NS':NS, 'NSAP':NSAP, 'NSEC':NSEC, 'NXT':NXT, 'NULL':NULL, 'PTR': PTR,
+-        'PX':PX, 'RP':RP, 'RRSIG':RRSIG, 'SIG':SIG, 'SOA': SOA, 'TXT':TXT, 'SRV':SRV, 'WKS':WKS, 'X25':X25,
++        'PX':PX, 'RP':RP, 'RRSIG':RRSIG, 'SIG':SIG, 'SOA': SOA, 'TXT':TXT, 'SRV':SRV, 'SSHFP':SSHFP, 'WKS':WKS, 'X25':X25,
+         # Directives:
+         'INCLUDE': INCLUDE, 'GENERATE': GENERATE, 'ORIGIN': ORIGIN, 'TTL': TTL       
+       }
diff --git a/system-config-bind-4.0.2-correct-typos.patch b/system-config-bind-4.0.2-correct-typos.patch
new file mode 100644
index 0000000..a1601b4
--- /dev/null
+++ b/system-config-bind-4.0.2-correct-typos.patch
@@ -0,0 +1,33 @@
+--- system-config-bind-4.0.2/NamedConfOptions.py.old	2007-03-15 10:28:51.000000000 +0100
++++ system-config-bind-4.0.2/NamedConfOptions.py	2007-03-15 10:31:20.000000000 +0100
+@@ -643,7 +643,7 @@
+     'coresize':
+     {  'name': _('Core File Size Limit'),
+        'type': DNS.Size,
+-       'desc': _('The maximum size of a core dump fil.') ,
++       'desc': _('The maximum size of a core dump file.') ,
+     },
+     'datasize':
+     {  'name': _('Data Memory Size Limit'),
+--- system-config-bind-4.0.2/Import.py.old	2007-03-15 10:28:25.000000000 +0100
++++ system-config-bind-4.0.2/Import.py	2007-03-15 10:30:43.000000000 +0100
+@@ -99,7 +99,7 @@
+         debug( 'CHOOSE FILE', file, response)
+         if( response != gtk.RESPONSE_CANCEL ):
+             if (file==None) or os.access(file, os.F_OK | os.R_OK) != 1:
+-                s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('You must choose a file that exists and that you have read permisssion for.'))
++                s.bind.gui.modalError(s.bind.gui.gui,_('Import File Error'),_('You must choose a file that exists and that you have read permission for.'))
+                 s.fileChooser.set_filename('/etc/hosts')
+                 s.fileEntry.set_text('/etc/hosts')
+                 return False
+--- system-config-bind-4.0.2/DNS.py.old	2007-03-15 10:28:04.000000000 +0100
++++ system-config-bind-4.0.2/DNS.py	2007-03-15 10:30:00.000000000 +0100
+@@ -1124,7 +1124,7 @@
+         {  'desc':_('Lame servers. These are misconfigurations in remote servers, discovered by BIND 9 when trying to query those servers during resolution.')
+         },
+         'delegation-only':
+-        {  'desc':_('Delegation only. Logs queries that have have been forced to NXDOMAIN as the result of a delegation-only zone or a delegation-only in a hint or stub zone declaration.')
++        {  'desc':_('Delegation only. Logs queries that have been forced to NXDOMAIN as the result of a delegation-only zone or a delegation-only in a hint or stub zone declaration.')
+         }
+     }
+     syslog_facilities=[ 'auth', 'authpriv', 'cron', 'daemon', 'kern', 'lpr', 'mail', 'mark',
diff --git a/system-config-bind.spec b/system-config-bind.spec
index 3d9f0cb..78bcf6d 100644
--- a/system-config-bind.spec
+++ b/system-config-bind.spec
@@ -1,7 +1,7 @@
 Summary: 	The Red Hat BIND DNS Configuration Tool.
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License: 	GPL
 Group: 		Applications/System
 URL: 		http://people.redhat.com/~jvdias/system-config-bind
@@ -9,6 +9,8 @@ Source0: 	%{name}-%{version}.tar.gz
 Patch: 		system-config-bind-4.0.2-ver.patch
 Patch1:		system-config-bind-4.0.2-version-2.patch
 Patch2:		system-config-bind-4.0.2-check-child.patch
+Patch3:		system-config-bind-4.0.2-SSHFPrecord.patch
+Patch4:		system-config-bind-4.0.2-correct-typos.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
@@ -33,6 +35,8 @@ DNS server.
 %patch  -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1 -b .sshfprecord
+%patch4	-p1 -b .correct-typos
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +103,12 @@ if [ "$2" -gt 0 ]; then
 fi
 
 %changelog
+* Tue Apr 3 2007 Ondrej Dvoracek <odvorace@redhat.com> - 4.0.2-5
+- Added SSHFP Resource record
+- Resolves #205689
+- Corrected some typos in strings
+- Resolves #232054
+
 * Tue Jan 23 2007 Martin Stransky <stransky@redhat.com> - 4.0.2-4
 - reworked version check
 - added check for child processes (#216584)