Author: ps-guest
Date: 2009-04-14 07:16:50 +0000 (Tue, 14 Apr 2009)
New Revision: 3406
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2449 (from glibc-bsd).
Closes: #522686. Thanks to Jan Christoph Nordholz.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-04-08 08:56:49 UTC (rev
3405)
+++ glibc-package/trunk/debian/changelog 2009-04-14 07:16:50 UTC (rev
3406)
@@ -1,10 +1,15 @@
glibc (2.9-8) unstable; urgency=low
+ [ Aurelien Jarno ]
* patches/any/local-csu-init.diff, patches/hppa/local-nptl-compat.diff:
new patches from Carlos O'Donell to add a compatibility layer for
binaries built against linuxthreads.
* Update Swedish debconf translation, by Martin Bagger. Closes: #522982.
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2449 (from glibc-bsd).
+ Closes: #522686. Thanks to Jan Christoph Nordholz.
+
-- Aurelien Jarno <aure...@debian.org> Wed, 08 Apr 2009 10:42:05 +0200
glibc (2.9-7) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2009-04-08 08:56:49 UTC (rev 3405)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
2009-04-14 07:16:50 UTC (rev 3406)
@@ -6522,6 +6522,117 @@
+# define WLINUXCLONE __WCLONE /* FreeBSD name for __WCLONE. */
+#endif
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/waitstatus.h
+@@ -0,0 +1,108 @@
++/* Definitions of status bits for `wait' et al.
++ Copyright (C) 1992,1994,1996,1997,2000,2004 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. */
++
++#if !defined _SYS_WAIT_H && !defined _STDLIB_H
++# error "Never include <bits/waitstatus.h> directly; use <sys/wait.h>
instead."
++#endif
++
++
++/* Everything extant so far uses these same bits. */
++
++
++/* If WIFEXITED(STATUS), the low-order 8 bits of the status. */
++#define __WEXITSTATUS(status) (((status) & 0xff00) >> 8)
++
++/* If WIFSIGNALED(STATUS), the terminating signal. */
++#define __WTERMSIG(status) ((status) & 0x7f)
++
++/* If WIFSTOPPED(STATUS), the signal that stopped the child. */
++#define __WSTOPSIG(status) __WEXITSTATUS(status)
++
++/* Nonzero if STATUS indicates normal termination. */
++#define __WIFEXITED(status) (__WTERMSIG(status) == 0)
++
++/* Nonzero if STATUS indicates termination by a signal. */
++#define __WIFSIGNALED(status) \
++ (((signed char) (((status) & 0x7f) + 1) >> 1) > 0)
++
++/* Nonzero if STATUS indicates the child is stopped. */
++#define __WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
++
++/* Nonzero if STATUS indicates the child continued after a stop. We only
++ define this if <bits/waitflags.h> provides the WCONTINUED flag bit. */
++#ifdef WCONTINUED
++# define __WIFCONTINUED(status) ((status) == __W_CONTINUED)
++#endif
++
++/* Nonzero if STATUS indicates the child dumped core. */
++#define __WCOREDUMP(status) ((status) & __WCOREFLAG)
++
++/* Macros for constructing status values. */
++#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
++#define __W_STOPCODE(sig) ((sig) << 8 | 0x7f)
++
++/* Linux uses 0xffff, BSD uses SIGCONT */
++#define __W_CONTINUED 0x13
++#define __WCOREFLAG 0x80
++
++
++#ifdef __USE_BSD
++
++# include <endian.h>
++
++union wait
++ {
++ int w_status;
++ struct
++ {
++# if __BYTE_ORDER == __LITTLE_ENDIAN
++ unsigned int __w_termsig:7; /* Terminating signal. */
++ unsigned int __w_coredump:1; /* Set if dumped core. */
++ unsigned int __w_retcode:8; /* Return code if exited normally. */
++ unsigned int:16;
++# endif /* Little endian. */
++# if __BYTE_ORDER == __BIG_ENDIAN
++ unsigned int:16;
++ unsigned int __w_retcode:8;
++ unsigned int __w_coredump:1;
++ unsigned int __w_termsig:7;
++# endif /* Big endian. */
++ } __wait_terminated;
++ struct
++ {
++# if __BYTE_ORDER == __LITTLE_ENDIAN
++ unsigned int __w_stopval:8; /* W_STOPPED if stopped. */
++ unsigned int __w_stopsig:8; /* Stopping signal. */
++ unsigned int:16;
++# endif /* Little endian. */
++# if __BYTE_ORDER == __BIG_ENDIAN
++ unsigned int:16;
++ unsigned int __w_stopsig:8; /* Stopping signal. */
++ unsigned int __w_stopval:8; /* W_STOPPED if stopped. */
++# endif /* Big endian. */
++ } __wait_stopped;
++ };
++
++# define w_termsig __wait_terminated.__w_termsig
++# define w_coredump __wait_terminated.__w_coredump
++# define w_retcode __wait_terminated.__w_retcode
++# define w_stopsig __wait_stopped.__w_stopsig
++# define w_stopval __wait_stopped.__w_stopval
++
++#endif /* Use BSD. */
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/brk.c
@@ -0,0 +1,53 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc.
@@ -15521,46 +15632,46 @@
+ */
+
+#ifndef _PATHS_H_
-+#define _PATHS_H_
++#define _PATHS_H_
+
+/* Default search path. */
-+#define _PATH_DEFPATH "/usr/bin:/bin"
++#define _PATH_DEFPATH "/usr/bin:/bin"
+/* All standard utilities path. */
-+#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
++#define _PATH_STDPATH \
++ "/usr/bin:/bin:/usr/sbin:/sbin"
+
-+#define _PATH_BSHELL "/bin/sh"
-+#define _PATH_CONSOLE "/dev/console"
-+#define _PATH_CSHELL "/bin/csh"
-+#define _PATH_DEVDB "/var/run/dev.db"
-+#define _PATH_DEVNULL "/dev/null"
-+#define _PATH_DRUM "/dev/drum"
-+#define _PATH_KLOG "/dev/klog"
-+#define _PATH_KMEM "/dev/kmem"
-+#define _PATH_LASTLOG "/var/log/lastlog"
-+/* FIFOs are not permitted in /dev, so we use /var/run/log instead of
/dev/log */
-+#define _PATH_MAILDIR "/var/mail"
-+#define _PATH_MAN "/usr/share/man"
-+#define _PATH_MEM "/dev/mem"
-+#define _PATH_MNTTAB "/etc/fstab"
-+#define _PATH_MOUNTED "/etc/mtab"
-+#define _PATH_NOLOGIN "/etc/nologin"
-+#define _PATH_PRESERVE "/var/preserve"
-+#define _PATH_RWHODIR "/var/rwho"
-+#define _PATH_SENDMAIL "/usr/sbin/sendmail"
-+#define _PATH_SHADOW "/etc/shadow"
-+#define _PATH_SHELLS "/etc/shells"
-+#define _PATH_TTY "/dev/tty"
-+#define _PATH_UNIX "/kernel"
++#define _PATH_BSHELL "/bin/sh"
++#define _PATH_CONSOLE "/dev/console"
++#define _PATH_CSHELL "/bin/csh"
++#define _PATH_DEVDB "/var/run/dev.db"
++#define _PATH_DEVNULL "/dev/null"
++#define _PATH_DRUM "/dev/drum"
++#define _PATH_KLOG "/dev/klog"
++#define _PATH_KMEM "/dev/kmem"
++#define _PATH_LASTLOG "/var/log/lastlog"
++#define _PATH_MAILDIR "/var/mail"
++#define _PATH_MAN "/usr/share/man"
++#define _PATH_MEM "/dev/mem"
++#define _PATH_MNTTAB "/etc/fstab"
++#define _PATH_MOUNTED "/etc/mtab"
++#define _PATH_NOLOGIN "/etc/nologin"
++#define _PATH_PRESERVE "/var/lib"
++#define _PATH_RWHODIR "/var/spool/rwho"
++#define _PATH_SENDMAIL "/usr/sbin/sendmail"
++#define _PATH_SHADOW "/etc/shadow"
++#define _PATH_SHELLS "/etc/shells"
++#define _PATH_TTY "/dev/tty"
++#define _PATH_UNIX "/kernel"
+#define _PATH_UTMP "/var/run/utmp"
-+#define _PATH_VI "/usr/bin/vi"
++#define _PATH_VI "/usr/bin/vi"
+#define _PATH_WTMP "/var/log/wtmp"
+
+/* Provide trailing slash, since mostly used for building pathnames. */
-+#define _PATH_DEV "/dev/"
-+#define _PATH_TMP "/tmp/"
-+#define _PATH_VARDB "/var/db/"
-+#define _PATH_VARRUN "/var/run/"
-+#define _PATH_VARTMP "/var/tmp/"
++#define _PATH_DEV "/dev/"
++#define _PATH_TMP "/tmp/"
++#define _PATH_VARDB "/var/lib/misc/"
++#define _PATH_VARRUN "/var/run/"
++#define _PATH_VARTMP "/var/tmp/"
+
+#endif /* !_PATHS_H_ */
--- /dev/null
@@ -18296,7 +18407,7 @@
+#endif /* _SYS_RFORK_H */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/swap.h
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,37 @@
+/* Calls to enable swapping on specified locations. FreeBSD version.
+ Copyright (C) 1996-1997, 2000, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -18328,6 +18439,9 @@
+ This call is restricted to the super-user. */
+extern int swapon (__const char *__path) __THROW;
+
++/* Stop using block special device PATH for swapping. */
++extern int swapoff (__const char *__path) __THROW;
++
+__END_DECLS
+
+#endif /* sys/swap.h */
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
