Accepting request 508579 from Base:System

- Point to the new download location. - Update the URL. - Remove authors list from package description, it does not belong there. - decode-dimms-correctly-check-for-out-of-bounds-vendor-id.patch: Fix recommended by upstream. OBS-URL: https://build.opensuse.org/request/show/508579 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/i2c-tools?expand=0&rev=31
2017-07-12 17:30:17 +00:00
parent 8f0e350894 408f62f373
commit 64a1b438d2
7 changed files with 71 additions and 19 deletions
--- a/decode-dimms-correctly-check-for-out-of-bounds-vendor-id.patch
+++ b/decode-dimms-correctly-check-for-out-of-bounds-vendor-id.patch
@@ -0,0 +1,27 @@
+From: Jean Delvare <jdelvare@suse.de>
+Date: Thu, 23 Jun 2016 18:59:07 +0200
+Subject: decode-dimms: Correctly check for out-of-bounds vendor ID
+Upstream: yes
+Git-commit: 2b4135907c1aa27edeb397e62b67386ff5d7d3d5
+
+---
+ eeprom/decode-dimms |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- i2c-tools-3.1.2.orig/eeprom/decode-dimms	2017-07-06 12:55:49.998319548 +0200
+++ i2c-tools-3.1.2/eeprom/decode-dimms	2017-07-06 12:55:51.398337567 +0200
+@@ -343,9 +343,11 @@ sub manufacturer_ddr3($$)
+ {
+ 	my ($count, $code) = @_;
+ 	return "Invalid" if parity($count) != 1;
+-	return "Invalid" if parity($code) != 1;
+-	return (($code & 0x7F) - 1 > $vendors[$count & 0x7F]) ? "Unknown" :
+-		$vendors[$count & 0x7F][($code & 0x7F) - 1];
+	return "Invalid" if parity($code) != 1
+			 or ($code & 0x7F) == 0;
+	return "Unknown" if ($count & 0x7F) >= @vendors
+			 or ($code & 0x7F) - 1 >= @{$vendors[$count & 0x7F]};
+	return $vendors[$count & 0x7F][($code & 0x7F) - 1];
+ }
+ 
+ sub manufacturer(@)
--- a/i2c-tools-3.1.2.tar.bz2
+++ b/i2c-tools-3.1.2.tar.bz2
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441
-size 72084
--- a/i2c-tools-3.1.2.tar.bz2.sig
+++ b/i2c-tools-3.1.2.tar.bz2.sig
--- a/i2c-tools-3.1.2.tar.sign
+++ b/i2c-tools-3.1.2.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIVAwUAWV3d/qVSa5uzzU5qAQIbtg/+Myg6os/BwbFv4FIpkvd0rhsKAwwng4dG
+bYnnKdF7WBsh+Q83PiHTxjfu15iKjS9+SHIlIxLGnIiI/+Vs0vDVBbGUI3YXd1fP
+rJWiYvdvsj7zwoJo/I6oxZIbz5fugsafIt5XJd43rRUaQCSE9b1mXFu3jnABqd6z
+3imfmMX+yY+8j45EABB1mD/9kHEF+hmjWBuMndsQxUUt72mfb7H26EgfqGAZKhzp
+f8DYri07x+98f54XumCWfuprs3qB2//9y5VBhiAxeleGh3tAd0Yr+q684zHuDfyo
+AHoegJ0FKv9SbrYu6QdVzKG4fRVGvIn/dsQKj12tNrzEntQU9Prsx+lePhBU1V4v
+xowZNQEb1r6grXHKOzgzPWgAAbfihFclJT5TIu2rXQ1PIeYDplfmHir/RmMZwG72
+7vhAOYMlNvLZbk0WfajOiCjT774/TRyrh2yz7lPRaaxpAnb6yItVMPcadr3jI6Zv
+yN/dt/tsf1kSKKzRWxrEG5nyaiLUsPq+Ung9amJURquRU6kOca9ej2XrirHina4V
+hSnnUOiYUD9qNLqFExYSVCdEVbQQ1fWYa/V/GcH6MRVwAem2qwZ+btznEsKIa0JI
+1VxxKANMRGl6IA2l7DBT6KlDPKTjNhE5KJncCFWmRuTBY7HfiP4ObSRvfVQYzdQt
+uiV+6BK83fw=
+=DIdi
+-----END PGP SIGNATURE-----
--- a/i2c-tools-3.1.2.tar.xz
+++ b/i2c-tools-3.1.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d6079153cd49a62d4addacef4c092db1a46ba60b2807070a3fbe050262aef87
+size 69240
--- a/i2c-tools.changes
+++ b/i2c-tools.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu Jul  6 10:57:08 UTC 2017 - jdelvare@suse.com
+
+- decode-dimms-correctly-check-for-out-of-bounds-vendor-id.patch:
+  Fix recommended by upstream.
+
+-------------------------------------------------------------------
+Thu Jul  6 10:45:42 UTC 2017 - jdelvare@suse.com
+
+- Update the URL.
+- Remove authors list from package description, it does not belong
+  there.
+
+-------------------------------------------------------------------
+Thu Jul  6 08:16:44 UTC 2017 - jdelvare@suse.com
+
+- Point to the new download location.
+
 -------------------------------------------------------------------
 Fri Nov 27 12:51:19 UTC 2015 - jdelvare@suse.com

--- a/i2c-tools.spec
+++ b/i2c-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package i2c-tools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@


 Name:           i2c-tools
-Url:            http://www.lm-sensors.org/wiki/I2CTools
 Version:        3.1.2
 Release:        0
 Summary:        A heterogeneous set of I2C tools for Linux
@@ -25,15 +24,14 @@ License:        GPL-2.0+
 Group:          Development/Tools/Other
 Requires:       udev
 Recommends:     modules
-# lm-sensors.org is down for several months now
-#Source0:        http://dl.lm-sensors.org/%{name}/releases/%{name}-%{version}.tar.bz2
-#Source1:        http://dl.lm-sensors.org/%{name}/releases/%{name}-%{version}.tar.bz2.sig
-Source0:        %{name}-%{version}.tar.bz2
-Source1:        %{name}-%{version}.tar.bz2.sig
+Url:            https://i2c.wiki.kernel.org/index.php/I2C_Tools
+Source0:        https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.xz
+Source1:        https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.sign
 Patch90:        i2c-tools-hackweek-9-dependencies.diff
 Patch91:        i2c-tools-hackweek-9-improve-DDR3-support.diff
 Patch92:        i2c-tools-r6053-Add-smbus-header.patch
 Patch93:        i2c-tools-r6048-Move-SMBus-helper-functions.patch
+Patch94:        decode-dimms-correctly-check-for-out-of-bounds-vendor-id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x

@@ -42,21 +40,13 @@ This package contains a heterogeneous set of I2C tools for Linux: a bus
 probing tool, a chip dumper, register-level access helpers, EEPROM
 decoding scripts, and more.

-
-
-Authors:
--------
-    Frodo Looijaard
-    Philip Edelbrock
-    Mark Studebaker
-    Jean Delvare <khali@linux-fr.org>
-
 %prep
 %setup -q
 %patch90 -p1
 %patch91 -p1
 %patch92 -p1
 %patch93 -p1
+%patch94 -p1

 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}"