Package: procps Version: 1:3.2.8-9 Severity: important Tags: patch User: debian-h...@lists.debian.org Usertags: hurd
Hi, The current version of procps fails to build from source on hurd-i386. This is caused by debian/patches/vmstat_part_format.patch, which uses the PATH_MAX constant. I'm not sure what the preferred form of submission is for such things, but the attached "patch to the patch" fixes this problem. Thanks, -- Jeremie Koenig <j...@jk.fr.eu.org> http://jk.fr.eu.org
--- debian/patches/vmstat_part_format.patch.orig 2010-07-11 03:59:28.000000000 +0000 +++ debian/patches/vmstat_part_format.patch 2010-07-11 04:01:23.000000000 +0000 @@ -1,15 +1,17 @@ Author: Daniel Novotny Description: The contents of /proc/diskstats have changed since 2.6.25 Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=485243 ---- a/proc/sysinfo.c -+++ b/proc/sysinfo.c +Index: procps-3.2.8/proc/sysinfo.c +=================================================================== +--- procps-3.2.8.orig/proc/sysinfo.c 2010-07-11 03:52:58.000000000 +0000 ++++ procps-3.2.8/proc/sysinfo.c 2010-07-11 04:01:18.000000000 +0000 @@ -796,6 +796,18 @@ } ///////////////////////////////////////////////////////////////////////////// -+static int is_disk(char *dev) ++static int is_disk(const char dev[16]) +{ -+ char syspath[PATH_MAX]; ++ char syspath[32]; + char *slash; + + while ((slash = strchr(dev, '/'))) @@ -26,7 +28,7 @@ int cPartition = 0; int fields; unsigned dummy; -+ char devname[PATH_MAX]; ++ char devname[16]; *disks = NULL; *partitions = NULL; @@ -53,8 +55,10 @@ //&part_major, //&part_minor, (*partitions)[cPartition].partition_name, ---- a/proc/sysinfo.h -+++ b/proc/sysinfo.h +Index: procps-3.2.8/proc/sysinfo.h +=================================================================== +--- procps-3.2.8.orig/proc/sysinfo.h 2010-07-11 03:52:58.000000000 +0000 ++++ procps-3.2.8/proc/sysinfo.h 2010-07-11 03:55:39.000000000 +0000 @@ -113,7 +113,7 @@ unsigned parent_disk; // index into a struct disk_stat array unsigned reads; @@ -64,8 +68,10 @@ }partition_stat; extern unsigned int getpartitions_num(struct disk_stat *disks, int ndisks); ---- a/vmstat.c -+++ b/vmstat.c +Index: procps-3.2.8/vmstat.c +=================================================================== +--- procps-3.2.8.orig/vmstat.c 2010-07-11 03:55:38.000000000 +0000 ++++ procps-3.2.8/vmstat.c 2010-07-11 03:55:39.000000000 +0000 @@ -286,7 +286,7 @@ struct disk_stat *disks; struct partition_stat *partitions, *current_partition=NULL;
