Hi! I'm proposing to update procps in stable to have it support kernels which advertise them as "3.0-something" instead of "2.6.x-something" or "3.0.0-something". (There are some other packages that need fixing, so this is a first step.) The required patch has already landed in unstable (#632749), but another (maybe cosmetic) issue is still open (#635553). The debdiff would fix both things, if this is not acceptable, I can prepare another version only fixing #632749. The procps maintainer, Craig Small, is ok with this, but is busy at the moment. Thanks for considering this. Christian -- christian hofstaedtler cellphone +43 680 2348846 diff -Nru procps-3.2.8/debian/changelog procps-3.2.8/debian/changelog --- procps-3.2.8/debian/changelog 2010-05-02 07:06:06.000000000 -0400 +++ procps-3.2.8/debian/changelog 2011-07-24 18:20:00.000000000 -0400 @@ -1,3 +1,12 @@ +procps (1:3.2.8-9squeeze1) stable; urgency=low + + * Non-maintainer upload to support 3.0 kernels in stable. + * Backport "No more complaints for 3.0 kernels" from unstable. + Closes: #632749 + * Drop check on LINUX_VERSION(2, 7, 0) Closes: #635553 + + -- Christian Hofstaedtler <christian@hofstaedtler.name> Sun, 24 Jul 2011 18:15:18 -0400 + procps (1:3.2.8-9) unstable; urgency=low * Fix for patch on cgroup crash Closes: #579824 diff -Nru procps-3.2.8/debian/patches/gnu-kbsd-version.patch procps-3.2.8/debian/patches/gnu-kbsd-version.patch --- procps-3.2.8/debian/patches/gnu-kbsd-version.patch 2010-01-08 07:26:57.000000000 -0500 +++ procps-3.2.8/debian/patches/gnu-kbsd-version.patch 2011-07-24 18:15:15.000000000 -0400 @@ -24,7 +24,7 @@ + exit(1); + } + fclose(fp); -+ if (sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z) < 3) ++ if (sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z) < 2) fprintf(stderr, /* *very* unlikely to happen by accident */ "Non-standard uts for running kernel:\n" - "release %s=%d.%d.%d gives version code %d\n", diff -Nru procps-3.2.8/debian/patches/remove_2_7_check.patch procps-3.2.8/debian/patches/remove_2_7_check.patch --- procps-3.2.8/debian/patches/remove_2_7_check.patch 1969-12-31 19:00:00.000000000 -0500 +++ procps-3.2.8/debian/patches/remove_2_7_check.patch 2011-07-24 18:33:17.000000000 -0400 @@ -0,0 +1,16 @@ +Description: remove check for Linux version 2.7.0 which never arrived +Author: Christian Hofstaedtler <christian@hofstaedtler.name> +Index: procps-3.2.8/proc/devname.c +=================================================================== +--- procps-3.2.8.orig/proc/devname.c 2011-07-24 11:48:18.000000000 -0400 ++++ procps-3.2.8/proc/devname.c 2011-07-24 11:49:55.000000000 -0400 +@@ -281,9 +281,6 @@ + unsigned i = 0; + int c; + if(dev == 0u) goto no_tty; +- if(linux_version_code > LINUX_VERSION(2, 7, 0)){ // not likely to make 2.6.xx +- if(link_name(tmp, MAJOR_OF(dev), MINOR_OF(dev), pid, "tty" )) goto abbrev; +- } + if(driver_name(tmp, MAJOR_OF(dev), MINOR_OF(dev) )) goto abbrev; + if( link_name(tmp, MAJOR_OF(dev), MINOR_OF(dev), pid, "fd/2" )) goto abbrev; + if( guess_name(tmp, MAJOR_OF(dev), MINOR_OF(dev) )) goto abbrev; diff -Nru procps-3.2.8/debian/patches/series procps-3.2.8/debian/patches/series --- procps-3.2.8/debian/patches/series 2010-02-28 23:32:47.000000000 -0500 +++ procps-3.2.8/debian/patches/series 2011-07-24 18:34:01.000000000 -0400 @@ -66,3 +66,4 @@ ps_1_flt_output.patch watch_ansi_colour.patch top_username_parse.patch +remove_2_7_check.patch
Attachment:
signature.asc
Description: Digital signature