Package: rstatd Version: 4.0.1-5 Severity: minor Tags: patch Hi Anibal. The following discussion refers to #654276[1]. The fix there introduced another case explicitly for 3.x kernels. During asking for a stable-update for rstatd Julien from Release Team noticed that it would be better to use get_*26 calls as default fallback as 2.6 and 3.x kernels use the same interface. See [2] for my initial request. [1]: http://bugs.debian.org/654276 [2]: https://lists.debian.org/debian-release/2012/06/msg00142.html On Wed, Jun 06, 2012 at 10:12:46PM +0200, Julien Cristau wrote: > On Wed, Jun 6, 2012 at 21:25:37 +0200, Salvatore Bonaccorso wrote: > > > Agreed, and thanks for feedback. Indeed the fix was simply taken from > > the version in unstable, which maybe should change that too. > > > Yes, that would be better. > > > Attached is the new debdiff for it. > > > Looks good to me, thanks. Attached is now the same against 4.0.1-5 in unstable (note the pach folliwing it needs a refresh for the offset). Regards, Salvatore
From 937673cb800b777965ad8841100771ab088e5dc5 Mon Sep 17 00:00:00 2001
From: Salvatore Bonaccorso <carnil@debian.org>
Date: Sat, 9 Jun 2012 08:11:29 +0200
Subject: [PATCH] Defaults to get_*26 for kernel version >= 2.6
Defaults to get_*26 for kernel version >= 2.6 instead of introducing a
new if for 3.x kernels.
See: https://lists.debian.org/debian-release/2012/06/msg00152.html
---
debian/patches/02-654276-get_disk26.patch | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/patches/02-654276-get_disk26.patch b/debian/patches/02-654276-get_disk26.patch
index b478b22..1914641 100644
--- a/debian/patches/02-654276-get_disk26.patch
+++ b/debian/patches/02-654276-get_disk26.patch
@@ -20,11 +20,12 @@ same interface is used for getting the disks statistics.
--- a/getdata.c 2012-01-08 12:26:19.000000000 +1100
+++ b/getdata.c 2012-01-08 12:31:12.000000000 +1100
-@@ -289,6 +289,10 @@ void getdata_setup() {
+@@ -289,6 +289,11 @@
getdata.disk = get_disk26;
getdata.vm = get_vm26;
}
-+ if (0 == strncmp(u.release, "3", 1)) {
++ /* defaults to get_*26 for kernel version >= 2.6 */
++ else {
+ getdata.disk = get_disk26;
+ getdata.vm = get_vm26;
+ }
--
1.7.10
Attachment:
signature.asc
Description: Digital signature