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

Aurelien Jarno aurel32 at alioth.debian.org
Sat Jan 23 20:37:37 UTC 2010


Author: aurel32
Date: 2010-01-23 20:37:36 +0000 (Sat, 23 Jan 2010)
New Revision: 2944

Added:
   trunk/freebsd-utils/debian/patches/000_kdump.sources
   trunk/freebsd-utils/debian/patches/026_kdump.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
   trunk/freebsd-utils/debian/freebsd-utils-udeb.install
   trunk/freebsd-utils/debian/freebsd-utils.install
   trunk/freebsd-utils/debian/freebsd-utils.manpages
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
  * Add kdump binary.
  * Move ktrace to /usr/bin. 



Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/changelog	2010-01-23 20:37:36 UTC (rev 2944)
@@ -3,8 +3,10 @@
   * mount: assume that the mount helpers are located in /sbin instead of
     looking in $PATH, which may not contain /sbin when called from 
     scripts.
+  * Add kdump binary.
+  * Move ktrace to /usr/bin. 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 23 Jan 2010 16:26:51 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 23 Jan 2010 21:37:23 +0100
 
 freebsd-utils (8.0-5) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/control	2010-01-23 20:37:36 UTC (rev 2944)
@@ -24,9 +24,9 @@
 Essential: yes
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ufsutils
-Suggests: freebsd-hackedutils (>= 6.1-1)
+Suggests: freebsd-hackedutils (>= 6.1-3)
 Conflicts: inetutils-tools (<= 2:1.4.3+20051212-4)
-Replaces: freebsd-hackedutils (<= 6.1-1)
+Replaces: freebsd-hackedutils (<= 6.1-3)
 Description: FreeBSD utilities needed for GNU/kFreeBSD
  This package provides FreeBSD utilities needed for GNU/kFreeBSD.
 

Modified: trunk/freebsd-utils/debian/freebsd-utils-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils-udeb.install	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/freebsd-utils-udeb.install	2010-01-23 20:37:36 UTC (rev 2944)
@@ -1,3 +1,4 @@
 bin/kenv/kenv				/bin
 sbin/sysctl/sysctl			/bin
-usr.bin/ktrace/ktrace    		/bin
+usr.bin/kdump/kdump	    		/usr/bin
+usr.bin/ktrace/ktrace    		/usr/bin

Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/freebsd-utils.install	2010-01-23 20:37:36 UTC (rev 2944)
@@ -4,7 +4,8 @@
 sbin/umount/umount			/lib/freebsd
 sbin/sysctl/sysctl			/lib/freebsd
 
-usr.bin/ktrace/ktrace    		/bin
+usr.bin/kdump/kdump	    		/usr/bin
+usr.bin/ktrace/ktrace    		/usr/bin
 
 debian/devfs.d				/etc
 debian/scripts/bin/mount		/bin

Modified: trunk/freebsd-utils/debian/freebsd-utils.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.manpages	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/freebsd-utils.manpages	2010-01-23 20:37:36 UTC (rev 2944)
@@ -1,4 +1,5 @@
 bin/kenv/kenv.1
+usr.bin/kdump/kdump.1
 usr.bin/ktrace/ktrace.1
 sbin/atacontrol/atacontrol.8
 sbin/camcontrol/camcontrol.8

