Update.

1998-08-31  Ulrich Drepper  <drepper@cygnus.com>

	* io/sys/stat.h (ALLPERMS): Fix type (S_ISTXT -> S_ISVTX).
	Reported by Rob.Hagopian@vu.union.edu [PR libc/763].

	* nscd/nscd.init: Make it work in RedHat systems.
	Patch by Christian Gafton.

1998-08-29  Philip Blundell  <philb@gnu.org>

	* catgets/Makefile: Don't try to run test programs when
	cross-compiling.

1998-08-31  Ulrich Drepper  <drepper@cygnus.com>

	* signal/signal.h: Include bits/sigthread.h only if __USE_POSIX.
	Reported by Zack Weinberg.

1998-08-30  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/Dist: Add umount.S and umount2.S.
	* elf/Makefile (distribute): Remove ldd.sh.in.

1998-08-31 11:46  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/dl-origin.h (get_origin): Remove unused
	variable.

7 files changed, 48 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index e9a89f2..9ff887a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+1998-08-31  Ulrich Drepper  <drepper@cygnus.com>
+
+	* io/sys/stat.h (ALLPERMS): Fix type (S_ISTXT -> S_ISVTX).
+	Reported by Rob.Hagopian@vu.union.edu [PR libc/763].
+
+	* nscd/nscd.init: Make it work in RedHat systems.
+	Patch by Christian Gafton.
+
+1998-08-29  Philip Blundell  <philb@gnu.org>
+
+	* catgets/Makefile: Don't try to run test programs when
+	cross-compiling.
+
+1998-08-31  Ulrich Drepper  <drepper@cygnus.com>
+
+	* signal/signal.h: Include bits/sigthread.h only if __USE_POSIX.
+	Reported by Zack Weinberg.
+
+1998-08-30  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/Dist: Add umount.S and umount2.S.
+	* elf/Makefile (distribute): Remove ldd.sh.in.
+
+1998-08-31 11:46  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/dl-origin.h (get_origin): Remove unused
+	variable.
+
 1998-08-29  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/i386/register-dump.h: Move to ...
diff --git a/NEWS b/NEWS
index 6e0c6b5..609b868 100644
--- a/NEWS
+++ b/NEWS
@@ -224,12 +224,6 @@ Version 2.0
   Parts of the code were heavily modified by Ulrich Drepper to fit in the
   NSS scheme used in glibc.
 
-* The new function `malloc_find_object_address' finds the starting address
-  of a malloc'd block, given any address within the block;
-  `malloc_object_allocated_size' returns the size of an allocated block;
-  and `malloc_walk' lets you walk through all allocated blocks.  These can
-  be useful for debugging; see <malloc.h> for the interfaces.
-
 * There is a new malloc debugging hook `__memalign_hook'.
 
 * There are new typedefs `ushort' for `unsigned short int' and `uint' for
diff --git a/catgets/Makefile b/catgets/Makefile
index d6646f3..f3f51eb 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -43,6 +43,7 @@ CPPFLAGS := -DNLSPATH='"$(localedir)/%L/%N:$(localedir)/%L/LC_MESSAGES/%N:$(loca
 
 generated = de.msg de.cat
 
+ifneq ($(cross-compiling),yes)
 tests: $(objpfx)de.cat
 # This test just checks whether the program produces any error or not.
 # The result is not tested.
@@ -52,3 +53,4 @@ $(objpfx)de.cat: $(objpfx)de.msg $(objpfx)gencat
 # Generate a non-simple input file.
 $(objpfx)de.msg: $(..)po/de.po
 	sed -f xopen-msg.sed $< > $@
+endif
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 83113e8..7c30430 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -148,9 +148,9 @@ __BEGIN_DECLS
 #define	S_IRWXU	(__S_IREAD|__S_IWRITE|__S_IEXEC)
 
 #if defined __USE_MISC && defined __USE_BSD
-# define S_IREAD		S_IRUSR
+# define S_IREAD	S_IRUSR
 # define S_IWRITE	S_IWUSR
-# define S_IEXEC		S_IXUSR
+# define S_IEXEC	S_IXUSR
 #endif
 
 #define	S_IRGRP	(S_IRUSR >> 3)	/* Read by group.  */
@@ -169,7 +169,7 @@ __BEGIN_DECLS
 #ifdef	__USE_BSD
 /* Macros for common mode bit masks.  */
 # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
-# define ALLPERMS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
 # define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
 
 # define S_BLKSIZE	512	/* Block size for `st_blocks'.  */
diff --git a/nscd/nscd.init b/nscd/nscd.init
index 097ce42..63172a0 100644
--- a/nscd/nscd.init
+++ b/nscd/nscd.init
@@ -2,11 +2,18 @@
 #
 # nscd:		Starts the Name Switch Cache Daemon
 #
-# chkconfig: 345 52 25
-# description:  This is a daemon which handles passwd and group lookups
-#		for running programs and cache the results for the next
-#		query.  You should start this daemon only if you use
+# chkconfig: - 30 80
+# description:  This is a daemon which handles passwd and group lookups \
+#		for running programs and cache the results for the next \
+#		query.  You should start this daemon only if you use \
 #		slow Services like NIS or NIS+
+# processname: nscd

+# config: /etc/nscd.conf
+#
+
+# Sanity checks.
+[ -f /etc/nscd.conf ] || exit 0
+[ -x /usr/sbin/nscd ] || exit 0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -14,7 +21,6 @@
 # See how we were called.
 case "$1" in
     start)
-	test -f /etc/nscd.conf -a -f /usr/sbin/nscd || exit 0
 	secure=""
 #	for table in passwd group
 #	do
@@ -30,7 +36,6 @@ case "$1" in
         touch /var/lock/subsys/nscd
 	;;
     stop)
-	test -f /usr/sbin/nscd || exit 0
 	echo -n "Stopping Name Switch Cache Daemon: "
 	/usr/sbin/nscd -K
         rm -f /var/lock/subsys/nscd
@@ -44,7 +49,7 @@ case "$1" in
         $0 start
         ;;
     *)
-	echo "Usage: /etc/rc.d/init.d/nscd.init {start|stop|status|restart}"
+	echo "Usage: $0 {start|stop|status|restart}"
 	;;
 esac
 exit 0
diff --git a/signal/signal.h b/signal/signal.h
index 9cf9218..9305897 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -340,9 +340,11 @@ extern int sigignore __P ((int __sig));
 extern __sighandler_t sigset __P ((int __sig, __sighandler_t __disp));
 #endif
 
+#ifdef __USE_POSIX
 /* Some of the functions for handling signals in threaded programs must
    be defined here.  */
-#include <bits/sigthread.h>
+# include <bits/sigthread.h>
+#endif
 
 /* The following functions are used internally in the C library and in
    other code which need deep insights.  */
diff --git a/sysdeps/unix/sysv/linux/dl-origin.h b/sysdeps/unix/sysv/linux/dl-origin.h
index 7f7d86c..f5a9237 100644
--- a/sysdeps/unix/sysv/linux/dl-origin.h
+++ b/sysdeps/unix/sysv/linux/dl-origin.h
@@ -42,8 +42,6 @@ get_origin (void)
     }
   else
     {
-      size_t len = 0;
-
       result = (char *) -1;
       /* We use te environment variable LD_ORIGIN_PATH.  If it is set make
 	 a copy and strip out trailing slashes.  */