Imported Debian patch 8.13.5-1debian/8.13.5-1

16 files changed, 377 insertions, 32 deletions

diff --git a/debian/changelog b/debian/changelog
index 7f96c37..68789a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+sendmail (8.13.5-1) unstable; urgency=low
+  * New upstream release
+  * Rework/Apply FTBFS on GNU/kFreeBSD patch                    closes: 327703
+    needed some surgery, but all-in-all, 'twasn't bad :)
+  * Add start/stop/etc to /etc/mail/makefile, like *BSD systems
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 17 Sep 2005 22:45:00 -0000
+
+sendmail (8.13.5-0) private; urgency=low
+  * New upstream release
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Sat, 17 Sep 2005 03:30:00 -0000
+
+sendmail (8.13.4-8.13.5.Beta1) private; urgency=low
+  * New upstream beta
+  * Refit patches
+
+ -- Richard A Nelson (Rick) <cowboy@debian.org>  Wed, 07 Sep 2005 02:30:00 -0000
+
 sendmail (8.13.4-4) unstable; urgency=low
   * start of LSB init function support
   * Remove smtpd daemon checks, as /etc/mail/sendmail.conf already
diff --git a/debian/local/update_mk.in b/debian/local/update_mk.in
index 5c64cc3..db8cd18 100644
--- a/debian/local/update_mk.in
+++ b/debian/local/update_mk.in
@@ -216,6 +216,15 @@ sub write_header {
 ####################################################################
 SHELL=/bin/sh
 
+#
+# targets that will be routed to the @sysconfdir@/init.d/sendmail script
+# NOTE: newaliases and clean removed due to extant rules
+#
+INIT = start stop restart restart-if-running \\
+       reload-if-running reload force-reload \\
+       hoststat purgestat mailstats mailq runq control \\
+       status debug 
+
 .SUFFIXES:
 .PRECIOUS: $Makefile
 
@@ -224,6 +233,14 @@ SHELL=/bin/sh
 #
 .PHONY: all
 all: sendmail $reload_stamp
+
+#
+# route to the @sysconfdir@/init.d/sendmail script
+#
+.PHONY: \$(INIT)
+\$(INIT): FORCE
+	@sysconfdir@/init.d/sendmail \$\@
+
 EOT
 	};
 
