Author: aurel32
Date: 2007-01-22 15:40:42 +0100 (Mon, 22 Jan 2007)
New Revision: 1910
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* patches/kfreebsd/local-sysdeps.diff: update to revision 1886 (from
glibc-bsd).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-01-22 14:28:12 UTC
(rev 1909)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-01-22 14:40:42 UTC
(rev 1910)
@@ -249,8 +249,15 @@
-- Clint Adams <[EMAIL PROTECTED]> Sun, 28 May 2006 03:28:14 +0200
-glibc (2.3.6.ds1-10) UNRELEASED; urgency=low
+glibc (2.3.6.ds1-11) unstable; urgency=low
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1886 (from
+ glibc-bsd).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 22 Jan 2007 15:36:14 +0100
+
+glibc (2.3.6.ds1-10) unstable; urgency=low
+
* sysdeps/kfreebsd.mk: Link all machine*/ directories to support
new bi-arch headers.
* Add bi-arch support on kfreebsd-amd64:
@@ -260,7 +267,7 @@
libc0.1-i386 packages
* patches/kfreebsd/local-sysdeps.diff: update to revision 1853 (from
glibc-bsd).
- * debian/control.in/libc: downgrade priority of libc-dev to optional
+ * debian/control.in/libc: downgrade priority of libc-dev to optional
from standard to match overrides.
* debian/patches/hppa/cvs-clone.diff: new patch by Helge Deller
<[EMAIL PROTECTED]> inspired from upstream CVS code (fix LTP clone04 and
@@ -271,7 +278,7 @@
* debian/rules.d/quilt.mk: use debian/quitlrc instead of default ~/.quiltrc.
Closes: #406136.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 2 Jan 2007 03:13:54 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 8 Jan 2007 22:29:37 +0100
glibc (2.3.6.ds1-9) unstable; urgency=low
Modified:
glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
2007-01-22 14:28:12 UTC (rev 1909)
+++ glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
2007-01-22 14:40:42 UTC (rev 1910)
@@ -14171,8 +14171,8 @@
+#endif /* netinet/if_ether.h */
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h
ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h 1970-01-01
01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h 2006-10-18
09:59:55.000000000 +0200
-@@ -0,0 +1,288 @@
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h 2007-01-10
11:18:12.000000000 +0100
+@@ -0,0 +1,296 @@
+/* Copyright (C) 1991-1993, 1995-1997, 1999, 2002 Free Software Foundation,
Inc.
+ This file is part of the GNU C Library.
+
@@ -14396,59 +14396,67 @@
+ /* N.B.: must separately check that header length >= 5 */
+#endif
+
-+/* Definition of type and code fields. */
-+/* defined above: ICMP_ECHOREPLY, ICMP_REDIRECT, ICMP_ECHO */
++/*
++ * Definition of type and code field values.
++ */
+#define ICMP_ECHOREPLY 0 /* echo reply */
+#define ICMP_UNREACH 3 /* dest unreachable,
codes: */
++#define ICMP_UNREACH_NET 0 /* bad net */
++#define ICMP_UNREACH_HOST 1 /* bad host */
++#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol
*/
++#define ICMP_UNREACH_PORT 3 /* bad port */
++#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused
drop */
++#define ICMP_UNREACH_SRCFAIL 5 /* src route
failed */
++#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net
*/
++#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host
*/
++#define ICMP_UNREACH_ISOLATED 8 /* src host
isolated */
++#define ICMP_UNREACH_NET_PROHIB 9 /* prohibited
access */
++#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */
++#define ICMP_UNREACH_TOSNET 11 /* bad tos for
net */
++#define ICMP_UNREACH_TOSHOST 12 /* bad tos for
host */
++#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib
*/
++#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec
vio. */
++#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff
*/
+#define ICMP_SOURCEQUENCH 4 /* packet lost, slow
down */
+#define ICMP_REDIRECT 5 /* shorter route,
codes: */
++#define ICMP_REDIRECT_NET 0 /* for network
*/
++#define ICMP_REDIRECT_HOST 1 /* for host */
++#define ICMP_REDIRECT_TOSNET 2 /* for tos and
net */
++#define ICMP_REDIRECT_TOSHOST 3 /* for tos and
host */
++#define ICMP_ALTHOSTADDR 6 /* alternate host
address */
+#define ICMP_ECHO 8 /* echo service */
+#define ICMP_ROUTERADVERT 9 /* router advertisement
*/
++#define ICMP_ROUTERADVERT_NORMAL 0 /*
normal advertisement */
++#define ICMP_ROUTERADVERT_NOROUTE_COMMON 16 /*
selective routing */
+#define ICMP_ROUTERSOLICIT 10 /* router solicitation
*/
+#define ICMP_TIMXCEED 11 /* time exceeded, code:
*/
++#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in
transit */
++#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in
reass */
+#define ICMP_PARAMPROB 12 /* ip header bad */
++#define ICMP_PARAMPROB_ERRATPTR 0 /* error at
param ptr */
++#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt.
absent */
++#define ICMP_PARAMPROB_LENGTH 2 /* bad length */
+#define ICMP_TSTAMP 13 /* timestamp request */
+#define ICMP_TSTAMPREPLY 14 /* timestamp reply */
+#define ICMP_IREQ 15 /* information request
*/
+#define ICMP_IREQREPLY 16 /* information reply */
+#define ICMP_MASKREQ 17 /* address mask request
*/
+#define ICMP_MASKREPLY 18 /* address mask reply */
++#define ICMP_TRACEROUTE 30 /* traceroute */
++#define ICMP_DATACONVERR 31 /* data conversion
error */
++#define ICMP_MOBILE_REDIRECT 32 /* mobile host redirect
*/
++#define ICMP_IPV6_WHEREAREYOU 33 /* IPv6 where-are-you */
++#define ICMP_IPV6_IAMHERE 34 /* IPv6 i-am-here */
++#define ICMP_MOBILE_REGREQUEST 35 /* mobile registration
req */
++#define ICMP_MOBILE_REGREPLY 36 /* mobile registration
reply */
++#define ICMP_SKIP 39 /* SKIP */
++#define ICMP_PHOTURIS 40 /* Photuris */
++#define ICMP_PHOTURIS_UNKNOWN_INDEX 1 /* unknown sec
index */
++#define ICMP_PHOTURIS_AUTH_FAILED 2 /* auth failed
*/
++#define ICMP_PHOTURIS_DECRYPT_FAILED 3 /* decrypt
failed */
+
-+#define ICMP_MAXTYPE 18
++#define ICMP_MAXTYPE 40
+
-+/* UNREACH codes */
-+#define ICMP_UNREACH_NET 0 /* bad net */
-+#define ICMP_UNREACH_HOST 1 /* bad host */
-+#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */
-+#define ICMP_UNREACH_PORT 3 /* bad port */
-+#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */
-+#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */
-+#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */
-+#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */
-+#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */
-+#define ICMP_UNREACH_NET_PROHIB 9 /* net denied */
-+#define ICMP_UNREACH_HOST_PROHIB 10 /* host denied */
-+#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */
-+#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */
-+#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib */
-+#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec vio. */
-+#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff */
-+
-+/* REDIRECT codes */
-+#define ICMP_REDIRECT_NET 0 /* for network */
-+#define ICMP_REDIRECT_HOST 1 /* for host */
-+#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */
-+#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */
-+
-+/* TIMEXCEED codes */
-+#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */
-+#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */
-+
-+/* PARAMPROB code */
-+#define ICMP_PARAMPROB_ERRATPTR 0 /* error at param ptr */
-+#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */
-+#define ICMP_PARAMPROB_LENGTH 2 /* bad length */
-+
+#define ICMP_INFOTYPE(type) \
+ ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
+ (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-01-22 14:28:12 UTC (rev
1909)
+++ glibc-package/trunk/debian/changelog 2007-01-22 14:40:42 UTC (rev
1910)
@@ -1,5 +1,12 @@
-glibc (2.3.6.ds1-10) UNRELEASED; urgency=low
+glibc (2.3.6.ds1-11) unstable; urgency=low
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1886 (from
+ glibc-bsd).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 22 Jan 2007 15:36:14 +0100
+
+glibc (2.3.6.ds1-10) unstable; urgency=low
+
* sysdeps/kfreebsd.mk: Link all machine*/ directories to support
new bi-arch headers.
* Add bi-arch support on kfreebsd-amd64:
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2007-01-22 14:28:12 UTC (rev 1909)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2007-01-22 14:40:42 UTC (rev 1910)
@@ -13155,8 +13155,8 @@
+#endif /* netinet/if_ether.h */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h
sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h
--- null/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h 1970-01-01
01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h 2005-12-16
14:31:52.000000000 +0100
-@@ -0,0 +1,288 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/ip_icmp.h 2007-01-10
11:18:11.000000000 +0100
+@@ -0,0 +1,296 @@
+/* Copyright (C) 1991-1993, 1995-1997, 1999, 2002 Free Software Foundation,
Inc.
+ This file is part of the GNU C Library.
+
@@ -13380,59 +13380,67 @@
+ /* N.B.: must separately check that header length >= 5 */
+#endif
+
-+/* Definition of type and code fields. */
-+/* defined above: ICMP_ECHOREPLY, ICMP_REDIRECT, ICMP_ECHO */
++/*
++ * Definition of type and code field values.
++ */
+#define ICMP_ECHOREPLY 0 /* echo reply */
+#define ICMP_UNREACH 3 /* dest unreachable,
codes: */
++#define ICMP_UNREACH_NET 0 /* bad net */
++#define ICMP_UNREACH_HOST 1 /* bad host */
++#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol
*/
++#define ICMP_UNREACH_PORT 3 /* bad port */
++#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused
drop */
++#define ICMP_UNREACH_SRCFAIL 5 /* src route
failed */
++#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net
*/
++#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host
*/
++#define ICMP_UNREACH_ISOLATED 8 /* src host
isolated */
++#define ICMP_UNREACH_NET_PROHIB 9 /* prohibited
access */
++#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */
++#define ICMP_UNREACH_TOSNET 11 /* bad tos for
net */
++#define ICMP_UNREACH_TOSHOST 12 /* bad tos for
host */
++#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib
*/
++#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec
vio. */
++#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff
*/
+#define ICMP_SOURCEQUENCH 4 /* packet lost, slow
down */
+#define ICMP_REDIRECT 5 /* shorter route,
codes: */
++#define ICMP_REDIRECT_NET 0 /* for network
*/
++#define ICMP_REDIRECT_HOST 1 /* for host */
++#define ICMP_REDIRECT_TOSNET 2 /* for tos and
net */
++#define ICMP_REDIRECT_TOSHOST 3 /* for tos and
host */
++#define ICMP_ALTHOSTADDR 6 /* alternate host
address */
+#define ICMP_ECHO 8 /* echo service */
+#define ICMP_ROUTERADVERT 9 /* router advertisement
*/
++#define ICMP_ROUTERADVERT_NORMAL 0 /*
normal advertisement */
++#define ICMP_ROUTERADVERT_NOROUTE_COMMON 16 /*
selective routing */
+#define ICMP_ROUTERSOLICIT 10 /* router solicitation
*/
+#define ICMP_TIMXCEED 11 /* time exceeded, code:
*/
++#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in
transit */
++#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in
reass */
+#define ICMP_PARAMPROB 12 /* ip header bad */
++#define ICMP_PARAMPROB_ERRATPTR 0 /* error at
param ptr */
++#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt.
absent */
++#define ICMP_PARAMPROB_LENGTH 2 /* bad length */
+#define ICMP_TSTAMP 13 /* timestamp request */
+#define ICMP_TSTAMPREPLY 14 /* timestamp reply */
+#define ICMP_IREQ 15 /* information request
*/
+#define ICMP_IREQREPLY 16 /* information reply */
+#define ICMP_MASKREQ 17 /* address mask request
*/
+#define ICMP_MASKREPLY 18 /* address mask reply */
++#define ICMP_TRACEROUTE 30 /* traceroute */
++#define ICMP_DATACONVERR 31 /* data conversion
error */
++#define ICMP_MOBILE_REDIRECT 32 /* mobile host redirect
*/
++#define ICMP_IPV6_WHEREAREYOU 33 /* IPv6 where-are-you */
++#define ICMP_IPV6_IAMHERE 34 /* IPv6 i-am-here */
++#define ICMP_MOBILE_REGREQUEST 35 /* mobile registration
req */
++#define ICMP_MOBILE_REGREPLY 36 /* mobile registration
reply */
++#define ICMP_SKIP 39 /* SKIP */
++#define ICMP_PHOTURIS 40 /* Photuris */
++#define ICMP_PHOTURIS_UNKNOWN_INDEX 1 /* unknown sec
index */
++#define ICMP_PHOTURIS_AUTH_FAILED 2 /* auth failed
*/
++#define ICMP_PHOTURIS_DECRYPT_FAILED 3 /* decrypt
failed */
+
-+#define ICMP_MAXTYPE 18
++#define ICMP_MAXTYPE 40
+
-+/* UNREACH codes */
-+#define ICMP_UNREACH_NET 0 /* bad net */
-+#define ICMP_UNREACH_HOST 1 /* bad host */
-+#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */
-+#define ICMP_UNREACH_PORT 3 /* bad port */
-+#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */
-+#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */
-+#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */
-+#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */
-+#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */
-+#define ICMP_UNREACH_NET_PROHIB 9 /* net denied */
-+#define ICMP_UNREACH_HOST_PROHIB 10 /* host denied */
-+#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */
-+#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */
-+#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib */
-+#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec vio. */
-+#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff */
-+
-+/* REDIRECT codes */
-+#define ICMP_REDIRECT_NET 0 /* for network */
-+#define ICMP_REDIRECT_HOST 1 /* for host */
-+#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */
-+#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */
-+
-+/* TIMEXCEED codes */
-+#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */
-+#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */
-+
-+/* PARAMPROB code */
-+#define ICMP_PARAMPROB_ERRATPTR 0 /* error at param ptr */
-+#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */
-+#define ICMP_PARAMPROB_LENGTH 2 /* bad length */
-+
+#define ICMP_INFOTYPE(type) \
+ ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
+ (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
