Hello community,

here is the log from the commit of package hwinfo for openSUSE:Factory checked 
in at 2018-02-13 10:24:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hwinfo (Old)
 and      /work/SRC/openSUSE:Factory/.hwinfo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hwinfo"

Tue Feb 13 10:24:24 2018 rev:158 rq:574637 version:21.52

Changes:
--------
--- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes    2018-01-16 
09:41:21.252543540 +0100
+++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes       2018-02-13 
10:24:26.087834904 +0100
@@ -1,0 +2,7 @@
+Fri Feb 9 12:16:10 UTC 2018 - wfe...@opensuse.org
+
+- merge gh#openSUSE/hwinfo#57
+- add another sanity check on scsi serial id (bsc#1078511)
+- 21.52
+
+--------------------------------------------------------------------

Old:
----
  hwinfo-21.51.tar.xz

New:
----
  hwinfo-21.52.tar.xz

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

Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.mmgmu2/_old  2018-02-13 10:24:26.659814296 +0100
+++ /var/tmp/diff_new_pack.mmgmu2/_new  2018-02-13 10:24:26.663814151 +0100
@@ -36,7 +36,7 @@
 License:        GPL-2.0+
 Group:          Hardware/Other
 Url:            http://gitorious.org/opensuse/hwinfo
-Version:        21.51
+Version:        21.52
 Release:        0
 Source:         %{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ hwinfo-21.51.tar.xz -> hwinfo-21.52.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-21.51/VERSION new/hwinfo-21.52/VERSION
--- old/hwinfo-21.51/VERSION    2018-01-12 10:04:50.000000000 +0100
+++ new/hwinfo-21.52/VERSION    2018-02-09 13:16:10.000000000 +0100
@@ -1 +1 @@
-21.51
+21.52
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-21.51/changelog new/hwinfo-21.52/changelog
--- old/hwinfo-21.51/changelog  2018-01-12 10:04:50.000000000 +0100
+++ new/hwinfo-21.52/changelog  2018-02-09 13:16:10.000000000 +0100
@@ -1,3 +1,6 @@
+2018-02-09:    21.52
+       - add another sanity check on scsi serial id (bsc #1078511)
+
 2018-01-11:    21.51
        - Please make CDBISDN_DATE ignore timezone.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-21.51/src/hd/block.c 
new/hwinfo-21.52/src/hd/block.c
--- old/hwinfo-21.51/src/hd/block.c     2018-01-12 10:04:50.000000000 +0100
+++ new/hwinfo-21.52/src/hd/block.c     2018-02-09 13:16:10.000000000 +0100
@@ -1066,7 +1066,9 @@
           ADD2LOG("\n");
         }
 
-        if((hd->serial = canon_str(serial_buf + 4, serial_buf[3]))) {
+        // bsc#1078511: additional consistency check:
+        // vpd page number should be returned at offset 1
+        if(serial_buf[1] == 0x80 && (hd->serial = canon_str(serial_buf + 4, 
serial_buf[3]))) {
           if(!*hd->serial) {
             hd->serial = free_mem(hd->serial);
           }
@@ -1074,6 +1076,9 @@
             ADD2LOG("  serial id: \"%s\"\n", hd->serial);
           }
         }
+        else {
+          ADD2LOG("  invalid response\n");
+        }
       }
       else {
         ADD2LOG("  no serial id\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/hwinfo-21.51/src/hd/hd.h new/hwinfo-21.52/src/hd/hd.h
--- old/hwinfo-21.51/src/hd/hd.h        2018-01-12 10:04:50.000000000 +0100
+++ new/hwinfo-21.52/src/hd/hd.h        2018-02-09 13:16:10.000000000 +0100
@@ -20,7 +20,7 @@
 
 /** Interface version */
 #define HD_VERSION     21
-#define HD_MINOR_VERSION       51
+#define HD_MINOR_VERSION       52
 #define HD_FULL_VERSION                (HD_VERSION * 1000 + HD_MINOR_VERSION)
 
 /**


Reply via email to