@@ -299,8 +316,8 @@ sub write_target_restart {
 noreload norestart: FORCE
 	\@touch $reload_stamp;
 
-.PHONY: reload restart
-reload restart: FORCE
+.PHONY: should_reload should_restart
+should_reload should_restart: FORCE
 	\@rm -f $reload_stamp;
 	\@\$(MAKE) -sf $Makefile $reload_stamp;
 
diff --git a/debian/patches/8.13/8.13.4/client_helo.patch b/debian/patches/8.13/8.13.5/client_helo.patch
index 7a12845..6cf447c 100644
--- a/debian/patches/8.13/8.13.4/client_helo.patch
+++ b/debian/patches/8.13/8.13.5/client_helo.patch
@@ -68,8 +68,8 @@
 #------------------------------------------------------------------------------
 diff -c 'deliver.orig' 'deliver.c'
 Index: ./deliver.orig
-Prereq:  8.986
-*** ./sendmail-8.13.4/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
+Prereq:  8.990
+*** ./sendmail-8.13.5/sendmail/deliver.c	Tue Aug 10 17:50:11 2004
 --- ./deliver.c	Tue Aug 10 17:44:04 2004
 ***************
 *** 1363,1368 ****
@@ -83,8 +83,8 @@ Prereq:  8.986
   	SM_TRY
 diff -c 'srvrsmtp.orig' 'srvrsmtp.c'
 Index: ./srvrsmtp.orig
-Prereq:  8.906
-*** ./sendmail-8.13.4/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
+Prereq:  8.909
+*** ./sendmail-8.13.5/sendmail/srvrsmtp.c	Tue Aug 10 17:50:23 2004
 --- ./srvrsmtp.c	Tue Aug 10 17:42:54 2004
 ***************
 *** 444,449 ****
diff --git a/debian/patches/8.13/8.13.4/cyrusv2.m4.debian-patch b/debian/patches/8.13/8.13.5/cyrusv2.m4.debian-patch
index 3cb478c..e48b70e 100644
--- a/debian/patches/8.13/8.13.4/cyrusv2.m4.debian-patch
+++ b/debian/patches/8.13/8.13.5/cyrusv2.m4.debian-patch
@@ -1,4 +1,4 @@
---- sendmail-8.13.4/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
+--- sendmail-8.13.5/cf/mailer/cyrusv2.m4	Sat Jun  1 15:14:57 2002
 +++ cyrusv2.m4.new	Wed Jun  5 04:21:34 2002
 @@ -12,7 +12,7 @@
  
diff --git a/debian/patches/8.13/8.13.4/dpatch.001 b/debian/patches/8.13/8.13.5/dpatch.001
index 6573d7c..6c1c2d8 100644
--- a/debian/patches/8.13/8.13.4/dpatch.001
+++ b/debian/patches/8.13/8.13.5/dpatch.001
@@ -19,7 +19,7 @@
 diff -c 'cf/feature/local_procmail.m4' 'debian/patches/local_procmail.m4'
 Index: ./cf/feature/local_procmail.m4
 Prereq:  8.22
-*** sendmail-8.13.4/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
+*** sendmail-8.13.5/cf/feature/local_procmail.m4	Sat Nov 20 15:26:21 1999
 --- ./debian/patches/local_procmail.m4	Sat Nov 20 15:39:46 1999
 ***************
 *** 27,32 ****
diff --git a/debian/patches/8.13/8.13.4/dpatch.002 b/debian/patches/8.13/8.13.5/dpatch.002
index f269f60..dfb9141 100644
--- a/debian/patches/8.13/8.13.4/dpatch.002
+++ b/debian/patches/8.13/8.13.5/dpatch.002
@@ -1,4 +1,4 @@
---- sendmail-8.13.4/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
+--- sendmail-8.13.5/cf/mailer/cyrus.m4	Tue May  2 14:40:24 2000
 +++ ./debian/patches/cf/mailer/cyrus.m4	Tue May  2 14:41:21 2000
 @@ -36,12 +36,12 @@
  # 
diff --git a/debian/patches/8.13/8.13.4/dpatch.003 b/debian/patches/8.13/8.13.5/dpatch.003
index 1710ca8..bd2440d 100644
--- a/debian/patches/8.13/8.13.4/dpatch.003
+++ b/debian/patches/8.13/8.13.5/dpatch.003
@@ -19,7 +19,7 @@
 diff -c 'rmail/rmail.c' 'debian/patches/rmail.c'
 Index: ./rmail/rmail.c
 Prereq:  8.61
-*** sendmail-8.13.4/rmail/rmail.c	Sat Sep 16 18:20:25 2000
+*** sendmail-8.13.5/rmail/rmail.c	Sat Sep 16 18:20:25 2000
 --- ./debian/patches/rmail.c	Thu Sep 28 17:00:59 2000
 ***************
 *** 318,324 ****
diff --git a/debian/patches/8.13/8.13.4/dpatch.004 b/debian/patches/8.13/8.13.5/dpatch.004
index cb824fc..33a8e2a 100644
--- a/debian/patches/8.13/8.13.4/dpatch.004
+++ b/debian/patches/8.13/8.13.5/dpatch.004
@@ -19,7 +19,7 @@
 diff -c 'sendmail/control.c' 'debian/patches/control.c'
 Index: ./sendmail/control.c
 Prereq:  8.126
-*** sendmail-8.13.4/sendmail/control.c	Sat Nov 20 15:26:23 1999
+*** sendmail-8.13.5/sendmail/control.c	Sat Nov 20 15:26:23 1999
 --- ./debian/patches/control.c	Sat Nov 20 15:39:52 1999
 ***************
 *** 92,98 ****
diff --git a/debian/patches/8.13/8.13.4/dpatch.005 b/debian/patches/8.13/8.13.5/dpatch.005
index 3015deb..c645bfe 100644
--- a/debian/patches/8.13/8.13.4/dpatch.005
+++ b/debian/patches/8.13/8.13.5/dpatch.005
@@ -19,7 +19,7 @@
 diff -c './cf/mailer/fax.m4' 'fax.m4'
 Index: ./cf/mailer/fax.m4
 Prereq:  8.16
-*** sendmail-8.13.4/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
+*** sendmail-8.13.5/cf/mailer/fax.m4	Mon Oct 18 02:35:28 1999
 --- ./fax.m4	Wed Jan  3 14:26:13 2001
 ***************
 *** 19,26 ****
diff --git a/debian/patches/8.13/8.13.4/drac.patch b/debian/patches/8.13/8.13.5/drac.patch
index fa5706f..3a3f540 100644
--- a/debian/patches/8.13/8.13.4/drac.patch
+++ b/debian/patches/8.13/8.13.5/drac.patch
@@ -1,5 +1,5 @@
---- sendmail-8.13.4/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
-+++ sendmail-8.13.4/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
+--- sendmail-8.13.5/cf/m4/proto.m4.orig 2003-03-29 02:20:53.000000000 +0900
++++ sendmail-8.13.5/cf/m4/proto.m4      2003-03-30 13:22:18.731049640 +0900
 @@ -2110,6 +2110,13 @@
  R127.0.0.1		$@ RELAY		originated locally
  RIPv6:::1		$@ RELAY		originated locally
@@ -15,7 +15,7 @@
  R$*			$: $>A <$1> <?> <+ Connect> <$1>
  R<RELAY> $* 		$@ RELAY		relayable IP address
 --- /dev/null   2002-01-01 00:00:00.000000000 +0900
-+++ sendmail-8.13.4/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
++++ sendmail-8.13.5/cf/feature/drac.m4  2002-04-18 21:33:31.716576810 +0900
 @@ -0,0 +1,5 @@
 +define(`_DRAC_', `')
 +
diff --git a/debian/patches/8.13/8.13.5/kfreebsd.patch b/debian/patches/8.13/8.13.5/kfreebsd.patch
new file mode 100644
index 0000000..e0bd4cb
--- /dev/null
+++ b/debian/patches/8.13/8.13.5/kfreebsd.patch
@@ -0,0 +1,146 @@
+diff -Nurd sendmail-8.13.5.orig/devtools/bin/Build sendmail-8.13.5/devtools/bin/Build
+--- sendmail-8.13.5.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.5/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
+@@ -422,6 +422,7 @@
+   NeXT)		mkdir="mkdirs";;
+   UNICOSMK)	rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)\..*$/\1.\2.\3/'`;;
+   UNICOS*)	rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\..*$/\1.\2/'`;;
++  GNU-kFreeBSD*)	os=Linux;;
+ esac
+ 
+ # get "base part" of operating system release
+diff -Nurd sendmail-8.13.5.orig/include/sm/conf.h sendmail-8.13.5/include/sm/conf.h
+--- sendmail-8.13.5.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.5/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
+@@ -783,7 +783,7 @@
+ **	See also BSD defines.
+ */
+ 
+-# if defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)
++# if defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN) && !defined(__GLIBC__)
+ #  include <paths.h>
+ #  define HASUNSETENV	1	/* has unsetenv(3) call */
+ #  define USESETEUID	1	/* has usable seteuid(2) call */
+@@ -801,7 +801,7 @@
+ #  endif /* ! LA_TYPE */
+ #  define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+ #  define SPT_TYPE	SPT_PSSTRINGS	/* use PS_STRINGS pointer */
+-# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/
++# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN) && !defined(__GLIBC__) */
+ 
+ 
+ /*
+@@ -1491,6 +1491,68 @@
+ 
+ 
+ /*
++**  GNU/kFreeBSD
++**	From Aurelien Jarno <aurel32@debian.org>
++ */
++
++# if defined (__GLIBC__) && defined(__FreeBSD_kernel__)
++#  define HASSETREGID	1	/* use setregid(2) to set saved gid */
++#  ifndef REQUIRES_DIR_FSYNC
++#   define REQUIRES_DIR_FSYNC	1	/* requires fsync() on directory */
++#  endif /* REQUIRES_DIR_FSYNC */
++#  ifndef USESETEUID
++#   define USESETEUID	0	/* has it due to POSIX, but doesn't work */
++#  endif /* USESETEUID */
++#  define SM_CONF_GETOPT	0	/* need a replacement for getopt(3) */
++#  define HASUNAME	1	/* use System V uname(2) system call */
++#  define HASUNSETENV	1	/* has unsetenv(3) call */
++#  define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
++#  define GIDSET_T	gid_t	/* from <linux/types.h> */
++#  ifndef HASGETUSERSHELL
++#   define HASGETUSERSHELL 0	/* getusershell(3) broken in Slackware 2.0 */
++#  endif /* HASGETUSERSHELL */
++#  ifndef IP_SRCROUTE
++#   define IP_SRCROUTE	0	/* linux <= 1.2.8 doesn't support IP_OPTIONS */
++#  endif /* ! IP_SRCROUTE */
++#  ifndef HAS_IN_H
++#   define HAS_IN_H	1	/* use netinet/in.h */
++#  endif /* ! HAS_IN_H */
++#  ifndef USE_SIGLONGJMP
++#   define USE_SIGLONGJMP	1 /* sigsetjmp needed for signal handling */
++#  endif /* ! USE_SIGLONGJMP */
++#  ifndef LA_TYPE
++#   define LA_TYPE	LA_PROCSTR
++#  endif /* ! LA_TYPE */
++#  define SFS_TYPE	SFS_VFS		/* use <sys/vfs.h> statfs() impl */
++#  define SPT_PADCHAR	'\0'		/* pad process title with nulls */
++#  define HASSTRERROR	1	/* has strerror(3) */
++#  ifndef TZ_TYPE
++#   define TZ_TYPE	TZ_NONE		/* no standard for GNU/kFreeBSD */
++#  endif /* ! TZ_TYPE */
++#  include <paths.h>
++#  ifndef _PATH_SENDMAILPID
++#   define _PATH_SENDMAILPID	"/var/run/sendmail.pid"
++#  endif /* ! _PATH_SENDMAILPID */
++#  include <sys/sysmacros.h>
++#  undef atol			/* wounded in <stdlib.h> */
++#  if NETINET6
++   /*
++   **  Indirectly included from glibc's <feature.h>.  IPv6 support is native
++   **  in 2.1 and later, but the APIs appear before the functions.
++   */
++#   undef IPPROTO_ICMPV6
++#   if (!defined(NEEDSGETIPNODE))
++    /* Have APIs in <netdb.h>, but no support in glibc */
++#    define NEEDSGETIPNODE	1
++#   endif /* (!defined(NEEDSGETIPNODE)) */
++#  endif /* NETINET6 */
++#  ifndef HASFCHOWN
++#   define HASFCHOWN	1	/* fchown(2) */
++#  endif /* ! HASFCHOWN */
++# endif /* defined(__GLIBC__) && defined(__FreeBSD_kernel__*/
++
++
++/*
+ **  DELL SVR4 Issue 2.2, and others
+ **	From Kimmo Suominen <kim@grendel.lut.fi>
+ **
+diff -Nurd sendmail-8.13.5.orig/include/sm/os/sm_os_linux.h sendmail-8.13.5/include/sm/os/sm_os_linux.h
+--- sendmail-8.13.5.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
++++ sendmail-8.13.5/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
+@@ -15,23 +15,27 @@
+ 
+ #define SM_OS_NAME	"linux"
+ 
+-/* to get version number */
+-#include <linux/version.h>
++#if defined(__linux__)
+ 
+-# if !defined(KERNEL_VERSION)	/* not defined in 2.0.x kernel series */
+-#  define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+-# endif /* ! KERNEL_VERSION */
++ /* to get version number */
++# include <linux/version.h>
+ 
+-/* doesn't seem to work on Linux */
+-#ifndef SM_CONF_SETITIMER
+-# define SM_CONF_SETITIMER	0
+-#endif /* SM_CONF_SETITIMER */
++#  if !defined(KERNEL_VERSION)	/* not defined in 2.0.x kernel series */
++#   define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
++#  endif /* ! KERNEL_VERSION */
+ 
+-#ifndef SM_CONF_SHM
+-# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,19))
+-#  define SM_CONF_SHM	1
+-# endif /* LINUX_VERSION_CODE */
+-#endif /* SM_CONF_SHM */
++ /* doesn't seem to work on Linux */
++# ifndef SM_CONF_SETITIMER
++#  define SM_CONF_SETITIMER	0
++# endif /* SM_CONF_SETITIMER */
++
++# ifndef SM_CONF_SHM
++#  if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,19))
++#   define SM_CONF_SHM	1
++#  endif /* LINUX_VERSION_CODE */
++# endif /* SM_CONF_SHM */
++
++#endif /* (__linux__) */
+ 
+ #define SM_CONF_SYS_CDEFS_H	1
+ #ifndef SM_CONF_SEM
diff --git a/debian/patches/8.13/8.13.4/ldap_url_search.p0 b/debian/patches/8.13/8.13.5/ldap_url_search.p0
index 4f36eb2..842ecf0 100644
--- a/debian/patches/8.13/8.13.4/ldap_url_search.p0
+++ b/debian/patches/8.13/8.13.5/ldap_url_search.p0
@@ -4,7 +4,7 @@ RCS file: /cvs/libsm/ldap.c,v
 retrieving revision 1.51
 retrieving revision 1.53
 diff -u -r1.51 -r1.53
