Hello community,

here is the log from the commit of package mksusecd for openSUSE:Factory 
checked in at 2018-05-08 13:38:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mksusecd (Old)
 and      /work/SRC/openSUSE:Factory/.mksusecd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mksusecd"

Tue May  8 13:38:43 2018 rev:45 rq:605108 version:1.57

Changes:
--------
--- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes        2018-03-07 
10:37:45.991793362 +0100
+++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes   2018-05-08 
13:38:44.782507404 +0200
@@ -0,0 +1,7 @@
+--------------------------------------------------------------------
+Mon May 7 12:38:39 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/mksusecd#30
+- fix cpio archive parser (bsc#1092147)
+- 1.57
+

Old:
----
  mksusecd-1.56.tar.xz

New:
----
  mksusecd-1.57.tar.xz

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

Other differences:
------------------
++++++ mksusecd.spec ++++++
--- /var/tmp/diff_new_pack.fSJcWB/_old  2018-05-08 13:38:45.406484882 +0200
+++ /var/tmp/diff_new_pack.fSJcWB/_new  2018-05-08 13:38:45.422484304 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           mksusecd
-Version:        1.56
+Version:        1.57
 Release:        0
 Summary:        Create SUSE Linux installation ISOs
 License:        GPL-3.0+

++++++ mksusecd-1.56.tar.xz -> mksusecd-1.57.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mksusecd-1.56/VERSION new/mksusecd-1.57/VERSION
--- old/mksusecd-1.56/VERSION   2018-01-19 10:26:47.000000000 +0100
+++ new/mksusecd-1.57/VERSION   2018-05-07 14:38:39.000000000 +0200
@@ -1 +1 @@
-1.56
+1.57
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mksusecd-1.56/changelog new/mksusecd-1.57/changelog
--- old/mksusecd-1.56/changelog 2018-01-19 10:26:47.000000000 +0100
+++ new/mksusecd-1.57/changelog 2018-05-07 14:38:39.000000000 +0200
@@ -1,3 +1,6 @@
+2018-05-07:    1.57
+       - fix cpio archive parser (bsc #1092147)
+
 2018-01-18:    1.56
        - fix handling of repo-md repositories with encrypted media
        - allow building of encrypted installation media
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mksusecd-1.56/mksusecd new/mksusecd-1.57/mksusecd
--- old/mksusecd-1.56/mksusecd  2018-01-19 10:26:47.000000000 +0100
+++ new/mksusecd-1.57/mksusecd  2018-05-07 14:38:39.000000000 +0200
@@ -3414,7 +3414,7 @@
 
   # Read # of bytes from input and write to output.
   #
-  # bytes = read_write(len)
+  # bytes = $read_write->(len)
   # -   len: number of bytes to transfer
   # - bytes: size of data actually transferred
   #
@@ -3424,7 +3424,7 @@
   # If the $sync variable is set search the input stream for a valid cpio
   # header (and reset $sync to 0).
   #
-  sub read_write
+  my $read_write = sub
   {
     my $len = $_[0];
 
@@ -3469,17 +3469,17 @@
     }
 
     return length $buf;
-  }
+  };
 
   # Write padding bytes (pad with 0 to full 512 byte blocks) and close
   # output pipe.
   #
-  # write_pad_and_close()
+  # $write_pad_and_close->()
   #
   # This also sets a sync flag indicating that we should search for the next
   # valid cpio header in the input stream.
   #
-  sub write_pad_and_close
+  my $write_pad_and_close = sub
   {
     if($p) {
       my $pad = (($write_ofs + 0x1ff) & ~0x1ff) - $write_ofs;
@@ -3490,7 +3490,7 @@
 
     # search for next cpio header in input stream
     $sync = 1;
-  }
+  };
 
   # open archive and get going...
   if(open $f, $file) {
@@ -3498,7 +3498,7 @@
 
     # We have to trace the cpio archive structure.
     # Keep going as long as there's a header.
-    while(($len = read_write(110)) == 110) {
+    while(($len = $read_write->(110)) == 110) {
       my $magic = substr($buf, 0, 6);
       my $head = substr($buf, 6);
 
@@ -3510,12 +3510,12 @@
       $fname_len += (2, 1, 0, 3)[$fname_len & 3];
       $data_len = (($data_len + 3) & ~3);
 
-      read_write $fname_len;
+      $read_write->($fname_len);
 
       my $fname = $buf;
       $fname =~ s/\x00*$//;
 
-      read_write $data_len;
+      $read_write->($data_len);
 
       # Look for cpio archive end marker.
       # If found, close cpio process. A new process will be started at the
@@ -3524,7 +3524,7 @@
         $fname eq 'TRAILER!!!' &&
         $head =~ /^0{39}10{55}b0{8}$/i
       ) {
-        write_pad_and_close;
+        $write_pad_and_close->();
         # exit if we're done
         if($cnt++ == $part) {
           close $f;
@@ -3537,7 +3537,7 @@
     close $f;
 
     # ...and output file.
-    write_pad_and_close;
+    $write_pad_and_close->();
 
     # If $len is != 0 this means we've seen something that's not a header of
     # a cpio archive entry.
@@ -3554,7 +3554,7 @@
 #
 # unpack_archive(type, file, dir, part)
 #
-# - type: a type sring as returned by get_archive_type
+# - type: a type string as returned by get_archive_type
 # - file: the archive
 # -  dir: the directory to unpack to
 # - part: is the part number of a multipart archive (0 = unpack all)


Reply via email to