rpms/system-config-bind/F-8 system-config-bind-4.0.4-srv.patch, NONE, 1.1 system-config-bind.spec, 1.69, 1.70

[Radek Brich (rbrich)]

Author: rbrich

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

Modified Files:
	system-config-bind.spec 
Added Files:
	system-config-bind-4.0.4-srv.patch 
Log Message:
Resolves: #423761

system-config-bind-4.0.4-srv.patch:

--- NEW FILE system-config-bind-4.0.4-srv.patch ---
Written-by: Radek Brich <rbrich at redhat.com>

diff -r 53271751f82a src/DNS.py
--- a/src/DNS.py	Tue Feb 05 12:04:02 2008 +0100
+++ b/src/DNS.py	Mon Feb 18 14:54:12 2008 +0100
@@ -63,12 +63,14 @@ class Name(Data):
 class Name(Data):
     data=''
     origin=None
-    
-    def __init__(self, name, zone=None):
+    SRV=False
+    
+    def __init__(self, name, zone=None, SRV=False):
         self.data = name
         if( zone != None ):
             self.origin = zone.origin           # origin at time of construction ($ORIGIN!)
             self.zone_origin = zone.zone_origin # zone's named.conf origin
+            self.SRV = SRV
     
     def name(self):
         if (self.data==None) or (len(self.data) == 0) or (self.data == '@') :
@@ -150,8 +152,12 @@ class Name(Data):
                 continue
             if (len(l) > 63):
                 return [(-1,_("label") + ' '  + str(i) + ' ' + _("too long - it is over the 63 character limit"))]
-            if l[0] not in allowed_first_chars:
-                warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("domain name labels should begin with a letter or number (RFC 1123)")])
+            if self.SRV and i <= 2:
+                if l[0] not in '_':
+                    warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("missing underscore - SRV RR should be in format _Service._Proto.Name (RFC 2782)")])
+            else:
+                if l[0] not in allowed_first_chars:
+                    warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("domain name labels should begin with a letter or number (RFC 1123)")])
             for c in l[1:]:
                 if c not in allowed_chars:
                     warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("domain name labels should contain only characters in the ranges A-Z,1-9 or '-' (RFC 1123)")])
diff -r 53271751f82a src/RR.py
--- a/src/RR.py	Tue Feb 05 12:04:02 2008 +0100
+++ b/src/RR.py	Mon Feb 18 14:54:12 2008 +0100
@@ -266,7 +266,7 @@ class RR:
         if (n == None):
             zone=self.zone
             if zone.type == DNS.FORWARD :
-                n=DNS.Name(zone.zone_origin, zone)
+                n=DNS.Name(zone.zone_origin, zone, self.__class__ == SRV)
             elif zone.type == DNS.IPV4.REVERSE :
                 n=DNS.IPV4.ReverseAddress(zone.zone_origin, zone)
             elif zone.type == DNS.IPV6.REVERSE_ARPA:
@@ -363,7 +363,7 @@ class RR:
                     name=DNS.Name(name,zone)
             if name==None:
                 if zone.type == DNS.FORWARD:
-                    self.name = DNS.Name(zone.zone_origin,zone)
+                    self.name = DNS.Name(zone.zone_origin,zone, self.__class__ == SRV)
                 elif zone.type == DNS.IPV4.REVERSE:
                     self.name = DNS.IPV4.ReverseAddress(zone.zone_origin,zone)
                 elif zone.type == DNS.IPV6.REVERSE_ARPA:


Index: system-config-bind.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-bind/F-8/system-config-bind.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- system-config-bind.spec	30 May 2007 13:25:50 -0000	1.69
+++ system-config-bind.spec	22 Feb 2008 14:00:08 -0000	1.70
@@ -1,8 +1,9 @@
-Summary: 	BIND DNS Configuration Tool.
+Summary: 	BIND DNS Configuration Tool
 Name: 		system-config-bind
 Version: 	4.0.2
-Release: 	8%{?dist}
-License: 	GPL
+Release: 	9%{?dist}
+URL:            http://fedorahosted.org/system-config-bind
+License: 	GPLv2+
 Group: 		Applications/System
 Source0: 	%{name}-%{version}.tar.gz
 Patch: 		system-config-bind-4.0.2-ver.patch
@@ -12,12 +13,13 @@
 Patch4:		system-config-bind-4.0.2-correct-typos.patch
 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
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: 	noarch
 BuildRequires:  python, gettext, make, intltool
 Requires: 	python >= 2.2
 Requires: 	pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas
-Requires: 	bind, bind-utils
+Requires: 	bind, bind-utils, usermode
 Requires(post): hicolor-icon-theme
 Obsoletes: 	redhat-config-bind
 Obsoletes: 	bindconf
@@ -40,12 +42,13 @@
 %patch4	-p1 -b .correct-typos
 %patch5 -p1
 %patch6 -p1
+%patch7 -p2 -b .srv
 
 %build
-rm -rf $RPM_BUILD_ROOT
 make 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install      ROOT=%{buildroot}
 %find_lang %{name} || touch %{name}.lang;
 %find_lang bindconf || touch bindconf.lang;
@@ -106,6 +109,11 @@
 fi
 
 %changelog
+* 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)
+- Update license tag
+
 * Wed May 30 2007 Ondrej Dvoracek <odvorace at redhat.com> - 4.0.2.8
 - Corrected summary in spec file (#234102)