ph10 2005/02/17 10:04:41 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/OS os.h-Linux
exim-src/scripts os-type
Log:
Some changes to Linux configs to help with other libc OS.
Revision Changes Path
1.83 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.3 +16 -7 exim/exim-src/OS/os.h-Linux
1.2 +4 -0 exim/exim-src/scripts/os-type
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog 17 Feb 2005 09:49:08 -0000 1.82
+++ ChangeLog 17 Feb 2005 10:04:40 -0000 1.83
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.82 2005/02/17 09:49:08 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.83 2005/02/17 10:04:40 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -388,6 +388,9 @@
83. Patch from Sieve maintainer to fix unterminated string problem in
"vacation" handling.
+
+84. Some minor changes to the Linux configuration files to help with other
+ OS variants using glibc.
----------------------------------------------------
Index: os.h-Linux
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-Linux,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os.h-Linux 12 Nov 2004 11:39:34 -0000 1.2
+++ os.h-Linux 17 Feb 2005 10:04:41 -0000 1.3
@@ -1,15 +1,28 @@
-/* $Cambridge: exim/exim-src/OS/os.h-Linux,v 1.2 2004/11/12 11:39:34 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/OS/os.h-Linux,v 1.3 2005/02/17 10:04:41 ph10 Exp $ */
/* Exim: OS-specific C header file for Linux */
#define CRYPT_H
#define GLIBC_IP_OPTIONS
#define HAVE_MMAP
+#define HAVE_BSD_GETLOADAVG
#define HAVE_SYS_STATVFS_H
#define NO_IP_VAR_H
-#define SIOCGIFCONF_GIVES_ADDR
#define SIG_IGN_WORKS
+#define F_FREESP O_TRUNC
+typedef struct flock flock_t;
+
+#define os_strsignal strsignal
+#define OS_STRSIGNAL
+
+#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
+#define SIOCGIFCONF_GIVES_ADDR
+#define HAVE_SYS_MOUNT_H
+#endif
+
+#if defined(__linux__)
+
/* Some versions of Linux need explicit sync-ing of directories as well as
files. This setting requests that. If the directory is on NFS, it may not
be possible to sync it - in that case, Exim now should ignore the error. But
@@ -22,12 +35,6 @@
/* Other OS have "const" in here */
#define ICONV_ARG2_TYPE char **
-#define F_FREESP O_TRUNC
-typedef struct flock flock_t;
-
-#define os_strsignal strsignal
-#define OS_STRSIGNAL
-
#define os_find_running_interfaces os_find_running_interfaces_linux
/* Need a prototype for the Linux-specific function. The structure hasn't
@@ -35,5 +42,7 @@
struct ip_address_item;
extern struct ip_address_item *os_find_running_interfaces_linux(void);
+
+#endif /* __linux__ */
/* End */
Index: os-type
===================================================================
RCS file: /home/cvs/exim/exim-src/scripts/os-type,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os-type 6 Oct 2004 15:07:40 -0000 1.1
+++ os-type 17 Feb 2005 10:04:41 -0000 1.2
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/scripts/os-type,v 1.1 2004/10/06 15:07:40 ph10 Exp $
+# $Cambridge: exim/exim-src/scripts/os-type,v 1.2 2005/02/17 10:04:41 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,
@@ -20,6 +20,10 @@
# option just in case there are any systems where -s is not the default.
case "$os" in '') os=`uname -s`;; esac
+
+# Identify Glibc systems under different names.
+
+case "$os" in GNU|GNU/*|Linux) os=Linux;; esac
# It is believed that all systems respond to uname -s, but just in case
# there is one that doesn't, use the shell's $OSTYPE variable. It is known
