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

lm_sensors-2.10.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59fe249a90cdb503644a7801221cdb776630fd63af20df1b663d9870801a8bc0
-size 675481

lm_sensors-2.10.2.dif

@@ -38,7 +38,7 @@
  
  MACHINE := $(shell uname -m)
  
-@@ -215,7 +215,7 @@ ifeq ($(DEBUG),1)
+@@ -216,7 +216,7 @@ ifeq ($(DEBUG),1)
  ALL_CPPFLAGS += -DDEBUG
  ALL_CFLAGS += -O -g
  else
@@ -47,7 +47,7 @@
  endif
  
  ifeq ($(WARN),1)
-@@ -278,7 +278,7 @@ LIBCPPFLAGS := $(ALL_CPPFLAGS)
+@@ -279,7 +279,7 @@ LIBCPPFLAGS := $(ALL_CPPFLAGS)
  ifdef SYSFS_SUPPORT
  LIBCPPFLAGS := $(LIBCPPFLAGS) -DSYSFS_SUPPORT
  endif
@@ -58,7 +58,7 @@
  
 --- prog/detect/sensors-detect
 +++ prog/detect/sensors-detect	2006-11-10 17:45:13.000000000 +0100
-@@ -1997,7 +1997,9 @@ sub initialize_conf
+@@ -2106,7 +2106,9 @@ sub initialize_conf
      }
    }
  
