Package: procps
Version: 1:3.2.6-2.1
Severity: normal
Tags: patch
The 40_gnu-kbsd patch contains reject from obsolete hunk (ps no longer
uses PAGE_SIZE, but getpagesize()). This causes unpatching to fail when
cleaning, since 'make clean' removes the .rej file.
Here's a patch to remove it:
diff -u procps-3.2.6/debian/patches/40_gnu-kbsd.dpatch
procps-3.2.6/debian/patches/40_gnu-kbsd.dpatch
--- procps-3.2.6/debian/patches/40_gnu-kbsd.dpatch
+++ procps-3.2.6/debian/patches/40_gnu-kbsd.dpatch
@@ -79,33 +79,6 @@
+#endif
linux_version_code = LINUX_VERSION(x, y, z);
}
-diff -urNad --exclude=CVS --exclude=.svn ./ps/common.h.rej
/tmp/dpep-work.k3RyXD/procps-3.2.6/ps/common.h.rej
---- ./ps/common.h.rej 1970-01-01 10:00:00.000000000 +1000
-+++ /tmp/dpep-work.k3RyXD/procps-3.2.6/ps/common.h.rej 2005-11-02
13:22:07.000000000 +1100
-@@ -0,0 +1,23 @@
-+***************
-+*** 14,20 ****
-+
-+ #include "../proc/procps.h"
-+ #include "../proc/readproc.h"
-+- #include <asm/page.h> /* looks safe for glibc, we need PAGE_SIZE */
-+
-+ #if 0
-+ #define trace(args...) printf(## args)
-+--- 14,26 ----
-+
-+ #include "../proc/procps.h"
-+ #include "../proc/readproc.h"
-++
-++ /* looks safe for glibc, we need PAGE_SIZE */
-++ #if defined(__linux__)
-++ # include <asm/page.h>
-++ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-++ # include <machine/param.h>
-++ #endif
-+
-+ #if 0
-+ #define trace(args...) printf(## args)
diff -urNad --exclude=CVS --exclude=.svn ./top.c
/tmp/dpep-work.k3RyXD/procps-3.2.6/top.c
--- ./top.c 2005-10-30 16:05:28.000000000 +1100
+++ /tmp/dpep-work.k3RyXD/procps-3.2.6/top.c 2005-11-02 13:22:07.000000000
+1100
--
ilmari
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