Added: trunk/freebsd-utils/debian/patches/000_kdump.sources
===================================================================
--- trunk/freebsd-utils/debian/patches/000_kdump.sources	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/000_kdump.sources	2010-01-23 20:37:36 UTC (rev 2944)
@@ -0,0 +1,527 @@
+--- a/sys/kern/syscalls.c
++++ b/sys/kern/syscalls.c
+@@ -0,0 +1,524 @@
++/*
++ * System call names.
++ *
++ * DO NOT EDIT-- this file is automatically generated.
++ * $FreeBSD$
++ * created from FreeBSD: head/sys/kern/syscalls.master 195458 2009-07-08 15:23:18Z trasz 
++ */
++
++const char *syscallnames[] = {
++	"syscall",			/* 0 = syscall */
++	"exit",			/* 1 = exit */
++	"fork",			/* 2 = fork */
++	"read",			/* 3 = read */
++	"write",			/* 4 = write */
++	"open",			/* 5 = open */
++	"close",			/* 6 = close */
++	"wait4",			/* 7 = wait4 */
++	"compat.creat",		/* 8 = old creat */
++	"link",			/* 9 = link */
++	"unlink",			/* 10 = unlink */
++	"obs_execv",			/* 11 = obsolete execv */
++	"chdir",			/* 12 = chdir */
++	"fchdir",			/* 13 = fchdir */
++	"mknod",			/* 14 = mknod */
++	"chmod",			/* 15 = chmod */
++	"chown",			/* 16 = chown */
++	"break",			/* 17 = break */
++	"compat4.getfsstat",		/* 18 = freebsd4 getfsstat */
++	"compat.lseek",		/* 19 = old lseek */
++	"getpid",			/* 20 = getpid */
++	"mount",			/* 21 = mount */
++	"unmount",			/* 22 = unmount */
++	"setuid",			/* 23 = setuid */
++	"getuid",			/* 24 = getuid */
++	"geteuid",			/* 25 = geteuid */
++	"ptrace",			/* 26 = ptrace */
++	"recvmsg",			/* 27 = recvmsg */
++	"sendmsg",			/* 28 = sendmsg */
++	"recvfrom",			/* 29 = recvfrom */
++	"accept",			/* 30 = accept */
++	"getpeername",			/* 31 = getpeername */
++	"getsockname",			/* 32 = getsockname */
++	"access",			/* 33 = access */
++	"chflags",			/* 34 = chflags */
++	"fchflags",			/* 35 = fchflags */
++	"sync",			/* 36 = sync */
++	"kill",			/* 37 = kill */
++	"compat.stat",		/* 38 = old stat */
++	"getppid",			/* 39 = getppid */
++	"compat.lstat",		/* 40 = old lstat */
++	"dup",			/* 41 = dup */
++	"pipe",			/* 42 = pipe */
++	"getegid",			/* 43 = getegid */
++	"profil",			/* 44 = profil */
++	"ktrace",			/* 45 = ktrace */
++	"compat.sigaction",		/* 46 = old sigaction */
++	"getgid",			/* 47 = getgid */
++	"compat.sigprocmask",		/* 48 = old sigprocmask */
++	"getlogin",			/* 49 = getlogin */
++	"setlogin",			/* 50 = setlogin */
++	"acct",			/* 51 = acct */
++	"compat.sigpending",		/* 52 = old sigpending */
++	"sigaltstack",			/* 53 = sigaltstack */
++	"ioctl",			/* 54 = ioctl */
++	"reboot",			/* 55 = reboot */
++	"revoke",			/* 56 = revoke */
++	"symlink",			/* 57 = symlink */
++	"readlink",			/* 58 = readlink */
++	"execve",			/* 59 = execve */
++	"umask",			/* 60 = umask */
++	"chroot",			/* 61 = chroot */
++	"compat.fstat",		/* 62 = old fstat */
++	"compat.getkerninfo",		/* 63 = old getkerninfo */
++	"compat.getpagesize",		/* 64 = old getpagesize */
++	"msync",			/* 65 = msync */
++	"vfork",			/* 66 = vfork */
++	"obs_vread",			/* 67 = obsolete vread */
++	"obs_vwrite",			/* 68 = obsolete vwrite */
++	"sbrk",			/* 69 = sbrk */
++	"sstk",			/* 70 = sstk */
++	"compat.mmap",		/* 71 = old mmap */
++	"vadvise",			/* 72 = vadvise */
++	"munmap",			/* 73 = munmap */
++	"mprotect",			/* 74 = mprotect */
++	"madvise",			/* 75 = madvise */
++	"obs_vhangup",			/* 76 = obsolete vhangup */
++	"obs_vlimit",			/* 77 = obsolete vlimit */
++	"mincore",			/* 78 = mincore */
++	"getgroups",			/* 79 = getgroups */
++	"setgroups",			/* 80 = setgroups */
++	"getpgrp",			/* 81 = getpgrp */
++	"setpgid",			/* 82 = setpgid */
++	"setitimer",			/* 83 = setitimer */
++	"compat.wait",		/* 84 = old wait */
++	"swapon",			/* 85 = swapon */
++	"getitimer",			/* 86 = getitimer */
++	"compat.gethostname",		/* 87 = old gethostname */
++	"compat.sethostname",		/* 88 = old sethostname */
++	"getdtablesize",			/* 89 = getdtablesize */
++	"dup2",			/* 90 = dup2 */
++	"#91",			/* 91 = getdopt */
++	"fcntl",			/* 92 = fcntl */
++	"select",			/* 93 = select */
++	"#94",			/* 94 = setdopt */
++	"fsync",			/* 95 = fsync */
++	"setpriority",			/* 96 = setpriority */
++	"socket",			/* 97 = socket */
++	"connect",			/* 98 = connect */
++	"compat.accept",		/* 99 = old accept */
++	"getpriority",			/* 100 = getpriority */
++	"compat.send",		/* 101 = old send */
++	"compat.recv",		/* 102 = old recv */
++	"compat.sigreturn",		/* 103 = old sigreturn */
++	"bind",			/* 104 = bind */
++	"setsockopt",			/* 105 = setsockopt */
++	"listen",			/* 106 = listen */
++	"obs_vtimes",			/* 107 = obsolete vtimes */
++	"compat.sigvec",		/* 108 = old sigvec */
++	"compat.sigblock",		/* 109 = old sigblock */
++	"compat.sigsetmask",		/* 110 = old sigsetmask */
++	"compat.sigsuspend",		/* 111 = old sigsuspend */
++	"compat.sigstack",		/* 112 = old sigstack */
++	"compat.recvmsg",		/* 113 = old recvmsg */
++	"compat.sendmsg",		/* 114 = old sendmsg */
++	"obs_vtrace",			/* 115 = obsolete vtrace */
++	"gettimeofday",			/* 116 = gettimeofday */
++	"getrusage",			/* 117 = getrusage */
++	"getsockopt",			/* 118 = getsockopt */
++	"#119",			/* 119 = resuba */
++	"readv",			/* 120 = readv */
++	"writev",			/* 121 = writev */
++	"settimeofday",			/* 122 = settimeofday */
++	"fchown",			/* 123 = fchown */
++	"fchmod",			/* 124 = fchmod */
++	"compat.recvfrom",		/* 125 = old recvfrom */
++	"setreuid",			/* 126 = setreuid */
++	"setregid",			/* 127 = setregid */
++	"rename",			/* 128 = rename */
++	"compat.truncate",		/* 129 = old truncate */
++	"compat.ftruncate",		/* 130 = old ftruncate */
++	"flock",			/* 131 = flock */
++	"mkfifo",			/* 132 = mkfifo */
++	"sendto",			/* 133 = sendto */
++	"shutdown",			/* 134 = shutdown */
++	"socketpair",			/* 135 = socketpair */
++	"mkdir",			/* 136 = mkdir */
++	"rmdir",			/* 137 = rmdir */
++	"utimes",			/* 138 = utimes */
++	"obs_4.2",			/* 139 = obsolete 4.2 sigreturn */
++	"adjtime",			/* 140 = adjtime */
++	"compat.getpeername",		/* 141 = old getpeername */
++	"compat.gethostid",		/* 142 = old gethostid */
++	"compat.sethostid",		/* 143 = old sethostid */
++	"compat.getrlimit",		/* 144 = old getrlimit */
++	"compat.setrlimit",		/* 145 = old setrlimit */
++	"compat.killpg",		/* 146 = old killpg */
++	"setsid",			/* 147 = setsid */
++	"quotactl",			/* 148 = quotactl */
++	"compat.quota",		/* 149 = old quota */
++	"compat.getsockname",		/* 150 = old getsockname */
++	"#151",			/* 151 = sem_lock */
++	"#152",			/* 152 = sem_wakeup */
++	"#153",			/* 153 = asyncdaemon */
++	"nlm_syscall",			/* 154 = nlm_syscall */
++	"nfssvc",			/* 155 = nfssvc */
++	"compat.getdirentries",		/* 156 = old getdirentries */
++	"compat4.statfs",		/* 157 = freebsd4 statfs */
++	"compat4.fstatfs",		/* 158 = freebsd4 fstatfs */
++	"#159",			/* 159 = nosys */
++	"lgetfh",			/* 160 = lgetfh */
++	"getfh",			/* 161 = getfh */
++	"compat4.getdomainname",		/* 162 = freebsd4 getdomainname */
++	"compat4.setdomainname",		/* 163 = freebsd4 setdomainname */
++	"compat4.uname",		/* 164 = freebsd4 uname */
++	"sysarch",			/* 165 = sysarch */
++	"rtprio",			/* 166 = rtprio */
++	"#167",			/* 167 = nosys */
++	"#168",			/* 168 = nosys */
++	"semsys",			/* 169 = semsys */
++	"msgsys",			/* 170 = msgsys */
++	"shmsys",			/* 171 = shmsys */
++	"#172",			/* 172 = nosys */
++	"freebsd6_pread",			/* 173 = freebsd6_pread */
++	"freebsd6_pwrite",			/* 174 = freebsd6_pwrite */
++	"setfib",			/* 175 = setfib */
++	"ntp_adjtime",			/* 176 = ntp_adjtime */
++	"#177",			/* 177 = sfork */
++	"#178",			/* 178 = getdescriptor */
++	"#179",			/* 179 = setdescriptor */
++	"#180",			/* 180 = nosys */
++	"setgid",			/* 181 = setgid */
++	"setegid",			/* 182 = setegid */
++	"seteuid",			/* 183 = seteuid */
++	"#184",			/* 184 = lfs_bmapv */
++	"#185",			/* 185 = lfs_markv */
++	"#186",			/* 186 = lfs_segclean */
++	"#187",			/* 187 = lfs_segwait */
++	"stat",			/* 188 = stat */
++	"fstat",			/* 189 = fstat */
++	"lstat",			/* 190 = lstat */
++	"pathconf",			/* 191 = pathconf */
++	"fpathconf",			/* 192 = fpathconf */
++	"#193",			/* 193 = nosys */
++	"getrlimit",			/* 194 = getrlimit */
++	"setrlimit",			/* 195 = setrlimit */
++	"getdirentries",			/* 196 = getdirentries */
++	"freebsd6_mmap",			/* 197 = freebsd6_mmap */
++	"__syscall",			/* 198 = __syscall */
++	"freebsd6_lseek",			/* 199 = freebsd6_lseek */
++	"freebsd6_truncate",			/* 200 = freebsd6_truncate */
++	"freebsd6_ftruncate",			/* 201 = freebsd6_ftruncate */
++	"__sysctl",			/* 202 = __sysctl */
++	"mlock",			/* 203 = mlock */
++	"munlock",			/* 204 = munlock */
++	"undelete",			/* 205 = undelete */
++	"futimes",			/* 206 = futimes */
++	"getpgid",			/* 207 = getpgid */
++	"#208",			/* 208 = newreboot */
++	"poll",			/* 209 = poll */
++	"lkmnosys",			/* 210 = lkmnosys */
++	"lkmnosys",			/* 211 = lkmnosys */
++	"lkmnosys",			/* 212 = lkmnosys */
++	"lkmnosys",			/* 213 = lkmnosys */
++	"lkmnosys",			/* 214 = lkmnosys */
++	"lkmnosys",			/* 215 = lkmnosys */
++	"lkmnosys",			/* 216 = lkmnosys */
++	"lkmnosys",			/* 217 = lkmnosys */
++	"lkmnosys",			/* 218 = lkmnosys */
++	"lkmnosys",			/* 219 = lkmnosys */
++	"compat7.__semctl",		/* 220 = freebsd7 __semctl */
++	"semget",			/* 221 = semget */
++	"semop",			/* 222 = semop */
++	"#223",			/* 223 = semconfig */
++	"compat7.msgctl",		/* 224 = freebsd7 msgctl */
++	"msgget",			/* 225 = msgget */
++	"msgsnd",			/* 226 = msgsnd */
++	"msgrcv",			/* 227 = msgrcv */
++	"shmat",			/* 228 = shmat */
++	"compat7.shmctl",		/* 229 = freebsd7 shmctl */
++	"shmdt",			/* 230 = shmdt */
++	"shmget",			/* 231 = shmget */
++	"clock_gettime",			/* 232 = clock_gettime */
++	"clock_settime",			/* 233 = clock_settime */
++	"clock_getres",			/* 234 = clock_getres */
++	"ktimer_create",			/* 235 = ktimer_create */
++	"ktimer_delete",			/* 236 = ktimer_delete */
++	"ktimer_settime",			/* 237 = ktimer_settime */
++	"ktimer_gettime",			/* 238 = ktimer_gettime */
++	"ktimer_getoverrun",			/* 239 = ktimer_getoverrun */
++	"nanosleep",			/* 240 = nanosleep */
++	"#241",			/* 241 = nosys */
++	"#242",			/* 242 = nosys */
++	"#243",			/* 243 = nosys */
++	"#244",			/* 244 = nosys */
++	"#245",			/* 245 = nosys */
++	"#246",			/* 246 = nosys */
++	"#247",			/* 247 = nosys */
++	"ntp_gettime",			/* 248 = ntp_gettime */
++	"#249",			/* 249 = nosys */
++	"minherit",			/* 250 = minherit */
++	"rfork",			/* 251 = rfork */
++	"openbsd_poll",			/* 252 = openbsd_poll */
++	"issetugid",			/* 253 = issetugid */
++	"lchown",			/* 254 = lchown */
++	"aio_read",			/* 255 = aio_read */
++	"aio_write",			/* 256 = aio_write */
++	"lio_listio",			/* 257 = lio_listio */
++	"#258",			/* 258 = nosys */
++	"#259",			/* 259 = nosys */
++	"#260",			/* 260 = nosys */
++	"#261",			/* 261 = nosys */
++	"#262",			/* 262 = nosys */
++	"#263",			/* 263 = nosys */
++	"#264",			/* 264 = nosys */
++	"#265",			/* 265 = nosys */
++	"#266",			/* 266 = nosys */
++	"#267",			/* 267 = nosys */
++	"#268",			/* 268 = nosys */
++	"#269",			/* 269 = nosys */
++	"#270",			/* 270 = nosys */
++	"#271",			/* 271 = nosys */
++	"getdents",			/* 272 = getdents */
++	"#273",			/* 273 = nosys */
++	"lchmod",			/* 274 = lchmod */
++	"netbsd_lchown",			/* 275 = netbsd_lchown */
++	"lutimes",			/* 276 = lutimes */
++	"netbsd_msync",			/* 277 = netbsd_msync */
++	"nstat",			/* 278 = nstat */
++	"nfstat",			/* 279 = nfstat */
++	"nlstat",			/* 280 = nlstat */
++	"#281",			/* 281 = nosys */
++	"#282",			/* 282 = nosys */
++	"#283",			/* 283 = nosys */
++	"#284",			/* 284 = nosys */
++	"#285",			/* 285 = nosys */
++	"#286",			/* 286 = nosys */
++	"#287",			/* 287 = nosys */
++	"#288",			/* 288 = nosys */
++	"preadv",			/* 289 = preadv */
++	"pwritev",			/* 290 = pwritev */
++	"#291",			/* 291 = nosys */
++	"#292",			/* 292 = nosys */
++	"#293",			/* 293 = nosys */
++	"#294",			/* 294 = nosys */
++	"#295",			/* 295 = nosys */
++	"#296",			/* 296 = nosys */
++	"compat4.fhstatfs",		/* 297 = freebsd4 fhstatfs */
++	"fhopen",			/* 298 = fhopen */
++	"fhstat",			/* 299 = fhstat */
++	"modnext",			/* 300 = modnext */
++	"modstat",			/* 301 = modstat */
++	"modfnext",			/* 302 = modfnext */
++	"modfind",			/* 303 = modfind */
++	"kldload",			/* 304 = kldload */
++	"kldunload",			/* 305 = kldunload */
++	"kldfind",			/* 306 = kldfind */
++	"kldnext",			/* 307 = kldnext */
++	"kldstat",			/* 308 = kldstat */
++	"kldfirstmod",			/* 309 = kldfirstmod */
++	"getsid",			/* 310 = getsid */
++	"setresuid",			/* 311 = setresuid */
++	"setresgid",			/* 312 = setresgid */
++	"obs_signanosleep",			/* 313 = obsolete signanosleep */
++	"aio_return",			/* 314 = aio_return */
++	"aio_suspend",			/* 315 = aio_suspend */
++	"aio_cancel",			/* 316 = aio_cancel */
++	"aio_error",			/* 317 = aio_error */
++	"oaio_read",			/* 318 = oaio_read */
++	"oaio_write",			/* 319 = oaio_write */
++	"olio_listio",			/* 320 = olio_listio */
++	"yield",			/* 321 = yield */
++	"obs_thr_sleep",			/* 322 = obsolete thr_sleep */
++	"obs_thr_wakeup",			/* 323 = obsolete thr_wakeup */
++	"mlockall",			/* 324 = mlockall */
++	"munlockall",			/* 325 = munlockall */
++	"__getcwd",			/* 326 = __getcwd */
++	"sched_setparam",			/* 327 = sched_setparam */
++	"sched_getparam",			/* 328 = sched_getparam */
++	"sched_setscheduler",			/* 329 = sched_setscheduler */
++	"sched_getscheduler",			/* 330 = sched_getscheduler */
++	"sched_yield",			/* 331 = sched_yield */
++	"sched_get_priority_max",			/* 332 = sched_get_priority_max */
++	"sched_get_priority_min",			/* 333 = sched_get_priority_min */
++	"sched_rr_get_interval",			/* 334 = sched_rr_get_interval */
++	"utrace",			/* 335 = utrace */
++	"compat4.sendfile",		/* 336 = freebsd4 sendfile */
++	"kldsym",			/* 337 = kldsym */
++	"jail",			/* 338 = jail */
++	"#339",			/* 339 = pioctl */
++	"sigprocmask",			/* 340 = sigprocmask */
++	"sigsuspend",			/* 341 = sigsuspend */
++	"compat4.sigaction",		/* 342 = freebsd4 sigaction */
++	"sigpending",			/* 343 = sigpending */
++	"compat4.sigreturn",		/* 344 = freebsd4 sigreturn */
++	"sigtimedwait",			/* 345 = sigtimedwait */
++	"sigwaitinfo",			/* 346 = sigwaitinfo */
++	"__acl_get_file",			/* 347 = __acl_get_file */
++	"__acl_set_file",			/* 348 = __acl_set_file */
++	"__acl_get_fd",			/* 349 = __acl_get_fd */
++	"__acl_set_fd",			/* 350 = __acl_set_fd */
++	"__acl_delete_file",			/* 351 = __acl_delete_file */
++	"__acl_delete_fd",			/* 352 = __acl_delete_fd */
++	"__acl_aclcheck_file",			/* 353 = __acl_aclcheck_file */
++	"__acl_aclcheck_fd",			/* 354 = __acl_aclcheck_fd */
++	"extattrctl",			/* 355 = extattrctl */
++	"extattr_set_file",			/* 356 = extattr_set_file */
++	"extattr_get_file",			/* 357 = extattr_get_file */
++	"extattr_delete_file",			/* 358 = extattr_delete_file */
++	"aio_waitcomplete",			/* 359 = aio_waitcomplete */
++	"getresuid",			/* 360 = getresuid */
++	"getresgid",			/* 361 = getresgid */
++	"kqueue",			/* 362 = kqueue */
++	"kevent",			/* 363 = kevent */
++	"#364",			/* 364 = __cap_get_proc */
++	"#365",			/* 365 = __cap_set_proc */
++	"#366",			/* 366 = __cap_get_fd */
++	"#367",			/* 367 = __cap_get_file */
++	"#368",			/* 368 = __cap_set_fd */
++	"#369",			/* 369 = __cap_set_file */
++	"#370",			/* 370 = nosys */
++	"extattr_set_fd",			/* 371 = extattr_set_fd */
++	"extattr_get_fd",			/* 372 = extattr_get_fd */
++	"extattr_delete_fd",			/* 373 = extattr_delete_fd */
++	"__setugid",			/* 374 = __setugid */
++	"#375",			/* 375 = nfsclnt */
++	"eaccess",			/* 376 = eaccess */
++	"#377",			/* 377 = afs_syscall */
++	"nmount",			/* 378 = nmount */
++	"#379",			/* 379 = kse_exit */
++	"#380",			/* 380 = kse_wakeup */
++	"#381",			/* 381 = kse_create */
++	"#382",			/* 382 = kse_thr_interrupt */
++	"#383",			/* 383 = kse_release */
++	"__mac_get_proc",			/* 384 = __mac_get_proc */
++	"__mac_set_proc",			/* 385 = __mac_set_proc */
++	"__mac_get_fd",			/* 386 = __mac_get_fd */
++	"__mac_get_file",			/* 387 = __mac_get_file */
++	"__mac_set_fd",			/* 388 = __mac_set_fd */
++	"__mac_set_file",			/* 389 = __mac_set_file */
++	"kenv",			/* 390 = kenv */
++	"lchflags",			/* 391 = lchflags */
++	"uuidgen",			/* 392 = uuidgen */
++	"sendfile",			/* 393 = sendfile */
++	"mac_syscall",			/* 394 = mac_syscall */
++	"getfsstat",			/* 395 = getfsstat */
++	"statfs",			/* 396 = statfs */
++	"fstatfs",			/* 397 = fstatfs */
++	"fhstatfs",			/* 398 = fhstatfs */
++	"#399",			/* 399 = nosys */
++	"ksem_close",			/* 400 = ksem_close */
++	"ksem_post",			/* 401 = ksem_post */
++	"ksem_wait",			/* 402 = ksem_wait */
++	"ksem_trywait",			/* 403 = ksem_trywait */
++	"ksem_init",			/* 404 = ksem_init */
++	"ksem_open",			/* 405 = ksem_open */
++	"ksem_unlink",			/* 406 = ksem_unlink */
++	"ksem_getvalue",			/* 407 = ksem_getvalue */
++	"ksem_destroy",			/* 408 = ksem_destroy */
++	"__mac_get_pid",			/* 409 = __mac_get_pid */
++	"__mac_get_link",			/* 410 = __mac_get_link */
++	"__mac_set_link",			/* 411 = __mac_set_link */
++	"extattr_set_link",			/* 412 = extattr_set_link */
++	"extattr_get_link",			/* 413 = extattr_get_link */
++	"extattr_delete_link",			/* 414 = extattr_delete_link */
++	"__mac_execve",			/* 415 = __mac_execve */
++	"sigaction",			/* 416 = sigaction */
++	"sigreturn",			/* 417 = sigreturn */
++	"#418",			/* 418 = __xstat */
++	"#419",			/* 419 = __xfstat */
++	"#420",			/* 420 = __xlstat */
++	"getcontext",			/* 421 = getcontext */
++	"setcontext",			/* 422 = setcontext */
++	"swapcontext",			/* 423 = swapcontext */
++	"swapoff",			/* 424 = swapoff */
++	"__acl_get_link",			/* 425 = __acl_get_link */
++	"__acl_set_link",			/* 426 = __acl_set_link */
++	"__acl_delete_link",			/* 427 = __acl_delete_link */
++	"__acl_aclcheck_link",			/* 428 = __acl_aclcheck_link */
++	"sigwait",			/* 429 = sigwait */
++	"thr_create",			/* 430 = thr_create */
++	"thr_exit",			/* 431 = thr_exit */
++	"thr_self",			/* 432 = thr_self */
++	"thr_kill",			/* 433 = thr_kill */
++	"_umtx_lock",			/* 434 = _umtx_lock */
++	"_umtx_unlock",			/* 435 = _umtx_unlock */
++	"jail_attach",			/* 436 = jail_attach */
++	"extattr_list_fd",			/* 437 = extattr_list_fd */
++	"extattr_list_file",			/* 438 = extattr_list_file */
++	"extattr_list_link",			/* 439 = extattr_list_link */
++	"#440",			/* 440 = kse_switchin */
++	"ksem_timedwait",			/* 441 = ksem_timedwait */
++	"thr_suspend",			/* 442 = thr_suspend */
++	"thr_wake",			/* 443 = thr_wake */
++	"kldunloadf",			/* 444 = kldunloadf */
++	"audit",			/* 445 = audit */
++	"auditon",			/* 446 = auditon */
++	"getauid",			/* 447 = getauid */
++	"setauid",			/* 448 = setauid */
++	"getaudit",			/* 449 = getaudit */
++	"setaudit",			/* 450 = setaudit */
++	"getaudit_addr",			/* 451 = getaudit_addr */
++	"setaudit_addr",			/* 452 = setaudit_addr */
++	"auditctl",			/* 453 = auditctl */
++	"_umtx_op",			/* 454 = _umtx_op */
++	"thr_new",			/* 455 = thr_new */
++	"sigqueue",			/* 456 = sigqueue */
++	"kmq_open",			/* 457 = kmq_open */
++	"kmq_setattr",			/* 458 = kmq_setattr */
++	"kmq_timedreceive",			/* 459 = kmq_timedreceive */
++	"kmq_timedsend",			/* 460 = kmq_timedsend */
++	"kmq_notify",			/* 461 = kmq_notify */
++	"kmq_unlink",			/* 462 = kmq_unlink */
++	"abort2",			/* 463 = abort2 */
++	"thr_set_name",			/* 464 = thr_set_name */
++	"aio_fsync",			/* 465 = aio_fsync */
++	"rtprio_thread",			/* 466 = rtprio_thread */
++	"#467",			/* 467 = nosys */
++	"#468",			/* 468 = nosys */
++	"#469",			/* 469 = __getpath_fromfd */
++	"#470",			/* 470 = __getpath_fromaddr */
++	"sctp_peeloff",			/* 471 = sctp_peeloff */
++	"sctp_generic_sendmsg",			/* 472 = sctp_generic_sendmsg */
++	"sctp_generic_sendmsg_iov",			/* 473 = sctp_generic_sendmsg_iov */
++	"sctp_generic_recvmsg",			/* 474 = sctp_generic_recvmsg */
++	"pread",			/* 475 = pread */
++	"pwrite",			/* 476 = pwrite */
++	"mmap",			/* 477 = mmap */
++	"lseek",			/* 478 = lseek */
++	"truncate",			/* 479 = truncate */
++	"ftruncate",			/* 480 = ftruncate */
++	"thr_kill2",			/* 481 = thr_kill2 */
++	"shm_open",			/* 482 = shm_open */
++	"shm_unlink",			/* 483 = shm_unlink */
++	"cpuset",			/* 484 = cpuset */
++	"cpuset_setid",			/* 485 = cpuset_setid */
++	"cpuset_getid",			/* 486 = cpuset_getid */
++	"cpuset_getaffinity",			/* 487 = cpuset_getaffinity */
++	"cpuset_setaffinity",			/* 488 = cpuset_setaffinity */
++	"faccessat",			/* 489 = faccessat */
++	"fchmodat",			/* 490 = fchmodat */
++	"fchownat",			/* 491 = fchownat */
++	"fexecve",			/* 492 = fexecve */
++	"fstatat",			/* 493 = fstatat */
++	"futimesat",			/* 494 = futimesat */
++	"linkat",			/* 495 = linkat */
++	"mkdirat",			/* 496 = mkdirat */
++	"mkfifoat",			/* 497 = mkfifoat */
++	"mknodat",			/* 498 = mknodat */
++	"openat",			/* 499 = openat */
++	"readlinkat",			/* 500 = readlinkat */
++	"renameat",			/* 501 = renameat */
++	"symlinkat",			/* 502 = symlinkat */
++	"unlinkat",			/* 503 = unlinkat */
++	"posix_openpt",			/* 504 = posix_openpt */
++	"gssd_syscall",			/* 505 = gssd_syscall */
++	"jail_get",			/* 506 = jail_get */
++	"jail_set",			/* 507 = jail_set */
++	"jail_remove",			/* 508 = jail_remove */
++	"closefrom",			/* 509 = closefrom */
++	"__semctl",			/* 510 = __semctl */
++	"msgctl",			/* 511 = msgctl */
++	"shmctl",			/* 512 = shmctl */
++	"lpathconf",			/* 513 = lpathconf */
++};

