[yast-commit] [ci_new_pac] JFYI yast2-dns-server -> sle12

26 Mar 2014

Script 'mail_helper' called by ro
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-dns-server -> sle12



## BNC# 867596 : "L3: YaST2 removes double quotes from dynamic added TXT records" (NEEDINFO/)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-dns-server/yast2-dns-server.changes	2014-02-07 16:22:50.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-dns-server/yast2-dns-server.changes	2014-03-26 12:18:13.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 12 16:26:57 CET 2014 - locilka@suse.com
+
+- Fixed splitting/joining longer TXT and SPF records (bnc#867596)
+- 3.1.5
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-dhcp-server
- yast2-dns-server
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-dns-server (Old)
 and      /mounts/work_src_done/SLE12/yast2-dns-server (BS:build ID:34818 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-dns-server", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-dns-server-3.1.4.tar.bz2

New:
----
  yast2-dns-server-3.1.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-dns-server.spec ++++++
--- /var/tmp/diff_new_pack.wfM51O/_old	2014-03-26 18:14:20.000000000 +0100
+++ /var/tmp/diff_new_pack.wfM51O/_new	2014-03-26 18:14:20.000000000 +0100
@@ -17,8 +17,9 @@
 
 
 Name:           yast2-dns-server
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
+Url:            https://github.com/yast/yast-dns-server
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2

++++++ yast2-dns-server-3.1.4.tar.bz2 -> yast2-dns-server-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.4/package/yast2-dns-server.changes new/yast2-dns-server-3.1.5/package/yast2-dns-server.changes
--- old/yast2-dns-server-3.1.4/package/yast2-dns-server.changes	2014-02-07 13:00:40.000000000 +0100
+++ new/yast2-dns-server-3.1.5/package/yast2-dns-server.changes	2014-03-26 12:14:52.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Mar 12 16:26:57 CET 2014 - locilka@suse.com
+
+- Fixed splitting/joining longer TXT and SPF records (bnc#867596)
+- 3.1.5
+
+-------------------------------------------------------------------
 Wed Feb  5 16:33:04 UTC 2014 - jreidinger@suse.com
 
 - Use new yast2-ldap instead of yast2-ldap-client
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.4/package/yast2-dns-server.spec new/yast2-dns-server-3.1.5/package/yast2-dns-server.spec
--- old/yast2-dns-server-3.1.4/package/yast2-dns-server.spec	2014-02-07 13:00:40.000000000 +0100
+++ new/yast2-dns-server-3.1.5/package/yast2-dns-server.spec	2014-03-26 12:14:52.000000000 +0100
@@ -17,8 +17,9 @@
 
 
 Name:           yast2-dns-server
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
+Url:            https://github.com/yast/yast-dns-server
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.4/src/include/dns-server/dialog-masterzone.rb new/yast2-dns-server-3.1.5/src/include/dns-server/dialog-masterzone.rb
--- old/yast2-dns-server-3.1.4/src/include/dns-server/dialog-masterzone.rb	2014-02-07 13:00:40.000000000 +0100
+++ new/yast2-dns-server-3.1.5/src/include/dns-server/dialog-masterzone.rb	2014-03-26 12:14:52.000000000 +0100
@@ -1919,7 +1919,12 @@
           )
           return false
         end
-        if val.size > MAX_TEXT_RECORD_LENGTH
+
+        # Too long records need to be split into more smaller parts
+        # Although splitting is done while writing it to the config file,
+        # checking, whether it's possible, is done here in advance.
+        max_val_size = val.split.map{|s| s.size}.max
+        if max_val_size > MAX_TEXT_RECORD_LENGTH
           UI.SetFocus(Id("add_record_val"))
           # TRANSLATORS: Error message
           # %{type}    - replaced with record type (TXT or SPF)
@@ -1932,7 +1937,7 @@
             ) % {
               :type => type,
               :max => MAX_TEXT_RECORD_LENGTH,
-              :current => val.size
+              :current => max_val_size
             }
           )
           return false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.4/src/modules/DnsZones.pm new/yast2-dns-server-3.1.5/src/modules/DnsZones.pm
--- old/yast2-dns-server-3.1.4/src/modules/DnsZones.pm	2014-02-07 13:00:40.000000000 +0100
+++ new/yast2-dns-server-3.1.5/src/modules/DnsZones.pm	2014-03-26 12:14:52.000000000 +0100
@@ -49,7 +49,7 @@
 our @EXPORT_OK = qw($zone_base_config_dn);
 
 my @tmp_all_rec_types = ("mx", "ns", "a", "aaaa", "md", "cname", "ptr", "hinfo",
-    "minfo", "txt", "sig", "key", "aaa", "loc", "nxtr", "srv",
+    "minfo", "txt", "spf", "sig", "key", "aaa", "loc", "nxtr", "srv",
     "naptr", "kx", "cert", "a6", "dname");
 
 my @all_rec_types = ();
@@ -261,7 +261,7 @@
 	}
 
 	# Handle special cases
-	if ($type =~ /^txt$/i) {
+	if ($type =~ /^(txt|spf)$/i) {
 	    $value =~ s/(^\"|\"$)//g;
 	    $value =~ s/\\\"/\"/g;
 	}
@@ -312,7 +312,7 @@
 	my $type = $r->{"type"} || "";
 	my $value = $r->{"value"} || "";
 
-	if ($type =~ /^txt$/i && $value !~ /^\"/ && $value !~ /\"$/) {
+	if ($type =~ /^(txt|spf)$/i && $value !~ /^\"/ && $value !~ /\"$/) {
 	    $value =~ s/\"/\\\"/g;
 	    $value = '"'.$value.'"';
 	}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.4/src/servers_non_y2/ag_dns_zone new/yast2-dns-server-3.1.5/src/servers_non_y2/ag_dns_zone
--- old/yast2-dns-server-3.1.4/src/servers_non_y2/ag_dns_zone	2014-02-07 13:00:40.000000000 +0100
+++ new/yast2-dns-server-3.1.5/src/servers_non_y2/ag_dns_zone	2014-03-26 12:14:52.000000000 +0100
@@ -132,6 +132,15 @@
 		my $type  = $record{"type"} || '';
 		my $value = $record{"value"} || '';
 		my $key   = $record{"key"} || '';
+
+		# BNC#867596: Single TXT/SPF records longer that 255 chars need to be split
+		# into more shorter strings (if possible)
+		if ($type =~ /^(TXT|SPF)$/i && length($value) > 255)
+		{
+		    # Converting "a b c" -> "a" "b" "c"
+		    $value =~ s/[ \t]+/" "/g;
+		}
+
 		if ($type eq "TTL")
 		{
 		    print OUT "\$TTL $value\n";
@@ -265,11 +274,12 @@
 		    ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = ($1, $2, $3, $4);
 
 		    # BNC #755766
-		    # TXT records (values) can contain semicolons
-		    if ($rec{"type"} =~ /txt/i) {
+		    # TXT/SPF records (values) can contain semicolons
+		    if ($rec{"type"} =~ /^(TXT|SPF)$/i) {
 			$line =~ s/^(\"[^\n]*\")[ \t]*(;.*)?$//;
 			$rec{"value"} = $1;
-			$rec{"value"} =~ s/\"[ \t]\"//g; # several texts merged into one
+			# BNC#867596: several texts merged into one: "a" "b" "c" -> "a b c"
+			$rec{"value"} =~ s/\"[ \t]\"/ /g;
 		    # The other records consider each semicolon to be a comment
 		    } else {
 			$line =~ s/^([^;\n]+).*$//;

continue with "q"...


Checked in at Wed Mar 26 18:14:25 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)