Wed Jul 17 17:08:48 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* version.h (VERSION): Update to 1.93.

	* Makerules ($(libdir)/libc.so): Depend on
	$(common-objpfx)libcrypt.so$(libcrypt.so-version).

	* crypt/nocrypt.c: New file.
	* Makefile (subdirs): Add crypt.
	* crypt/Makefile: New file.

	* Makerules (soversions.mk): Move this target, include of it, and
	include of version.mk to ...
	* Makeconfig: ... here.
	(soversions.mk): Depend on Makeconfig instead of Makerules.

	* shlib-versions (*-*-*): Set libcrypt=0.

Wed Jul 17 02:43:28 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* shlib-versions (*-*-gnu*): Set libc=0.0

Tue Jul 16 01:52:42 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/dl-machine.h: Follow Jul 14 change in
	sysdeps/i386/dl-machine.h.

Tue Jul 16 00:14:07 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/inet/syscalls.list (connect, send): Add underscores
	to the strong name, not the file name.

	* csu/initfini.c: More magic.  Detect if .end is produced and put it
	in the output iff the compiler does.

6 files changed, 77 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a14f9ae4a..7f5e0f8673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Wed Jul 17 17:08:48 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* version.h (VERSION): Update to 1.93.
+
+	* Makerules ($(libdir)/libc.so): Depend on
+	$(common-objpfx)libcrypt.so$(libcrypt.so-version).
+
+	* crypt/nocrypt.c: New file.
+	* Makefile (subdirs): Add crypt.
+	* crypt/Makefile: New file.
+
+	* Makerules (soversions.mk): Move this target, include of it, and
+	include of version.mk to ...
+	* Makeconfig: ... here.
+	(soversions.mk): Depend on Makeconfig instead of Makerules.
+
+	* shlib-versions (*-*-*): Set libcrypt=0.
+
 Wed Jul 17 11:29:26 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* stdio/linewrap.c (lwupdate): Fix boundary condition where a
@@ -13,13 +31,30 @@ Wed Jul 17 11:29:26 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	(line_wrap_stream): Make wmargin ssize_t.
 	(line_wrap_point): Return 0 for a negative point_col.
 
+Wed Jul 17 02:43:28 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* shlib-versions (*-*-gnu*): Set libc=0.0
+
+Tue Jul 16 01:52:42 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/m68k/dl-machine.h: Follow Jul 14 change in
+	sysdeps/i386/dl-machine.h.
+
 Tue Jul 16 00:18:19 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* stdio/linewrap.c (__line_wrap_update): Add hackery from flshfp
  	to fiddle __put_limit in conjunction with __linebuf_active.
 
+Tue Jul 16 00:14:07 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/unix/inet/syscalls.list (connect, send): Add underscores
+	to the strong name, not the file name.
+
 Tue Jul 16 16:43:58 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* csu/initfini.c: More magic.  Detect if .end is produced and put it
+	in the output iff the compiler does.
+
 	* elf/dl-lookup.c (_dl_lookup_symbol): Avoid sizeof dynamic auto array
 	because that is broken on alpha.
 
diff --git a/Makefile b/Makefile
index c83e9a3774..2576c79e07 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endif
 subdirs = csu assert ctype db locale intl catgets math setjmp signal stdlib \
 	  stdio-common $(stdio) malloc string wcsmbs time dirent grp pwd\
 	  posix io termios resource misc login socket sysvipc gmon gnulib \
-	  wctype manual $(sysdep-subdirs) nss elf po
+	  wctype manual $(sysdep-subdirs) nss elf crypt po
 export subdirs := $(subdirs)	# Benign, useless in GNU make before 3.63.
 
 # The mach and hurd subdirectories have many generated header files which
diff --git a/Makerules b/Makerules
index 0554f85f98..06be41c35e 100644
--- a/Makerules
+++ b/Makerules
@@ -290,25 +290,6 @@ endif
 
 ifeq (yes,$(build-shared))
 