Added: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff	2010-01-23 20:37:36 UTC (rev 2944)
@@ -0,0 +1,321 @@
+--- a/usr.bin/kdump/kdump.c
++++ b/usr.bin/kdump/kdump.c
+@@ -45,20 +45,18 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+ 
+-#define _KERNEL
+-extern int errno;
+ #include <sys/errno.h>
+-#undef _KERNEL
++#define ERESTART        (-1)            /* restart syscall */
++#define EJUSTRETURN     (-2)            /* don't modify regs, just return */
+ #include <sys/param.h>
+ #include <sys/errno.h>
+-#define _KERNEL
+ #include <sys/time.h>
+-#undef _KERNEL
+ #include <sys/uio.h>
+ #include <sys/ktrace.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
++#include "stat16.h"
+ #include <sys/un.h>
+ #ifdef IPX
+ #include <sys/types.h>
+@@ -71,6 +69,8 @@
+ #include <netinet/in.h>
+ #include <ctype.h>
+ #include <dlfcn.h>
++#define RTLD_MODEMASK   0x3
++#define RTLD_TRACE      0x200   /* Trace loaded objects and exit. */
+ #include <err.h>
+ #include <grp.h>
+ #include <inttypes.h>
+@@ -79,6 +79,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <bsd/string.h>
+ #include <time.h>
+ #include <unistd.h>
+ #include <vis.h>
+@@ -97,7 +98,7 @@
+ void ktrcsw(struct ktr_csw *);
+ void ktruser(int, unsigned char *);
+ void ktrsockaddr(struct sockaddr *);
+-void ktrstat(struct stat *);
++void ktrstat(struct stat16 *);
+ void ktrstruct(char *, size_t);
+ void usage(void);
+ void sockfamilyname(int);
+@@ -111,6 +112,9 @@
+ #define TIME_FORMAT	"%b %e %T %Y"
+ #define eqs(s1, s2)	(strcmp((s1), (s2)) == 0)
+ 
++timevaladd(struct timeval *t1, const struct timeval *t2);
++timevalsub(struct timeval *t1, const struct timeval *t2);
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -650,7 +654,7 @@
+ 				ip++;
+ 				narg--;
+ 				c = ',';
+-			} else if (ktr->ktr_code == SYS___semctl) {
++			} else if (ktr->ktr_code == SYS_semctl) {
+ 				print_number(ip,narg,c);
+ 				print_number(ip,narg,c);
+ 				(void)putchar(',');
+@@ -742,18 +746,18 @@
+ 				ip++;
+ 				narg--;
+ 				c = ',';
+-			} else if (ktr->ktr_code == SYS___acl_get_file ||
+-				   ktr->ktr_code == SYS___acl_set_file ||
+-				   ktr->ktr_code == SYS___acl_get_fd ||
+-				   ktr->ktr_code == SYS___acl_set_fd ||
+-				   ktr->ktr_code == SYS___acl_delete_file ||
+-				   ktr->ktr_code == SYS___acl_delete_fd ||
+-				   ktr->ktr_code == SYS___acl_aclcheck_file ||
+-				   ktr->ktr_code == SYS___acl_aclcheck_fd ||
+-				   ktr->ktr_code == SYS___acl_get_link ||
+-				   ktr->ktr_code == SYS___acl_set_link ||
+-				   ktr->ktr_code == SYS___acl_delete_link ||
+-				   ktr->ktr_code == SYS___acl_aclcheck_link) {
++			} else if (ktr->ktr_code == SYS_acl_get_file ||
++				   ktr->ktr_code == SYS_acl_set_file ||
++				   ktr->ktr_code == SYS_acl_get_fd ||
++				   ktr->ktr_code == SYS_acl_set_fd ||
++				   ktr->ktr_code == SYS_acl_delete_file ||
++				   ktr->ktr_code == SYS_acl_delete_fd ||
++				   ktr->ktr_code == SYS_acl_aclcheck_file ||
++				   ktr->ktr_code == SYS_acl_aclcheck_fd ||
++				   ktr->ktr_code == SYS_acl_get_link ||
++				   ktr->ktr_code == SYS_acl_set_link ||
++				   ktr->ktr_code == SYS_acl_delete_link ||
++				   ktr->ktr_code == SYS_acl_aclcheck_link) {
+ 				print_number(ip,narg,c);
+ 				(void)putchar(',');
+ 				acltypename((int)*ip);
+@@ -1243,7 +1247,7 @@
+ }
+ 
+ void
+-ktrstat(struct stat *statp)
++ktrstat(struct stat16 *statp)
+ {
+ 	char mode[12], timestr[PATH_MAX + 4];
+ 	struct passwd *pwd;
+@@ -1348,7 +1352,7 @@
+ 	if (strcmp(name, "stat") == 0) {
+ 		if (datalen != sizeof(struct stat))
+ 			goto invalid;
+-		ktrstat((struct stat *)data);
++		ktrstat((struct stat16 *)data);
+ 	} else if (strcmp(name, "sockaddr") == 0) {
+ 		if (datalen < sizeof(struct sockaddr) ||
+ 		    datalen != ((struct sockaddr *)(data))->sa_len)
+--- a/usr.bin/kdump/Makefile
++++ b/usr.bin/kdump/Makefile
+@@ -6,13 +6,14 @@
+ PROG=		kdump
+ SRCS=		kdump.c ioctl.c kdump_subr.c subr.c
+ CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../..
++LDADD+=		-lbsd
+ 
+ CLEANFILES=	ioctl.c kdump_subr.c
+ 
+ ioctl.c: mkioctls
+-	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
++	sh ${.CURDIR}/mkioctls /usr/include > ${.TARGET}
+ 
+ kdump_subr.c: mksubr
+-	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}
++	sh ${.CURDIR}/mksubr /usr/include > ${.TARGET}
+ 
+ .include <bsd.prog.mk>
+--- a/usr.bin/kdump/mksubr
++++ b/usr.bin/kdump/mksubr
+@@ -56,7 +56,9 @@
+ 		if ($i ~ /define/) \
+ 			break; \
+ 		++i; \
+-		printf "\tif(!((arg>0)^((%s)>0)))\n\t\tif_print_or(arg, %s, or);\n", $i, $i }'
++		n = $i ; \
++		sub("__", "", n); \
++		printf "\tif(!((arg>0)^((%s)>0)))\n\t\tif_print_or(arg, %s, or);\n", $i, n }'
+ cat <<_EOF_
+ 	if (or == 0)
+ 		(void)printf("<invalid>%ld", (long)arg);
+@@ -135,6 +137,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/unistd.h>
++#include <sys/rfork.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+ #define _KERNEL
+@@ -148,9 +151,6 @@
+ #include <sys/reboot.h>
+ #include <sched.h>
+ #include <sys/linker.h>
+-#define _KERNEL
+-#include <sys/thr.h>
+-#undef _KERNEL
+ #include <sys/extattr.h>
+ #include <sys/acl.h>
+ #include <aio.h>
+@@ -158,11 +158,14 @@
+ #include <sys/ipc.h>
+ #include <sys/rtprio.h>
+ #include <sys/shm.h>
+-#include <nfsserver/nfs.h>
+ #include <ufs/ufs/quota.h>
+ 
+ #include "kdump_subr.h"
+ 
++#ifndef S_IFWHT
++#define S_IFWHT __S_IFWHT
++#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 @@
+ 
+ _EOF_
+ 
+-auto_or_type "modename" "S_[A-Z]+[[:space:]]+[0-6]{7}" "sys/stat.h"
+-auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/fcntl.h"
+-auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+0?x?[0-9A-Fa-f]+" "sys/unistd.h"
+-auto_or_type "mmapprotname" "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h"
+-auto_or_type "mmapflagsname" "MAP_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h"
+-auto_or_type "wait4optname" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h"
++auto_or_type "modename" "__S_[A-Z]+[[:space:]]+[0-6]{7}" "bits/stat.h"
++auto_or_type "flagsname" "O_[A-Z]+[[:space:]]+[0-9]+" "bits/fcntl.h"
++auto_or_type "accessmodename" "[A-Z]_OK[[:space:]]+[0-9]+" "fcntl.h"
++auto_or_type "mmapprotname" "PROT_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "bits/mman.h"
++auto_or_type "mmapflagsname" "MAP_[A-Z]+[[:space:]]+0x[0-9A-Fa-f]+" "bits/mman.h"
++auto_or_type "wait4optname" "W[A-Z]+[[:space:]]+[0-9]+" "bits/waitflags.h"
+ auto_or_type "getfsstatflagsname" "MNT_[A-Z]+[[:space:]]+[1-9][0-9]*" "sys/mount.h"
+ auto_or_type "mountflagsname" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mount.h"
+ auto_or_type "rebootoptname" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h"
+-auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+0x[0-9]+" "sys/fcntl.h"
++auto_or_type "flockname" "LOCK_[A-Z]+[[:space:]]+[0-9]+" "bits/fcntl.h"
+ auto_or_type "thrcreateflagsname" "THR_[A-Z]+[[:space:]]+0x[0-9]+" "sys/thr.h"
+-auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
+-auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h"
+-auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h"
++auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+[0-9]+" "bits/mman.h"
++auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "bits/shm.h"
++auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/rfork.h"
+ auto_or_type "nfssvcname" "NFSSVC_[A-Z]+[[:space:]]+0x[0-9]+" "nfsserver/nfs.h"
+ 
+-auto_switch_type "whencename" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h"
+-auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h"
+-auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h"
+-auto_switch_type "prioname" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h"
+-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 "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"
+ auto_switch_type "schedpolicyname" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sched.h"
+ auto_switch_type "kldunloadfflagsname" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h"
+ auto_switch_type "extattrctlname" "EXTATTR_NAMESPACE_[A-Z]+[[:space:]]+0x[0-9]+" "sys/extattr.h"
+ auto_switch_type "kldsymcmdname" "KLDSYM_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h"
+ auto_switch_type "sendfileflagsname" "SF_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.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]+" "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"
+ auto_switch_type "quotactlname" "Q_[A-Z]+[[:space:]]+0x[0-9]+" "ufs/ufs/quota.h"
+-auto_if_type "sockdomainname" "PF_[[:alnum:]]+[[:space:]]+" "sys/socket.h"
+-auto_if_type "sockfamilyname" "AF_[[:alnum:]]+[[:space:]]+" "sys/socket.h"
++auto_if_type "sockdomainname" "PF_[[:alnum:]]+[[:space:]]+" "bits/socket.h"
++auto_if_type "sockfamilyname" "AF_[[:alnum:]]+[[:space:]]+" "bits/socket.h"
+ auto_if_type "sockipprotoname" "IPPROTO_[[:alnum:]]+[[:space:]]+" "netinet/in.h"
+-auto_switch_type "sockoptname" "SO_[A-Z]+[[:space:]]+0x[0-9]+" "sys/socket.h"
+-auto_switch_type "socktypename" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*" "sys/socket.h"
++auto_switch_type "sockoptname" "SO_[A-Z]+[[:space:]]+0x[0-9]+" "bits/socket.h"
++auto_switch_type "socktypename" "SOCK_[A-Z]+[[:space:]]+" "bits/socket.h"
+ auto_switch_type "ptraceopname" "PT_[[:alnum:]]+[[:space:]]+[0-9]+" "sys/ptrace.h"
+ 
+ cat <<_EOF_
+@@ -433,7 +436,7 @@
+ 		return;
+ 	}
+ _EOF_
+-egrep "^#[[:space:]]*define[[:space:]]+MSG_[A-Z]+[[:space:]]+0x[0-9]+[[:space:]]*" $include_dir/sys/socket.h | \
++egrep "^#[[:space:]]*define[[:space:]]+MSG_[A-Z]*" $include_dir/bits/socket.h | \
+ 	awk '{ for (i = 1; i <= NF; i++) \
+ 		if ($i ~ /define/) \
+ 			break; \
+--- a/usr.bin/kdump/stat16.h
++++ b/usr.bin/kdump/stat16.h
+@@ -0,0 +1,55 @@
++/* Copyright (C) 2002, 2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++/* This structure corresponds to the standard FreeBSD 'struct stat'
++   (i.e. _STAT_VER_stat), and is used by the stat() system call family. */
++
++struct stat16
++  {
++    __dev_t st_dev;		/* Device containing the file.  */
++    __ino_t st_ino;		/* File serial number.  */
++
++    __uint16_t st_mode;		/* File mode.  */
++    __uint16_t st_nlink;	/* Link count.  */
++
++    __uid_t st_uid;		/* User ID of the file's owner.  */
++    __gid_t st_gid;		/* Group ID of the file's group.  */
++
++    __dev_t st_rdev;		/* Device number, if device.  */
++
++    struct  timespec st_atimespec;  /* time of last access */
++    struct  timespec st_mtimespec;  /* time of last data modification */
++    struct  timespec st_ctimespec;  /* time of last file status change */
++
++    __off_t st_size;		/* Size of file, in bytes.  */
++
++    __blkcnt_t st_blocks;	/* Number of 512-byte blocks allocated.  */
++
++    __blksize_t st_blksize;	/* Optimal block size for I/O.  */
++
++    __uint32_t st_flags;	/* User defined flags.  */
++
++    __uint32_t st_gen;		/* Generation number.  */
++
++    __uint32_t __unused1;
++
++    struct timespec st_birthtimespec; /* time of file creation */
++
++#define _BIRTH_PADSIZE     (2*(8 - sizeof (long)))
++    char __birth_padding[_BIRTH_PADSIZE];
++  };

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/patches/series	2010-01-23 20:37:36 UTC (rev 2944)
@@ -3,6 +3,7 @@
 000_camcontrol.sources
 000_devd_sources.diff
 000_devfs_sources.diff
