Accepting request 614834 from network

OBS-URL: https://build.opensuse.org/request/show/614834
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bind?expand=0&rev=136

bind-ldapdump-use-valid-host.patch

@@ -0,0 +1,51 @@
+--- a/vendor-files/tools/ldapdump
++++ b/vendor-files/tools/ldapdump
+@@ -343,11 +343,11 @@ 
+         };
+         print PIPE "server $server\n" or die "can’t write to $nsupdate pipe: $!";
+     }
+-    print STDERR "\t\tupdate add $zone. 1234 NS ldapdump_kill_me\n" if( $DEBUG );
++    print STDERR "\t\tupdate add $zone. 1234 NS ldapdump.kill.me\n" if( $DEBUG );
+     if( $DONSUPDATE ) {
+         # create dummy NS record
+         # sadly this one is needed if we want to change the last NS record
+-        print PIPE "update add $zone. 1234 NS ldapdump_kill_me\n" or die "can’t write to $nsupdate pipe: $!";
++        print PIPE "update add $zone. 1234 NS ldapdump.kill.me\n" or die "can’t write to $nsupdate pipe: $!";
+     }
+     foreach my $e ( @data ) {
+         next if( $e =~ /^[\s;]/ );
+@@ -587,6 +587,7 @@ 
+             my $ref = $zone_entry->get_value($rec.'record', asref => 1);
+             next unless $ref;
+             foreach my $rr ( @$ref ) {
++		$rdn =~ s/\.$zone\.$//;
+                 my $where = ($rdn eq '@')?("$zone."):("$rdn.$zone");
+                 my $command = "update add $where $ttl $rec $rr\n";
+                 print STDERR "\t\t$command" if($DEBUG);
+@@ -596,9 +597,10 @@ 
+             }
+         }
+     }
+-    print STDERR "\t\tupdate delete $zone. NS ldapdump_kill_me\n" if($DEBUG);
++    print STDERR "\t\tupdate delete $zone. NS ldapdump.kill.me\n" if($DEBUG);
+     if( $DONSUPDATE ) {
+-        print PIPE "update delete $zone. NS ldapdump_kill_me\n" or die "can’t write to $nsupdate pipe: $!";
++        print PIPE "update delete $zone. NS ldapdump.kill.me\n" or die "can’t write to $nsupdate pipe: $!";
++        print PIPE "send\n" or die "can’t write to $nsupdate pipe: $!";
+         print PIPE "\n\n\n" or die "can’t write to $nsupdate pipe: $!";
+         close(PIPE) or die "can’t close $nsupdate pipe: status=$?";
+     }
+@@ -688,9 +688,11 @@ 
+     my %entries;
+     my $entry = "";
+     foreach( my $i=0; $i<@data; $i++ ) {
+-        if( $data[$i] =~ /^(\S+)\s+(.*)/ ) {
++        if( $data[$i] =~ /^(\S+)\s+(.*)/ && $data[$i] !~ /^\$TTL/ ) {
+             $entry = $1;
+             $entries{$1} .= "$2\n";
++        } elsif ($data[$i] =~ /^\$TTL/) {
++            $entries{$entry} .=  $data[$i];
+         } else {
+             $data[$i] =~ /^\s+(.*)/;
+             $entries{$entry} .= "\t$1\n";
+

bind.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jun  6 12:03:25 UTC 2018 - navin.kukreja@suse.com
+
+- Fix a patch error in dnszone-schema file (bsc#901577) 
+
+-------------------------------------------------------------------
+Tue Jun  5 10:47:22 UTC 2018 - navin.kukreja@suse.com
+
+- Add SPF records in dnszone-schema file (bsc#901577) 
+
+-------------------------------------------------------------------
+Tue Jun  5 09:01:52 UTC 2018 - navin.kukreja@suse.com
+
+- Fix the hostname in ldapdump to be valid (bsc#965748) 
+- Patch file - bind-ldapdump-use-valid-host.patch
+
 -------------------------------------------------------------------
 Mon May 21 11:57:47 UTC 2018 - scabrero@suse.de
 

bind.spec

@@ -79,6 +79,7 @@ Patch52:        named-bootconf.diff
 Patch53:        bind-sdb-ldap.patch
 Patch54:        bind-CVE-2017-3145.patch
 Patch55:        bug-4697-Restore-workaround-for-Microsoft-Windows-T.patch
+Patch56:        bind-ldapdump-use-valid-host.patch
 BuildRequires:  libcap-devel
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  libopenssl-devel
@@ -310,6 +311,7 @@ This package provides a module which allows commands to be sent to rndc directly
 %patch53
 %patch54 -p1
 %patch55 -p1
+%patch56 -p1
 
 # use the year from source gzip header instead of current one to make reproducible rpms
 year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < %{SOURCE0})

dnszone-schema.txt

@@ -142,6 +142,12 @@ attributetype ( 1.3.6.1.4.1.2428.20.1.47 NAME 'nSECRecord'
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+attributetype ( 1.3.6.1.4.1.2428.20.1.99 NAME 'sPFRecord'
+	DESC 'Sender Policy Framework, RFC 4408'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
 objectclass ( 1.3.6.1.4.1.2428.20.3 NAME 'dNSZone'
         SUP top STRUCTURAL
 	MUST ( zoneName $ relativeDomainName )
@@ -152,4 +158,4 @@ objectclass ( 1.3.6.1.4.1.2428.20.3 NAME 'dNSZone'
               KEYRecord $ AAAARecord $ LOCRecord $ NXTRecord $
               SRVRecord $ NAPTRRecord $ KXRecord $ CERTRecord $
               A6Record $ DNAMERecord $ DSRecord $ SSHFPRecord $
-              RRSIGRecord $ NSECRecord ) )
+              RRSIGRecord $ NSECRecord $ sPFRecord ) )