@@ -69,8 +69,8 @@
      $modules_conf = '/etc/modules.conf';
    } elsif (-f '/etc/conf.modules') {
      $modules_conf = '/etc/conf.modules';
-@@ -5132,7 +5134,7 @@ sub generate_modprobes
+@@ -5406,7 +5408,7 @@ sub generate_modprobes
- 
+   $modprobes .= "# I2C adapter drivers\n" if $nr;
    for ($i = 0; $i < $nr; $i++) {
      foreach $adap (@adapters) {
 -      next unless exists $adap->{nr_later} and $adap->{nr_later} == $i;
@@ -78,7 +78,7 @@
        if ($adap->{driver} eq "UNKNOWN") {
          $modprobes .= "# modprobe unknown adapter ".$adap->{adapname}."\n";
        } elsif ($adap->{driver} eq "DISABLED") {
-@@ -5162,6 +5164,19 @@ sub generate_modprobes
+@@ -5436,6 +5438,19 @@ sub generate_modprobes
      next if $chip->{driver} eq "use-isa-instead";
      if ($chip->{driver} eq "to-be-written") {
        $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
@@ -98,7 +98,7 @@
      } else {
         # need the * for 2.4 kernels, won't necessarily be an exact match
         open(local *INPUTFILE, "modprobe -l $chip->{driver}\\* 2>/dev/null |");
-@@ -5430,7 +5445,7 @@ sub main
+@@ -5714,7 +5729,7 @@ sub main
    print "#----cut here----\n".
          $modprobes.
          "# sleep 2 # optional\n".
@@ -107,7 +107,7 @@
          "#----cut here----\n\n";
  
    print "If you have some drivers built into your kernel, the list above will\n".
-@@ -5499,6 +5514,8 @@ EOT
+@@ -5783,6 +5798,8 @@ EOT
      print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
            "for initialization at boot time.\n"
        unless -f "/etc/init.d/lm_sensors";
@@ -119,7 +119,7 @@
 --- prog/dump/isadump.c
 +++ prog/dump/isadump.c	2006-02-28 13:05:01.000000000 +0100
 @@ -35,15 +35,26 @@
- 
+ #include "util.h"
  #include "superio.h"
  
 -
@@ -149,7 +149,7 @@
  unsigned long isa_io_base = 0; /* XXX for now */
  #endif /* __powerpc__ */
  
-@@ -255,7 +266,7 @@ int main(int argc, char *argv[])
+@@ -252,7 +263,7 @@ int main(int argc, char *argv[])
  		}
  	}
  
@@ -585,7 +585,7 @@
  esac
 --- prog/pwm/fancontrol
 +++ prog/pwm/fancontrol	2006-02-28 13:05:01.000000000 +0100
-@@ -154,10 +154,10 @@ function restorefans()
+@@ -188,10 +188,10 @@ function restorefans()
  	do
  		pwmo=${AFCPWM[$fcvcount]}
  		pwmdisable $pwmo
@@ -598,7 +598,7 @@
  }
  
  trap restorefans SIGHUP SIGINT SIGQUIT SIGTERM SIGKILL
-@@ -240,7 +240,7 @@ function UpdateFanSpeeds {
+@@ -274,7 +274,7 @@ function UpdateFanSpeeds {
  		  if [ $pwmpval -eq 0 -o $fanval -eq 0 ]
  		  then # if fan was stopped start it using a safe value
  		  	echo $minsa > $pwmo
@@ -607,7 +607,7 @@
  		  fi
  		fi
  		echo $pwmval > $pwmo # write new value to pwm output
-@@ -253,7 +253,7 @@ function UpdateFanSpeeds {
+@@ -287,7 +287,7 @@ function UpdateFanSpeeds {
  		then
  			echo "new pwmval=$pwmval"
  		fi
@@ -616,7 +616,7 @@
  	done
  }
  
-@@ -268,7 +268,7 @@ do
+@@ -302,7 +302,7 @@ do
  		echo "Error enabling PWM on $DIR/$pwmo"
  		restorefans
  	fi
@@ -625,7 +625,7 @@
  done
  
  echo 'Starting automatic fan control...'
-@@ -277,7 +277,7 @@ echo 'Starting automatic fan control...'
+@@ -311,7 +311,7 @@ echo 'Starting automatic fan control...'
  while true
  do
  	UpdateFanSpeeds
@@ -636,7 +636,7 @@
  # some old stuff/missing features, will clean this up soon
 --- prog/pwm/pwmconfig
 +++ prog/pwm/pwmconfig	2006-02-28 13:05:01.000000000 +0100
-@@ -189,6 +189,9 @@ echo
+@@ -248,6 +248,9 @@ echo
  PLOTTER=gnuplot
  STEP=15
  PDELAY=2
@@ -646,7 +646,7 @@
  
  function pwmdetail()
  {
-@@ -256,6 +259,7 @@ function pwmdetail()
+@@ -315,6 +318,7 @@ function pwmdetail()
  			fi
  			break
  		fi
@@ -655,12 +655,12 @@
  	done
  	pwmdisable $P	
 --- prog/sensors/main.c
-+++ prog/sensors/main.c	2006-02-28 13:05:01.000000000 +0100
++++ prog/sensors/main.c	2007-01-30 17:26:00.000000000 +0100
-@@ -188,6 +188,11 @@ int main (int argc, char *argv[])
+@@ -187,6 +187,11 @@ int main (int argc, char *argv[])
        exit(0);
      case 'c':
-       config_file_name = strdup(optarg);
+       config_file_name = optarg;
-+      if (!config_file_name) {
++      if (!config_file_name || *config_file_name == '\0') {
 +	fprintf(stderr, "Could not open config file\n");
 +	perror(config_file_name);
 +	exit(1);
@@ -668,15 +668,3 @@
        break;
      case 's':
        do_sets = 1;
-@@ -232,6 +237,11 @@ int main (int argc, char *argv[])
- 
-   if (config_file_name == NULL)
-     config_file_name = strdup(ETCDIR "/" DEFAULT_CONFIG_FILE_NAME);
-+  if (!config_file_name) {
-+    fprintf(stderr, "Could not open config file\n");
-+    perror(config_file_name);
-+    exit(1);
-+  }
-   open_config_file(config_file_name);
- 
-   if ((res = sensors_init(config_file))) {

lm_sensors-2.10.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3854cd0e77c6f2fea53a3646511635f0e079ef0fbca7e9dd2e38f5f37251deb
+size 682749

sensors.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 30 17:29:21 CET 2007 - werner@suse.de
+
+- Update to lm_sensors version 2.10.2 which added support for
+  recent devices.
+
 -------------------------------------------------------------------
 Mon Nov 13 12:06:01 CET 2006 - werner@suse.de
 

sensors.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package sensors (Version 2.10.1)
+# spec file for package sensors (Version 2.10.2)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,16 +13,16 @@
 Name:           sensors
 BuildRequires:  rrdtool sysfsutils udev
 URL:            http://www.lm-sensors.org/
-Version:        2.10.1
+Version:        2.10.2
 Release:        1
 Summary:        Hardware health monitoring for Linux
-License:        GNU General Public License (GPL) - all versions
+License:        GNU General Public License (GPL)
 Group:          System/Monitoring
 Requires:       modules udev
 Autoreqprov:    on
-Source0:        lm_sensors-2.10.1.tar.bz2
+Source0:        lm_sensors-2.10.2.tar.bz2
 Source1:        README.SuSE
-Patch:          lm_sensors-2.10.1.dif
+Patch:          lm_sensors-2.10.2.dif
 Patch1:         lm_sensors-2.8.3-nodump.patch
 Patch2:         lm_sensors-2.7.0-kernelheaders.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -118,6 +118,9 @@ rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h
 %doc /usr/share/man/man8/*.8.gz
 
 %changelog -n sensors
+* Tue Jan 30 2007 - werner@suse.de
+- Update to lm_sensors version 2.10.2 which added support for
+  recent devices.
 * Mon Nov 13 2006 - werner@suse.de
 - Update to lm_sensors version 2.10.1 which also includes the
   fix for bug #192092 by not overwriting chip settings