- decode-dimms-correctly-check-for-out-of-bounds-vendor-id.patch:
Fix recommended by upstream. - Update the URL. - Remove authors list from package description, it does not belong there. OBS-URL: https://build.opensuse.org/package/show/Base:System/i2c-tools?expand=0&rev=40
This commit is contained in:
parent
173fc4848e
commit
408f62f373
@ -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(@)
|
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Thu Jul 6 08:16:44 UTC 2017 - jdelvare@suse.com
|
||||||
|
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: i2c-tools
|
Name: i2c-tools
|
||||||
Url: http://www.lm-sensors.org/wiki/I2CTools
|
|
||||||
Version: 3.1.2
|
Version: 3.1.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A heterogeneous set of I2C tools for Linux
|
Summary: A heterogeneous set of I2C tools for Linux
|
||||||
@ -25,12 +24,14 @@ License: GPL-2.0+
|
|||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
Requires: udev
|
Requires: udev
|
||||||
Recommends: modules
|
Recommends: modules
|
||||||
|
Url: https://i2c.wiki.kernel.org/index.php/I2C_Tools
|
||||||
Source0: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.xz
|
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
|
Source1: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.sign
|
||||||
Patch90: i2c-tools-hackweek-9-dependencies.diff
|
Patch90: i2c-tools-hackweek-9-dependencies.diff
|
||||||
Patch91: i2c-tools-hackweek-9-improve-DDR3-support.diff
|
Patch91: i2c-tools-hackweek-9-improve-DDR3-support.diff
|
||||||
Patch92: i2c-tools-r6053-Add-smbus-header.patch
|
Patch92: i2c-tools-r6053-Add-smbus-header.patch
|
||||||
Patch93: i2c-tools-r6048-Move-SMBus-helper-functions.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
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
ExcludeArch: s390 s390x
|
ExcludeArch: s390 s390x
|
||||||
|
|
||||||
@ -39,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
|
probing tool, a chip dumper, register-level access helpers, EEPROM
|
||||||
decoding scripts, and more.
|
decoding scripts, and more.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Frodo Looijaard
|
|
||||||
Philip Edelbrock
|
|
||||||
Mark Studebaker
|
|
||||||
Jean Delvare <khali@linux-fr.org>
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch90 -p1
|
%patch90 -p1
|
||||||
%patch91 -p1
|
%patch91 -p1
|
||||||
%patch92 -p1
|
%patch92 -p1
|
||||||
%patch93 -p1
|
%patch93 -p1
|
||||||
|
%patch94 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}"
|
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user