r3642 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2009-07-24 17:45:53 +0000 (Fri, 24 Jul 2009)
New Revision: 3642
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2670 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-07-20 18:37:37 UTC (rev 3641)
+++ glibc-package/trunk/debian/changelog 2009-07-24 17:45:53 UTC (rev 3642)
@@ -1,6 +1,6 @@
eglibc (2.9-22) UNSTABLE; urgency=low
- * kfreebsd/local-sysdeps.diff: update to revision 2653 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2670 (from glibc-bsd).
* any/submitted-signalfd-eventfd.diff: new patch to support < 2.6.27
kernels in eventfd/signalfd. Closes: #537509.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-07-20 18:37:37 UTC (rev 3641)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-07-24 17:45:53 UTC (rev 3642)
@@ -129,7 +129,7 @@
+# For <sys/socket.h>.
+sysdep_routines += bsd_sendfile
+# For <sys/sysctl.h>.
-+sysdep_routines += sysctl sysctlbyname
++sysdep_routines += sysctl sysctlbyname sysctlnametomib
+# For <sys/uio.h>.
+sysdep_routines += sys_readv sys_writev
+# Other.
@@ -22452,7 +22452,7 @@
+#include <sysdeps/posix/sysconf.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysctlbyname.c
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,38 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Bruno Haible <bruno@clisp.org>, 2002.
@@ -22482,13 +22482,7 @@
+ int request[CTL_MAXNAME];
+ size_t requestlen = sizeof (request);
+
-+ /* Convert the string NAME to a binary encoded request. The kernel
-+ contains a routine for doing this, called "name2oid". But the way
-+ to call it is a little bit strange. */
-+ int name2oid_request[2] = { 0, 3 };
-+ if (__sysctl (name2oid_request, 2, request, &requestlen,
-+ (void *) name, strlen (name))
-+ < 0)
++ if (__sysctlnametomib(name, request, &requestlen) < 0)
+ return -1;
+
+ /* Now call sysctl using the binary encoded request. */
@@ -22498,6 +22492,46 @@
+
+weak_alias (__sysctlbyname, sysctlbyname)
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysctlnametomib.c
+@@ -0,0 +1,37 @@
++/* Copyright (C) 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. */
++
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#include <string.h>
++
++int
++__sysctlnametomib (const char *name, int *mibp, size_t *sizep)
++{
++ int request[CTL_MAXNAME];
++ size_t requestlen = sizeof (request);
++
++ /* Convert the string NAME to a binary encoded request. The kernel
++ contains a routine for doing this, called "name2oid". But the way
++ to call it is a little bit strange. */
++ int name2oid_request[2] = { 0, 3 };
++ return __sysctl (name2oid_request, 2, mibp, sizep, (void *) name,
++ strlen (name));
++}
++
++weak_alias (__sysctlnametomib, sysctlnametomib)
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/tcdrain.c
@@ -0,0 +1,41 @@
+/* Copyright (C) 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
Reply to: