rpms/hardinfo/F-7 fixsensors.patch,1.1,1.2 hardinfo.spec,1.2,1.3

Adel Gadllah (drago01) fedora-extras-commits at redhat.com
Fri Jul 27 08:38:30 UTC 2007


Author: drago01

Update of /cvs/pkgs/rpms/hardinfo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441

Modified Files:
	fixsensors.patch hardinfo.spec 
Log Message:
better sensor fix

fixsensors.patch:

Index: fixsensors.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/fixsensors.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fixsensors.patch	26 Jul 2007 08:35:39 -0000	1.1
+++ fixsensors.patch	27 Jul 2007 08:38:27 -0000	1.2
@@ -1,13 +1,9 @@
- diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
---- hardinfo-0.4.2.2.orign/util.c	2007-07-20 16:45:08.000000000 +0200
-+++ hardinfo-0.4.2.2/util.c	2007-07-26 10:15:32.000000000 +0200
-@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo
-     if (source) {
- 	retn = g_strconcat(source, buffer, NULL);
- 	g_free(buffer);
--        g_free(source);
-+        if(strlen(source))
-+		 g_free(source);
-     } else {
- 	retn = buffer;
-     }
+diff -upNr hardinfo-0.4.2.2.orign/arch/linux/common/sensors.h hardinfo-0.4.2.2/arch/linux/common/sensors.h
+--- hardinfo-0.4.2.2.orign/arch/linux/common/sensors.h	2007-07-20 16:44:57.000000000 +0200
++++ hardinfo-0.4.2.2/arch/linux/common/sensors.h	2007-07-27 10:30:58.000000000 +0200
+@@ -254,7 +254,7 @@ static void read_sensors_acpi(void)
+ 
+ 	if ((tz = g_dir_open(path_tz, 0, NULL))) {
+ 	    const gchar *entry;
+-	    gchar *temp = "";
++	    gchar *temp = g_strdup(""); 


Index: hardinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/F-7/hardinfo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hardinfo.spec	26 Jul 2007 08:35:39 -0000	1.2
+++ hardinfo.spec	27 Jul 2007 08:38:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name: hardinfo
 Version: 0.4.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: System Profiler and Benchmark      
 
 Group: Applications/System    
@@ -26,8 +26,11 @@
 
 %prep
 %setup -q
+#fix multilib build isses (upstream working on better one)
 %patch0 -p1 -b .multilib
+#fix sensors segfault
 %patch1 -p1 -b .fixsensors
+#use correct uids
 %patch2 -p1 -b .fixuserdsp
 
 %build
@@ -60,6 +63,10 @@
 
 
 %changelog
+* Fri Jul 27 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-4
+- Add better sensors fix from upstream
+- Backport cleanups from devel
+
 * Thu Jul 26 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-3
 - Fix and reenable sensor reading
 - Remove zlib requires




More information about the fedora-extras-commits mailing list