- Update to 3.3.5 (#1056448)
This commit is contained in:
Jaromir Capik
parent
bc69dd31cf
commit
959ece00a3
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@ lm_sensors-3.1.2.tar.bz2
|
||||
/lm_sensors-3.3.2.tar.bz2
|
||||
/lm_sensors-3.3.3.tar.bz2
|
||||
/lm_sensors-3.3.4.tar.bz2
|
||||
/lm_sensors-3.3.5.tar.bz2
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
diff -Naur lm_sensors-3.3.4.orig/etc/Module.mk lm_sensors-3.3.4/etc/Module.mk
|
||||
--- lm_sensors-3.3.4.orig/etc/Module.mk 2009-07-24 15:52:28.000000000 +0200
|
||||
+++ lm_sensors-3.3.4/etc/Module.mk 2013-08-01 13:47:42.000000000 +0200
|
||||
@@ -32,10 +32,13 @@
|
||||
-a ! -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ] ; then \
|
||||
$(MV) $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ; \
|
||||
fi
|
||||
+ $(MKDIR) $(DESTDIR)$(MANDIR)/man8
|
||||
+ $(INSTALL) -m 644 $(ETC_DIR)/sensors-conf-convert.8 $(DESTDIR)$(MANDIR)/man8
|
||||
|
||||
user_install :: install-etc
|
||||
|
||||
uninstall-etc:
|
||||
$(RM) $(DESTDIR)$(BINDIR)/sensors-conf-convert
|
||||
+ $(RM) $(DESTDIR)$(MANDIR)/man8/sensors-conf-convert.8
|
||||
|
||||
user_uninstall :: uninstall-etc
|
||||
diff -Naur lm_sensors-3.3.4.orig/etc/sensors-conf-convert.8 lm_sensors-3.3.4/etc/sensors-conf-convert.8
|
||||
--- lm_sensors-3.3.4.orig/etc/sensors-conf-convert.8 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ lm_sensors-3.3.4/etc/sensors-conf-convert.8 2013-08-01 13:34:06.197767137 +0200
|
||||
@@ -0,0 +1,27 @@
|
||||
+.TH SENSORS-CONF-CONVERT 8 "August 2013" "lm-sensors 3"
|
||||
+.SH NAME
|
||||
+sensors-conf-convert \- sensors configuration conversion
|
||||
+
|
||||
+.SH SYNOPSIS
|
||||
+.B sensors-conf-convert
|
||||
+\ <
|
||||
+.I /etc/sensors.conf
|
||||
+\ \ \ >
|
||||
+.I /etc/sensors3.conf
|
||||
+
|
||||
+.SH DESCRIPTION
|
||||
+The purpose of the
|
||||
+.B sensors-conf-convert
|
||||
+tool is to convert
|
||||
+.I sensors.conf
|
||||
+from the lm_sensors version 2 to the lm_sensors
|
||||
+version 3 format.
|
||||
+.P
|
||||
+The data are read from the standard input and the result
|
||||
+is written to the standard output.
|
||||
+
|
||||
+.SH SEE ALSO
|
||||
+sensors(1)
|
||||
+
|
||||
+.SH AUTHOR
|
||||
+Jean Delvare
|
||||
@ -1,30 +0,0 @@
|
||||
diff -Naur lm_sensors-3.3.4.orig/prog/detect/sensors-detect lm_sensors-3.3.4/prog/detect/sensors-detect
|
||||
--- lm_sensors-3.3.4.orig/prog/detect/sensors-detect 2013-05-20 21:25:22.000000000 +0200
|
||||
+++ lm_sensors-3.3.4/prog/detect/sensors-detect 2013-07-25 18:24:41.636807410 +0200
|
||||
@@ -3707,7 +3707,7 @@
|
||||
"Do you want to scan it? (\%s/selectively): ",
|
||||
$default ? "YES/no" : "yes/NO";
|
||||
|
||||
- $input = <STDIN>;
|
||||
+ $input = <STDIN> || '';
|
||||
if ($input =~ /^\s*n/i
|
||||
|| (!$default && $input !~ /^\s*[ys]/i)) {
|
||||
print "\n";
|
||||
@@ -3718,7 +3718,7 @@
|
||||
print "Please enter one or more addresses not to scan. Separate them with commas.\n",
|
||||
"You can specify a range by using dashes. Example: 0x58-0x5f,0x69.\n",
|
||||
"Addresses: ";
|
||||
- $input = <STDIN>;
|
||||
+ $input = <STDIN> || '';
|
||||
chomp($input);
|
||||
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
|
||||
} elsif (($class & 0xff00) == 0x0300) {
|
||||
@@ -6859,7 +6859,7 @@
|
||||
"safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
|
||||
"ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
|
||||
$superio_features ? "yes/NO" : "YES/no";
|
||||
- $input = <STDIN>;
|
||||
+ $input = <STDIN> || '';
|
||||
unless ($input =~ /^\s*n/i
|
||||
|| ($superio_features && $input !~ /^\s*y/i)) {
|
||||
if (initialize_ioports()) {
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur lm_sensors-3.3.4.orig/prog/detect/sensors-detect lm_sensors-3.3.4/prog/detect/sensors-detect
|
||||
--- lm_sensors-3.3.4.orig/prog/detect/sensors-detect 2013-08-07 09:46:59.000000000 -0400
|
||||
+++ lm_sensors-3.3.4/prog/detect/sensors-detect 2013-09-09 13:59:09.753266033 -0400
|
||||
@@ -2657,6 +2657,7 @@
|
||||
if (m/^processor\s*:\s*(\d+)/) {
|
||||
push @cpu, $entry if scalar keys(%{$entry}); # Previous entry
|
||||
$entry = { nr => $1 }; # New entry
|
||||
+ $entry->{vendor_id} = "undefined";
|
||||
next;
|
||||
}
|
||||
if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) {
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up lm_sensors-3.3.4/prog/init/lm_sensors.service~ lm_sensors-3.3.4/prog/init/lm_sensors.service
|
||||
--- lm_sensors-3.3.4/prog/init/lm_sensors.service~ 2011-04-27 20:35:18.671815000 +0300
|
||||
+++ lm_sensors-3.3.4/prog/init/lm_sensors.service 2014-01-19 16:39:48.878173066 +0200
|
||||
@@ -1,6 +1,5 @@
|
||||
[Unit]
|
||||
Description=Initialize hardware monitoring sensors
|
||||
-After=syslog.target
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=/etc/sysconfig/lm_sensors
|
||||
diff -up lm_sensors-3.3.4/prog/init/sensord.service~ lm_sensors-3.3.4/prog/init/sensord.service
|
||||
--- lm_sensors-3.3.4/prog/init/sensord.service~ 2013-05-24 16:28:38.651221000 +0300
|
||||
+++ lm_sensors-3.3.4/prog/init/sensord.service 2014-01-19 16:39:41.822032580 +0200
|
||||
@@ -1,7 +1,6 @@
|
||||
[Unit]
|
||||
Description=Log hardware monitoring data
|
||||
After=lm_sensors.service
|
||||
-After=syslog.target
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/etc/sysconfig/sensord
|
||||
@ -1,6 +1,6 @@
|
||||
Name: lm_sensors
|
||||
Version: 3.3.4
|
||||
Release: 11%{?dist}
|
||||
Version: 3.3.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Hardware monitoring tools
|
||||
Group: Applications/System
|
||||
License: LGPLv2+ and GPLv3+ and GPLv2+ and Verbatim and Public domain
|
||||
@ -16,12 +16,8 @@ Source4: lm_sensors-modprobe-r
|
||||
Source5: sensord.service
|
||||
Source6: sensord-service-wrapper
|
||||
|
||||
Patch0: lm_sensors-3.3.4-sensors-detect-null-input.patch
|
||||
Patch1: lm_sensors-3.3.4-lm_sensors-service-modprobe-warnings.patch
|
||||
Patch2: lm_sensors-3.3.4-man-sensors-conf-conv.patch
|
||||
Patch3: lm_sensors-3.3.4-sensors-detect-ppc-missing-vendor_id.patch
|
||||
# http://lists.lm-sensors.org/pipermail/lm-sensors/2014-January/040947.html
|
||||
Patch4: lm_sensors-3.3.4-syslogorder.patch
|
||||
|
||||
|
||||
Requires: /usr/sbin/modprobe
|
||||
%ifarch %{ix86} x86_64
|
||||
@ -68,11 +64,8 @@ database, and warns of sensor alarms.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
|
||||
mv prog/init/README prog/init/README.initscripts
|
||||
chmod -x prog/init/fancontrol.init
|
||||
@ -186,6 +179,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 23 2014 Jaromir Capik <jcapik@redhat.com> - 3.3.5-1
|
||||
- Update to 3.3.5 (#1056448)
|
||||
|
||||
* Sun Jan 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.3.4-11
|
||||
- Do not order services after syslog.target.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user