r3398 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2009-04-05 22:05:52 +0000 (Sun, 05 Apr 2009)
New Revision: 3398
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2390 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-04-04 08:24:18 UTC (rev 3397)
+++ glibc-package/trunk/debian/changelog 2009-04-05 22:05:52 UTC (rev 3398)
@@ -8,7 +8,7 @@
* Update testsuite results on hppa, tst-posix_fallocate.out and
tst-makecontext.out are known to fail with a 32-bit kernel.
* debian/script.in/nsscheck.sh: fix a typo. Closes: #520455.
- * kfreebsd/local-sysdeps.diff: update to revision 2379 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2390 (from glibc-bsd).
* libc6.1.symbols.alpha: fix package name for private symbols.
[ Samuel Thibault ]
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-04-04 08:24:18 UTC (rev 3397)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-04-05 22:05:52 UTC (rev 3398)
@@ -6076,7 +6076,7 @@
+#endif /* bits/syslog-path.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/termios.h
-@@ -0,0 +1,264 @@
+@@ -0,0 +1,253 @@
+/* termios type and macro definitions. FreeBSD version.
+ Copyright (C) 1993-1994,1996-1997,1999,2001-2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -6128,51 +6128,69 @@
+#endif
+
+
-+/* Type of terminal control flag masks. */
-+typedef unsigned int tcflag_t;
++typedef unsigned char cc_t;
++typedef unsigned int speed_t;
++typedef unsigned int tcflag_t;
+
-+/* Type of control characters. */
-+typedef unsigned char cc_t;
-+
-+/* Type of baud rate specifiers. */
-+typedef unsigned int speed_t;
-+
-+/* Terminal control structure. */
-+
+#define NCCS 20
+struct termios
-+{
-+ tcflag_t c_iflag; /* input mode flags */
-+ tcflag_t c_oflag; /* output mode flags */
-+ tcflag_t c_cflag; /* control mode flags */
-+ tcflag_t c_lflag; /* local mode flags */
-+ cc_t c_cc[NCCS]; /* control characters */
-+ speed_t c_ispeed; /* input speed */
-+ speed_t c_ospeed; /* output speed */
++ {
++ tcflag_t c_iflag; /* input mode flags */
++ tcflag_t c_oflag; /* output mode flags */
++ tcflag_t c_cflag; /* control mode flags */
++ tcflag_t c_lflag; /* local mode flags */
++ cc_t c_cc[NCCS]; /* control characters */
++ speed_t c_ispeed; /* input speed */
++ speed_t c_ospeed; /* output speed */
+#define __ispeed c_ispeed
+#define __ospeed c_ospeed
+#define _HAVE_STRUCT_TERMIOS_C_ISPEED 1
+#define _HAVE_STRUCT_TERMIOS_C_OSPEED 1
-+};
++ };
+
++/* c_cc characters */
++#define VEOF 0
++#define VEOL 1
++#define VEOL2 2
++#define VERASE 3
++#define VWERASE 4
++#define VKILL 5
++#define VREPRINT 6
++#ifdef __USE_BSD
++# define VERASE2 7
++#endif
++#define VINTR 8
++#define VQUIT 9
++#define VSUSP 10
++#ifdef __USE_BSD
++# define VDSUSP 11
++#endif
++#define VSTART 12
++#define VSTOP 13
++#define VLNEXT 14
++#define VDISCARD 15
++#define VMIN 16
++#define VTIME 17
++#ifdef __USE_BSD
++# define VSTATUS 18
++#endif
+
-+ /* Input modes. */
-+#define IGNBRK (1 << 0) /* Ignore break condition. */
-+#define BRKINT (1 << 1) /* Signal interrupt on break. */
-+#define IGNPAR (1 << 2) /* Ignore characters with parity errors. */
-+#define PARMRK (1 << 3) /* Mark parity and framing errors. */
-+#define INPCK (1 << 4) /* Enable input parity check. */
-+#define ISTRIP (1 << 5) /* Strip 8th bit off characters. */
-+#define INLCR (1 << 6) /* Map NL to CR on input. */
-+#define IGNCR (1 << 7) /* Ignore CR. */
-+#define ICRNL (1 << 8) /* Map CR to NL on input. */
-+#define IXON (1 << 9) /* Enable start/stop output control. */
-+#define IXOFF (1 << 10) /* Enable start/stop input control. */
-+#define IXANY (1 << 11) /* Any character will restart after stop. */
-+#define IMAXBEL (1 << 13) /* Ring bell when input queue is full. */
++/* c_iflag bits */
++#define IGNBRK 0000001
++#define BRKINT 0000002
++#define IGNPAR 0000004
++#define PARMRK 0000010
++#define INPCK 0000020
++#define ISTRIP 0000040
++#define INLCR 0000100
++#define IGNCR 0000200
++#define ICRNL 0000400
++#define IXON 0001000
++#define IXOFF 0002000
++#define IXANY 0004000
++#define IMAXBEL 0020000
+
-+
-+ /* Output modes. */
++/* c_oflag bits */
+#define OPOST (1 << 0) /* Perform output processing. */
+#define ONLCR (1 << 1) /* Map NL to CR-NL on output. */
+#if defined __USE_MISC || defined __USE_XOPEN
@@ -6189,8 +6207,7 @@
+#define ONOCR (1 << 5) /* no CR output at column 0 */
+#define ONLRET (1 << 6) /* NL performs CR function */
+
-+
-+ /* Control modes. */
++/* c_cflag bit meaning */
+#ifdef __USE_BSD
+# define CIGNORE (1 << 0) /* Ignore these control flags. */
+#endif
@@ -6215,7 +6232,7 @@
+# define MDMBUF (1 << 20) /* Carrier flow control of output. */
+#endif
+
-+ /* Local modes. */
++/* c_lflag bits */
+#ifdef __USE_BSD
+# define ECHOKE (1 << 0) /* Visual erase for KILL. */
+#endif
@@ -6252,33 +6269,6 @@
+#define _NOFLSH (1 << 31) /* Disable flush after interrupt. */
+#define NOFLSH _NOFLSH
+
-+ /* Control characters. */
-+#define VEOF 0 /* End-of-file character [ICANON]. */
-+#define VEOL 1 /* End-of-line character [ICANON]. */
-+#define VEOL2 2 /* Second EOL character [ICANON]. */
-+#define VERASE 3 /* Erase character [ICANON]. */
-+#define VWERASE 4 /* Word-erase character [ICANON]. */
-+#define VKILL 5 /* Kill-line character [ICANON]. */
-+#define VREPRINT 6 /* Reprint-line character [ICANON]. */
-+#ifdef __USE_BSD
-+# define VERASE2 7 /* [ICANON] */
-+#endif
-+#define VINTR 8 /* Interrupt character [ISIG]. */
-+#define VQUIT 9 /* Quit character [ISIG]. */
-+#define VSUSP 10 /* Suspend character [ISIG]. */
-+#ifdef __USE_BSD
-+# define VDSUSP 11 /* Delayed suspend character [ISIG]. */
-+#endif
-+#define VSTART 12 /* Start (X-ON) character [IXON, IXOFF]. */
-+#define VSTOP 13 /* Stop (X-OFF) character [IXON, IXOFF]. */
-+#define VLNEXT 14 /* Literal-next character [IEXTEN]. */
-+#define VDISCARD 15 /* Discard character [IEXTEN]. */
-+#define VMIN 16 /* Minimum number of bytes read at once [!ICANON]. */
-+#define VTIME 17 /* Time-out value (tenths of a second) [!ICANON]. */
-+#ifdef __USE_BSD
-+# define VSTATUS 18 /* Status character [ICANON]. */
-+#endif
-+
+ /* Input and output baud rates. */
+#define B0 0 /* Hang up. */
+#define B50 50 /* 50 baud. */
@@ -6321,26 +6311,25 @@
+#define B4000000 4000000
+#define __MAX_BAUD B4000000
+
++/* tcflow() and TCXONC use these */
++#define TCOOFF 1
++#define TCOON 2
++#define TCIOFF 3
++#define TCION 4
+
-+/* Values for the OPTIONAL_ACTIONS argument to `tcsetattr'. */
-+#define TCSANOW 0 /* Change immediately. */
-+#define TCSADRAIN 1 /* Change when pending output is written. */
-+#define TCSAFLUSH 2 /* Flush pending input before changing. */
++/* tcflush() and TCFLSH use these */
++#define TCIFLUSH 1
++#define TCOFLUSH 2
++#define TCIOFLUSH 3
++
++/* tcsetattr uses these */
++#define TCSANOW 0
++#define TCSADRAIN 1
++#define TCSAFLUSH 2
+#ifdef __USE_BSD
+# define TCSASOFT 0x10 /* Flag: Don't alter hardware state. */
+#endif
+
-+/* Values for the QUEUE_SELECTOR argument to `tcflush'. */
-+#define TCIFLUSH 1 /* Discard data received but not yet read. */
-+#define TCOFLUSH 2 /* Discard data written but not yet sent. */
-+#define TCIOFLUSH 3 /* Discard all pending data. */
-+
-+/* Values for the ACTION argument to `tcflow'. */
-+#define TCOOFF 1 /* Suspend output. */
-+#define TCOON 2 /* Restart suspended output. */
-+#define TCIOFF 3 /* Send a STOP character. */
-+#define TCION 4 /* Send a START character. */
-+
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/typesizes.h
@@ -0,0 +1,66 @@
@@ -18134,6 +18123,84 @@
+
+#endif /* _SYS_PTRACE_H */
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/reboot.h
+@@ -0,0 +1,75 @@
++/*-
++ * Copyright (c) 1982, 1986, 1988, 1993, 1994
++ * The Regents of the University of California. 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.
++ * 4. Neither the name of the University nor the names of its contributors
++ * may be used to endorse or promote products derived from this software
++ * without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
++ *
++ * @(#)reboot.h 8.3 (Berkeley) 12/13/94
++ * $FreeBSD: src/sys/sys/reboot.h,v 1.26.18.1 2008/11/25 02:59:29 kensmith Exp $
++ */
++
++#ifndef _SYS_REBOOT_H_
++#define _SYS_REBOOT_H_ 1
++
++#include <features.h>
++
++/*
++ * Arguments to reboot system call. These are passed to
++ * the boot program and on to init.
++ */
++#define RB_AUTOBOOT 0 /* flags for system auto-booting itself */
++
++#define RB_ASKNAME 0x001 /* ask for file name to reboot from */
++#define RB_SINGLE 0x002 /* reboot to single user only */
++#define RB_NOSYNC 0x004 /* dont sync before reboot */
++#define RB_HALT 0x008 /* don't reboot, just halt */
++#define RB_INITNAME 0x010 /* name given for /etc/init (unused) */
++#define RB_DFLTROOT 0x020 /* use compiled-in rootdev */
++#define RB_KDB 0x040 /* give control to kernel debugger */
++#define RB_RDONLY 0x080 /* mount root fs read-only */
++#define RB_DUMP 0x100 /* dump kernel memory before reboot */
++#define RB_MINIROOT 0x200 /* mini-root present in memory at boot time */
++#define RB_VERBOSE 0x800 /* print all potentially useful info */
++#define RB_SERIAL 0x1000 /* use serial port as console */
++#define RB_CDROM 0x2000 /* use cdrom as root */
++#define RB_POWEROFF 0x4000 /* turn the power off if possible */
++#define RB_GDB 0x8000 /* use GDB remote debugger instead of DDB */
++#define RB_MUTE 0x10000 /* start up with the console muted */
++#define RB_SELFTEST 0x20000 /* don't complete the boot; do selftest */
++#define RB_RESERVED1 0x40000 /* reserved for internal use of boot blocks */
++#define RB_RESERVED2 0x80000 /* reserved for internal use of boot blocks */
++#define RB_PAUSE 0x100000 /* pause after each output line during probe */
++#define RB_MULTIPLE 0x20000000 /* use multiple consoles */
++
++#define RB_BOOTINFO 0x80000000 /* have `struct bootinfo *' arg */
++
++__BEGIN_DECLS
++
++/* Reboot or halt the system. */
++extern int reboot (int __howto) __THROW;
++
++__END_DECLS
++
++#endif
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/rfork.h
@@ -0,0 +1,91 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
Reply to: