r3783 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2009-08-27 21:08:01 +0000 (Thu, 27 Aug 2009)
New Revision: 3783
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2744 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-08-26 18:51:56 UTC (rev 3782)
+++ glibc-package/trunk/debian/changelog 2009-08-27 21:08:01 UTC (rev 3783)
@@ -11,6 +11,7 @@
* Convert config_os' gnu-gnu into gnu to fix multiarch paths.
[ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2744 (from glibc-bsd).
* any/local-linuxthreads-kill_other.diff, fixes ruby 1.9 testsuite failure
-- Aurelien Jarno <aurel32@debian.org> Tue, 25 Aug 2009 16:08:24 +0200
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-08-26 18:51:56 UTC (rev 3782)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-08-27 21:08:01 UTC (rev 3783)
@@ -47,7 +47,7 @@
+gnu
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Makefile
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,136 @@
+# Use bash, not /bin/sh, for executing scripts, because the native
+# FreeBSD /bin/sh does not interpret the IFS="<tab>" read ... command
+# in localedata/tst-fmon.sh correctly.
@@ -57,6 +57,7 @@
+
+ifeq ($(subdir),misc)
+sysdep_headers += \
++ kenv.h \
+ sys/mount.h \
+ sys/kd.h \
+ sys/rfork.h
@@ -102,6 +103,8 @@
+endif
+
+ifeq ($(subdir),misc)
++# For <kenv.h>.
++sysdep_routines += kenv
+# For <sched.h>.
+sysdep_routines += clone start_thread
+# For <unistd.h>.
@@ -7134,7 +7137,7 @@
+#include <sysdeps/unix/clock_settime.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c
-@@ -0,0 +1,105 @@
+@@ -0,0 +1,108 @@
+/* Create a thread.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -7199,14 +7202,17 @@
+ return -1;
+ }
+
-+ if ((flags & CSIGNAL) != 0 && (flags & CSIGNAL) != SIGCHLD)
++ if ((flags & CSIGNAL) != SIGCHLD)
+ {
+ if ((flags & CSIGNAL) & ~RFTHPNMASK)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
-+ rfork_flags |= (RFLINUXTHPN | ((flags & CSIGNAL) << RFTHPNSHIFT));
++ if ((flags & CSIGNAL) == 0)
++ rfork_flags |= (RFLINUXTHPN | ((SIGCHLD) << RFTHPNSHIFT));
++ else
++ rfork_flags |= (RFLINUXTHPN | ((flags & CSIGNAL) << RFTHPNSHIFT));
+ }
+
+ if (flags & CLONE_VM)
@@ -14441,6 +14447,48 @@
+ abort ();
+}
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kenv.h
+@@ -0,0 +1,39 @@
++/*-
++ * Copyright (c) 2002 Maxime Henrion <mux@FreeBSD.org>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in the
++ * documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ * $FreeBSD: src/include/kenv.h,v 1.2.8.1 2009/04/15 03:14:26 kensmith Exp $
++ */
++
++#ifndef _KENV_H_
++#define _KENV_H 1
++
++#include <sys/cdefs.h>
++#include <sys/kenv.h>
++
++__BEGIN_DECLS
++int kenv(int action, const char *name, char *value, int len);
++__END_DECLS
++
++#endif /* !_KENV_H */
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h
@@ -0,0 +1,92 @@
+/* Set flags signalling availability of kernel features based on given
@@ -22291,7 +22339,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
-@@ -0,0 +1,183 @@
+@@ -0,0 +1,184 @@
+# File name Caller Syscall name # args Strong name Weak names
+sys_access - access i:si __syscall_access
+acl_aclcheck_fd - acl_aclcheck_fd i:iip __acl_aclcheck_fd
@@ -22341,6 +22389,7 @@
+getsid - getsid i:i getsid
+issetugid - issetugid i: issetugid
+jail - jail i:p jail
++kenv - kenv i:issi kenv
+kldfind - kldfind i:s kldfind
+kldfirstmod - kldfirstmod i:i kldfirstmod
+kldload - kldload i:s kldload
Reply to: