ph10 2005/06/27 11:40:14 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/scripts os-type
Removed files:
exim-src/OS Makefile-Linux-libc5 os.c-Linux-libc5
os.h-Linux-libc5
Log:
Removed support for Linux-libc5. It must be well obsolete, and the code
in the os-type script was giving problems when libc.so lives in lib64,
like on x86_64 Fedora Core.
Revision Changes Path
1.172 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.2 +0 -23 exim/exim-src/OS/Makefile-Linux-libc5 (dead)
1.2 +0 -39 exim/exim-src/OS/os.c-Linux-libc5 (dead)
1.2 +0 -13 exim/exim-src/OS/os.h-Linux-libc5 (dead)
1.4 +5 -16 exim/exim-src/scripts/os-type
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- ChangeLog 27 Jun 2005 10:21:38 -0000 1.171
+++ ChangeLog 27 Jun 2005 10:40:14 -0000 1.172
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.171 2005/06/27 10:21:38 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.172 2005/06/27 10:40:14 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -197,6 +197,11 @@
PH/28 Changed -d+all to exclude +memory, because that information is very
rarely of interest, but it makes the output a lot bigger. People tend to
do -d+all out of habit.
+
+PH/29 Removed support for the Linux-libc5 build, as it is obsolete and the
+ code in os-type was giving problems when libc.so lives in lib64, like on
+ x86_64 Fedora Core.
+
Exim version 4.51
Index: os-type
===================================================================
RCS file: /home/cvs/exim/exim-src/scripts/os-type,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- os-type 6 Apr 2005 10:53:47 -0000 1.3
+++ os-type 27 Jun 2005 10:40:14 -0000 1.4
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/scripts/os-type,v 1.3 2005/04/06 10:53:47 ph10 Exp $
+# $Cambridge: exim/exim-src/scripts/os-type,v 1.4 2005/06/27 10:40:14 ph10 Exp $
# Shell script to determine the operating system type. Some of the heuristics
# herein have accumulated over the years and may not strictly be needed now,
@@ -125,22 +125,11 @@
esac
;;
-# In the case of Linux we need to distinguish which libc is used.
-# This is more cautious than it needs to be. In practice libc5 will always
-# be a symlink, and libc6 will always be a linker control file, but it's
-# easy enough to do a better check, and check the symlink destination or the
-# control file contents and make sure.
-
-Linux) if [ -L /usr/lib/libc.so ]; then
- if [ x"$(file /usr/lib/libc.so | grep "libc.so.5")"x != xx ]; then
- os=Linux-libc5
- fi
- else
- if grep -q libc.so.5 /usr/lib/libc.so; then
- os=Linux-libc5
- fi
- fi
- ;;
+# In the case of Linux we used to distinguish which libc was used so that
+# the old libc5 was supported as well as the current glibc. This support
+# was giving some people problems, so it was removed in June 2005, under
+# the assumption that nobody would be using libc5 any more (it is over seven
+# years old).
# In the case of NetBSD we need to distinguish between a.out, ELF
# and COFF binary formats. However, a.out and COFF are the same