-# Process the shlib-versions file, which tells us what shared library
-# version numbers to use when we install shared objects on this system.
--include $(common-objpfx)soversions.mk
-$(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makerules \
-			       $(common-objpfx)config.make
-	sed 's/#.*$$//' $< | while read conf versions; do \
-	  test -n "$$versions" || continue; \
-	  case '$(config-machine)-$(config-vendor)-$(config-os)' in $$conf)\
-	    for v in $$versions; do \
-	      lib="$${v%%=*}"; if eval "test -z \"\$$vers_lib$$lib\""; then \
-		eval vers_lib$${lib}=yes; \
-		echo $$lib.so-version=.$${v##$$lib=}; fi; \
-	  done ;; esac; done > $@T
-	mv -f $@T $@
-
-# Get $(version) defined with the release version number.
--include $(common-objpfx)version.mk
-
-
 # Pattern rule to build a shared object from an archive of PIC objects.
 # This must come after the installation rules so Make doesn't try to
 # build shared libraries in place from the installed *_pic.a files.
@@ -603,9 +584,11 @@ ifndef subdir
 # the special object libc-syms.so that contains just the dynamic symbol
 # table of the shared libc object.
 install: $(libdir)/libc.so
+cryptobjdir := $(firstword $(objdir) $(patsubst ../$(subdir),.,$(..)crypt))
 $(libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \
 		   $(elfobjdir)/$(rtld-installed-name) \
-		   $(common-objpfx)libc.a
+		   $(common-objpfx)libc.a \
+		   $(cryptobjdir)libcrypt.so$(libcrypt.so-version)
 	(echo '/* Use the shared library, but some functions are only in';\
 	 echo '   the static library, so try that secondarily.'; \
 	 echo '   The dynamic linker defines some functions used by $(<F),';\
diff --git a/manual/maint.texi b/manual/maint.texi
index 8d2610de2e..639852d1ab 100644
--- a/manual/maint.texi
+++ b/manual/maint.texi
@@ -856,12 +856,18 @@ multi-precision integer functions used in those functions are taken from
 GNU MP, which was contributed by @value{tege}.
 
 @item
-The internationalization support in the library, and the support programs
-@code{locale} and @code{localedef}, were written by Ulrich Drepper.
-Ulrich Drepper adapted the support code for message catalogs
+The internationalization support in the library, and the support
+programs @code{locale} and @code{localedef}, were written by Ulrich
+Drepper.  Ulrich Drepper adapted the support code for message catalogs
 (@file{libintl.h}, etc.) from the GNU @code{gettext} package, which he
-also wrote.  He also contributed the entire suite of multi-byte and
-wide-character support functions (@file{wctype.h}, @file{wchar.h}, etc.).
+also wrote.  He also contributed the @code{catgets} support and the
+entire suite of multi-byte and wide-character support functions
+(@file{wctype.h}, @file{wchar.h}, etc.).
+
+@item
+The implementations of the @file{nsswitch.conf} mechanism and the files
+and DNS backends for it were designed and written by Ulrich Drepper and
+Roland McGrath, based on a backend interface defined by Peter Eriksson.
 
 @item
 The port to Linux i386/ELF (@code{i386-@var{anything}-linux}) was
@@ -873,6 +879,14 @@ The port to Linux/m68k (@code{m68k-@var{anything}-linux}) was
 contributed by Andreas Schwab.
 
 @item
+Richard Henderson contributed the ELF dynamic linking code and other
+support for the Alpha processor.
+
+@item
+David Mosberger-Tang contributed the port to Linux/Alpha
+(@code{alpha-@var{anything}-linux}).
+
+@item
 Stephen R. van den Berg contributed a highly-optimized @code{strstr} function.
 
 @item
@@ -883,7 +897,12 @@ several highly-optimized string functions for i@var{x}86 processors.
 
 @item
 The math functions are taken from @code{fdlibm-5.1} by Sun
-Microsystems, as modified by J.T. Conklin and Ian Lance Taylor.
+Microsystems, as modified by J.T. Conklin, Ian Lance Taylor,
+Ulrich Drepper, Andreas Schwab, and Roland McGrath.
+
+@item
+The @code{libio} library used to implement @code{stdio} functions on
+some platforms was written by Per Bothner and modified by Ulrich Drepper.
 
 @item
 The Internet-related code (most of the @file{inet} subdirectory) and
@@ -946,7 +965,7 @@ changes to fit into the GNU C library and to fit the ANSI C standard,
 but the functional code is Berkeley's.@refill
 
 @item
-The Internet resolver code is taken directly from BIND 4.9.3, which is
+The Internet resolver code is taken directly from BIND 4.9.4, which is
 under both the Berkeley copyright above and also:
 
 @quotation
diff --git a/shlib-versions b/shlib-versions
index 42e513199f..5f9ed657da 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -13,7 +13,7 @@ i?86-*-*		libm=6
 m68k-*-*		libm=6
 alpha-*-*		libm=6
 
-# We provide libc.so.6 for Linux kernel versions 1.3.95 and later.
+# We provide libc.so.6 for Linux kernel versions 2.0 and later.
 i?86-*-linux*		libc=6
 m68k-*-linux*		libc=6
 alpha-*-linux*		libc=6
@@ -24,6 +24,9 @@ alpha-*-linux*		libc=6
 # libhurduser.so.0.0 corresponds to hurd/*.defs as of 7 May 1996.
 *-*-gnu*		libhurduser=0.0
 
+# libc.so.0.0 is for the Hurd alpha release 0.0.
+*-*-gnu*		libc=0.0
+
 # The -ldl interface (see <dlfcn.h>) is the same on all platforms.
 *-*-*			libdl=2
 
@@ -44,3 +47,10 @@ alpha-*-linux*		libc=6
 
 # We use libdb.so.2 for the interface in version 1.85 of the Berkeley DB code.
 *-*-*			libdb=2
+
+# So far libcrypt.so.0 specifies the interface of the traditional `crypt'
+# function.  The libc distribution installs the stub `nocrypt' library
+# with this interface.  The separate crypt distribution (which cannot be
+# legally exported from the USA) provides real DES encryption in a shared
+# library libcrypt.so.0 with the same interface.
+*-*-*			libcrypt=0
diff --git a/version.h b/version.h
index 3ea8184e85..03e3001b67 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "alpha"
-#define VERSION "1.92"
+#define VERSION "1.93"