Author: aurel32
Date: 2012-01-28 21:59:21 +0000 (Sat, 28 Jan 2012)
New Revision: 5138
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 4024 (from glibc-bsd).
Closes: #654712.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-01-28 21:49:56 UTC (rev
5137)
+++ glibc-package/trunk/debian/changelog 2012-01-28 21:59:21 UTC (rev
5138)
@@ -22,8 +22,8 @@
fix error value.
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 4002 (from glibc-bsd).
- Closes: #630203.
+ * kfreebsd/local-sysdeps.diff: update to revision 4024 (from glibc-bsd).
+ Closes: #630203, #654712.
* fixup kfreebsd/local-use-thr-primitives.diff. Closes: #657687.
-- Samuel Thibault <[email protected]> Tue, 27 Dec 2011 02:02:41 +0100
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2012-01-28 21:49:56 UTC (rev 5137)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2012-01-28 21:59:21 UTC (rev 5138)
@@ -4394,7 +4394,7 @@
+#endif /* need timeval */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/typesizes.h
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,91 @@
+/* bits/typesizes.h -- underlying types for *_t. kFreeBSD version.
+ Copyright (C) 2002, 2003, 2010, 2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -4463,12 +4463,13 @@
+ * necessary to implement function overload), so it must stay
+ * with __SLONGWORD_TYPE.
+ */
-+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
++#if defined(__i386__) || defined(__amd64__)
+#define __TIME_T_TYPE __SLONGWORD_TYPE
++#elif defined(__powerpc__) && !defined(__LP64__)
++#define __TIME_T_TYPE __S32_TYPE
+#else
+#define __TIME_T_TYPE __S64_TYPE
+#endif
-+
+#define __USECONDS_T_TYPE __U32_TYPE
+#define __SUSECONDS_T_TYPE __SLONGWORD_TYPE
+#define __DADDR_T_TYPE __SQUAD_TYPE
@@ -15539,7 +15540,7 @@
+#endif /* net/ethernet.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/net/if.h
-@@ -0,0 +1,449 @@
+@@ -0,0 +1,451 @@
+/*-
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
@@ -15579,6 +15580,7 @@
+
+#include <features.h>
+
++#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
@@ -15675,7 +15677,7 @@
+#define IFF_LINK2 0x4000 /* per link layer defined bit */
+#define IFF_ALTPHYS IFF_LINK2 /* use alternate physical
connection */
+#define IFF_MULTICAST 0x8000 /* (i) supports multicast */
-+/* 0x10000 */
++#define IFF_CANTCONFIG 0x10000 /* (i) unconfigurable using
ioctl(2) */
+#define IFF_PPROMISC 0x20000 /* (n) user-requested promisc
mode */
+#define IFF_MONITOR 0x40000 /* (n) user-requested monitor
mode */
+#define IFF_STATICARP 0x80000 /* (n) static ARP */
@@ -15695,7 +15697,8 @@
+/* flags set internally only: */
+#define IFF_CANTCHANGE \
+ (IFF_BROADCAST|IFF_POINTOPOINT|IFF_DRV_RUNNING|IFF_DRV_OACTIVE|\
-+ IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC)
++ IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC|\
++ IFF_DYING|IFF_CANTCONFIG)
+
+/*
+ * Values for if_link_state.
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
