sysV68 R3V7.1 port changes.

svn path=/trunk/; revision=1282

4 files changed, 25 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index fc9e40af..d032ec48 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+				Known Bugs
+
+* We have some kind of incompatibility with the Cyrus IMAP server.
+
 			    Features To Consider
 
 * Generate bounce messages when delivery is refused.  See RFC1891, RFC1894.
@@ -12,6 +16,13 @@
 				Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-4.1.2 ()
+* Fixed a bonehead bug in RCPT TO name generation introduced in 4.1.1.
+* Added James Steven's ip-up wrapper to the contrib directory.
+* Prevent buffer spamming in SockOpen by a broken DNS.
+* Al Youngwerth's fix to prevent segfaults when Return-Path has no address.
+* Phillippe De Muyter's port changes for sysV68 R3V7.1.
+
 fetchmail-4.1.1 (Fri Aug 15 21:02:50 EDT 1997)
 * Fix an obvious bug in some snprintf calls (non-Linux systems only)
 * No more hard limit on number of destination headers
diff --git a/configure.in b/configure.in
index d406ab2c..562f4fa9 100644
--- a/configure.in
+++ b/configure.in
@@ -31,9 +31,16 @@ AC_PROG_LEX
 AC_PROG_YACC
 AC_SUBST(LIBOBJS)
 
+# Under sysV68, socket and friends are provided by the C library.
+# -linet does not provide socket, but causes multiple definition
+# errors at link-time.  It is thus better to only use the C library.
+# So don't add -linet to the link list unless it's necessary
+AC_CHECK_FUNC(socket,
+    AC_MSG_RESULT(using libc's socket),
+    AC_CHECK_LIB(socket,socket)
+    AC_CHECK_LIB(inet,socket))
+
 AC_CHECK_LIB(nsl,inet_addr)
-AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(inet,socket)
 AC_CHECK_LIB(opie,opiegenerator)
 
 dnl Port hack for Interactive UNIX System V/386 Release 3.2
diff --git a/daemon.c b/daemon.c
index e3a5d39b..fe6243fe 100644
--- a/daemon.c
+++ b/daemon.c
@@ -13,10 +13,11 @@
 #include <sys/wait.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+#else /* !HAVE_FCNTL_H */
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif /* HAVE_SYS_FCNTL_H */
+#endif /* !HAVE_FCNTL_H */
 #include <sys/stat.h>	/* get umask(2) prototyped */
 
 #if defined(HAVE_UNISTD_H)
diff --git a/env.c b/env.c
index ba70d82c..fd46df10 100644
--- a/env.c
+++ b/env.c
@@ -15,6 +15,9 @@
 #endif
 #include <pwd.h>
 #include <string.h>
+#include <ctype.h>
+
+extern char *getenv();	/* needed on sysV68 R3V7.1. */
 
 char *user, *home, *fetchmailhost;