update from main archive 970126cvs/libc-970127

Sun Jan 26 19:40:17 1997  Ulrich Drepper  <drepper@cygnus.com>

	* Version 2.0 net release.

	* Make-dist: Don't take care for two malloc directories.

Sun Jan 26 13:39:31 1997  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/alpha/Dist: Correct distribution of
	kernel_*.h files.

	* Make-dist: Don't mention new-malloc for dirs with have to be
	processed.

	* sysdeps/unix/sysv/linux/netinet/in.h (SOL_IP): Added.
	* inet/netinet/tcp.h (SOL_TCP): Added.
	* sysdeps/unix/sysv/linux/socketbits.h (SOL_RAW): Added.
	Reported by a sun <asun@zoology.washington.edu>.

	* Makefile: Add special goal to generate only-MD5 based crypt

8 files changed, 86 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 4094e640a8..708bd35e66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Sun Jan 26 19:40:17 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Version 2.0 net release.
+
+	* Make-dist: Don't take care for two malloc directories.
+
+Sun Jan 26 13:39:31 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/alpha/Dist: Correct distribution of
+	kernel_*.h files.
+
+	* Make-dist: Don't mention new-malloc for dirs with have to be
+	processed.
+
+	* sysdeps/unix/sysv/linux/netinet/in.h (SOL_IP): Added.
+	* inet/netinet/tcp.h (SOL_TCP): Added.
+	* sysdeps/unix/sysv/linux/socketbits.h (SOL_RAW): Added.
+	Reported by a sun <asun@zoology.washington.edu>.
+
 Sun Jan 26 05:41:42 1997  Ulrich Drepper  <drepper@cygnus.com>
 
 	* version.h (VERSION): Bump to 2.0.
@@ -15,7 +34,7 @@ Sun Jan 26 05:41:42 1997  Ulrich Drepper  <drepper@cygnus.com>
 	* malloc/Makefile (subdir): Change to malloc.
 	* sysdeps/unix/sysv/linux/configure.in: Don't set malloc anymore.
 
-	* Makefile: Add special goal to call generate only-MD5 based crypt
+	* Makefile: Add special goal to generate only-MD5 based crypt
 	library.
 	* md5-crypt/Makefile: Likewise.
 
diff --git a/Make-dist b/Make-dist
index 84252d46ab..64b99b7f0c 100644
--- a/Make-dist
+++ b/Make-dist
@@ -47,9 +47,6 @@ subdirs := $(filter-out $(add-ons),$(subdirs))
 # Make sure both stdio and libio get in, whichever is in use.
 subdirs += stdio libio
 
