Accepting request 444688 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/444688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=98

lm_sensors-3.4.0+-Only-probe-I-O-ports-on-x86.patch

@@ -0,0 +1,25 @@
+From 3ec458c2a891f26e1bfd4f0c7d88be3737ac7515 Mon Sep 17 00:00:00 2001
+From: Jean Delvare <khali@linux-fr.org>
+Date: Mon, 10 Aug 2015 09:04:53 +0000
+Subject: [PATCH] sensors-detect: Only probe I/O ports on x86
+
+Contributed by Aurelien Jarno.
+---
+ prog/detect/sensors-detect |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -7268,9 +7268,9 @@ sub main
+ 	print "\n";
+ 
+ 	$superio_features = 0;
+-	# Skip "random" I/O port probing on PPC
+-	if ($kernel_arch ne 'ppc'
+-	 && $kernel_arch ne 'ppc64') {
++	# Skip "random" I/O port probing on non-x86 machines
++	if ($kernel_arch =~ m/^i[3456]86$/
++	 || $kernel_arch eq 'x86_64') {
+ 		print "Some Super I/O chips contain embedded sensors. We have to write to\n".
+ 		      "standard I/O ports to probe them. This is usually safe.\n";
+ 		print "Do you want to scan for Super I/O sensors? (YES/no): ";

sensors.changes

@@ -1,8 +1,14 @@
+-------------------------------------------------------------------
+Wed Nov 30 14:32:40 CET 2016 - jdelvare@suse.com
+
+- lm_sensors-3.4.0+-Only-probe-I-O-ports-on-x86.patch: Skip
+  "random" I/O port probing on non-x86 machines (bsc#1008552)
+
 -------------------------------------------------------------------
 Wed Oct  5 06:44:24 UTC 2016 - jdelvare@suse.com
 
 - lm_sensors-3.4.0-sensors-detect-ppc64le.patch: Fix sensors-detect
-  CPU detection support on ppc architectures.
+  CPU detection support on ppc architectures (bsc#999987)
 
 -------------------------------------------------------------------
 Fri Sep  2 12:39:37 UTC 2016 - sweet_f_a@gmx.de

sensors.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sensors
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,8 @@ Patch6:         lm_sensors-3.4.0-sensord-service-extra-args.patch
 Patch7:         lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch
 #PATCH-BUGFIX-UPSTREAM sensors-detect on ppc
 Patch8:         lm_sensors-3.4.0-sensors-detect-ppc64le.patch
+#PATCH-BUGFIX-UPSTREAL sensors-detect crash on arm
+Patch9:         lm_sensors-3.4.0+-Only-probe-I-O-ports-on-x86.patch
 
 ExcludeArch:    s390 s390x
 %{?systemd_requires}
@@ -107,6 +109,7 @@ sense to the user.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS"