From ec2ac6d5303ac21282d0ab2865f3e00746bedacb Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 17 Jul 1996 19:01:35 +0000 Subject: [PATCH] Wed Jul 17 17:08:48 1996 Roland McGrath * 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 * shlib-versions (*-*-gnu*): Set libc=0.0 Tue Jul 16 01:52:42 1996 Andreas Schwab * sysdeps/m68k/dl-machine.h: Follow Jul 14 change in sysdeps/i386/dl-machine.h. Tue Jul 16 00:14:07 1996 Andreas Schwab * 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. --- ChangeLog | 35 +++++++++++++++++++++++++++++++++++ Makefile | 2 +- Makerules | 23 +++-------------------- manual/maint.texi | 33 ++++++++++++++++++++++++++------- shlib-versions | 12 +++++++++++- version.h | 2 +- 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 + + * 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 * stdio/linewrap.c (lwupdate): Fix boundary condition where a @@ -13,13 +31,30 @@ Wed Jul 17 11:29:26 1996 Miles Bader (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 + + * shlib-versions (*-*-gnu*): Set libc=0.0 + +Tue Jul 16 01:52:42 1996 Andreas Schwab + + * sysdeps/m68k/dl-machine.h: Follow Jul 14 change in + sysdeps/i386/dl-machine.h. + Tue Jul 16 00:18:19 1996 Miles Bader * 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 + + * 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 + * 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 $() 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"