Author: ps-guest
Date: 2009-02-20 10:30:25 +0000 (Fri, 20 Feb 2009)
New Revision: 3289
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2370 (from glibc-bsd)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-02-19 19:34:27 UTC (rev
3288)
+++ glibc-package/trunk/debian/changelog 2009-02-20 10:30:25 UTC (rev
3289)
@@ -10,7 +10,7 @@
in pthread.h.
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 2368 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2370 (from glibc-bsd).
* drop kfreebsd/local-sysdeps28.diff (merged into local-sysdeps.diff).
-- Aurelien Jarno <[email protected]> Thu, 19 Feb 2009 13:41:10 +0100
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2009-02-19 19:34:27 UTC (rev 3288)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2009-02-20 10:30:25 UTC (rev 3289)
@@ -3273,7 +3273,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/in.h
-@@ -0,0 +1,249 @@
+@@ -0,0 +1,305 @@
+/* Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -3305,56 +3305,109 @@
+#define IMPLINK_HIGHEXPER 158
+
+
-+/* Options for use with `getsockopt' and `setsockopt' at the IP level.
-+ The first word in the comment at the right is the data type used;
-+ "bool" means a boolean value stored in an `int'. */
-+#define IP_OPTIONS 1 /* ip_opts; IP per-packet options. */
-+#define IP_HDRINCL 2 /* int; Header is included with data.
*/
-+#define IP_TOS 3 /* int; IP type of service and
precedence. */
-+#define IP_TTL 4 /* int; IP time to live. */
-+#define IP_RECVOPTS 5 /* bool; Receive all IP options
w/datagram. */
-+#define IP_RECVRETOPTS 6 /* bool; Receive IP options for
response. */
-+#define IP_RECVDSTADDR 7 /* bool; Receive IP dst addr
w/datagram. */
-+#define IP_RETOPTS 8 /* ip_opts; Set/get IP per-packet
options. */
-+#define IP_MULTICAST_IF 9 /* in_addr; set/get IP multicast i/f */
-+#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast ttl */
-+#define IP_MULTICAST_LOOP 11 /* i_char; set/get IP multicast loopback */
-+#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */
-+#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */
-+#define IP_MULTICAST_VIF 14 /* set/get IP mcast virt. iface */
-+#define IP_RSVP_ON 15 /* enable RSVP in kernel */
-+#define IP_RSVP_OFF 16 /* disable RSVP in kernel */
-+#define IP_RSVP_VIF_ON 17 /* set RSVP per-vif socket */
-+#define IP_RSVP_VIF_OFF 18 /* unset RSVP per-vif socket */
-+#define IP_PORTRANGE 19 /* int; range to choose for unspec port */
-+#define IP_RECVIF 20 /* bool; receive reception if w/dgram */
++/* To select the IP level. */
++#define SOL_IP 0
++
++/*
++ * Options for use with [gs]etsockopt at the IP level.
++ * First word of comment is data type; bool is stored in int.
++ */
++#define IP_OPTIONS 1 /* buf/ip_opts; set/get IP options
*/
++#define IP_HDRINCL 2 /* int; header is included with
data */
++#define IP_TOS 3 /* int; IP type of service and
preced. */
++#define IP_TTL 4 /* int; IP time to live */
++#define IP_RECVOPTS 5 /* bool; receive all IP opts
w/dgram */
++#define IP_RECVRETOPTS 6 /* bool; receive IP opts for
response */
++#define IP_RECVDSTADDR 7 /* bool; receive IP dst addr
w/dgram */
++#define IP_SENDSRCADDR IP_RECVDSTADDR /* cmsg_type to set src
addr */
++#define IP_RETOPTS 8 /* ip_opts; set/get IP options */
++#define IP_MULTICAST_IF 9 /* struct in_addr *or* struct
ip_mreqn;
++ * set/get IP multicast i/f */
++#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast
ttl */
++#define IP_MULTICAST_LOOP 11 /* u_char; set/get IP multicast
loopback */
++#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group
membership */
++#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group
membership */
++#define IP_MULTICAST_VIF 14 /* set/get IP mcast virt. iface */
++#define IP_RSVP_ON 15 /* enable RSVP in kernel */
++#define IP_RSVP_OFF 16 /* disable RSVP in kernel */
++#define IP_RSVP_VIF_ON 17 /* set RSVP per-vif socket */
++#define IP_RSVP_VIF_OFF 18 /* unset RSVP per-vif socket */
++#define IP_PORTRANGE 19 /* int; range to choose for unspec
port */
++#define IP_RECVIF 20 /* bool; receive reception if
w/dgram */
+/* for IPSEC */
-+#define IP_IPSEC_POLICY 21 /* int; set/get security policy */
-+#define IP_FAITH 22 /* bool; accept FAITH'ed connections */
++#define IP_IPSEC_POLICY 21 /* int; set/get security policy */
++#define IP_FAITH 22 /* bool; accept FAITH'ed
connections */
+
-+#define IP_FW_ADD 50 /* add a firewall rule to chain */
-+#define IP_FW_DEL 51 /* delete a firewall rule from chain */
-+#define IP_FW_FLUSH 52 /* flush firewall rule chain */
-+#define IP_FW_ZERO 53 /* clear single/all firewall counter(s)
*/
-+#define IP_FW_GET 54 /* get entire firewall rule chain */
-+#define IP_FW_RESETLOG 55 /* reset logging counters */
++#define IP_ONESBCAST 23 /* bool: send all-ones broadcast */
++#define IP_NONLOCALOK 24 /* bool: allow bind to spoof
non-local addresses;
++ requires kernel compile option
IP_NONLOCALBIND */
+
-+#define IP_DUMMYNET_CONFIGURE 60 /* add/configure a dummynet
pipe */
-+#define IP_DUMMYNET_DEL 61 /* delete a dummynet pipe from
chain */
-+#define IP_DUMMYNET_FLUSH 62 /* flush dummynet */
-+#define IP_DUMMYNET_GET 64 /* get entire dummynet pipes */
++#define IP_FW_TABLE_ADD 40 /* add entry */
++#define IP_FW_TABLE_DEL 41 /* delete entry */
++#define IP_FW_TABLE_FLUSH 42 /* flush table */
++#define IP_FW_TABLE_GETSIZE 43 /* get table size */
++#define IP_FW_TABLE_LIST 44 /* list table contents */
+
-+/* To select the IP level. */
-+#define SOL_IP 0
++#define IP_FW_ADD 50 /* add a firewall rule to chain */
++#define IP_FW_DEL 51 /* delete a firewall rule from
chain */
++#define IP_FW_FLUSH 52 /* flush firewall rule chain */
++#define IP_FW_ZERO 53 /* clear single/all firewall
counter(s) */
++#define IP_FW_GET 54 /* get entire firewall rule chain
*/
++#define IP_FW_RESETLOG 55 /* reset logging counters */
+
++#define IP_FW_NAT_CFG 56 /* add/config a nat rule */
++#define IP_FW_NAT_DEL 57 /* delete a nat rule */
++#define IP_FW_NAT_GET_CONFIG 58 /* get configuration of a nat rule */
++#define IP_FW_NAT_GET_LOG 59 /* get log of a nat rule */
++
++#define IP_DUMMYNET_CONFIGURE 60 /* add/configure a dummynet pipe */
++#define IP_DUMMYNET_DEL 61 /* delete a dummynet pipe from
chain */
++#define IP_DUMMYNET_FLUSH 62 /* flush dummynet */
++#define IP_DUMMYNET_GET 64 /* get entire dummynet pipes */
++
++#define IP_RECVTTL 65 /* bool; receive IP TTL w/dgram */
++#define IP_MINTTL 66 /* minimum TTL for packet or drop
*/
++#define IP_DONTFRAG 67 /* don't fragment packet */
++
++/* IPv4 Source Filter Multicast API [RFC3678] */
++#define IP_ADD_SOURCE_MEMBERSHIP 70 /* join a source-specific
group */
++#define IP_DROP_SOURCE_MEMBERSHIP 71 /* drop a single source */
++#define IP_BLOCK_SOURCE 72 /* block a source */
++#define IP_UNBLOCK_SOURCE 73 /* unblock a source */
++
++/* The following option is private; do not use it from user applications. */
++#define IP_MSFILTER 74 /* set/get filter list */
++
++/* Protocol Independent Multicast API [RFC3678] */
++#define MCAST_JOIN_GROUP 80 /* join an any-source
group */
++#define MCAST_LEAVE_GROUP 81 /* leave all sources for
group */
++#define MCAST_JOIN_SOURCE_GROUP 82 /* join a source-specific
group */
++#define MCAST_LEAVE_SOURCE_GROUP 83 /* leave a single source */
++#define MCAST_BLOCK_SOURCE 84 /* block a source */
++#define MCAST_UNBLOCK_SOURCE 85 /* unblock a source */
++
+/*
+ * Defaults and limits for options
+ */
+#define IP_DEFAULT_MULTICAST_TTL 1 /* normally limit m'casts to 1
hop */
+#define IP_DEFAULT_MULTICAST_LOOP 1 /* normally hear sends if a
member */
-+#define IP_MAX_MEMBERSHIPS 20 /* per socket */
+
+/*
++ * The imo_membership vector for each socket is now dynamically allocated at
++ * run-time, bounded by USHRT_MAX, and is reallocated when needed, sized
++ * according to a power-of-two increment.
++ */
++#define IP_MIN_MEMBERSHIPS 31
++#define IP_MAX_MEMBERSHIPS 4095
++#define IP_MAX_SOURCE_FILTER 1024 /* # of filters per socket, per
group */
++
++/*
++ * Filter modes; also used to represent per-socket filter mode internally.
++ */
++#define MCAST_INCLUDE 1 /* fmode: include these source(s) */
++#define MCAST_EXCLUDE 2 /* fmode: exclude these source(s) */
++
++/*
+ * Argument for IP_PORTRANGE:
+ * - which range to search when port is unspecified at bind() or connect()
+ */
@@ -3515,14 +3568,17 @@
+#define IPV6CTL_RIP6STATS 36 /* raw_ip6 stats */
+#define IPV6CTL_PREFER_TEMPADDR 37 /* prefer temporary addr as src
*/
+#define IPV6CTL_ADDRCTLPOLICY 38 /* get/set address selection policy */
++#define IPV6CTL_USE_DEFAULTZONE 39 /* use default scope zone */
+
+#define IPV6CTL_MAXFRAGS 41 /* max fragments */
++#define IPV6CTL_MCAST_PMTU 44 /* enable pMTU discovery for multicast?
*/
+
+/* New entries should be added here from current IPV6CTL_MAXID value. */
+/* to define items, should talk with KAME guys first, for *BSD compatibility
*/
+/* 42-44 is already used in KAME */
+#define IPV6CTL_STEALTH 45
-+#define IPV6CTL_MAXID 46
++#define ICMPV6CTL_ND6_ONLINKNSRFC4861 47
++#define IPV6CTL_MAXID 48
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/ioctl-types.h
@@ -0,0 +1,37 @@
@@ -4420,7 +4476,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sem.h
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,95 @@
+/* Copyright (C) 1995-1998, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -4492,8 +4548,12 @@
+ one must define the union or not. */
+#define _SEM_SEMUN_UNDEFINED 1
+
-+#ifdef _KERNEL
++#ifdef __USE_MISC
+
++/* ipcs ctl cmds */
++# define SEM_STAT 10
++# define SEM_INFO 11
++
+/*
+ * semaphore info struct
+ */
@@ -13814,7 +13874,7 @@
+#endif /* net/ethernet.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/net/if.h
-@@ -0,0 +1,424 @@
+@@ -0,0 +1,432 @@
+/*-
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
@@ -14003,20 +14063,28 @@
+ * more detailed or differenciated than IFCAP_*.
+ * Hwassist features are defined CSUM_* in sys/mbuf.h
+ */
-+#define IFCAP_RXCSUM 0x0001 /* can offload checksum on RX */
-+#define IFCAP_TXCSUM 0x0002 /* can offload checksum on TX */
-+#define IFCAP_NETCONS 0x0004 /* can be a network console */
-+#define IFCAP_VLAN_MTU 0x0008 /* VLAN-compatible MTU */
-+#define IFCAP_VLAN_HWTAGGING 0x0010 /* hardware VLAN tag support */
-+#define IFCAP_JUMBO_MTU 0x0020 /* 9000 byte MTU supported */
-+#define IFCAP_POLLING 0x0040 /* driver supports polling */
-+#define IFCAP_VLAN_HWCSUM 0x0080 /* can do IFCAP_HWCSUM on VLANs
*/
-+#define IFCAP_TSO4 0x0100 /* can do TCP Segmentation
Offload */
-+#define IFCAP_TSO6 0x0200 /* can do TCP6 Segmentation
Offload */
-+#define IFCAP_LRO 0x0400 /* can do Large Receive Offload
*/
++#define IFCAP_RXCSUM 0x00001 /* can offload checksum on RX
*/
++#define IFCAP_TXCSUM 0x00002 /* can offload checksum on TX
*/
++#define IFCAP_NETCONS 0x00004 /* can be a network console */
++#define IFCAP_VLAN_MTU 0x00008 /* VLAN-compatible MTU */
++#define IFCAP_VLAN_HWTAGGING 0x00010 /* hardware VLAN tag support */
++#define IFCAP_JUMBO_MTU 0x00020 /* 9000 byte MTU supported */
++#define IFCAP_POLLING 0x00040 /* driver supports polling */
++#define IFCAP_VLAN_HWCSUM 0x00080 /* can do IFCAP_HWCSUM on VLANs
*/
++#define IFCAP_TSO4 0x00100 /* can do TCP Segmentation
Offload */
++#define IFCAP_TSO6 0x00200 /* can do TCP6 Segmentation
Offload */
++#define IFCAP_LRO 0x00400 /* can do Large Receive Offload
*/
++#define IFCAP_WOL_UCAST 0x00800 /* wake on any unicast frame */
++#define IFCAP_WOL_MCAST 0x01000 /* wake on any multicast frame
*/
++#define IFCAP_WOL_MAGIC 0x02000 /* wake on any Magic Packet */
++#define IFCAP_TOE4 0x04000 /* interface can offload TCP */
++#define IFCAP_TOE6 0x08000 /* interface can offload TCP6 */
++#define IFCAP_VLAN_HWFILTER 0x10000 /* interface hw can filter vlan
tag */
+
-+#define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM)
++#define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM)
+#define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6)
++#define IFCAP_WOL (IFCAP_WOL_UCAST | IFCAP_WOL_MCAST |
IFCAP_WOL_MAGIC)
++#define IFCAP_TOE (IFCAP_TOE4 | IFCAP_TOE6)
+
+#define IFQ_MAXLEN 50
+#define IFNET_SLOWHZ 1 /* granularity is 1 second */
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
