Many files:
Checked in e2fsprogs 1.01.
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 14a8f19..84b8413 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 30 21:11:47 1995 <tytso@rsts-11.mit.edu>
+
+ * Makefile.elf-lib: Changes to pass -soname to the linker, so that
+ ld.so knows which version of the library to load when
+ there's more than one major version of the shared library.
+
Mon Sep 4 21:42:46 1995 Remy Card <card@bbj>
* Makefile.bsd-lib: New file containing support for BSD shared
diff --git a/lib/Makefile.dll-lib b/lib/Makefile.dll-lib
index 94864bf..1a1f969 100644
--- a/lib/Makefile.dll-lib
+++ b/lib/Makefile.dll-lib
@@ -62,6 +62,9 @@
-a $(DLL_ADDRESS) -j $(DLL_JUMPSIZE) -g $(DLL_GOTSIZE) -- \
$(OBJS) -lc $(DLL_LIBS) $(DLL_LIBGCC) -lc)
$(MV) jump/$(DLL_IMAGE).so.$(DLL_VERSION) .
+ $(LN) -f $(DLL_IMAGE).so.$(DLL_VERSION) \
+ `echo ../$(DLL_IMAGE).so.$(DLL_VERSION) | \
+ sed -e 's/\.[0-9]*\$$//'`
$(DLL_STUB).sa:
(cd jump; export JUMP_DIR=`pwd`; \
@@ -87,5 +90,8 @@
$(CHMOD) $(LIBMODE) $(DESTDIR)$(ulibdir)/$(DLL_STUB).sa
clean::
- $(RM) -f ../$(DLL_STUB).sa $(DLL_STUB).sa $(DLL_IMAGE).so.$(DLL_VERSION)
+ $(RM) -f ../$(DLL_STUB).sa $(DLL_STUB).sa \
+ $(DLL_IMAGE).so.$(DLL_VERSION) ../$(DLL_IMAGE).so.*
$(RM) -rf jump
+
+
diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
index 10051dd..bd2693c 100644
--- a/lib/Makefile.elf-lib
+++ b/lib/Makefile.elf-lib
@@ -5,6 +5,7 @@
# In order to use this stub, the following makefile variables must be defined.
#
# ELF_VERSION = 1.0
+# ELF_SONAME = 1
# ELF_IMAGE = libce
# ELF_MYDIR = et
# ELF_INSTALL_DIR = $(SHLIBDIR)
@@ -18,15 +19,17 @@
mkdir elfshared
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
+ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
image: $(ELF_LIB)
$(ELF_LIB): $(OBJS)
- (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(OBJS))
+ (cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-soname,$(ELF_SONAME) $(OBJS))
$(MV) elfshared/$(ELF_LIB) .
- $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so
+ $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
$(LN) $(ELF_LIB) ../$(ELF_LIB)
$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
+ $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
installdirs::
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR)
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index 228b472..631d8f6 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 30 17:44:07 1995 <tytso@rsts-11.mit.edu>
+
+ * ls.c (list_super): Use the correct field (s_def_resgid) when
+ printing the reserved group gid.
+
Fri Oct 27 18:07:48 1995 <tytso@rsts-11.mit.edu>
* iod.c (iterate_on_dir): Don't assume that d->reclen is the size
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 2e8da28..1e68fe6 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -39,6 +39,7 @@
DLL_INSTALL_DIR = $(libdir)
ELF_VERSION = 2.1
+ELF_SO_VERSION = 2
ELF_IMAGE = libe2p
ELF_MYDIR = e2p
ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 6870098..08ccc8f 100644
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -80,6 +80,6 @@
printf ("Reserved blocks uid: ");
print_user (s->s_def_resuid);
printf ("Reserved blocks gid: ");
- print_group (s->s_def_resuid);
+ print_group (s->s_def_resgid);
#endif
}
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index 39141a4..44b091a 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -31,6 +31,7 @@
DLL_INSTALL_DIR = $(libdir)
ELF_VERSION = 2.0
+ELF_SO_VERSION = 2
ELF_IMAGE = libcom_err
ELF_MYDIR = et
ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 879ea81..fd8301c 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -84,6 +84,7 @@
DLL_INSTALL_DIR = $(libdir)
ELF_VERSION = 2.0
+ELF_SO_VERSION = 2
ELF_IMAGE = libext2fs
ELF_MYDIR = ext2fs
ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index 58c88fb..781bfdf 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -37,7 +37,7 @@
#ifdef HAVE_MNTENT_H
/*
* XXX we only check to see if the mount is readonly when it's the
- * root filesystem EXT2_FS_READONLY.
+ * root filesystem.
*/
static errcode_t check_mntent(const char *file, int *mount_flags)
{
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index aaab812..2cedb5b 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -24,6 +24,7 @@
DLL_INSTALL_DIR = $(libdir)
ELF_VERSION = 2.0
+ELF_SO_VERSION = 2
ELF_IMAGE = libss
ELF_MYDIR = ss
ELF_INSTALL_DIR = $(libdir)
diff --git a/lib/ss/test_ss.c b/lib/ss/test_ss.c
index 7b37ec4..3878400 100644
--- a/lib/ss/test_ss.c
+++ b/lib/ss/test_ss.c
@@ -9,8 +9,8 @@
* $Locker$
*
* $Log$
- * Revision 1.3 1997/04/26 13:58:24 tytso
- * Checked in e2fsprogs 0.5c
+ * Revision 1.4 1997/04/26 14:25:12 tytso
+ * Checked in e2fsprogs 1.01.
*
* Revision 1.1 1993/06/03 12:31:25 tytso
* Initial revision