---- ./sendmail-8.13.4/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
+--- ./sendmail-8.13.5/libsm/ldap.c	30 Oct 2003 23:11:12 -0000	1.51
 +++ ldap.c	30 Oct 2003 23:33:10 -0000	1.53
 @@ -1043,6 +1043,7 @@
  						   NULL : lmap->ldap_attr),
diff --git a/debian/patches/8.13/8.13.4/maxseq.patch b/debian/patches/8.13/8.13.5/maxseq.patch
index 6cca01f..9067b62 100644
--- a/debian/patches/8.13/8.13.4/maxseq.patch
+++ b/debian/patches/8.13/8.13.5/maxseq.patch
@@ -18,24 +18,24 @@
 #### Patch data follows ####
 diff -c 'conf.h' 'conf.h.new'
 Index: ./conf.h
-Prereq:  8.567
-*** ./sendmail-8.13.4/sendmail/conf.h	Fri Sep 21 19:01:46 2001
+Prereq:  8.568
+*** ./sendmail-8.13.5/sendmail/conf.h	Fri Sep 21 19:01:46 2001
 --- ./conf.h.new	Wed Oct 10 09:24:41 2001
 ***************
-*** 71,76 ****
-  #define MEMCHUNKSIZE	1024		/* chunk size for memory allocation */
-  #define MAXUSERENVIRON	100		/* max envars saved, must be >= 3 */
-! #define MAXMAPSTACK	12		/* max # of stacked or sequenced maps */
+*** 74,79 ****
+  #define MEMCHUNKSIZE	1024	/* chunk size for memory allocation */
+  #define MAXUSERENVIRON	100	/* max envars saved, must be >= 3 */
+! #define MAXMAPSTACK	12	/* max # of stacked or sequenced maps */
   #if MILTER
