[Glibc-bsd-commits] r2292 - in trunk/kfreebsd-kernel-headers/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Wed Aug 6 20:09:02 UTC 2008
Author: aurel32
Date: 2008-08-06 20:09:02 +0000 (Wed, 06 Aug 2008)
New Revision: 2292
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/includes.list
trunk/kfreebsd-kernel-headers/debian/links
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff
trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff
trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff
trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff
trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff
trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff
trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
* debian/patches/*: convert to patchlevel p1 as requested by the new
dpkg-source.
* debian/includes.list: update for kfreebsd-7.
* debian/links: provide a compat symlink for usr/include/isofs/cd9660.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,3 +1,12 @@
+kfreebsd-kernel-headers (0.30) unreleased; urgency=low
+
+ * debian/patches/*: convert to patchlevel p1 as requested by the new
+ dpkg-source.
+ * debian/includes.list: update for kfreebsd-7.
+ * debian/links: provide a compat symlink for usr/include/isofs/cd9660.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 Aug 2008 22:08:02 +0200
+
kfreebsd-kernel-headers (0.29) unreleased; urgency=low
[ Petr Salinger ]
Modified: trunk/kfreebsd-kernel-headers/debian/includes.list
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/includes.list 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/includes.list 2008-08-06 20:09:02 UTC (rev 2292)
@@ -17,8 +17,8 @@
netatalk/phase2.h
netatm
net/bpf.h
-net/bridge.h
netgraph
+net/bridgestp.h
net/if_arc.h
net/if_arp.h
net/if_atm.h
@@ -38,21 +38,11 @@
net/if_types.h
net/if_var.h
net/if_vlan_var.h
-netinet6/ah_aesxcbcmac.h
-netinet6/ah.h
-netinet6/esp6.h
-netinet6/esp_aesctr.h
-netinet6/esp.h
-netinet6/esp_rijndael.h
netinet6/in6_gif.h
netinet6/in6_var.h
-netinet6/ip6_fw.h
netinet6/ip6_mroute.h
netinet6/ip6protosw.h
netinet6/ip6_var.h
-netinet6/ipcomp.h
-netinet6/ipsec6.h
-netinet6/ipsec.h
netinet6/nd6.h
netinet6/pim6.h
netinet6/pim6_var.h
@@ -80,7 +70,6 @@
netipsec
netipx/ipx.h
netipx/ipx_if.h
-netipx/ipx_ip.h
netipx/ipx_pcb.h
netipx/ipx_var.h
netipx/spx_debug.h
@@ -88,10 +77,8 @@
netipx/spx_timer.h
netipx/spx_var.h
net/iso88025.h
-netkey
netncp
net/netisr.h
-net/net_osdep.h
net/pfkeyv2.h
net/ppp_comp.h
net/ppp_defs.h
@@ -108,7 +95,6 @@
opencrypto
osreldate.h
pccard
-posix4
sys/acct.h
sys/agpio.h
sys/assym.h
@@ -195,6 +181,7 @@
sys/pciio.h
sys/pioctl.h
sys/pipe.h
+sys/posix4.h
sys/priority.h
sys/procfs.h
sys/proc.h
Modified: trunk/kfreebsd-kernel-headers/debian/links
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/links 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/links 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,3 +1,4 @@
usr/include/opencrypto usr/include/crypto
usr/include/contrib/altq/altq usr/include/altq
usr/include/contrib/pf/net/pfvar.h usr/include/net/pfvar.h
+usr/include/fs/cd9660 usr/include/isofs/cd9660
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/i386/include/npx.h
+Index: src/sys/i386/include/npx.h
===================================================================
---- sys/i386/include/npx.h.orig
-+++ sys/i386/include/npx.h
+--- src/sys/i386/include/npx.h.orig
++++ src/sys/i386/include/npx.h
@@ -41,6 +41,8 @@
#ifndef _MACHINE_NPX_H_
#define _MACHINE_NPX_H_
@@ -11,10 +11,10 @@
/* Environment information of floating point unit */
struct env87 {
long en_cw; /* control word (16bits) */
-Index: sys/i386/include/pcb.h
+Index: src/sys/i386/include/pcb.h
===================================================================
---- sys/i386/include/pcb.h.orig
-+++ sys/i386/include/pcb.h
+--- src/sys/i386/include/pcb.h.orig
++++ src/sys/i386/include/pcb.h
@@ -36,6 +36,8 @@
#ifndef _I386_PCB_H_
#define _I386_PCB_H_
@@ -24,10 +24,10 @@
/*
* Intel 386 process control block
*/
-Index: sys/i386/include/pmap.h
+Index: src/sys/i386/include/pmap.h
===================================================================
---- sys/i386/include/pmap.h.orig
-+++ sys/i386/include/pmap.h
+--- src/sys/i386/include/pmap.h.orig
++++ src/sys/i386/include/pmap.h
@@ -44,6 +44,13 @@
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
@@ -42,10 +42,10 @@
/*
* Page-directory and page-table entries follow this format, with a few
* of the fields not present here and there, depending on a lot of things.
-Index: sys/net/if_arp.h
+Index: src/sys/net/if_arp.h
===================================================================
---- sys/net/if_arp.h.orig
-+++ sys/net/if_arp.h
+--- src/sys/net/if_arp.h.orig
++++ src/sys/net/if_arp.h
@@ -33,6 +33,11 @@
#ifndef _NET_IF_ARP_H_
#define _NET_IF_ARP_H_
@@ -74,10 +74,10 @@
/*
* ARP ioctl request
*/
-Index: sys/net/if_dl.h
+Index: src/sys/net/if_dl.h
===================================================================
---- sys/net/if_dl.h.orig
-+++ sys/net/if_dl.h
+--- src/sys/net/if_dl.h.orig
++++ src/sys/net/if_dl.h
@@ -33,6 +33,10 @@
#ifndef _NET_IF_DL_H_
#define _NET_IF_DL_H_
@@ -107,10 +107,10 @@
-#endif /* !_KERNEL */
-
#endif
-Index: sys/nfsclient/nfs.h
+Index: src/sys/nfsclient/nfs.h
===================================================================
---- sys/nfsclient/nfs.h.orig
-+++ sys/nfsclient/nfs.h
+--- src/sys/nfsclient/nfs.h.orig
++++ src/sys/nfsclient/nfs.h
@@ -36,6 +36,11 @@
#ifndef _NFSCLIENT_NFS_H_
#define _NFSCLIENT_NFS_H_
@@ -123,10 +123,10 @@
#ifdef _KERNEL
#include "opt_nfs.h"
#endif
-Index: sys/sys/callout.h
+Index: src/sys/sys/callout.h
===================================================================
---- sys/sys/callout.h.orig
-+++ sys/sys/callout.h
+--- src/sys/sys/callout.h.orig
++++ src/sys/sys/callout.h
@@ -38,6 +38,8 @@
#ifndef _SYS_CALLOUT_H_
#define _SYS_CALLOUT_H_
@@ -136,10 +136,10 @@
#include <sys/queue.h>
struct mtx;
-Index: sys/sys/dvdio.h
+Index: src/sys/sys/dvdio.h
===================================================================
---- sys/sys/dvdio.h.orig
-+++ sys/sys/dvdio.h
+--- src/sys/sys/dvdio.h.orig
++++ src/sys/sys/dvdio.h
@@ -31,6 +31,8 @@
#ifndef _SYS_DVDIO_H_
#define _SYS_DVDIO_H_
@@ -149,10 +149,10 @@
struct dvd_layer {
u_int8_t book_type :4;
u_int8_t book_version :4;
-Index: sys/sys/extattr.h
+Index: src/sys/sys/extattr.h
===================================================================
---- sys/sys/extattr.h.orig
-+++ sys/sys/extattr.h
+--- src/sys/sys/extattr.h.orig
++++ src/sys/sys/extattr.h
@@ -67,36 +67,36 @@
struct ucred *cred, struct thread *td, int access);
@@ -216,10 +216,10 @@
__END_DECLS
#endif /* !_KERNEL */
-Index: sys/sys/filedesc.h
+Index: src/sys/sys/filedesc.h
===================================================================
---- sys/sys/filedesc.h.orig
-+++ sys/sys/filedesc.h
+--- src/sys/sys/filedesc.h.orig
++++ src/sys/sys/filedesc.h
@@ -33,6 +33,7 @@
#ifndef _SYS_FILEDESC_H_
#define _SYS_FILEDESC_H_
@@ -228,10 +228,10 @@
#include <sys/queue.h>
#include <sys/event.h>
#include <sys/lock.h>
-Index: sys/sys/jail.h
+Index: src/sys/sys/jail.h
===================================================================
---- sys/sys/jail.h.orig
-+++ sys/sys/jail.h
+--- src/sys/sys/jail.h.orig
++++ src/sys/sys/jail.h
@@ -13,6 +13,10 @@
#ifndef _SYS_JAIL_H_
#define _SYS_JAIL_H_
@@ -256,10 +256,10 @@
#else /* _KERNEL */
-Index: sys/sys/linker.h
+Index: src/sys/sys/linker.h
===================================================================
---- sys/sys/linker.h.orig
-+++ sys/sys/linker.h
+--- src/sys/sys/linker.h.orig
++++ src/sys/sys/linker.h
@@ -168,6 +168,13 @@
/* HWPMC helper */
void *linker_hwpmc_list_objects(void);
@@ -296,10 +296,10 @@
__END_DECLS
#endif
-Index: sys/sys/lock.h
+Index: src/sys/sys/lock.h
===================================================================
---- sys/sys/lock.h.orig
-+++ sys/sys/lock.h
+--- src/sys/sys/lock.h.orig
++++ src/sys/sys/lock.h
@@ -32,6 +32,7 @@
#ifndef _SYS_LOCK_H_
#define _SYS_LOCK_H_
@@ -308,10 +308,10 @@
#include <sys/queue.h>
#include <sys/_lock.h>
-Index: sys/sys/memrange.h
+Index: src/sys/sys/memrange.h
===================================================================
---- sys/sys/memrange.h.orig
-+++ sys/sys/memrange.h
+--- src/sys/sys/memrange.h.orig
++++ src/sys/sys/memrange.h
@@ -4,6 +4,11 @@
* $FreeBSD: src/sys/sys/memrange.h,v 1.7 2004/08/04 18:30:31 markm Exp $
*/
@@ -329,10 +329,10 @@
#endif
+#endif /* _SYS_MEMRANGE_H_ */
-Index: sys/sys/pciio.h
+Index: src/sys/sys/pciio.h
===================================================================
---- sys/sys/pciio.h.orig
-+++ sys/sys/pciio.h
+--- src/sys/sys/pciio.h.orig
++++ src/sys/sys/pciio.h
@@ -31,6 +31,7 @@
#ifndef _SYS_PCIIO_H_
#define _SYS_PCIIO_H_
@@ -341,10 +341,10 @@
#include <sys/ioccom.h>
#define PCI_MAXNAMELEN 16
-Index: sys/sys/procfs.h
+Index: src/sys/sys/procfs.h
===================================================================
---- sys/sys/procfs.h.orig
-+++ sys/sys/procfs.h
+--- src/sys/sys/procfs.h.orig
++++ src/sys/sys/procfs.h
@@ -82,4 +82,8 @@
typedef void *psaddr_t; /* An address in the target process. */
@@ -354,10 +354,10 @@
+typedef __pid_t lwpid_t;
+
#endif /* _SYS_PROCFS_H_ */
-Index: sys/sys/resourcevar.h
+Index: src/sys/sys/resourcevar.h
===================================================================
---- sys/sys/resourcevar.h.orig
-+++ sys/sys/resourcevar.h
+--- src/sys/sys/resourcevar.h.orig
++++ src/sys/sys/resourcevar.h
@@ -35,6 +35,8 @@
#include <sys/resource.h>
@@ -367,10 +367,10 @@
#ifdef _KERNEL
#include <sys/_lock.h>
#include <sys/_mutex.h>
-Index: sys/sys/rtprio.h
+Index: src/sys/sys/rtprio.h
===================================================================
---- sys/sys/rtprio.h.orig
-+++ sys/sys/rtprio.h
+--- src/sys/sys/rtprio.h.orig
++++ src/sys/sys/rtprio.h
@@ -36,6 +36,10 @@
#include <sys/priority.h>
@@ -409,10 +409,10 @@
+#endif
#endif /* !_KERNEL */
#endif /* !_SYS_RTPRIO_H_ */
-Index: sys/sys/signalvar.h
+Index: src/sys/sys/signalvar.h
===================================================================
---- sys/sys/signalvar.h.orig
-+++ sys/sys/signalvar.h
+--- src/sys/sys/signalvar.h.orig
++++ src/sys/sys/signalvar.h
@@ -43,6 +43,9 @@
* not exported to user programs.
*/
@@ -465,10 +465,10 @@
typedef struct ksiginfo {
TAILQ_ENTRY(ksiginfo) ksi_link;
siginfo_t ksi_info;
-Index: sys/sys/sysctl.h
+Index: src/sys/sys/sysctl.h
===================================================================
---- sys/sys/sysctl.h.orig
-+++ sys/sys/sysctl.h
+--- src/sys/sys/sysctl.h.orig
++++ src/sys/sys/sysctl.h
@@ -36,7 +36,103 @@
#ifndef _SYS_SYSCTL_H_
#define _SYS_SYSCTL_H_
@@ -607,10 +607,10 @@
#endif /* _KERNEL */
#endif /* !_SYS_SYSCTL_H_ */
-Index: sys/sys/syslimits.h
+Index: src/sys/sys/syslimits.h
===================================================================
---- sys/sys/syslimits.h.orig
-+++ sys/sys/syslimits.h
+--- src/sys/sys/syslimits.h.orig
++++ src/sys/sys/syslimits.h
@@ -54,7 +54,9 @@
#define MAX_CANON 255 /* max bytes in term canon input line */
#define MAX_INPUT 255 /* max bytes in terminal input */
@@ -621,10 +621,10 @@
#ifndef OPEN_MAX
#define OPEN_MAX 64 /* max open files per process */
#endif
-Index: sys/sys/timepps.h
+Index: src/sys/sys/timepps.h
===================================================================
---- sys/sys/timepps.h.orig
-+++ sys/sys/timepps.h
+--- src/sys/sys/timepps.h.orig
++++ src/sys/sys/timepps.h
@@ -15,6 +15,8 @@
#ifndef _SYS_TIMEPPS_H_
#define _SYS_TIMEPPS_H_
@@ -634,10 +634,10 @@
#include <sys/ioccom.h>
#include <sys/time.h>
-Index: sys/sys/timex.h
+Index: src/sys/sys/timex.h
===================================================================
---- sys/sys/timex.h.orig
-+++ sys/sys/timex.h
+--- src/sys/sys/timex.h.orig
++++ src/sys/sys/timex.h
@@ -95,11 +95,9 @@
*/
#ifndef _SYS_TIMEX_H_
@@ -682,10 +682,10 @@
__END_DECLS
#endif /* _KERNEL */
-Index: sys/sys/ucred.h
+Index: src/sys/sys/ucred.h
===================================================================
---- sys/sys/ucred.h.orig
-+++ sys/sys/ucred.h
+--- src/sys/sys/ucred.h.orig
++++ src/sys/sys/ucred.h
@@ -33,6 +33,9 @@
#ifndef _SYS_UCRED_H_
#define _SYS_UCRED_H_
@@ -696,10 +696,10 @@
#include <bsm/audit.h>
/*
-Index: sys/sys/xrpuio.h
+Index: src/sys/sys/xrpuio.h
===================================================================
---- sys/sys/xrpuio.h.orig
-+++ sys/sys/xrpuio.h
+--- src/sys/sys/xrpuio.h.orig
++++ src/sys/sys/xrpuio.h
@@ -13,6 +13,7 @@
#ifndef _SYS_XRPUIO_H_
#define _SYS_XRPUIO_H_
@@ -708,10 +708,10 @@
#include <sys/ioccom.h>
#define XRPU_MAX_PPS 16
-Index: sys/vm/vm.h
+Index: src/sys/vm/vm.h
===================================================================
---- sys/vm/vm.h.orig
-+++ sys/vm/vm.h
+--- src/sys/vm/vm.h.orig
++++ src/sys/vm/vm.h
@@ -61,6 +61,8 @@
#ifndef VM_H
#define VM_H
@@ -721,10 +721,10 @@
typedef char vm_inherit_t; /* inheritance codes */
#define VM_INHERIT_SHARE ((vm_inherit_t) 0)
-Index: sys/vm/vm_map.h
+Index: src/sys/vm/vm_map.h
===================================================================
---- sys/vm/vm_map.h.orig
-+++ sys/vm/vm_map.h
+--- src/sys/vm/vm_map.h.orig
++++ src/sys/vm/vm_map.h
@@ -70,6 +70,12 @@
#include <sys/sx.h>
#include <sys/_mutex.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/soundcard.h.orig 2005-04-28 22:29:18.000000000 +0200
-+++ sys/sys/soundcard.h 2005-08-03 15:26:34.000000000 +0200
+--- src/sys/sys/soundcard.h.orig 2005-04-28 22:29:18.000000000 +0200
++++ src/sys/sys/soundcard.h 2005-08-03 15:26:34.000000000 +0200
@@ -94,6 +94,10 @@
#define SNDCARD_UART16550 27
#define SNDCARD_OPL 28
Modified: trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,6 +1,6 @@
diff -ur sys.orig/sys/event.h sys/sys/event.h
---- sys.orig/sys/event.h 2004-11-30 01:05:19.000000000 +0100
-+++ sys/sys/event.h 2004-11-30 01:06:55.000000000 +0100
+--- src/sys.orig/sys/event.h 2004-11-30 01:05:19.000000000 +0100
++++ src/sys/sys/event.h 2004-11-30 01:06:55.000000000 +0100
@@ -29,6 +29,8 @@
#ifndef _SYS_EVENT_H_
#define _SYS_EVENT_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,6 +1,6 @@
diff -Nur sys/osreldate.h sys/osreldate.h
---- sys/osreldate.h 1970-01-01 01:00:00.000000000 +0100
-+++ sys/osreldate.h 2004-08-03 02:21:30.000000000 +0200
+--- src/sys/osreldate.h 1970-01-01 01:00:00.000000000 +0100
++++ src/sys/osreldate.h 2004-08-03 02:21:30.000000000 +0200
@@ -0,0 +1,12 @@
+
+/* kFreeBSD 7.0 headers */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/net80211/ieee80211.h.orig 2006-04-30 04:21:55.000000000 +0200
-+++ sys/net80211/ieee80211.h 2006-04-30 13:28:41.000000000 +0200
+--- src/sys/net80211/ieee80211.h.orig 2006-04-30 04:21:55.000000000 +0200
++++ src/sys/net80211/ieee80211.h 2006-04-30 13:28:41.000000000 +0200
@@ -31,6 +31,7 @@
*
* $FreeBSD: src/sys/net80211/ieee80211.h,v 1.5 2004/04/05 17:47:40 sam Exp $
@@ -8,8 +8,8 @@
#ifndef _NET80211_IEEE80211_H_
#define _NET80211_IEEE80211_H_
---- sys/net/if_media.h~ 2006-08-25 22:53:05.000000000 +0200
-+++ sys/net/if_media.h 2006-08-25 22:53:05.000000000 +0200
+--- src/sys/net/if_media.h~ 2006-08-25 22:53:05.000000000 +0200
++++ src/sys/net/if_media.h 2006-08-25 22:53:05.000000000 +0200
@@ -38,6 +38,8 @@
#ifndef _NET_IF_MEDIA_H_
#define _NET_IF_MEDIA_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,6 +1,6 @@
diff -ur sys.orig/sys/tty.h sys/sys/tty.h
---- sys.orig/sys/tty.h 2004-07-15 22:47:41.000000000 +0200
-+++ sys/sys/tty.h 2004-11-30 01:13:49.000000000 +0100
+--- src/sys.orig/sys/tty.h 2004-07-15 22:47:41.000000000 +0200
++++ src/sys/sys/tty.h 2004-11-30 01:13:49.000000000 +0100
@@ -48,6 +48,8 @@
#include <sys/termios.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -2,8 +2,8 @@
FIXME: should migrate to uintXX_t / <stdint.h>
diff -ur sys.orig/sys/blist.h sys/sys/blist.h
---- sys.orig/sys/blist.h 2004-06-04 06:03:25.000000000 +0200
-+++ sys/sys/blist.h 2004-11-30 01:15:18.000000000 +0100
+--- src/sys.orig/sys/blist.h 2004-06-04 06:03:25.000000000 +0200
++++ src/sys/sys/blist.h 2004-11-30 01:15:18.000000000 +0100
@@ -53,6 +53,8 @@
#ifndef _SYS_BLIST_H_
#define _SYS_BLIST_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/vm.old/vm_param.h 2005-09-04 12:22:36.000000000 -0400
-+++ sys/vm/vm_param.h 2005-09-04 14:13:45.000000000 -0400
+--- src/sys/vm.old/vm_param.h 2005-09-04 12:22:36.000000000 -0400
++++ src/sys/vm/vm_param.h 2005-09-04 14:13:45.000000000 -0400
@@ -67,6 +67,7 @@
#ifndef _VM_PARAM_
#define _VM_PARAM_
@@ -17,8 +17,8 @@
dev_t xsw_dev;
int xsw_flags;
int xsw_nblks;
---- sys/vm/swap_pager.h
-+++ sys/vm/swap_pager.h
+--- src/sys/vm/swap_pager.h
++++ src/sys/vm/swap_pager.h
@@ -38,6 +38,9 @@
#ifndef _VM_SWAP_PAGER_H_
#define _VM_SWAP_PAGER_H_ 1
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,6 +1,6 @@
diff -ur sys.orig/net/if_dl.h sys/net/if_dl.h
---- sys.orig/net/if_dl.h 2004-11-30 01:05:19.000000000 +0100
-+++ sys/net/if_dl.h 2004-11-30 01:16:42.000000000 +0100
+--- src/sys.orig/net/if_dl.h 2004-11-30 01:05:19.000000000 +0100
++++ src/sys/net/if_dl.h 2004-11-30 01:16:42.000000000 +0100
@@ -59,13 +59,13 @@
* Structure of a Link-Level sockaddr:
*/
@@ -23,8 +23,8 @@
contains both if name and ll address */
};
diff -ur sys.orig/net/if_var.h sys/net/if_var.h
---- sys.orig/net/if_var.h 2004-10-31 00:01:43.000000000 +0200
-+++ sys/net/if_var.h 2004-11-30 01:16:42.000000000 +0100
+--- src/sys.orig/net/if_var.h 2004-10-31 00:01:43.000000000 +0200
++++ src/sys/net/if_var.h 2004-11-30 01:16:42.000000000 +0100
@@ -33,6 +33,9 @@
#ifndef _NET_IF_VAR_H_
#define _NET_IF_VAR_H_
@@ -36,8 +36,8 @@
* Structures defining a network interface, providing a packet
* transport mechanism (ala level 0 of the PUP protocols).
diff -ur sys.orig/netinet/in_var.h sys/netinet/in_var.h
---- sys.orig/netinet/in_var.h 2004-08-16 20:32:07.000000000 +0200
-+++ sys/netinet/in_var.h 2004-11-30 01:16:42.000000000 +0100
+--- src/sys.orig/netinet/in_var.h 2004-08-16 20:32:07.000000000 +0200
++++ src/sys/netinet/in_var.h 2004-11-30 01:16:42.000000000 +0100
@@ -34,7 +34,9 @@
#define _NETINET_IN_VAR_H_
@@ -49,8 +49,8 @@
/*
* Interface address, Internet version. One of these structures
diff -ur sys.orig/netinet/ip_var.h sys/netinet/ip_var.h
---- sys.orig/netinet/ip_var.h 2004-09-23 18:38:53.000000000 +0200
-+++ sys/netinet/ip_var.h 2004-11-30 01:16:42.000000000 +0100
+--- src/sys.orig/netinet/ip_var.h 2004-09-23 18:38:53.000000000 +0200
++++ src/sys/netinet/ip_var.h 2004-11-30 01:16:42.000000000 +0100
@@ -34,6 +34,8 @@
#define _NETINET_IP_VAR_H_
@@ -61,8 +61,8 @@
/*
* Overlay for ip header used by other protocols (tcp, udp).
diff -ur sys.orig/netinet6/in6_var.h sys/netinet6/in6_var.h
---- sys.orig/netinet6/in6_var.h 2004-11-30 01:05:19.000000000 +0100
-+++ sys/netinet6/in6_var.h 2004-11-30 01:16:42.000000000 +0100
+--- src/sys.orig/netinet6/in6_var.h 2004-11-30 01:05:19.000000000 +0100
++++ src/sys/netinet6/in6_var.h 2004-11-30 01:16:42.000000000 +0100
@@ -64,6 +64,9 @@
#ifndef _NETINET6_IN6_VAR_H_
#define _NETINET6_IN6_VAR_H_
@@ -74,8 +74,8 @@
* Interface address, Internet version. One of these structures
* is allocated for each interface with an Internet address.
diff -ur sys.orig/sys/fnv_hash.h sys/sys/fnv_hash.h
---- sys.orig/sys/fnv_hash.h 2001-03-20 03:10:18.000000000 +0100
-+++ sys/sys/fnv_hash.h 2004-11-30 01:16:42.000000000 +0100
+--- src/sys.orig/sys/fnv_hash.h 2001-03-20 03:10:18.000000000 +0100
++++ src/sys/sys/fnv_hash.h 2004-11-30 01:16:42.000000000 +0100
@@ -8,6 +8,8 @@
* $FreeBSD: sys/sys/fnv_hash.h,v 1.2 2001/03/20 02:10:18 peter Exp $
*/
Modified: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,6 +1,6 @@
diff -ur sys.orig/sys/syslimits.h sys/sys/syslimits.h
---- sys.orig/sys/syslimits.h 2004-11-30 01:05:19.000000000 +0100
-+++ sys/sys/syslimits.h 2004-11-30 01:23:49.000000000 +0100
+--- src/sys.orig/sys/syslimits.h 2004-11-30 01:05:19.000000000 +0100
++++ src/sys/sys/syslimits.h 2004-11-30 01:23:49.000000000 +0100
@@ -33,15 +33,6 @@
#ifndef _SYS_SYSLIMITS_H_
#define _SYS_SYSLIMITS_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/i386/include/segments.h
+Index: src/sys/i386/include/segments.h
===================================================================
---- sys/i386/include/segments.h.orig
-+++ sys/i386/include/segments.h
+--- src/sys/i386/include/segments.h.orig
++++ src/sys/i386/include/segments.h
@@ -60,7 +60,7 @@
*/
struct segment_descriptor {
@@ -20,10 +20,10 @@
};
/*
-Index: sys/sys/elf32.h
+Index: src/sys/sys/elf32.h
===================================================================
---- sys/sys/elf32.h.orig
-+++ sys/sys/elf32.h
+--- src/sys/sys/elf32.h.orig
++++ src/sys/sys/elf32.h
@@ -35,11 +35,9 @@
* ELF definitions common to all 32-bit architectures.
*/
@@ -238,10 +238,10 @@
-} Elf32_Syminfo;
-
#endif /* !_SYS_ELF32_H_ */
-Index: sys/sys/elf64.h
+Index: src/sys/sys/elf64.h
===================================================================
---- sys/sys/elf64.h.orig
-+++ sys/sys/elf64.h
+--- src/sys/sys/elf64.h.orig
++++ src/sys/sys/elf64.h
@@ -35,14 +35,10 @@
* ELF definitions common to all 64-bit architectures.
*/
@@ -453,10 +453,10 @@
-} Elf64_Syminfo;
-
#endif /* !_SYS_ELF64_H_ */
-Index: sys/sys/elf_common.h
+Index: src/sys/sys/elf_common.h
===================================================================
---- sys/sys/elf_common.h.orig
-+++ sys/sys/elf_common.h
+--- src/sys/sys/elf_common.h.orig
++++ src/sys/sys/elf_common.h
@@ -29,6 +29,8 @@
#ifndef _SYS_ELF_COMMON_H_
#define _SYS_ELF_COMMON_H_ 1
Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/i386/include/npx.h~ 2004-12-01 18:13:36.000000000 +0100
-+++ sys/i386/include/npx.h 2004-12-01 18:17:24.000000000 +0100
+--- src/sys/i386/include/npx.h~ 2004-12-01 18:13:36.000000000 +0100
++++ src/sys/i386/include/npx.h 2004-12-01 18:17:24.000000000 +0100
@@ -111,7 +111,7 @@
} sv_fp[8];
struct xmmacc sv_xmm[8];
@@ -9,8 +9,8 @@
union savefpu {
struct save87 sv_87;
---- sys/amd64/include/fpu.h~ 2006-03-01 20:30:51.000000000 +0100
-+++ sys/amd64/include/fpu.h 2006-03-29 20:27:45.000000000 +0200
+--- src/sys/amd64/include/fpu.h~ 2006-03-01 20:30:51.000000000 +0100
++++ src/sys/amd64/include/fpu.h 2006-03-29 20:27:45.000000000 +0200
@@ -71,7 +71,7 @@
} sv_fp[8];
struct xmmacc sv_xmm[16];
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,6 +1,6 @@
diff -ur sys.orig/dev/usb/usb.h sys/dev/usb/usb.h
---- sys.orig/dev/usb/usb.h 2005-03-02 21:21:45.000000000 +0100
-+++ sys/dev/usb/usb.h 2005-03-02 21:26:56.000000000 +0100
+--- src/sys.orig/dev/usb/usb.h 2005-03-02 21:21:45.000000000 +0100
++++ src/sys/dev/usb/usb.h 2005-03-02 21:26:56.000000000 +0100
@@ -98,7 +98,7 @@
#define USETDW(w,v) (*(u_int32_t *)(w) = (v))
#endif
@@ -11,8 +11,8 @@
typedef struct {
uByte bmRequestType;
diff -ur sys.orig/i386/include/cpufunc.h sys/i386/include/cpufunc.h
---- sys.orig/i386/include/cpufunc.h 2004-04-07 22:46:05.000000000 +0200
-+++ sys/i386/include/cpufunc.h 2005-03-02 21:28:56.000000000 +0100
+--- src/sys.orig/i386/include/cpufunc.h 2004-04-07 22:46:05.000000000 +0200
++++ src/sys/i386/include/cpufunc.h 2005-03-02 21:28:56.000000000 +0100
@@ -193,57 +193,12 @@
return (data);
}
@@ -149,8 +149,8 @@
u_int rcr2(void);
u_int rcr3(void);
diff -ur sys.orig/sys/_types.h sys/sys/_types.h
---- sys.orig/sys/_types.h 2004-06-19 19:58:32.000000000 +0200
-+++ sys/sys/_types.h 2005-03-02 21:27:37.000000000 +0100
+--- src/sys.orig/sys/_types.h 2004-06-19 19:58:32.000000000 +0200
++++ src/sys/sys/_types.h 2005-03-02 21:27:37.000000000 +0100
@@ -31,6 +31,7 @@
#include <sys/cdefs.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/cam/scsi/scsi_all.h
+Index: src/sys/cam/scsi/scsi_all.h
===================================================================
---- sys/cam/scsi/scsi_all.h.orig
-+++ sys/cam/scsi/scsi_all.h
+--- src/sys/cam/scsi/scsi_all.h.orig
++++ src/sys/cam/scsi/scsi_all.h
@@ -25,6 +25,7 @@
#define _SCSI_SCSI_ALL_H 1
@@ -10,10 +10,10 @@
#ifdef _KERNEL
/*
-Index: sys/i386/include/md_var.h
+Index: src/sys/i386/include/md_var.h
===================================================================
---- sys/i386/include/md_var.h.orig
-+++ sys/i386/include/md_var.h
+--- src/sys/i386/include/md_var.h.orig
++++ src/sys/i386/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -23,10 +23,10 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-Index: sys/amd64/include/md_var.h
+Index: src/sys/amd64/include/md_var.h
===================================================================
---- sys/amd64/include/md_var.h.orig
-+++ sys/amd64/include/md_var.h
+--- src/sys/amd64/include/md_var.h.orig
++++ src/sys/amd64/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -36,10 +36,10 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-Index: sys/sys/_mutex.h
+Index: src/sys/sys/_mutex.h
===================================================================
---- sys/sys/_mutex.h.orig
-+++ sys/sys/_mutex.h
+--- src/sys/sys/_mutex.h.orig
++++ src/sys/sys/_mutex.h
@@ -31,6 +31,8 @@
#ifndef _SYS__MUTEX_H_
#define _SYS__MUTEX_H_
@@ -49,10 +49,10 @@
/*
* Sleep/spin mutex.
*/
-Index: sys/sys/_timeval.h
+Index: src/sys/sys/_timeval.h
===================================================================
---- sys/sys/_timeval.h.orig
-+++ sys/sys/_timeval.h
+--- src/sys/sys/_timeval.h.orig
++++ src/sys/sys/_timeval.h
@@ -30,6 +30,7 @@
#define _SYS__TIMEVAL_H_
@@ -74,10 +74,10 @@
-};
-
#endif /* !_SYS__TIMEVAL_H_ */
-Index: sys/sys/bio.h
+Index: src/sys/sys/bio.h
===================================================================
---- sys/sys/bio.h.orig
-+++ sys/sys/bio.h
+--- src/sys/sys/bio.h.orig
++++ src/sys/sys/bio.h
@@ -39,6 +39,15 @@
#define _SYS_BIO_H_
@@ -94,10 +94,10 @@
struct disk;
struct bio;
-Index: sys/sys/devicestat.h
+Index: src/sys/sys/devicestat.h
===================================================================
---- sys/sys/devicestat.h.orig
-+++ sys/sys/devicestat.h
+--- src/sys/sys/devicestat.h.orig
++++ src/sys/sys/devicestat.h
@@ -32,7 +32,15 @@
#define _DEVICESTAT_H
@@ -115,10 +115,10 @@
/*
* XXX: Should really be SPECNAMELEN
-Index: sys/sys/sbuf.h
+Index: src/sys/sys/sbuf.h
===================================================================
---- sys/sys/sbuf.h.orig
-+++ sys/sys/sbuf.h
+--- src/sys/sys/sbuf.h.orig
++++ src/sys/sys/sbuf.h
@@ -62,8 +62,8 @@
int sbuf_bcpy(struct sbuf *, const void *, size_t);
int sbuf_cat(struct sbuf *, const char *);
@@ -130,10 +130,10 @@
int sbuf_putc(struct sbuf *, int);
int sbuf_trim(struct sbuf *);
int sbuf_overflowed(struct sbuf *);
-Index: sys/sys/timespec.h
+Index: src/sys/sys/timespec.h
===================================================================
---- sys/sys/timespec.h.orig
-+++ sys/sys/timespec.h
+--- src/sys/sys/timespec.h.orig
++++ src/sys/sys/timespec.h
@@ -43,10 +43,7 @@
#define _TIME_T_DECLARED
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/_types.h.orig 2005-10-11 01:30:09.000000000 +0200
-+++ sys/sys/_types.h 2005-12-13 20:13:11.000000000 +0100
+--- src/sys/sys/_types.h.orig 2005-10-11 01:30:09.000000000 +0200
++++ src/sys/sys/_types.h 2005-12-13 20:13:11.000000000 +0100
@@ -62,7 +62,6 @@
typedef __uint8_t __sa_family_t;
typedef __uint32_t __socklen_t;
@@ -68,8 +68,8 @@
+#endif
+
#endif /* !_SYS__TYPES_H_ */
---- sys/sys/proc.h.orig 2005-10-11 01:30:09.000000000 +0200
-+++ sys/sys/proc.h 2005-12-13 20:09:19.000000000 +0100
+--- src/sys/sys/proc.h.orig 2005-10-11 01:30:09.000000000 +0200
++++ src/sys/sys/proc.h 2005-12-13 20:09:19.000000000 +0100
@@ -38,6 +38,7 @@
#ifndef _SYS_PROC_H_
#define _SYS_PROC_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/amd64/include/param.h 2005-11-19 18:53:09.000000000 +0100
-+++ sys/amd64/include/param.h 2006-01-16 13:14:18.000000000 +0100
+--- src/sys/amd64/include/param.h 2005-11-19 18:53:09.000000000 +0100
++++ src/sys/amd64/include/param.h 2006-01-16 13:14:18.000000000 +0100
@@ -71,6 +71,10 @@
#define _MACHINE_ARCH amd64
#endif
@@ -11,8 +11,8 @@
#ifndef _NO_NAMESPACE_POLLUTION
#ifndef _MACHINE_PARAM_H_
---- sys/i386/include/param.h 2005-11-19 19:23:51.000000000 +0100
-+++ sys/i386/include/param.h 2006-01-16 13:16:22.000000000 +0100
+--- src/sys/i386/include/param.h 2005-11-19 19:23:51.000000000 +0100
++++ src/sys/i386/include/param.h 2006-01-16 13:16:22.000000000 +0100
@@ -56,6 +56,10 @@
#define _MACHINE_ARCH i386
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/elf_generic.h 2006-04-02 16:51:38.000000000 +0200
-+++ sys/sys/elf_generic.h 2006-04-02 16:51:38.000000000 +0200
+--- src/sys/sys/elf_generic.h 2006-04-02 16:51:38.000000000 +0200
++++ src/sys/sys/elf_generic.h 2006-04-02 16:51:38.000000000 +0200
@@ -50,9 +50,10 @@
#error "Unknown byte order"
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/i386/include/_types.h
+Index: src/sys/i386/include/_types.h
===================================================================
---- sys/i386/include/_types.h.orig 2006-08-25 12:18:54.091511000 +0200
-+++ sys/i386/include/_types.h 2006-08-25 12:25:31.000000000 +0200
+--- src/sys/i386/include/_types.h.orig 2006-08-25 12:18:54.091511000 +0200
++++ src/sys/i386/include/_types.h 2006-08-25 12:25:31.000000000 +0200
@@ -39,12 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -53,10 +53,10 @@
typedef __uint32_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
typedef __uint32_t __uintptr_t;
-Index: sys/amd64/include/_types.h
+Index: src/sys/amd64/include/_types.h
===================================================================
---- sys/amd64/include/_types.h.orig 2006-08-25 12:18:54.127268000 +0200
-+++ sys/amd64/include/_types.h 2006-08-25 12:26:12.000000000 +0200
+--- src/sys/amd64/include/_types.h.orig 2006-08-25 12:18:54.127268000 +0200
++++ src/sys/amd64/include/_types.h 2006-08-25 12:26:12.000000000 +0200
@@ -39,12 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/buf.h 2006-08-25 17:45:28.000000000 +0200
-+++ sys/sys/buf.h 2006-08-25 16:23:08.000000000 +0200
+--- src/sys/sys/buf.h 2006-08-25 17:45:28.000000000 +0200
++++ src/sys/sys/buf.h 2006-08-25 16:23:08.000000000 +0200
@@ -38,7 +38,7 @@
#ifndef _SYS_BUF_H_
#define _SYS_BUF_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/net80211/ieee80211.h
+Index: src/sys/net80211/ieee80211.h
===================================================================
---- sys/net80211/ieee80211.h.orig
-+++ sys/net80211/ieee80211.h
+--- src/sys/net80211/ieee80211.h.orig
++++ src/sys/net80211/ieee80211.h
@@ -44,7 +44,7 @@
uint8_t i_service;
uint16_t i_length;
@@ -280,10 +280,10 @@
/* rate set entries are in .5 Mb/s units, and potentially marked as basic */
#define IEEE80211_RATE_BASIC 0x80
-Index: sys/sys/ata.h
+Index: src/sys/sys/ata.h
===================================================================
---- sys/sys/ata.h.orig
-+++ sys/sys/ata.h
+--- src/sys/sys/ata.h.orig
++++ src/sys/sys/ata.h
@@ -167,7 +167,7 @@
#define ATA_SUPPORT_WRITEDMAFUAEXT 0x0040
#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
@@ -311,10 +311,10 @@
struct ata_ioc_request {
union {
-Index: sys/dev/ata/atapi-cd.h
+Index: src/sys/dev/ata/atapi-cd.h
===================================================================
---- sys/dev/ata/atapi-cd.h.orig
-+++ sys/dev/ata/atapi-cd.h
+--- src/sys/dev/ata/atapi-cd.h.orig
++++ src/sys/dev/ata/atapi-cd.h
@@ -267,7 +267,7 @@
u_int8_t vendor_specific_byte1;
u_int8_t vendor_specific_byte2;
@@ -324,10 +324,10 @@
/* CDROM Read Track Information structure */
struct acd_track_info {
-Index: sys/i386/include/segments.h
+Index: src/sys/i386/include/segments.h
===================================================================
---- sys/amd64/include/segments.h.orig
-+++ sys/amd64/include/segments.h
+--- src/sys/amd64/include/segments.h.orig
++++ src/sys/amd64/include/segments.h
@@ -72,7 +72,7 @@
u_int64_t sd_def32:1; /* default 32 vs 16 bit size */
u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/
Modified: trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/ioccom.h~ 2006-11-18 00:35:03.000000000 +0100
-+++ sys/sys/ioccom.h 2006-11-18 00:35:03.000000000 +0100
+--- src/sys/sys/ioccom.h~ 2006-11-18 00:35:03.000000000 +0100
++++ src/sys/sys/ioccom.h 2006-11-18 00:35:03.000000000 +0100
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/iconv.h~ 2006-11-18 12:22:08.000000000 +0100
-+++ sys/sys/iconv.h 2006-11-18 12:22:08.000000000 +0100
+--- src/sys/sys/iconv.h~ 2006-11-18 12:22:08.000000000 +0100
++++ src/sys/sys/iconv.h 2006-11-18 12:22:08.000000000 +0100
@@ -91,7 +91,7 @@
#define ENCODING_UNICODE "UTF-16BE"
#define KICONV_VENDOR_MICSFT 1 /* Microsoft Vendor Code for quirk */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/dev/acpica/acpiio.h~ 2006-11-18 16:33:36.000000000 +0100
-+++ sys/dev/acpica/acpiio.h 2006-11-18 16:33:36.000000000 +0100
+--- src/sys/dev/acpica/acpiio.h~ 2006-11-18 16:33:36.000000000 +0100
++++ src/sys/dev/acpica/acpiio.h 2006-11-18 16:33:36.000000000 +0100
@@ -30,6 +30,8 @@
#ifndef _ACPIIO_H_
#define _ACPIIO_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/ktrace.h 2006-06-25 11:40:55.000000000 +0200
-+++ sys/sys/ktrace.h 2006-11-20 10:32:42.000000000 +0100
+--- src/sys/sys/ktrace.h 2006-06-25 11:40:55.000000000 +0200
++++ src/sys/sys/ktrace.h 2006-11-20 10:32:42.000000000 +0100
@@ -33,6 +33,19 @@
#ifndef _SYS_KTRACE_H_
#define _SYS_KTRACE_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/fbio.h~ 2006-11-29 10:35:33.000000000 +0100
-+++ sys/sys/fbio.h 2006-11-29 10:35:33.000000000 +0100
+--- src/sys/sys/fbio.h~ 2006-11-29 10:35:33.000000000 +0100
++++ src/sys/sys/fbio.h 2006-11-29 10:35:33.000000000 +0100
@@ -39,7 +39,7 @@
#define _SYS_FBIO_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/sys/conf.h
+Index: src/sys/sys/conf.h
===================================================================
---- sys/sys/conf.h.orig
-+++ sys/sys/conf.h
+--- src/sys/sys/conf.h.orig
++++ src/sys/sys/conf.h
@@ -43,6 +43,7 @@
#ifdef _KERNEL
#include <sys/eventhandler.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/contrib/pf/net/pfvar.h
+Index: src/sys/contrib/pf/net/pfvar.h
===================================================================
---- sys/contrib/pf/net/pfvar.h.orig
-+++ sys/contrib/pf/net/pfvar.h
+--- src/sys/contrib/pf/net/pfvar.h.orig
++++ src/sys/contrib/pf/net/pfvar.h
@@ -40,13 +40,14 @@
#include <sys/tree.h>
#ifdef __FreeBSD_kernel__
Modified: trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,7 +1,7 @@
-Index: sys/ufs/ufs/quota.h
+Index: src/sys/ufs/ufs/quota.h
===================================================================
---- sys/ufs/ufs/quota.h.orig
-+++ sys/ufs/ufs/quota.h
+--- src/sys/ufs/ufs/quota.h.orig
++++ src/sys/ufs/ufs/quota.h
@@ -205,7 +205,6 @@
int quotaon(struct thread *td, struct mount *, int, void *);
int setquota(struct thread *, struct mount *, u_long, int, void *);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,5 +1,5 @@
---- sys/sys/vnode.h~
-+++ sys/sys/vnode.h
+--- src/sys/sys/vnode.h~
++++ src/sys/sys/vnode.h
@@ -47,7 +47,6 @@
#include <sys/mutex.h>
#include <sys/selinfo.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2008-08-06 19:45:19 UTC (rev 2291)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2008-08-06 20:09:02 UTC (rev 2292)
@@ -1,29 +1,29 @@
-000_bruno_haible.diff -p0
-001_sys_soundcard.diff -p0
-002_gdb.diff -p0
-003_osreldate.diff -p0
-004_stdint_h.diff -p0
-006_sys_tty_h.diff -p0
-007_kvm.diff -p0
-008_vm_vm_param_h.diff -p0
-009_inetutils.diff -p0
-010_glibc.diff -p0
-011_wine.diff -p0
-012_strace.diff -p0
-014_misc.diff -p0
-015_cam.diff -p0
-018_sys__types.diff -p0
-019_exec_pagesize.diff -p0
-020_concat_elf_generic.diff -p0
-021_machine__types.diff -p0
-022_sys_buf_h.diff -p0
-023_packed.diff -p0
-024_ioccom.diff -p0
-025_iconv.diff -p0
-026_acpiio.diff -p0
-027_ktrace.diff -p0
-028_fbio.diff -p0
-029_conf.diff -p0
-030_pfvar.diff -p0
-031_ufs.diff -p0
-032_vnode.diff -p0
+000_bruno_haible.diff -p1
+001_sys_soundcard.diff -p1
+002_gdb.diff -p1
+003_osreldate.diff -p1
+004_stdint_h.diff -p1
+006_sys_tty_h.diff -p1
+007_kvm.diff -p1
+008_vm_vm_param_h.diff -p1
+009_inetutils.diff -p1
+010_glibc.diff -p1
+011_wine.diff -p1
+012_strace.diff -p1
+014_misc.diff -p1
+015_cam.diff -p1
+018_sys__types.diff -p1
+019_exec_pagesize.diff -p1
+020_concat_elf_generic.diff -p1
+021_machine__types.diff -p1
+022_sys_buf_h.diff -p1
+023_packed.diff -p1
+024_ioccom.diff -p1
+025_iconv.diff -p1
+026_acpiio.diff -p1
+027_ktrace.diff -p1
+028_fbio.diff -p1
+029_conf.diff -p1
+030_pfvar.diff -p1
+031_ufs.diff -p1
+032_vnode.diff -p1
More information about the Glibc-bsd-commits
mailing list