+000_kdump.sources
 001_dmesg.diff
 002_ifconfig.diff
 003_kbdcontrol.diff
@@ -27,3 +28,4 @@
 023_acpiconf.diff
 024_devfs.diff
 025_camcontrol.diff
+026_kdump.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2010-01-23 17:24:54 UTC (rev 2943)
+++ trunk/freebsd-utils/debian/rules	2010-01-23 20:37:36 UTC (rev 2944)
@@ -27,6 +27,7 @@
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
+	mkdir -p $(ORIGDIR)/sys/kern
 	for i in sbin/dmesg sbin/sysctl usr.bin/kdump usr.bin/ktrace \
 		 usr.sbin/jail bin/chflags sbin/devd usr.sbin/acpi/acpiconf \
 		 sbin/kldconfig sbin/kldload sbin/kldstat sbin/kldunload \
@@ -39,7 +40,8 @@
 		 sbin/mount_reiserfs sbin/mount \
 		 sbin/mdconfig sbin/ccdconfig sbin/swapon sbin/atacontrol sbin/camcontrol \
 	         sbin/gbde sbin/geom bin/kenv \
-		 usr.sbin/kbdcontrol share/syscons/keymaps ; do \
+		 usr.sbin/kbdcontrol share/syscons/keymaps \
+		 sys/kern/syscalls.c ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
 	tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-utils_$(VERSION).orig.tar.gz $(ORIGDIR)
@@ -84,7 +86,7 @@
 	$(PMAKE) -C sbin/swapon
 	$(PMAKE) -C sbin/sysctl 
 	$(PMAKE) -C sbin/umount
-#	$(PMAKE) -C usr.bin/kdump
+	$(PMAKE) -C usr.bin/kdump
 	$(PMAKE) -C usr.bin/ktrace
 	$(PMAKE) -C usr.sbin/acpi/acpiconf
 	$(PMAKE) -C usr.sbin/rpc.umntall




More information about the Glibc-bsd-commits mailing list