[Glibc-bsd-commits] r2853 - in trunk/kfreebsd-kernel-headers/debian: . patches

Petr Salinger ps-guest at alioth.debian.org
Thu Nov 19 11:13:09 UTC 2009


Author: ps-guest
Date: 2009-11-19 11:13:09 +0000 (Thu, 19 Nov 2009)
New Revision: 2853

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/links
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
Log:
update for netstat


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2009-11-19 11:12:22 UTC (rev 2852)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2009-11-19 11:13:09 UTC (rev 2853)
@@ -2,7 +2,7 @@
 
   [ Petr Salinger ]
   * Based on kfreebsd-source-8.0
-  * debian/includes.list: update for kfreebsd-8.0
+  * debian/includes.list: update for kfreebsd-8.0, netstat
 
  -- Aurelien Jarno <aurel32 at debian.org>  Fri, 13 Nov 2009 14:31:07 +0100
 

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2009-11-19 11:12:22 UTC (rev 2852)
+++ trunk/kfreebsd-kernel-headers/debian/install	2009-11-19 11:13:09 UTC (rev 2853)
@@ -1,6 +1,7 @@
 sys/bsm/*.h                             usr/include/bsm
 sys/cam/*.h                             usr/include/cam
 sys/cam/scsi/*.h                        usr/include/cam/scsi
+sys/contrib/pf/net/*.h                  usr/include/net
 sys/dev/acpica/*.h                      usr/include/dev/acpica
 sys/dev/an/*.h                          usr/include/dev/an
 sys/dev/bktr/*.h                        usr/include/dev/bktr
@@ -56,8 +57,8 @@
 sys/geom/stripe/*.h                     usr/include/geom/stripe
 sys/geom/vinum/*.h                      usr/include/geom/vinum
 sys/geom/virstor/*.h                    usr/include/geom/virstor
-sys/net80211/*.h                        usr/include/net80211
 sys/net/bpf.h                           usr/include/net
+sys/net/bpfdesc.h                       usr/include/net
 sys/net/bridgestp.h                     usr/include/net
 sys/net/if_arc.h                        usr/include/net
 sys/net/if_arp.h                        usr/include/net
@@ -84,9 +85,10 @@
 sys/net/slcompress.h                    usr/include/net
 sys/net/vnet.h                          usr/include/net
 sys/net/zlib.h                          usr/include/net
+sys/net80211/*.h                        usr/include/net80211
 sys/netatalk/aarp.h                     usr/include/netatalk
+sys/netatalk/at.h                       usr/include/netatalk
 sys/netatalk/at_extern.h                usr/include/netatalk
-sys/netatalk/at.h                       usr/include/netatalk
 sys/netatalk/at_var.h                   usr/include/netatalk
 sys/netatalk/ddp.h                      usr/include/netatalk
 sys/netatalk/ddp_var.h                  usr/include/netatalk
@@ -105,49 +107,62 @@
 sys/netgraph/bluetooth/include/*.h      usr/include/netgraph/bluetooth/include
 sys/netgraph/bluetooth/l2cap/*.h        usr/include/netgraph/bluetooth/l2cap
 sys/netgraph/netflow/*.h                usr/include/netgraph/netflow
-sys/netinet6/in6_gif.h                  usr/include/netinet6
-sys/netinet6/in6_var.h                  usr/include/netinet6
-sys/netinet6/ip6_mroute.h               usr/include/netinet6
-sys/netinet6/ip6protosw.h               usr/include/netinet6
-sys/netinet6/ip6_var.h                  usr/include/netinet6
-sys/netinet6/nd6.h                      usr/include/netinet6
-sys/netinet6/pim6.h                     usr/include/netinet6
-sys/netinet6/pim6_var.h                 usr/include/netinet6
-sys/netinet6/raw_ip6.h                  usr/include/netinet6
 sys/netinet/icmp_var.h                  usr/include/netinet
 sys/netinet/if_atm.h                    usr/include/netinet
 sys/netinet/igmp_var.h                  usr/include/netinet
 sys/netinet/in_gif.h                    usr/include/netinet
 sys/netinet/in_pcb.h                    usr/include/netinet
 sys/netinet/in_var.h                    usr/include/netinet
+sys/netinet/ip_carp.h                   usr/include/netinet 
 sys/netinet/ip_dummynet.h               usr/include/netinet
 sys/netinet/ip_ecn.h                    usr/include/netinet
 sys/netinet/ip_encap.h                  usr/include/netinet
 sys/netinet/ip_fw.h                     usr/include/netinet
 sys/netinet/ip_mroute.h                 usr/include/netinet
 sys/netinet/ip_var.h                    usr/include/netinet
+sys/netinet/pim_var.h                   usr/include/netinet
+sys/netinet/sctp*.h                     usr/include/netinet
 sys/netinet/tcp_debug.h                 usr/include/netinet
 sys/netinet/tcp_fsm.h                   usr/include/netinet
-sys/netinet/tcpip.h                     usr/include/netinet
 sys/netinet/tcp_seq.h                   usr/include/netinet
 sys/netinet/tcp_timer.h                 usr/include/netinet
 sys/netinet/tcp_var.h                   usr/include/netinet
+sys/netinet/tcpip.h                     usr/include/netinet
 sys/netinet/udp_var.h                   usr/include/netinet
+sys/netinet6/in6_gif.h                  usr/include/netinet6
+sys/netinet6/in6_pcb.h                  usr/include/netinet6
+sys/netinet6/in6_var.h                  usr/include/netinet6
+sys/netinet6/ip6_mroute.h               usr/include/netinet6
+sys/netinet6/ip6_var.h                  usr/include/netinet6
+sys/netinet6/ip6protosw.h               usr/include/netinet6
+sys/netinet6/nd6.h                      usr/include/netinet6
+sys/netinet6/pim6.h                     usr/include/netinet6
+sys/netinet6/pim6_var.h                 usr/include/netinet6
+sys/netinet6/raw_ip6.h                  usr/include/netinet6
 sys/netipsec/*.h                        usr/include/netipsec
 sys/netipx/ipx.h                        usr/include/netipx
 sys/netipx/ipx_if.h                     usr/include/netipx
 sys/netipx/ipx_pcb.h                    usr/include/netipx
 sys/netipx/ipx_var.h                    usr/include/netipx
+sys/netipx/spx.h                        usr/include/netipx
 sys/netipx/spx_debug.h                  usr/include/netipx
-sys/netipx/spx.h                        usr/include/netipx
 sys/netipx/spx_timer.h                  usr/include/netipx
 sys/netipx/spx_var.h                    usr/include/netipx
 sys/netncp/*.h                          usr/include/netncp
-sys/nfsclient/*.h                       usr/include/nfsclient
 sys/nfs/nfsproto.h                      usr/include/nfs
 sys/nfs/xdr_subs.h                      usr/include/nfs
+sys/nfsclient/*.h                       usr/include/nfsclient
 sys/opencrypto/*.h                      usr/include/opencrypto
 sys/osreldate.h                         usr/include/.
+sys/sys/_iovec.h                        usr/include/sys
+sys/sys/_lock.h                         usr/include/sys
+sys/sys/_mutex.h                        usr/include/sys
+sys/sys/_null.h                         usr/include/sys
+sys/sys/_rwlock.h                       usr/include/sys
+sys/sys/_sx.h                           usr/include/sys
+sys/sys/_task.h                         usr/include/sys
+sys/sys/_timeval.h                      usr/include/sys
+sys/sys/_types.h                        usr/include/sys
 sys/sys/acct.h                          usr/include/sys
 sys/sys/agpio.h                         usr/include/sys
 sys/sys/assym.h                         usr/include/sys
@@ -191,14 +206,13 @@
 sys/sys/filio.h                         usr/include/sys
 sys/sys/fnv_hash.h                      usr/include/sys
 sys/sys/iconv.h                         usr/include/sys
+sys/sys/imgact.h                        usr/include/sys
 sys/sys/imgact_aout.h                   usr/include/sys
 sys/sys/imgact_elf.h                    usr/include/sys
-sys/sys/imgact.h                        usr/include/sys
 sys/sys/inflate.h                       usr/include/sys
 sys/sys/interrupt.h                     usr/include/sys
 sys/sys/ioccom.h                        usr/include/sys
 sys/sys/ioctl_compat.h                  usr/include/sys
-sys/sys/_iovec.h                        usr/include/sys
 sys/sys/jail.h                          usr/include/sys
 sys/sys/joystick.h                      usr/include/sys
 sys/sys/kbio.h                          usr/include/sys
@@ -206,17 +220,16 @@
 sys/sys/kernel.h                        usr/include/sys
 sys/sys/kobj.h                          usr/include/sys
 sys/sys/kthread.h                       usr/include/sys
+sys/sys/ktr.h                           usr/include/sys
 sys/sys/ktrace.h                        usr/include/sys
-sys/sys/ktr.h                           usr/include/sys
 sys/sys/libkern.h                       usr/include/sys
 sys/sys/limits.h                        usr/include/sys
 sys/sys/linker.h                        usr/include/sys
 sys/sys/linker_set.h                    usr/include/sys
+sys/sys/lock.h                          usr/include/sys
+sys/sys/lock_profile.h                  usr/include/sys
 sys/sys/lockf.h                         usr/include/sys
-sys/sys/_lock.h                         usr/include/sys
-sys/sys/lock.h                          usr/include/sys
 sys/sys/lockmgr.h                       usr/include/sys
-sys/sys/lock_profile.h                  usr/include/sys
 sys/sys/malloc.h                        usr/include/sys
 sys/sys/mbuf.h                          usr/include/sys
 sys/sys/mchain.h                        usr/include/sys
@@ -227,20 +240,18 @@
 sys/sys/module.h                        usr/include/sys
 sys/sys/mouse.h                         usr/include/sys
 sys/sys/msgbuf.h                        usr/include/sys
-sys/sys/_mutex.h                        usr/include/sys
 sys/sys/mutex.h                         usr/include/sys
 sys/sys/namei.h                         usr/include/sys
 sys/sys/nlist_aout.h                    usr/include/sys
-sys/sys/_null.h                         usr/include/sys
-sys/sys/osd.h                         usr/include/sys
+sys/sys/osd.h                           usr/include/sys
 sys/sys/pciio.h                         usr/include/sys
 sys/sys/pcpu.h                          usr/include/sys
 sys/sys/pioctl.h                        usr/include/sys
 sys/sys/pipe.h                          usr/include/sys
 sys/sys/posix4.h                        usr/include/sys
 sys/sys/priority.h                      usr/include/sys
+sys/sys/proc.h                          usr/include/sys
 sys/sys/procfs.h                        usr/include/sys
-sys/sys/proc.h                          usr/include/sys
 sys/sys/protosw.h                       usr/include/sys
 sys/sys/ptio.h                          usr/include/sys
 sys/sys/random.h                        usr/include/sys
@@ -248,7 +259,6 @@
 sys/sys/rman.h                          usr/include/sys
 sys/sys/rtprio.h                        usr/include/sys
 sys/sys/runq.h                          usr/include/sys
-sys/sys/_rwlock.h                       usr/include/sys
 sys/sys/sbuf.h                          usr/include/sys
 sys/sys/selinfo.h                       usr/include/sys
 sys/sys/sigio.h                         usr/include/sys
@@ -256,25 +266,21 @@
 sys/sys/snoop.h                         usr/include/sys
 sys/sys/sockio.h                        usr/include/sys
 sys/sys/soundcard.h                     usr/include/sys
-sys/sys/_sx.h                           usr/include/sys
 sys/sys/sx.h                            usr/include/sys
 sys/sys/sysctl.h                        usr/include/sys
 sys/sys/sysent.h                        usr/include/sys
 sys/sys/syslimits.h                     usr/include/sys
 sys/sys/sysproto.h                      usr/include/sys
 sys/sys/systm.h                         usr/include/sys
-sys/sys/_task.h                         usr/include/sys
 sys/sys/taskqueue.h                     usr/include/sys
 sys/sys/timepps.h                       usr/include/sys
 sys/sys/timers.h                        usr/include/sys
 sys/sys/timespec.h                      usr/include/sys
-sys/sys/_timeval.h                      usr/include/sys
 sys/sys/timex.h                         usr/include/sys
 sys/sys/tree.h                          usr/include/sys
+sys/sys/tty.h                           usr/include/sys
 sys/sys/ttycom.h                        usr/include/sys
 sys/sys/ttyqueue.h                      usr/include/sys
-sys/sys/tty.h                           usr/include/sys
-sys/sys/_types.h                        usr/include/sys
 sys/sys/ucred.h                         usr/include/sys
 sys/sys/unpcb.h                         usr/include/sys
 sys/sys/user.h                          usr/include/sys
@@ -288,7 +294,6 @@
 # not be installed as they are neither present on plain FreeBSD nor
 # on GNU/Linux
 sys/contrib/altq/altq/*.h               usr/include/contrib/altq/altq
-sys/contrib/pf/net/pfvar.h              usr/include/contrib/pf/net
 sys/dev/aac/*.h                         usr/include/dev/aac
 sys/dev/advansys/*.h                    usr/include/dev/advansys
 sys/dev/ae/*.h                          usr/include/dev/ae

Modified: trunk/kfreebsd-kernel-headers/debian/links
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/links	2009-11-19 11:12:22 UTC (rev 2852)
+++ trunk/kfreebsd-kernel-headers/debian/links	2009-11-19 11:13:09 UTC (rev 2853)
@@ -1,4 +1,3 @@
 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	2009-11-19 11:12:22 UTC (rev 2852)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2009-11-19 11:13:09 UTC (rev 2853)
@@ -443,21 +443,14 @@
  /*
   * Logical process signal actions and state, needed only within the process
   * The mapping between sigacts and proc structures is 1:1 except for rfork()
-@@ -95,10 +98,14 @@
+@@ -95,6 +98,7 @@
  typedef void __osiginfohandler_t(int, osiginfo_t *, void *);
  #endif /* _KERNEL && COMPAT_43 */
  
 +#if 0
-+#endif
  /* additional signal action values, used only temporarily/internally */
  #define	SIG_CATCH	((__sighandler_t *)2)
  #define SIG_HOLD        ((__sighandler_t *)3)
- 
-+#if 0
-+
- /*
-  * get signal action for process and signal; currently only for current process
-  */
 @@ -181,7 +188,7 @@
  	int i;
  




More information about the Glibc-bsd-commits mailing list