r3910 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2009-10-29 11:04:42 +0000 (Thu, 29 Oct 2009)
New Revision: 3910
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2817 (from glibc-bsd).
Fixes <netinet/icmp6.h>. Closes: #552138.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-10-29 09:51:09 UTC (rev 3909)
+++ glibc-package/trunk/debian/changelog 2009-10-29 11:04:42 UTC (rev 3910)
@@ -8,8 +8,10 @@
size). Closes: #552233.
* patches/any/submitted-confname.h.diff: new patch to fix build of
bits/confname.h with -pedantic-errors. Closes: #552819.
+ * kfreebsd/local-sysdeps.diff: update to revision 2817 (from glibc-bsd).
+ Fixes <netinet/icmp6.h>. Closes: #552138.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 29 Oct 2009 10:49:24 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 29 Oct 2009 12:03:44 +0100
eglibc (2.10.1-3) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-10-29 09:51:09 UTC (rev 3909)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-10-29 11:04:42 UTC (rev 3910)
@@ -16460,6 +16460,398 @@
+
+#endif /* net/if_ether.h */
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/icmp6.h
+@@ -0,0 +1,389 @@
++/* Copyright (C) 1991-1997,2000,2006,2009 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. */
++
++#ifndef _NETINET_ICMP6_H
++#define _NETINET_ICMP6_H 1
++
++#include <inttypes.h>
++#include <string.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
++#define ICMP6_FILTER 18
++
++#define ICMP6_FILTER_BLOCK 1
++#define ICMP6_FILTER_PASS 2
++#define ICMP6_FILTER_BLOCKOTHERS 3
++#define ICMP6_FILTER_PASSONLY 4
++
++#define ICMPV6_PLD_MAXLEN 1232 /* IPV6_MMTU - sizeof(struct ip6_hdr)
++ - sizeof(struct icmp6_hdr) */
++
++struct icmp6_filter
++ {
++ uint32_t icmp6_filt[8];
++ } __attribute__ ((__packed__));
++
++struct icmp6_hdr
++ {
++ uint8_t icmp6_type; /* type field */
++ uint8_t icmp6_code; /* code field */
++ uint16_t icmp6_cksum; /* checksum field */
++ union
++ {
++ uint32_t icmp6_un_data32[1]; /* type-specific field */
++ uint16_t icmp6_un_data16[2]; /* type-specific field */
++ uint8_t icmp6_un_data8[4]; /* type-specific field */
++ } icmp6_dataun;
++ } __attribute__ ((__packed__));
++
++#define icmp6_data32 icmp6_dataun.icmp6_un_data32
++#define icmp6_data16 icmp6_dataun.icmp6_un_data16
++#define icmp6_data8 icmp6_dataun.icmp6_un_data8
++#define icmp6_pptr icmp6_data32[0] /* parameter prob */
++#define icmp6_mtu icmp6_data32[0] /* packet too big */
++#define icmp6_id icmp6_data16[0] /* echo request/reply */
++#define icmp6_seq icmp6_data16[1] /* echo request/reply */
++#define icmp6_maxdelay icmp6_data16[0] /* mcast group membership */
++
++#define ICMP6_DST_UNREACH 1
++#define ICMP6_PACKET_TOO_BIG 2
++#define ICMP6_TIME_EXCEEDED 3
++#define ICMP6_PARAM_PROB 4
++
++#define ICMP6_INFOMSG_MASK 0x80 /* all informational messages */
++
++#define ICMP6_NI_SUBJ_IPV6 0 /* Query Subject is an IPv6 address */
++#define ICMP6_NI_SUBJ_FQDN 1 /* Query Subject is a Domain name */
++#define ICMP6_NI_SUBJ_IPV4 2 /* Query Subject is an IPv4 address */
++
++#define ICMP6_NI_SUCCESS 0 /* node information successful reply */
++#define ICMP6_NI_REFUSED 1 /* node information request is refused */
++#define ICMP6_NI_UNKNOWN 2 /* unknown Qtype */
++
++#define ICMP6_ECHO_REQUEST 128
++#define ICMP6_ECHO_REPLY 129
++#define MLD_LISTENER_QUERY 130
++#define MLD_LISTENER_REPORT 131
++#define MLD_LISTENER_DONE 132
++#define MLD_LISTENER_REDUCTION MLD_LISTENER_DONE
++
++/* RFC2292 decls */
++#define ICMP6_MEMBERSHIP_QUERY 130 /* group membership query */
++#define ICMP6_MEMBERSHIP_REPORT 131 /* group membership report */
++#define ICMP6_MEMBERSHIP_REDUCTION 132 /* group membership termination */
++/* the followings are for backward compatibility to old KAME apps. */
++#define MLD6_LISTENER_QUERY MLD_LISTENER_QUERY
++#define MLD6_LISTENER_REPORT MLD_LISTENER_REPORT
++#define MLD6_LISTENER_DONE MLD_LISTENER_DONE
++
++
++#define ICMP6_DST_UNREACH_NOROUTE 0 /* no route to destination */
++#define ICMP6_DST_UNREACH_ADMIN 1 /* communication with destination */
++ /* administratively prohibited */
++#define ICMP6_DST_UNREACH_BEYONDSCOPE 2 /* beyond scope of source address */
++#define ICMP6_DST_UNREACH_ADDR 3 /* address unreachable */
++#define ICMP6_DST_UNREACH_NOPORT 4 /* bad port */
++
++#define ICMP6_TIME_EXCEED_TRANSIT 0 /* Hop Limit == 0 in transit */
++#define ICMP6_TIME_EXCEED_REASSEMBLY 1 /* Reassembly time out */
++
++#define ICMP6_PARAMPROB_HEADER 0 /* erroneous header field */
++#define ICMP6_PARAMPROB_NEXTHEADER 1 /* unrecognized Next Header */
++#define ICMP6_PARAMPROB_OPTION 2 /* unrecognized IPv6 option */
++
++#define ICMP6_FILTER_WILLPASS(type, filterp) \
++ ((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) != 0)
++
++#define ICMP6_FILTER_WILLBLOCK(type, filterp) \
++ ((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
++
++#define ICMP6_FILTER_SETPASS(type, filterp) \
++ ((((filterp)->icmp6_filt[(type) >> 5]) |= (1 << ((type) & 31))))
++
++#define ICMP6_FILTER_SETBLOCK(type, filterp) \
++ ((((filterp)->icmp6_filt[(type) >> 5]) &= ~(1 << ((type) & 31))))
++
++#define ICMP6_FILTER_SETPASSALL(filterp) \
++ memset (filterp, 0xFF, sizeof (struct icmp6_filter));
++
++#define ICMP6_FILTER_SETBLOCKALL(filterp) \
++ memset (filterp, 0, sizeof (struct icmp6_filter));
++
++#define ND_ROUTER_SOLICIT 133
++#define ND_ROUTER_ADVERT 134
++#define ND_NEIGHBOR_SOLICIT 135
++#define ND_NEIGHBOR_ADVERT 136
++#define ND_REDIRECT 137
++
++struct nd_router_solicit /* router solicitation */
++ {
++ struct icmp6_hdr nd_rs_hdr;
++ /* could be followed by options */
++ } __attribute__ ((__packed__));
++
++#define nd_rs_type nd_rs_hdr.icmp6_type
++#define nd_rs_code nd_rs_hdr.icmp6_code
++#define nd_rs_cksum nd_rs_hdr.icmp6_cksum
++#define nd_rs_reserved nd_rs_hdr.icmp6_data32[0]
++
++struct nd_router_advert /* router advertisement */
++ {
++ struct icmp6_hdr nd_ra_hdr;
++ uint32_t nd_ra_reachable; /* reachable time */
++ uint32_t nd_ra_retransmit; /* retransmit timer */
++ /* could be followed by options */
++ } __attribute__ ((__packed__));
++
++#define nd_ra_type nd_ra_hdr.icmp6_type
++#define nd_ra_code nd_ra_hdr.icmp6_code
++#define nd_ra_cksum nd_ra_hdr.icmp6_cksum
++#define nd_ra_curhoplimit nd_ra_hdr.icmp6_data8[0]
++#define nd_ra_flags_reserved nd_ra_hdr.icmp6_data8[1]
++#define ND_RA_FLAG_MANAGED 0x80
++#define ND_RA_FLAG_OTHER 0x40
++#define ND_RA_FLAG_HOME_AGENT 0x20
++#define nd_ra_router_lifetime nd_ra_hdr.icmp6_data16[1]
++
++struct nd_neighbor_solicit /* neighbor solicitation */
++ {
++ struct icmp6_hdr nd_ns_hdr;
++ struct in6_addr nd_ns_target; /* target address */
++ /* could be followed by options */
++ } __attribute__ ((__packed__));
++
++#define nd_ns_type nd_ns_hdr.icmp6_type
++#define nd_ns_code nd_ns_hdr.icmp6_code
++#define nd_ns_cksum nd_ns_hdr.icmp6_cksum
++#define nd_ns_reserved nd_ns_hdr.icmp6_data32[0]
++
++struct nd_neighbor_advert /* neighbor advertisement */
++ {
++ struct icmp6_hdr nd_na_hdr;
++ struct in6_addr nd_na_target; /* target address */
++ /* could be followed by options */
++ } __attribute__ ((__packed__));
++
++#define nd_na_type nd_na_hdr.icmp6_type
++#define nd_na_code nd_na_hdr.icmp6_code
++#define nd_na_cksum nd_na_hdr.icmp6_cksum
++#define nd_na_flags_reserved nd_na_hdr.icmp6_data32[0]
++#if BYTE_ORDER == BIG_ENDIAN
++#define ND_NA_FLAG_ROUTER 0x80000000
++#define ND_NA_FLAG_SOLICITED 0x40000000
++#define ND_NA_FLAG_OVERRIDE 0x20000000
++#else /* BYTE_ORDER == LITTLE_ENDIAN */
++#define ND_NA_FLAG_ROUTER 0x00000080
++#define ND_NA_FLAG_SOLICITED 0x00000040
++#define ND_NA_FLAG_OVERRIDE 0x00000020
++#endif
++
++struct nd_redirect /* redirect */
++ {
++ struct icmp6_hdr nd_rd_hdr;
++ struct in6_addr nd_rd_target; /* target address */
++ struct in6_addr nd_rd_dst; /* destination address */
++ /* could be followed by options */
++ } __attribute__ ((__packed__));;
++
++#define nd_rd_type nd_rd_hdr.icmp6_type
++#define nd_rd_code nd_rd_hdr.icmp6_code
++#define nd_rd_cksum nd_rd_hdr.icmp6_cksum
++#define nd_rd_reserved nd_rd_hdr.icmp6_data32[0]
++
++struct nd_opt_hdr /* Neighbor discovery option header */
++ {
++ uint8_t nd_opt_type;
++ uint8_t nd_opt_len; /* in units of 8 octets */
++ /* followed by option specific data */
++ } __attribute__ ((__packed__));
++
++#define ND_OPT_SOURCE_LINKADDR 1
++#define ND_OPT_TARGET_LINKADDR 2
++#define ND_OPT_PREFIX_INFORMATION 3
++#define ND_OPT_REDIRECTED_HEADER 4
++#define ND_OPT_MTU 5
++#define ND_OPT_RTR_ADV_INTERVAL 7
++#define ND_OPT_HOME_AGENT_INFO 8
++
++struct nd_opt_prefix_info /* prefix information */
++ {
++ uint8_t nd_opt_pi_type;
++ uint8_t nd_opt_pi_len;
++ uint8_t nd_opt_pi_prefix_len;
++ uint8_t nd_opt_pi_flags_reserved;
++ uint32_t nd_opt_pi_valid_time;
++ uint32_t nd_opt_pi_preferred_time;
++ uint32_t nd_opt_pi_reserved2;
++ struct in6_addr nd_opt_pi_prefix;
++ } __attribute__ ((__packed__));
++
++#define ND_OPT_PI_FLAG_ONLINK 0x80
++#define ND_OPT_PI_FLAG_AUTO 0x40
++#define ND_OPT_PI_FLAG_RADDR 0x20
++
++struct nd_opt_rd_hdr /* redirected header */
++ {
++ uint8_t nd_opt_rh_type;
++ uint8_t nd_opt_rh_len;
++ uint16_t nd_opt_rh_reserved1;
++ uint32_t nd_opt_rh_reserved2;
++ /* followed by IP header and data */
++ } __attribute__ ((__packed__));
++
++struct nd_opt_mtu /* MTU option */
++ {
++ uint8_t nd_opt_mtu_type;
++ uint8_t nd_opt_mtu_len;
++ uint16_t nd_opt_mtu_reserved;
++ uint32_t nd_opt_mtu_mtu;
++ } __attribute__ ((__packed__));
++
++struct mld_hdr
++ {
++ struct icmp6_hdr mld_icmp6_hdr;
++ struct in6_addr mld_addr; /* multicast address */
++ } __attribute__ ((__packed__));
++
++#define mld_type mld_icmp6_hdr.icmp6_type
++#define mld_code mld_icmp6_hdr.icmp6_code
++#define mld_cksum mld_icmp6_hdr.icmp6_cksum
++#define mld_maxdelay mld_icmp6_hdr.icmp6_data16[0]
++#define mld_reserved mld_icmp6_hdr.icmp6_data16[1]
++
++/* definitions to provide backward compatibility to old KAME applications */
++#define mld6_hdr mld_hdr
++#define mld6_type mld_type
++#define mld6_code mld_code
++#define mld6_cksum mld_cksum
++#define mld6_maxdelay mld_maxdelay
++#define mld6_reserved mld_reserved
++#define mld6_addr mld_addr
++
++#define ICMP6_ROUTER_RENUMBERING 138
++
++#define ICMP6_ROUTER_RENUMBERING_COMMAND 0 /* rr command */
++#define ICMP6_ROUTER_RENUMBERING_RESULT 1 /* rr result */
++#define ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET 255 /* rr seq num reset */
++
++struct icmp6_router_renum /* router renumbering header */
++ {
++ struct icmp6_hdr rr_hdr;
++ uint8_t rr_segnum;
++ uint8_t rr_flags;
++ uint16_t rr_maxdelay;
++ uint32_t rr_reserved;
++ } __attribute__ ((__packed__));
++
++#define rr_type rr_hdr.icmp6_type
++#define rr_code rr_hdr.icmp6_code
++#define rr_cksum rr_hdr.icmp6_cksum
++#define rr_seqnum rr_hdr.icmp6_data32[0]
++
++/* Router renumbering flags */
++#define ICMP6_RR_FLAGS_TEST 0x80
++#define ICMP6_RR_FLAGS_REQRESULT 0x40
++#define ICMP6_RR_FLAGS_FORCEAPPLY 0x20
++#define ICMP6_RR_FLAGS_SPECSITE 0x10
++#define ICMP6_RR_FLAGS_PREVDONE 0x08
++
++#define ICMP6_WRUREQUEST 139 /* who are you request */
++#define ICMP6_WRUREPLY 140 /* who are you reply */
++#define ICMP6_FQDN_QUERY 139 /* FQDN query */
++#define ICMP6_FQDN_REPLY 140 /* FQDN reply */
++#define ICMP6_NI_QUERY 139 /* node information request */
++#define ICMP6_NI_REPLY 140 /* node information reply */
++
++struct rr_pco_match /* match prefix part */
++ {
++ uint8_t rpm_code;
++ uint8_t rpm_len;
++ uint8_t rpm_ordinal;
++ uint8_t rpm_matchlen;
++ uint8_t rpm_minlen;
++ uint8_t rpm_maxlen;
++ uint16_t rpm_reserved;
++ struct in6_addr rpm_prefix;
++ } __attribute__ ((__packed__));
++
++/* PCO code values */
++#define RPM_PCO_ADD 1
++#define RPM_PCO_CHANGE 2
++#define RPM_PCO_SETGLOBAL 3
++#define RPM_PCO_MAX 4
++
++struct rr_pco_use /* use prefix part */
++ {
++ uint8_t rpu_uselen;
++ uint8_t rpu_keeplen;
++ uint8_t rpu_ramask;
++ uint8_t rpu_raflags;
++ uint32_t rpu_vltime;
++ uint32_t rpu_pltime;
++ uint32_t rpu_flags;
++ struct in6_addr rpu_prefix;
++ } __attribute__ ((__packed__));
++
++#define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x80
++#define ICMP6_RR_PCOUSE_RAFLAGS_AUTO 0x40
++
++#if BYTE_ORDER == BIG_ENDIAN
++# define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80000000
++# define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40000000
++#elif BYTE_ORDER == LITTLE_ENDIAN
++# define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80
++# define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40
++#endif
++
++struct rr_result /* router renumbering result message */
++ {
++ uint16_t rrr_flags;
++ uint8_t rrr_ordinal;
++ uint8_t rrr_matchedlen;
++ uint32_t rrr_ifid;
++ struct in6_addr rrr_prefix;
++ } __attribute__ ((__packed__));
++
++#if BYTE_ORDER == BIG_ENDIAN
++# define ICMP6_RR_RESULT_FLAGS_OOB 0x0002
++# define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0001
++#elif BYTE_ORDER == LITTLE_ENDIAN
++# define ICMP6_RR_RESULT_FLAGS_OOB 0x0200
++# define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0100
++#endif
++
++/* Mobile IPv6 extension: Advertisement Interval. */
++struct nd_opt_adv_interval
++ {
++ uint8_t nd_opt_adv_interval_type;
++ uint8_t nd_opt_adv_interval_len;
++ uint16_t nd_opt_adv_interval_reserved;
++ uint32_t nd_opt_adv_interval_ival;
++ };
++
++/* Mobile IPv6 extension: Home Agent Info. */
++struct nd_opt_home_agent_info
++ {
++ uint8_t nd_opt_home_agent_info_type;
++ uint8_t nd_opt_home_agent_info_len;
++ uint16_t nd_opt_home_agent_info_reserved;
++ uint16_t nd_opt_home_agent_info_preference;
++ uint16_t nd_opt_home_agent_info_lifetime;
++ };
++
++#endif /* netinet/icmpv6.h */
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/if_ether.h
@@ -0,0 +1,138 @@
+/* Copyright (C) 1996, 1997, 1999, 2006 Free Software Foundation, Inc.
Reply to: