rpms/system-config-bind/F-8 system-config-bind-4.0.2-slaves-perm.patch, NONE, 1.1 system-config-bind.spec, 1.70, 1.71

[Radek Brich (rbrich)]

Author: rbrich

Update of /cvs/extras/rpms/system-config-bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv546

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.2-slaves-perm.patch 
Log Message:
fix bugs #444285, #444286

system-config-bind-4.0.2-slaves-perm.patch:

--- NEW FILE system-config-bind-4.0.2-slaves-perm.patch ---
diff -r 813e04e7b5db -r 1ecf764a4d06 src/BIND.py
--- a/src/BIND.py	Tue Apr 08 10:54:57 2008 +0200
+++ b/src/BIND.py	Tue Apr 29 13:26:19 2008 +0200
@@ -121,7 +121,7 @@ class BIND:
                 if (origin == '.') and (cfg['type'] == 'hint') and (os.access(filename,os.F_OK) != 1):
                     r = self.get_root_hints( dir=self.nmdc.directory())
                     if r != None:
-                        self.gui.error(_('Initialization Error'),_('Root Cache Download Failed:\m\t%s\nEnsure this machine is connected to the Internet.') % r,True)
+                        self.gui.error(_('Initialization Error'),_('Root Cache Download Failed:\n\t%s\nEnsure this machine is connected to the Internet.') % r,True)
                     zone = Zone(filename, origin, self.nmdc, parent + [ real_key ], clas, cfg['type'])
                     if len(zone.errors) != 0:                        
                         self.gui.error(_('Zone File Initialisation Error:'), _('Zone %s\nfile %s\nload error:\n%s') % (origin, filename, string.join(zone.errors,"\n")), fatal=True) 
@@ -691,6 +691,8 @@ class BIND:
         if not failed:
             zone.filename = newLocation
             s.nmdc [ zone.nmdcKey ]['file']='"'+newLocation+'"'
+            if newLocation[:7] == 'slaves/':
+                commands.getstatusoutput('chown named:named '+newLocation+'; if [ -x /sbin/restorecon ]; then /sbin/restorecon '+newLocation+'; fi')
             return True
         return False
 


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-bind/F-8/system-config-bind.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- system-config-bind.spec	22 Feb 2008 14:00:08 -0000	1.70
+++ system-config-bind.spec	26 May 2008 15:17:11 -0000	1.71
@@ -1,7 +1,7 @@
 Summary: 	BIND DNS Configuration Tool
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License: 	GPLv2+
 Group: 		Applications/System
@@ -14,6 +14,7 @@
 Patch5:		system-config-bind-4.0.2-rndc-label-correction.patch
 Patch6:		system-config-bind-4.0.2-DNSSECkey-record-column.patch
 Patch7:		system-config-bind-4.0.4-srv.patch
+Patch8:		system-config-bind-4.0.2-slaves-perm.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
@@ -43,6 +44,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p2 -b .srv
+%patch8 -p2 -b .slaves-perm
 
 %build
 make 
@@ -109,6 +111,11 @@
 fi
 
 %changelog
+* Mon May 26 2008 Radek Brich <rbrich at redhat.com> - 4.0.2-10
+- set proper permissions on zone files moved to slaves/
+  (bz#444285, bz#444286)
+- fix typo in a error dialog (bz#443731)
+
 * Fri Feb 22 2008 Radek Brich <rbrich at redhat.com> - 4.0.2-9
 - Correct warning about format of SRV RR (bz#423761)
 - Update URL to new project page (bz#237363)