-# The same must be true for the malloc directories.
-subdirs += malloc new-malloc
-
 sysdep-Subdir-files := $(wildcard $(addsuffix /Subdirs,$(sysdep_dirs)))
 ifdef sysdep-Subdir-files
 subdirs := $(sort $(subdirs) \
diff --git a/README b/README
index 418d82066f..32b6973893 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 1.101 test release of the GNU C Library.
+This directory contains the version 2.0 test release of the GNU C Library.
 Many bugs have been fixed since the last release.
 Some bugs surely remain.
 
@@ -6,9 +6,9 @@ As of this release, the GNU C library is known to run on the following
 configurations:
 
 		*-*-gnu			GNU Hurd
-		i[3456]86-*-linux	Linux-2.0 on Intel
-		m68k-*-linux		Linux-2.0 on Motorola 680x0
-		alpha-*-linux		Linux-2.0 on DEC Alpha
+		i[3456]86-*-linux-gnu	Linux-2.0 on Intel
+		m68k-*-linux-gnu	Linux-2.0 on Motorola 680x0
+		alpha-*-linux-gnu	Linux-2.0 on DEC Alpha
 
 
 Former releases of this library (version 1.09.1 and perhaps earlier
@@ -39,38 +39,50 @@ versions) used to run on the following configurations:
 Whether this is still true for this release is unknown.  Porting the
 library is not hard.  If you are interested in doing a port, please
 get on the mailing list by sending electronic mail to
-bug-glibc-request@prep.ai.mit.edu.
+<bug-glibc-request@prep.ai.mit.edu>.
 
 The GNU C library now includes Michael Glad's Ultra Fast Crypt, which
 provides the Unix `crypt' function, plus some other entry points.
 Because of the United States export restriction on DES implementations,
 we are distributing this code separately from the rest of the C
 library.  There is an extra distribution tar file just for crypt; it is
-called `glibc-1.101-crypt.tar.gz'.  You can just unpack the crypt
+called `glibc-crypt-2.0.tar.gz'.  You can just unpack the crypt
 distribution along with the rest of the C library and build; you can
 also build the library without getting crypt.  Users outside the USA
-can get the crypt distribution via anonymous FTP from ftp.uni-c.dk
-[129.142.6.74], or another archive site outside the USA.  Archive
+can get the crypt distribution via anonymous FTP from ftp.ifi.uio.no
+[129.240.64.21], or another archive site outside the USA.  Archive
 maintainers are encouraged to copy this distribution to their archives
-outside the USA.  Please get it from ftp.uni-c.dk; transferring this
+outside the USA.  Please get it from ftp.ifi.uio.no; transferring this
 distribution from prep.ai.mit.edu (or any other site in the USA) to a
 site outside the USA is in violation of US export laws.
 
+Beside the separate crypt tar file there are some more add-ons which can be
+used together with GNU libc.  They are designed in a way to ease the
+installation by integrating them in the libc source tree.  Simply get the
+add-ons you need and use the --enable-add-ons option of the `configure'
+script to tell where the add-ons are found.  Please read the FAQ file for
+more details.
+
 See the file INSTALL to find out how to configure, build, install, and port
-the GNU C library.
+the GNU C library.  You might also consider reading the WWW pages for the
+GNU libc at http://www.gnu.org/software/libc/libc.html.
 
 The GNU C Library is completely documented by the Texinfo manual found
 in the `manual/' subdirectory.  The manual is still being updated and
 contains some known errors and omissions; we regret that we do not have
 the resources to work on the manual as much as we would like.  Please
-send comments on the manual to bug-glibc-manual@prep.ai.mit.edu, and
+send comments on the manual to <bug-glibc-manual@prep.ai.mit.edu>, and
 not to the library bug-reporting address.
 
 The file NOTES contains a description of the feature-test macros used
 in the GNU C library, explaining how you can tell the library what
 facilities you want it to make available.
 
-Send bug reports to bug-glibc@prep.ai.mit.edu.
+We prefer to get bug reports sent using the `glibcbug' shell script which
+is install together with the rest of the GNU libc to <bugs@gnu.ai.mit.edu>.
+Simply run this shell script and fill in the information.  Nevertheless
+you can still send bug reports to <bug-glibc@prep.ai.mit.edu> as normal
+electronic mails.
 
 The GNU C Library is free software.  See the file COPYING.LIB for copying
 conditions.
diff --git a/inet/netinet/tcp.h b/inet/netinet/tcp.h
index bf12a0c609..e5011b053c 100644
--- a/inet/netinet/tcp.h
+++ b/inet/netinet/tcp.h
@@ -33,6 +33,14 @@
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
  */
 
+#ifndef _NETINET_TCP_H
+
+#define _NETINET_TCP_H	1
+#include <sys/cdefs.h>
+
+
+__BEGIN_DECLS
+
 typedef	unsigned int	tcp_seq;
 /*
  * TCP header.
@@ -96,3 +104,9 @@ struct tcphdr {
  */
 #define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
 #define	TCP_MAXSEG	0x02	/* set maximum segment size */
+
+#define SOL_TCP		6	/* TCP level */
+
+__END_DECLS
+
+#endif /* netinet/tcp.h */
diff --git a/po/libc.pot b/po/libc.pot
index 91d7d425d8..e38500c191 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 1.100\n"
-"POT-Creation-Date: 1997-01-06 15:00+0100\n"
+"Project-Id-Version: libc 2.0\n"
+"POT-Creation-Date: 1997-01-26 15:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+DIST\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -178,47 +178,47 @@ msgstr ""
 msgid "%s: error in state machine"
 msgstr ""
 
-#: posix/getopt.c:743
+#: posix/getopt.c:733
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: posix/getopt.c:746
+#: posix/getopt.c:736
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: posix/getopt.c:667
+#: posix/getopt.c:657
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:638
+#: posix/getopt.c:628
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:684 posix/getopt.c:858
+#: posix/getopt.c:674 posix/getopt.c:847
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: posix/getopt.c:662
+#: posix/getopt.c:652
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:843
+#: posix/getopt.c:831
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:824
+#: posix/getopt.c:813
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:777 posix/getopt.c:907
+#: posix/getopt.c:766 posix/getopt.c:896
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
@@ -233,12 +233,12 @@ msgstr ""
 msgid "%s: premature end of file"
 msgstr ""
 
-#: posix/getopt.c:717
+#: posix/getopt.c:707
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: posix/getopt.c:713
+#: posix/getopt.c:703
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
@@ -1839,11 +1839,11 @@ msgstr ""
 msgid "blank TO field on Link line"
 msgstr ""
 
-#: new-malloc/mcheck.c:191
+#: malloc/mcheck.c:191
 msgid "block freed twice"
 msgstr ""
 
-#: new-malloc/mcheck.c:194
+#: malloc/mcheck.c:194
 msgid "bogus mcheck_status, library is buggy"
 msgstr ""
 
@@ -2134,7 +2134,7 @@ msgid "garbage at end of character code specification"
 msgstr ""
 
 #: locale/programs/linereader.c:214
-msgid "garbage at end of digit"
+msgid "garbage at end of number"
 msgstr ""
 
 #: locale/programs/ld-time.c:183
@@ -2306,11 +2306,11 @@ msgstr ""
 msgid "malformed line ignored"
 msgstr ""
 
-#: new-malloc/mcheck.c:185
+#: malloc/mcheck.c:185
 msgid "memory clobbered before allocated block"
 msgstr ""
 
-#: new-malloc/mcheck.c:188
+#: malloc/mcheck.c:188
 msgid "memory clobbered past end of allocated block"
 msgstr ""
 
@@ -2321,11 +2321,11 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
-#: new-malloc/obstack.c:462
+#: malloc/obstack.c:462
 msgid "memory exhausted\n"
 msgstr ""
 
-#: new-malloc/mcheck.c:182
+#: malloc/mcheck.c:182
 msgid "memory is consistent, library is buggy"
 msgstr ""
 
@@ -2336,7 +2336,7 @@ msgstr ""
 
 #: locale/programs/ld-time.c:337
 #, c-format
-msgid "missing era name in string %d in `era' fieldin category `%s'"
+msgid "missing era name in string %d in `era' field in category `%s'"
 msgstr ""
 
 #: time/zic.c:919
diff --git a/sysdeps/unix/sysv/linux/alpha/Dist b/sysdeps/unix/sysv/linux/alpha/Dist
index f3c4cb92d6..344ffa55fb 100644
--- a/sysdeps/unix/sysv/linux/alpha/Dist
+++ b/sysdeps/unix/sysv/linux/alpha/Dist
@@ -3,8 +3,8 @@ ieee_get_fp_control.S ieee_set_fp_control.S
 ioperm.c
 init-first.h
 clone.S
+kernel_sigaction.h
 sys/io.h
-kernel_termios.h
 sys/acct.h
-sys/kernel_sigaction.h
+sys/kernel_termios.h
 sys/procfs.h
diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index 3dea878a21..c1df8250c0 100644
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -164,6 +164,9 @@ struct sockaddr_in
 #define IP_ADD_MEMBERSHIP  35	/* ip_mreq; add an IP group membership */
 #define IP_DROP_MEMBERSHIP 36	/* ip_mreq; drop an IP group membership */
 
+/* To select the IP level.  */
+#define SOL_IP	0
+
 /* Structure used to describe IP options for IP_OPTIONS. The `ip_dst'
    field is used for the first-hop gateway when using a source route
    (this gets put into the header proper).  */
diff --git a/sysdeps/unix/sysv/linux/socketbits.h b/sysdeps/unix/sysv/linux/socketbits.h
index e9c88758e5..1cf44b4347 100644
--- a/sysdeps/unix/sysv/linux/socketbits.h
+++ b/sysdeps/unix/sysv/linux/socketbits.h
@@ -80,7 +80,8 @@ enum __socket_type
 #define	AF_INET6	PF_INET6
 #define	AF_MAX		PF_MAX
 
-
+/* Raw IP packet level.  */
+#define SOL_RAW		255
 
 /* Maximum queue length specifiable by listen.  */
 #define SOMAXCONN	128