r3809 - in glibc-package/branches/multiarch/debian: . control.in debhelper.in local/manpages patches/kfreebsd
Author: aurel32
Date: 2009-09-07 18:53:08 +0000 (Mon, 07 Sep 2009)
New Revision: 3809
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/control
glibc-package/branches/multiarch/debian/control.in/main
glibc-package/branches/multiarch/debian/debhelper.in/libc.postinst
glibc-package/branches/multiarch/debian/debhelper.in/nscd.init
glibc-package/branches/multiarch/debian/local/manpages/nscd.conf.5
glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff
Log:
Merge from unstable
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/changelog 2009-09-07 18:53:08 UTC (rev 3809)
@@ -1,3 +1,31 @@
+eglibc (2.9-27) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Extend description of libc-bin, patch by Christoph Berg. Closes:
+ bug#544389.
+ * Strip *.o files manually (dh_strip does not do it) to prevent
+ leakage of the build directory.
+ * libc.postinst: re-add "telinit u", removed by accident in version
+ 2.9-24. Closes: bug#545179.
+ * nscd.init: set PATH to "/sbin:/usr/sbin:/bin:/usr/bin". Closes:
+ bug#544942.
+ * nscd.conf.5: add documentation for max-db-size and auto-propagate
+ options. Closes: bug#544544.
+ * Merge from the multiarch branch:
+ - allow to specify libdir and slibdir also for the main flavor.
+ - use real dependencies between the build_* and binaryinst_*
+ targets.
+ - simplify clean target.
+
+ [ Samuel Thibault ]
+ * debian/debhelper.in/libc.install: Install libc/*-gnu*/ instead of
+ libc/*-*-gnu*/, to fix FTBFS on hurd-i386 due to it now being i486-gnu/.
+
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2779 (from glibc-bsd).
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 07 Sep 2009 20:49:08 +0200
+
eglibc (2.9-26) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/multiarch/debian/control
===================================================================
--- glibc-package/branches/multiarch/debian/control 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/control 2009-09-07 18:53:08 UTC (rev 3809)
@@ -23,7 +23,16 @@
Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
- This package contains utility programs related to the GNU C Library.
+ This package contains utility programs related to the GNU C Library.
+ .
+ * catchsegv: catch segmentation faults in programs
+ * getconf: query system configuration variables
+ * getent: get entries from administrative databases
+ * iconv, iconvconfig: convert between character encodings
+ * ldd, ldconfig: print/configure shared library dependencies
+ * locale, localedef: show/generate locale definitions
+ * rpcinfo: report RPC information
+ * tzselect, zdump, zic: select/dump/compile time zones
Package: libc-dev-bin
Architecture: any
Modified: glibc-package/branches/multiarch/debian/control.in/main
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/main 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/control.in/main 2009-09-07 18:53:08 UTC (rev 3809)
@@ -23,7 +23,16 @@
Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
- This package contains utility programs related to the GNU C Library.
+ This package contains utility programs related to the GNU C Library.
+ .
+ * catchsegv: catch segmentation faults in programs
+ * getconf: query system configuration variables
+ * getent: get entries from administrative databases
+ * iconv, iconvconfig: convert between character encodings
+ * ldd, ldconfig: print/configure shared library dependencies
+ * locale, localedef: show/generate locale definitions
+ * rpcinfo: report RPC information
+ * tzselect, zdump, zic: select/dump/compile time zones
Package: libc-dev-bin
Architecture: any
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.postinst 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.postinst 2009-09-07 18:53:08 UTC (rev 3809)
@@ -204,6 +204,12 @@
# Generate cache file /usr/lib/gconv/gconv-modules.cache
iconvconfig || true
+
+ if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
+ # the devicenumber/inode pair of / is the same as that of /sbin/init's
+ # root, so we're *not* in a chroot
+ (telinit u ; sleep 1)
+ fi
fi
#DEBHELPER#
Modified: glibc-package/branches/multiarch/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/nscd.init 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/debhelper.in/nscd.init 2009-09-07 18:53:08 UTC (rev 3809)
@@ -16,8 +16,7 @@
# query. You should start this daemon only if you use
# slow Services like NIS or NIS+
-# Sanity checks.
-
+PATH="/sbin:/usr/sbin:/bin:/usr/bin"
NAME="nscd"
DESC="Name Service Cache Daemon"
DAEMON="/usr/sbin/nscd"
Modified: glibc-package/branches/multiarch/debian/local/manpages/nscd.conf.5
===================================================================
--- glibc-package/branches/multiarch/debian/local/manpages/nscd.conf.5 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/local/manpages/nscd.conf.5 2009-09-07 18:53:08 UTC (rev 3809)
@@ -199,6 +199,18 @@
.BR nscd (8)
will either reload it (query the NSS service again if the data hasn't changed), or
drop it.
+.TP
+.BI max-db-size \ service\ number-of-bytes
+Sets the maximum allowable size for the service.
+.TP
+.BI auto-propagate \ service\ bool
+When set to no for passwd or group service, then the
+.I .byname
+requests are not added to
+.I passwd.byuid
+or
+.I group.bygid
+cache. This may help for tables containing multiple records for the same id.
.SH EXAMPLE
.nf
Modified: glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff 2009-09-07 18:51:15 UTC (rev 3808)
+++ glibc-package/branches/multiarch/debian/patches/kfreebsd/local-sysdeps.diff 2009-09-07 18:53:08 UTC (rev 3809)
@@ -8289,7 +8289,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/faccessat.c
-@@ -0,0 +1,163 @@
+@@ -0,0 +1,164 @@
+/* Test for access to file, relative to open directory. Linux version.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -8453,9 +8453,10 @@
+ __set_errno (EACCES);
+ return -1;
+}
++stub_warning(faccessat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchmodat.c
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8586,9 +8587,10 @@
+ return __chmod(file, mode);
+#endif
+}
++stub_warning(fchmodat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchownat.c
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,130 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8718,13 +8720,14 @@
+ return __chown(file, owner, group);
+#endif
+}
++stub_warning(fchownat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fcntl.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/fcntl.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fexecve.c
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,104 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8828,6 +8831,7 @@
+ return -1;
+#endif
+}
++stub_warning(fexecve)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fhstat.c
@@ -0,0 +1,40 @@
@@ -9221,7 +9225,7 @@
+/* 'ftruncate64' is the same as 'ftruncate', because __off64_t == __off_t. */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/futimesat.c
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9352,6 +9356,7 @@
+ return __utimes(file, tvp);
+#endif
+}
++stub_warning(futimesat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstat.c
@@ -0,0 +1,48 @@
@@ -9452,7 +9457,7 @@
+hidden_def (__fxstat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat.c
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,151 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9603,9 +9608,10 @@
+}
+
+libc_hidden_def (__fxstatat)
++stub_warning(fstatat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat64.c
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,145 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9750,6 +9756,7 @@
+}
+
+libc_hidden_def (__fxstatat64)
++stub_warning(fstatat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c
@@ -0,0 +1,91 @@
@@ -11100,7 +11107,7 @@
+/* State of this thread when the signal was taken.
+ The unions below are for compatibility with Linux (whose sigcontext
+ components don't have sc_ prefix) */
-+struct sigcontext
++__extension__ struct sigcontext
+ {
+ __sigset_t sc_mask; /* Blocked signals to restore. */
+ int sc_onstack; /* Nonzero if running on sigstack. */
@@ -14635,7 +14642,7 @@
+#endif /* ldsodefs.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linkat.c
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,172 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -14807,6 +14814,7 @@
+ return __link (from, to);
+#endif
+}
++stub_warning(linkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linuxthreads/Implies
@@ -0,0 +1 @@
@@ -15552,7 +15560,7 @@
+hidden_def (__lxstat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mkdirat.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,119 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -15671,6 +15679,7 @@
+ return __mkdir (file, mode);
+#endif
+}
++stub_warning(mkdirat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c
@@ -0,0 +1,86 @@
@@ -16871,7 +16880,7 @@
+#endif /* netinet/ip_icmp.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/tcp.h
-@@ -0,0 +1,258 @@
+@@ -0,0 +1,267 @@
+/* netinet/tcp.h
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -16926,6 +16935,7 @@
+#define _NETINET_TCP_H 1
+
+#include <features.h>
++#include <sys/queue.h>
+
+/*
+ * User-settable options (used with setsockopt).
@@ -16934,13 +16944,21 @@
+#define TCP_MAXSEG 2 /* Set maximum segment size */
+#define TCP_NOPUSH 4 /* Don't push last block of write */
+#define TCP_NOOPT 8 /* Don't use TCP options */
++#define TCP_MD5SIG 16 /* use MD5 digests (RFC2385) */
++#define TCP_INFO 32 /* retrieve tcp_info structure */
++#define TCP_CONGESTION 64 /* get/set congestion control algorithm */
+
+#ifdef __USE_MISC
+# include <sys/types.h>
+
-+# ifdef __FAVOR_BSD
+typedef u_int32_t tcp_seq;
+typedef u_int32_t tcp_cc; /* connection count, per RFC 1644 */
++
++/* Miscellaneous constants */
++#define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */
++#define TCP_MAX_SACK 4 /* MAX # SACKs sent in any segment */
++
++# ifdef __FAVOR_BSD
+/*
+ * TCP header.
+ * Per RFC 793, September, 1981.
@@ -17647,7 +17665,7 @@
+strong_alias (__open_2, __open64_2)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat.c
-@@ -0,0 +1,294 @@
+@@ -0,0 +1,296 @@
+/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -17942,6 +17960,8 @@
+}
+
+strong_alias (__openat_2, __openat64_2)
++stub_warning(openat)
++stub_warning(openat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat64.c
@@ -0,0 +1,2 @@
@@ -18443,7 +18463,7 @@
+weak_alias (__readdir64_r, readdir64_r)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readlinkat.c
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,123 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -18566,6 +18586,7 @@
+}
+
+libc_hidden_def (readlinkat)
++stub_warning(readlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readonly-area.c
@@ -0,0 +1,96 @@
@@ -18771,7 +18792,7 @@
+LIBC_CANCEL_HANDLED (); /* in __libc_recvfrom */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/renameat.c
-@@ -0,0 +1,164 @@
+@@ -0,0 +1,165 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -18936,6 +18957,7 @@
+ return __rename (old, new);
+#endif
+}
++stub_warning(renameat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/rtld-lowlevel.h
@@ -0,0 +1,131 @@
@@ -20457,7 +20479,7 @@
+#include <misc/stty.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/symlinkat.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,119 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -20576,6 +20598,7 @@
+ return __symlink (from, to);
+#endif
+}
++stub_warning(symlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h
@@ -0,0 +1,25 @@
@@ -22941,7 +22964,7 @@
+libc_hidden_def (uname)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlinkat.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,128 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -23069,6 +23092,7 @@
+ return __unlink (file);
+#endif
+}
++stub_warning(unlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlockpt.c
@@ -0,0 +1,45 @@
@@ -24269,7 +24293,7 @@
+/* State of this thread when the signal was taken.
+ The unions below are for compatibility with Linux (whose sigcontext
+ components don't have sc_ prefix) */
-+struct sigcontext
++__extension__ struct sigcontext
+ {
+ __sigset_t sc_mask; /* Blocked signals to restore. */
+ int sc_onstack; /* Nonzero if running on sigstack. */
@@ -24338,7 +24362,7 @@
+
+#else
+
-+struct sigcontext
++__extension__ struct sigcontext
+ {
+ __sigset_t sc_mask; /* Blocked signals to restore. */
+ long sc_onstack; /* Nonzero if running on sigstack. */
@@ -26532,7 +26556,7 @@
+weak_alias (__xmknod, _xmknod)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xmknodat.c
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,138 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -26670,6 +26694,7 @@
+}
+
+libc_hidden_def (__xmknodat)
++stub_warning(xmknodat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xstat.c
@@ -0,0 +1,49 @@
Reply to: