From eb86e94ce397a73a1bd39154b573ae42ad55f3da Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Wed, 29 May 2013 15:53:41 +0200
Subject: [PATCH] Update to 3.3.4

---
 .gitignore                       |  1 +
 lm_sensors.spec                  | 11 ++---
 sensors-detect-no-dev-port.patch | 84 --------------------------------
 sources                          |  2 +-
 4 files changed, 7 insertions(+), 91 deletions(-)
 delete mode 100644 sensors-detect-no-dev-port.patch

diff --git a/.gitignore b/.gitignore
index 5994cc5..6ecbcf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ lm_sensors-3.1.2.tar.bz2
 /lm_sensors-3.3.1.tar.bz2
 /lm_sensors-3.3.2.tar.bz2
 /lm_sensors-3.3.3.tar.bz2
+/lm_sensors-3.3.4.tar.bz2
diff --git a/lm_sensors.spec b/lm_sensors.spec
index ec6b171..2af56dc 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,6 +1,6 @@
 Name: lm_sensors
-Version: 3.3.3
-Release: 3%{?dist}
+Version: 3.3.4
+Release: 1%{?dist}
 Summary: Hardware monitoring tools
 Group: Applications/System
 License: LGPLv2+
@@ -13,8 +13,6 @@ Source1: lm_sensors.sysconfig
 Source2: sensord.sysconfig
 Source3: sensord.systemd
 
-Patch0: sensors-detect-no-dev-port.patch
-
 %ifarch %{ix86} x86_64
 Requires: /usr/sbin/dmidecode
 %endif
@@ -61,8 +59,6 @@ database, and warns of sensor alarms.
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
 
-%patch0 -p1
-
 
 %build
 export CFLAGS="%{optflags}"
@@ -157,6 +153,9 @@ fi
 
 
 %changelog
+* Wed May 29 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.4-1
+- Update to 3.3.4
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sensors-detect-no-dev-port.patch b/sensors-detect-no-dev-port.patch
deleted file mode 100644
index 11eaa7c..0000000
--- a/sensors-detect-no-dev-port.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur lm_sensors-3.3.3.orig/prog/detect/sensors-detect lm_sensors-3.3.3/prog/detect/sensors-detect
---- lm_sensors-3.3.3.orig/prog/detect/sensors-detect	2012-10-30 18:18:45.000000000 +0100
-+++ lm_sensors-3.3.3/prog/detect/sensors-detect	2013-01-17 15:04:46.354612233 +0100
-@@ -2463,9 +2463,12 @@
- 
- sub initialize_ioports
- {
--	sysopen(IOPORTS, "/dev/port", O_RDWR)
--		or die "/dev/port: $!\n";
--	binmode(IOPORTS);
-+	if (sysopen(IOPORTS, "/dev/port", O_RDWR)) {
-+		binmode(IOPORTS);
-+		return 1;
-+	}
-+	print STDERR "/dev/port: $!\n";
-+	return 0;
- }
- 
- sub close_ioports
-@@ -3493,13 +3496,14 @@
- 				print("Can't set I2C address for $dev\n"),
- 				next;
- 
--			initialize_ioports();
--			$alias_detect = $detected->[$isa]->{alias_detect};
--			$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
--						   \*FILE,
--						   $detected->[$i2c]->{i2c_addr});
-+			if (initialize_ioports()) {
-+				$alias_detect = $detected->[$isa]->{alias_detect};
-+				$is_alias = &$alias_detect($detected->[$isa]->{isa_addr},
-+							   \*FILE,
-+							   $detected->[$i2c]->{i2c_addr});
-+				close_ioports();
-+			}
- 			close(FILE);
--			close_ioports();
- 
- 			next unless $is_alias;
- 			# This is an alias: copy the I2C data into the ISA
-@@ -6814,10 +6818,11 @@
- 		      "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): ";
- 		unless (<STDIN> =~ /^\s*n/i) {
--			initialize_ioports();
--			$superio_features |= scan_superio(0x2e, 0x2f);
--			$superio_features |= scan_superio(0x4e, 0x4f);
--			close_ioports();
-+			if (initialize_ioports()) {
-+				$superio_features |= scan_superio(0x2e, 0x2f);
-+				$superio_features |= scan_superio(0x4e, 0x4f);
-+				close_ioports();
-+			}
- 		}
- 		print "\n";
- 
-@@ -6830,9 +6835,10 @@
- 			      "interfaces? (YES/no): ";
- 			unless (<STDIN> =~ /^\s*n/i) {
- 				if (!ipmi_from_smbios()) {
--					initialize_ioports();
--					scan_isa_bus(\@ipmi_ifs);
--					close_ioports();
-+					if (initialize_ioports()) {
-+						scan_isa_bus(\@ipmi_ifs);
-+						close_ioports();
-+					}
- 				}
- 			}
- 			print "\n";
-@@ -6846,9 +6852,10 @@
- 		$input = <STDIN>;
- 		unless ($input =~ /^\s*n/i
- 		     || ($superio_features && $input !~ /^\s*y/i)) {
--			initialize_ioports();
--			scan_isa_bus(\@chip_ids);
--			close_ioports();
-+			if (initialize_ioports()) {
-+				scan_isa_bus(\@chip_ids);
-+				close_ioports();
-+			}
- 		}
- 		print "\n";
- 	}
diff --git a/sources b/sources
index d0b56fa..d773e15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73c2fcccdab6049d289c5e0c596192a1  lm_sensors-3.3.3.tar.bz2
+60cfb98ab7a8915c3ac684af5459de2e  lm_sensors-3.3.4.tar.bz2