On Sat, Sep 27, 2008 at 05:20:38PM +0100, Adeodato Simó wrote:
> * Mattia Dongili [Sun, 21 Sep 2008 11:46:13 +0900]:
...
> > Please allow cpufreqd 2.3.3-2 to enter Lenny.
>
> Unblocked.
Please, could you unblock it one more time? 2.3.3-3 this time though.
The diff from previous version only contains an obvious bugfix for
a segfault happening on pretty much all of the desktops (second hunk
below).
Note: I'll be off line for 10 days starting tomorrow.
Thanks and apologies for the extra work.
diff --git a/debian/changelog b/debian/changelog
index 2fddc7b..92a6c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cpufreqd (2.3.3-3) unstable; urgency=low
+
+ * backport a patch from upstream repository fixing
+ a segfault when reading a /sys device class with no
+ attributes (Closes: #496288).
+
+ -- Mattia Dongili <malattia@debian.org> Sun, 05 Oct 2008 11:23:07 +0900
+
cpufreqd (2.3.3-2) unstable; urgency=low
* backport a patch from upstream repository to support the
diff --git a/debian/patches/02_fix_segfault_reading_class_devices.patch b/debian/patches/02_fix_segfault_reading_class_devices.patch
new file mode 100644
index 0000000..77f1fe6
--- /dev/null
+++ b/debian/patches/02_fix_segfault_reading_class_devices.patch
@@ -0,0 +1,15 @@
+Index: cpufreqd-2.3.3/src/cpufreqd_acpi.c
+===================================================================
+--- cpufreqd-2.3.3.orig/src/cpufreqd_acpi.c 2008-07-27 16:41:40.000000000 +0900
++++ cpufreqd-2.3.3/src/cpufreqd_acpi.c 2008-10-05 11:29:19.542579811 +0900
+@@ -246,8 +246,8 @@ int find_class_device(const char *clsnam
+
+ /* read `clsname` devices */
+ devs = sysfs_get_class_devices(cls);
+- if (!cls) {
+- clog(LOG_INFO, "class '%s' not found (%s)\n", clsname,
++ if (!devs) {
++ clog(LOG_INFO, "class device '%s' not found (%s)\n", clsname,
+ strerror(errno));
+ sysfs_close_class(cls);
+ return -1;
diff --git a/debian/patches/series b/debian/patches/series
index ab7b339..84fa53f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_acpitz_support.patch
+02_fix_segfault_reading_class_devices.patch
--
mattia
:wq!
Attachment:
signature.asc
Description: Digital signature