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

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-25 11:35:31 +0000 (Mon, 25 Jan 2010)
New Revision: 2958

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/patches/026_kdump.diff
Log:
  * debian/patches/026_kdump.diff: don't parse <sys/acl.h> in auto mode.
  * Build-depends on libedit-dev. Closes: bug#566774.



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2010-01-25 09:27:20 UTC (rev 2957)
+++ trunk/freebsd-utils/debian/changelog	2010-01-25 11:35:31 UTC (rev 2958)
@@ -1,3 +1,10 @@
+freebsd-utils (8.0-8) unstable; urgency=low
+
+  * debian/patches/026_kdump.diff: don't parse <sys/acl.h> in auto mode.
+  * Build-depends on libedit-dev. Closes: bug#566774.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 25 Jan 2010 12:34:52 +0100
+
 freebsd-utils (8.0-7) unstable; urgency=low
 
   * Fix clean rule.

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2010-01-25 09:27:20 UTC (rev 2957)
+++ trunk/freebsd-utils/debian/control	2010-01-25 11:35:31 UTC (rev 2958)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), quilt, po-debconf, freebsd-buildutils,
  libkvm-dev (>= 8.0), libbsd-dev (>= 0.2.0), libc0.1-dev (>= 2.10.1),
  flex | flex-old, kfreebsd-kernel-headers (>= 0.43), libmemstat-dev, libnetgraph-dev,
- libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev, libcam-dev
+ libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev, libcam-dev, libedit-dev
 # libkvm-dev: dmesg
 # libgeom-dev : ccdconfig
 # libipx-dev: ifconfig
@@ -15,6 +15,7 @@
 # libdevstat-dev: mdconfig
 # libsbuf-dev: mdconfig
 # libcam-dev: camcontrol
+# libedit-dev: pppctl
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-utils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-utils/
 Standards-Version: 3.8.3

Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff	2010-01-25 09:27:20 UTC (rev 2957)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff	2010-01-25 11:35:31 UTC (rev 2958)
@@ -194,8 +194,38 @@
  /*
   * These are simple support macros. print_or utilizes a variable
   * defined in the calling function to track whether or not it should
-@@ -304,43 +316,43 @@
+@@ -302,45 +314,72 @@
+ 	}
+ }
  
++/*
++ * MANUAL
++ */
++
++void
++acltypename (int arg)
++{
++	switch (arg) {
++	case 0x00000000:
++		(void)printf("ACL_TYPE_ACCESS_OLD");
++		break;
++	case 0x00000001:
++		(void)printf("ACL_TYPE_ACCESS_OLD");
++		break;
++	case 0x00000002:
++		(void)printf("ACL_TYPE_ACCESS");
++		break;
++	case 0x00000003:
++		(void)printf("ACL_TYPE_DEFAULT");
++		break;
++	case 0x00000004:
++		(void)printf("ACL_TYPE_NFS4");
++	 	break;
++	default: /* Should not reach */
++		(void)printf("<invalid=%ld>", (long)arg);
++	}
++}
++
  _EOF_
  
 -auto_or_type "modename" "S_[A-Z]+[[:space:]]+[0-6]{7}" "sys/stat.h"
@@ -231,8 +261,8 @@
 -auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h"
 -auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
 +auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "stdio.h"
-+auto_switch_type "rlimitname" "RLIMIT_[A-Z]++[[:space:]]" "bits/resource.h"
-+auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]" "sys/socket.h"
++auto_switch_type "rlimitname" "RLIMIT_[A-Z]++[[:space:]]+" "bits/resource.h"
++auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+" "sys/socket.h"
 +auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+" "bits/resource.h"
 +auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "bits/mman.h"
 +auto_switch_type "msyncflagsname" "MS_[A-Z]+[[:space:]]+[0-9]+" "bits/mman.h"
@@ -245,7 +275,6 @@
 -auto_switch_type "sigprocmaskhowname" "SIG_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h"
 -auto_switch_type "lio_listioname" "LIO_(NO)?WAIT[[:space:]]+[0-9]+" "aio.h"
 -auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h"
-+auto_switch_type "acltypename" "ACL_TYPE_[A-Z]+[[:space:]]+\(0x[0-9]+\)" "sys/acl.h"
 +auto_switch_type "sigprocmaskhowname" "SIG_[A-Z]+[[:space:]]+[0-9]+" "bits/sigaction.h"
 +auto_switch_type "lio_listioname" "LIO_(NO)?WAIT[[:space:]]+" "aio.h"
 +auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "bits/mman.h"
@@ -262,7 +291,16 @@
  auto_switch_type "ptraceopname" "PT_[[:alnum:]]+[[:space:]]+[0-9]+" "sys/ptrace.h"
  
  cat <<_EOF_
-@@ -433,7 +445,7 @@
+@@ -403,7 +442,7 @@
+ {
+ 	switch (func) {
+ _EOF_
+-egrep "^#[[:space:]]*define[[:space:]]+RTP_[A-Z]+[[:space:]]+0x[0-9]+[[:space:]]*" \
++egrep "^#[[:space:]]*define[[:space:]]+RTP_[A-Z]+[[:space:]]+[0-9]+[[:space:]]*" \
+ 	$include_dir/sys/rtprio.h | grep -v RTP_PRIO | \
+ 	awk '{ for (i = 1; i <= NF; i++) \
+ 		if ($i ~ /define/) \
+@@ -433,7 +472,7 @@
  		return;
  	}
  _EOF_