r3792 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2009-09-01 16:43:04 +0000 (Tue, 01 Sep 2009)
New Revision: 3792
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 2772 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-09-01 06:57:08 UTC (rev 3791)
+++ glibc-package/trunk/debian/changelog 2009-09-01 16:43:04 UTC (rev 3792)
@@ -5,9 +5,12 @@
bug#544389.
[ Samuel Thibault ]
- * debian/debhelper.in/libc.install: Install libc/*-gnu/ instead of
+ * debian/debhelper.in/libc.install: Install libc/*-gnu*/ instead of
libc/*-*-gnu*/, to fix FTBFS on hurd-i386 due to it now being i486-gnu/.
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2772 (from glibc-bsd).
+
-- Aurelien Jarno <aurel32@debian.org> Mon, 31 Aug 2009 22:15:07 +0200
eglibc (2.9-26) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-09-01 06:57:08 UTC (rev 3791)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-09-01 16:43:04 UTC (rev 3792)
@@ -16871,7 +16871,7 @@
+#endif /* netinet/ip_icmp.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/tcp.h
-@@ -0,0 +1,258 @@
+@@ -0,0 +1,264 @@
+/* netinet/tcp.h
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -16926,6 +16926,7 @@
+#define _NETINET_TCP_H 1
+
+#include <features.h>
++#include <sys/queue.h>
+
+/*
+ * User-settable options (used with setsockopt).
@@ -16938,9 +16939,14 @@
+#ifdef __USE_MISC
+# include <sys/types.h>
+
-+# ifdef __FAVOR_BSD
+typedef u_int32_t tcp_seq;
+typedef u_int32_t tcp_cc; /* connection count, per RFC 1644 */
++
++/* Miscellaneous constants */
++#define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */
++#define TCP_MAX_SACK 4 /* MAX # SACKs sent in any segment */
++
++# ifdef __FAVOR_BSD
+/*
+ * TCP header.
+ * Per RFC 793, September, 1981.
Reply to: