r4997 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2011-10-18 06:56:51 +0000 (Tue, 18 Oct 2011)
New Revision: 4997
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 3742 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-10-17 20:03:52 UTC (rev 4996)
+++ glibc-package/trunk/debian/changelog 2011-10-18 06:56:51 UTC (rev 4997)
@@ -10,7 +10,7 @@
setres[ug]id.
[ Petr Salinger ]
- * kfreebsd/local-sysdeps.diff: update to revision 3740 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 3742 (from glibc-bsd).
-- Samuel Thibault <sthibault@debian.org> Mon, 17 Oct 2011 01:23:52 +0200
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-10-17 20:03:52 UTC (rev 4996)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-10-18 06:56:51 UTC (rev 4997)
@@ -19295,7 +19295,7 @@
+ case AF_IPX:
+ return sizeof (struct sockaddr_ipx);
+ case AF_LOCAL:
-+ return sizeof (struct sockaddr_un) - sizeof(((struct sockaddr_un *) 0)->__sun_user_compat);
++ return __SOCKADDR_COMMON_SIZE + sizeof(((struct sockaddr_un *) 0)->sun_path);
+ }
+ return 0;
+}
@@ -22622,7 +22622,7 @@
+#endif /* sys/ucontext.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/un.h
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,50 @@
+/* Copyright (C) 1991, 1995, 1996, 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -22656,7 +22656,9 @@
+ {
+ __SOCKADDR_COMMON (sun_);
+ char sun_path[104]; /* Path name, the kernel restrict it to 104, */
++#if defined(__i386__) || defined(__amd64__)
+ char __sun_user_compat[4]; /* but former user header used 108 */
++#endif
+ };
+
+
Reply to: