[Glibc-bsd-commits] r2952 - in trunk/freebsd-utils/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-24 13:05:30 +0000 (Sun, 24 Jan 2010)
New Revision: 2952

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/026_kdump.diff
Log:
  * Fix build with newer <sys/ptrace.h>. 



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2010-01-24 11:35:52 UTC (rev 2951)
+++ trunk/freebsd-utils/debian/changelog	2010-01-24 13:05:30 UTC (rev 2952)
@@ -1,8 +1,9 @@
 freebsd-utils (8.0-7) UNRELEASED; urgency=low
 
   * Fix clean rule.
+  * Fix build with newer <sys/ptrace.h>. 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 24 Jan 2010 12:35:36 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 24 Jan 2010 14:05:05 +0100
 
 freebsd-utils (8.0-6) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff	2010-01-24 11:35:52 UTC (rev 2951)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff	2010-01-24 13:05:30 UTC (rev 2952)
@@ -158,7 +158,7 @@
  #include <sys/mman.h>
  #include <sys/wait.h>
  #define _KERNEL
-@@ -148,9 +151,6 @@
+@@ -148,21 +151,30 @@
  #include <sys/reboot.h>
  #include <sched.h>
  #include <sys/linker.h>
@@ -166,9 +166,9 @@
 -#include <sys/thr.h>
 -#undef _KERNEL
  #include <sys/extattr.h>
- #include <sys/acl.h>
+-#include <sys/acl.h>
  #include <aio.h>
-@@ -158,11 +158,14 @@
+ #include <sys/sem.h>
  #include <sys/ipc.h>
  #include <sys/rtprio.h>
  #include <sys/shm.h>
@@ -181,10 +181,20 @@
 +#define S_IFWHT __S_IFWHT
 +#endif
 +
++#ifndef PT_LWPINFO
++#define PT_LWPINFO      13      /* Info about the LWP that stopped. */
++#endif
++#ifndef PT_GETNUMLWPS
++#define PT_GETNUMLWPS   14      /* get total number of threads */
++#endif
++#ifndef PT_GETLWPLIST
++#define PT_GETLWPLIST   15      /* get thread list */
++#endif
++
  /*
   * These are simple support macros. print_or utilizes a variable
   * defined in the calling function to track whether or not it should
-@@ -304,43 +307,43 @@
+@@ -304,43 +316,43 @@
  
  _EOF_
  
@@ -252,7 +262,7 @@
  auto_switch_type "ptraceopname" "PT_[[:alnum:]]+[[:space:]]+[0-9]+" "sys/ptrace.h"
  
  cat <<_EOF_
-@@ -433,7 +436,7 @@
+@@ -433,7 +445,7 @@
  		return;
  	}
  _EOF_