-  # define MAXFILTERS	25		/* max # of milter filters */
-  # define MAXFILTERMACROS 50		/* max # of macros per milter cmd */
---- 71,76 ----
-  #define MEMCHUNKSIZE	1024		/* chunk size for memory allocation */
-  #define MAXUSERENVIRON	100		/* max envars saved, must be >= 3 */
-! #define MAXMAPSTACK	128		/* max # of stacked or sequenced maps */
+  # define MAXFILTERS	25	/* max # of milter filters */
+  # define MAXFILTERMACROS 50	/* max # of macros per milter cmd */
+--- 74,79 ----
+  #define MEMCHUNKSIZE	1024	/* chunk size for memory allocation */
+  #define MAXUSERENVIRON	100	/* max envars saved, must be >= 3 */
+! #define MAXMAPSTACK	128	/* max # of stacked or sequenced maps */
   #if MILTER
-  # define MAXFILTERS	25		/* max # of milter filters */
-  # define MAXFILTERMACROS 50		/* max # of macros per milter cmd */
+  # define MAXFILTERS	25	/* max # of milter filters */
+  # define MAXFILTERMACROS 50	/* max # of macros per milter cmd */
 #### End of Patch data ####
 
 #### ApplyPatch data follows ####
diff --git a/debian/patches/8.13/8.13.4/qtool.patch b/debian/patches/8.13/8.13.5/qtool.patch
index b3752b0..181c344 100644
--- a/debian/patches/8.13/8.13.4/qtool.patch
+++ b/debian/patches/8.13/8.13.5/qtool.patch
@@ -1,5 +1,5 @@
-*** ./sendmail-8.13.4/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
---- ./sendmail-8.13.4/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
+*** ./sendmail-8.13.5/contrib/qtool.pl	Wed Mar  5 16:11:54 2003
+--- ./sendmail-8.13.5/contrib/qtool.pl	Wed Mar  5 15:59:10 2003
 ***************
 *** 355,373 ****
   sub lock_file
