rpms/system-config-bind/F-9 system-config-bind-4.0.8-listen-on-changing-fix.patch, NONE, 1.1 system-config-bind-4.0.8-rndc-file-handling-fix.patch, NONE, 1.1 system-config-bind.spec, 1.74, 1.75

[Jaroslav Reznik (jreznik)]

Author: jreznik

Update of /cvs/pkgs/rpms/system-config-bind/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16531

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.8-listen-on-changing-fix.patch 
	system-config-bind-4.0.8-rndc-file-handling-fix.patch 
Log Message:
fix bugs #323161, #449046, #359781


system-config-bind-4.0.8-listen-on-changing-fix.patch:

--- NEW FILE system-config-bind-4.0.8-listen-on-changing-fix.patch ---
--- system-config-bind-4.0.8/src/RRGUI.py.orig	2008-07-17 13:21:15.000000000 +0200
+++ system-config-bind-4.0.8/src/RRGUI.py	2008-07-17 13:24:06.000000000 +0200
@@ -1562,7 +1562,12 @@ class DNS_ACL(Widget):
             debug( 'SAVING un-named ACL:', s.attr.key)
             if s.attr.nmdc.__contains__( s.attr.key ):
                 del s.attr.nmdc[ s.attr.key  ]
-            s.attr.nmdc[ s.attr.key  ] = s.attr.key[-1] + ' ' + s.attr.out() + '\n'
+            if ( 'listen-on' in s.attr.key ) or ( 'listen-on-v6' in s.attr.key ):
+                debug( 'OPTION LISTEN-ON or LISTEN-ON-V6' )
+                if ( len(s.attr.key) == 3 ):
+                    s.attr.nmdc[ s.attr.key  ] = s.attr.key[-2] + ' ' + s.attr.key[-1] + ' ' + s.attr.out() + '\n'
+            else:
+                s.attr.nmdc[ s.attr.key  ] = s.attr.key[-1] + ' ' + s.attr.out() + '\n'
             s.attr.nmdc.update()
         
     def aclDialogResponse(s,d,r):

system-config-bind-4.0.8-rndc-file-handling-fix.patch:

--- NEW FILE system-config-bind-4.0.8-rndc-file-handling-fix.patch ---
--- system-config-bind-4.0.8/src/RRGUI.py.orig	2008-05-26 16:26:05.000000000 +0200
+++ system-config-bind-4.0.8/src/RRGUI.py	2008-07-17 12:36:10.000000000 +0200
@@ -2250,8 +2250,7 @@ class DNS_Key(Widget):
                 s.bind.nmdc.update()
                 s.bind.load()
             elif changed:                
-                del s.bind.nmdc[ s.attr.key  ]
-                s.bind.nmdc[ s.attr.key  ] = s.attr.out()
+                s.bind.nmdc[ s.attr.key ] = {'algorithm': s.attr.algorithm, 'secret': s.attr.secret}
                 s.bind.nmdc.update()
         d.destroy()
         


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-bind/F-9/system-config-bind.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- system-config-bind.spec	26 May 2008 14:59:39 -0000	1.74
+++ system-config-bind.spec	5 Aug 2008 09:53:47 -0000	1.75
@@ -1,7 +1,7 @@
 Summary:        BIND DNS Configuration Tool
 Name:           system-config-bind
 Version:        4.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://fedorahosted.org/system-config-bind
 License:        GPLv2
 Group:          Applications/System
@@ -12,6 +12,8 @@
 Requires:       pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
 Requires:       bind, bind-utils, usermode, xdg-utils
 Requires(post): hicolor-icon-theme
+Patch:          system-config-bind-4.0.8-rndc-file-handling-fix.patch
+Patch1:         system-config-bind-4.0.8-listen-on-changing-fix.patch
 
 %description
 The system-config-bind package provides a graphical user interface (GUI) to
@@ -22,6 +24,8 @@
 
 %prep
 %setup -q
+%patch -p1
+%patch1 -p1
 
 %build
 make 
@@ -81,6 +85,10 @@
 fi;
 
 %changelog
+* Thu Aug 05 2008 Jaroslav Reznik <jreznik at redhat.com> - 4.0.8-2
+- fix rndc.key file handling (bz#323161)
+- fix listen-on changing (bz#449046, bz#359781)
+
 * Mon May 26 2008 Radek Brich <rbrich at redhat.com> - 4.0.8-1
 - fix delegation-only zone creation (bz#323291)
 - allow subdomain delegation (i.e. make Domain Name field editable)