diff --git a/debian/patches/8.13/fixup b/debian/patches/8.13/fixup
new file mode 100644
index 0000000..f31f497
--- /dev/null
+++ b/debian/patches/8.13/fixup
@@ -0,0 +1,10 @@
+#!/bin/sh
+for file in 8.13.5*; do
+	cp -p $file $file.new;
+	chmod u+w $file.new;
+	sed \
+		-e "s?8.13.4?8.13.5?g" \
+	$file > $file.new;
+	mv -f $file.new $file;
+	chmod u-w $file;
+	done;
diff --git a/debian/patches/8.13/sendmail.diff b/debian/patches/8.13/sendmail.diff
new file mode 100644
index 0000000..cfca3f4
--- /dev/null
+++ b/debian/patches/8.13/sendmail.diff
@@ -0,0 +1,152 @@
+Author: aurel32
+Status: in BTS
+
+--- sendmail-8.13.5.orig/debian/patches/8.13/8.13.5/kfreebsd.patch
++++ sendmail-8.13.5/debian/patches/8.13/8.13.5/kfreebsd.patch
+@@ -0,0 +1,146 @@
++diff -Nurd sendmail-8.13.5.orig/devtools/bin/Build sendmail-8.13.5/devtools/bin/Build
++--- sendmail-8.13.5.orig/devtools/bin/Build	2005-09-09 11:36:00.000000000 +0200
+++++ sendmail-8.13.5/devtools/bin/Build	2005-09-09 12:02:15.000000000 +0200
++@@ -422,6 +422,7 @@
++   NeXT)		mkdir="mkdirs";;
++   UNICOSMK)	rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\.\(.*\)\..*$/\1.\2.\3/'`;;
++   UNICOS*)	rel=`echo $rel | sed -e 's/\(.*\)\.\(.*\)\..*$/\1.\2/'`;;
+++  GNU-kFreeBSD*)	os=Linux;;
++ esac
++ 
++ # get "base part" of operating system release
++diff -Nurd sendmail-8.13.5.orig/include/sm/conf.h sendmail-8.13.5/include/sm/conf.h
++--- sendmail-8.13.5.orig/include/sm/conf.h	2005-09-09 11:36:00.000000000 +0200
+++++ sendmail-8.13.5/include/sm/conf.h	2005-09-09 11:57:33.000000000 +0200
++@@ -773,7 +773,7 @@
++ **	See also BSD defines.
++ */
++ 
++-# if defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__)
+++# if defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(__GLIBC__)
++ #  include <paths.h>
++ #  define HASUNSETENV	1	/* has unsetenv(3) call */
++ #  define USESETEUID	1	/* has usable seteuid(2) call */
++@@ -791,7 +791,7 @@
++ #  endif /* ! LA_TYPE */
++ #  define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
++ #  define SPT_TYPE	SPT_PSSTRINGS	/* use PS_STRINGS pointer */
++-# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) */
+++# endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(__GLIBC__) */
++ 
++ 
++ /*
++@@ -1478,6 +1478,68 @@
++ 
++ 
++ /*
+++**  GNU/kFreeBSD
+++**	From Aurelien Jarno <aurel32@debian.org>
+++ */
+++
+++# if defined (__GLIBC__) && defined(__FreeBSD_kernel__)
+++#  define HASSETREGID	1	/* use setregid(2) to set saved gid */
+++#  ifndef REQUIRES_DIR_FSYNC
+++#   define REQUIRES_DIR_FSYNC	1	/* requires fsync() on directory */
+++#  endif /* REQUIRES_DIR_FSYNC */
+++#  ifndef USESETEUID
+++#   define USESETEUID	0	/* has it due to POSIX, but doesn't work */
+++#  endif /* USESETEUID */
+++#  define SM_CONF_GETOPT	0	/* need a replacement for getopt(3) */
+++#  define HASUNAME	1	/* use System V uname(2) system call */
+++#  define HASUNSETENV	1	/* has unsetenv(3) call */
+++#  define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
+++#  define GIDSET_T	gid_t	/* from <linux/types.h> */
+++#  ifndef HASGETUSERSHELL
+++#   define HASGETUSERSHELL 0	/* getusershell(3) broken in Slackware 2.0 */
+++#  endif /* HASGETUSERSHELL */
+++#  ifndef IP_SRCROUTE
+++#   define IP_SRCROUTE	0	/* linux <= 1.2.8 doesn't support IP_OPTIONS */
+++#  endif /* ! IP_SRCROUTE */
+++#  ifndef HAS_IN_H
+++#   define HAS_IN_H	1	/* use netinet/in.h */
+++#  endif /* ! HAS_IN_H */
+++#  ifndef USE_SIGLONGJMP
+++#   define USE_SIGLONGJMP	1 /* sigsetjmp needed for signal handling */
+++#  endif /* ! USE_SIGLONGJMP */
+++#  ifndef LA_TYPE
+++#   define LA_TYPE	LA_PROCSTR
+++#  endif /* ! LA_TYPE */
+++#  define SFS_TYPE	SFS_VFS		/* use <sys/vfs.h> statfs() impl */
+++#  define SPT_PADCHAR	'\0'		/* pad process title with nulls */
+++#  define HASSTRERROR	1	/* has strerror(3) */
+++#  ifndef TZ_TYPE
+++#   define TZ_TYPE	TZ_NONE		/* no standard for GNU/kFreeBSD */
+++#  endif /* ! TZ_TYPE */
+++#  include <paths.h>
+++#  ifndef _PATH_SENDMAILPID
+++#   define _PATH_SENDMAILPID	"/var/run/sendmail.pid"
+++#  endif /* ! _PATH_SENDMAILPID */
+++#  include <sys/sysmacros.h>
+++#  undef atol			/* wounded in <stdlib.h> */
+++#  if NETINET6
+++   /*
+++   **  Indirectly included from glibc's <feature.h>.  IPv6 support is native
+++   **  in 2.1 and later, but the APIs appear before the functions.
+++   */
+++#   undef IPPROTO_ICMPV6
+++#   if (!defined(NEEDSGETIPNODE))
+++    /* Have APIs in <netdb.h>, but no support in glibc */
+++#    define NEEDSGETIPNODE	1
+++#   endif /* (!defined(NEEDSGETIPNODE)) */
+++#  endif /* NETINET6 */
+++#  ifndef HASFCHOWN
+++#   define HASFCHOWN	1	/* fchown(2) */
+++#  endif /* ! HASFCHOWN */
+++# endif /* defined(__GLIBC__) && defined(__FreeBSD_kernel__*/
+++
+++
+++/*
++ **  DELL SVR4 Issue 2.2, and others
++ **	From Kimmo Suominen <kim@grendel.lut.fi>
++ **
++diff -Nurd sendmail-8.13.5.orig/include/sm/os/sm_os_linux.h sendmail-8.13.5/include/sm/os/sm_os_linux.h
++--- sendmail-8.13.5.orig/include/sm/os/sm_os_linux.h	2005-09-09 11:36:00.000000000 +0200
+++++ sendmail-8.13.5/include/sm/os/sm_os_linux.h	2005-09-09 11:45:45.000000000 +0200
++@@ -15,23 +15,27 @@
++ 
++ #define SM_OS_NAME	"linux"
++ 
++-/* to get version number */
++-#include <linux/version.h>
+++#if defined(__linux__)
++ 
++-# if !defined(KERNEL_VERSION)	/* not defined in 2.0.x kernel series */
++-#  define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
++-# endif /* ! KERNEL_VERSION */
+++ /* to get version number */
+++# include <linux/version.h>
++ 
++-/* doesn't seem to work on Linux */
++-#ifndef SM_CONF_SETITIMER
++-# define SM_CONF_SETITIMER	0
++-#endif /* SM_CONF_SETITIMER */
+++#  if !defined(KERNEL_VERSION)	/* not defined in 2.0.x kernel series */
+++#   define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+++#  endif /* ! KERNEL_VERSION */
++ 
++-#ifndef SM_CONF_SHM
++-# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,19))
++-#  define SM_CONF_SHM	1
++-# endif /* LINUX_VERSION_CODE */
++-#endif /* SM_CONF_SHM */
+++ /* doesn't seem to work on Linux */
+++# ifndef SM_CONF_SETITIMER
+++#  define SM_CONF_SETITIMER	0
+++# endif /* SM_CONF_SETITIMER */
+++
+++# ifndef SM_CONF_SHM
+++#  if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,19))
+++#   define SM_CONF_SHM	1
+++#  endif /* LINUX_VERSION_CODE */
+++# endif /* SM_CONF_SHM */
+++
+++#endif /* (__linux__) */
++ 
++ #define SM_CONF_SYS_CDEFS_H	1
++ #ifndef SM_CONF_SEM