Adjust build infrastructure for sendmail 8.13.6
authorGregory Neil Shapiro <gshapiro@dragonflybsd.org>
Wed, 22 Mar 2006 18:25:43 +0000 (18:25 +0000)
committerGregory Neil Shapiro <gshapiro@dragonflybsd.org>
Wed, 22 Mar 2006 18:25:43 +0000 (18:25 +0000)
18 files changed:
bin/rmail/Makefile
etc/sendmail/Makefile
lib/libmilter/Makefile
lib/libsm/Makefile
lib/libsmdb/Makefile
lib/libsmutil/Makefile
libexec/mail.local/Makefile
libexec/smrsh/Makefile
libexec/smrsh/patches/smrsh.8.patch
share/doc/smm/08.sendmailop/Makefile
share/sendmail/Makefile
usr.bin/vacation/Makefile
usr.sbin/editmap/Makefile
usr.sbin/mailstats/Makefile
usr.sbin/makemap/Makefile
usr.sbin/praliases/Makefile
usr.sbin/sendmail/Makefile
usr.sbin/sendmail/mci.c.patch

index d421dcf..e78c279 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 # $FreeBSD: src/bin/rmail/Makefile,v 1.8.2.6 2002/03/25 21:31:30 gshapiro Exp $
-# $DragonFly: src/bin/rmail/Makefile,v 1.7 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/bin/rmail/Makefile,v 1.8 2006/03/22 18:25:42 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/rmail
 
 WARNS?=        0       # XXX Not yet.
index 26c36d7..ff0d03d 100644 (file)
@@ -1,13 +1,13 @@
 #      @(#)Makefile    8.19 (Berkeley) 1/14/97
 # $FreeBSD: src/etc/sendmail/Makefile,v 1.31 2004/01/22 17:51:02 ru Exp $
-# $DragonFly: src/etc/sendmail/Makefile,v 1.5 2005/08/01 22:03:15 corecode Exp $
+# $DragonFly: src/etc/sendmail/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
 M4=            m4
 CHMOD=         chmod
 ROMODE=                444
 RM=            rm -f
 
-SENDMAIL_DIR=  ${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=  ${.CURDIR}/../../contrib/sendmail-8.13.6
 SMDIR=         ${SENDMAIL_DIR}/sendmail
 SENDMAIL_CF_DIR?=${SENDMAIL_DIR}/cf
 
index 9725a1b..b4c034f 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libmilter/Makefile,v 1.1.2.2 2002/07/22 14:21:49 ru Exp $
-# $DragonFly: src/lib/libmilter/Makefile,v 1.5 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/lib/libmilter/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
 
 CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I.
index 12451c9..8b06e66 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libsm/Makefile,v 1.1.2.2 2002/07/19 18:46:26 ru Exp $
-# $DragonFly: src/lib/libsm/Makefile,v 1.8 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/lib/libsm/Makefile,v 1.9 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/libsm
 
 CFLAGS+= -I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I.
@@ -23,7 +23,7 @@ SRCS+=        assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \
        wbuf.c wsetup.c string.c stringf.c \
        xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c \
        signal.c clock.c config.c shm.c mbdb.c strexit.c cf.c ldap.c \
-       niprop.c mpeix.c
+       niprop.c mpeix.c memstat.c
 CLEANFILES+=sm_os.h
 
 INTERNALLIB=           true
index a47ff4f..9819bb1 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libsmdb/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $
-# $DragonFly: src/lib/libsmdb/Makefile,v 1.5 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/lib/libsmdb/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/libsmdb
 
 CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I.
index 41dd683..8ac7394 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/lib/libsmutil/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $
-# $DragonFly: src/lib/libsmutil/Makefile,v 1.5 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/lib/libsmutil/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/libsmutil
 
 CFLAGS+=-I${SENDMAIL_DIR}/sendmail -I${SENDMAIL_DIR}/include -I.
index 588f914..132508c 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.1 (Berkeley) 7/19/93
 # $FreeBSD: src/libexec/mail.local/Makefile,v 1.10.2.7 2002/03/25 21:31:38 gshapiro Exp $
-# $DragonFly: src/libexec/mail.local/Makefile,v 1.5 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/libexec/mail.local/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/mail.local
 
 PROG=  mail.local
index f0485e1..f6fd3fe 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.1 (Berkeley) 7/2/95
 # $FreeBSD: src/libexec/smrsh/Makefile,v 1.1.6.6 2002/03/25 21:31:40 gshapiro Exp $
-# $DragonFly: src/libexec/smrsh/Makefile,v 1.5 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/libexec/smrsh/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/smrsh
 
 PROG=  smrsh
index b1bb009..89674a2 100644 (file)
@@ -1,6 +1,6 @@
-$DragonFly: src/libexec/smrsh/patches/smrsh.8.patch,v 1.1 2005/07/25 00:24:31 gshapiro Exp $
+$DragonFly: src/libexec/smrsh/patches/smrsh.8.patch,v 1.2 2006/03/22 18:25:43 gshapiro Exp $
 
---- sendmail-8.13.4/smrsh/smrsh.8      2004-08-05 20:55:35.000000000 -0700
+--- sendmail-8.13.6/smrsh/smrsh.8      2004-08-05 20:55:35.000000000 -0700
 +++ sendmail/smrsh/smrsh.8     2005-02-13 18:39:14.000000000 -0800
 @@ -39,7 +39,7 @@
  .I smrsh
index 41de301..f6324d0 100644 (file)
@@ -1,12 +1,12 @@
 #      From: @(#)Makefile      8.2 (Berkeley) 2/28/94
 # $FreeBSD: src/share/doc/smm/08.sendmailop/Makefile,v 1.5.2.1 2000/10/26 23:05:13 gshapiro Exp $
-# $DragonFly: src/share/doc/smm/08.sendmailop/Makefile,v 1.4 2005/07/25 00:24:31 gshapiro Exp $
+# $DragonFly: src/share/doc/smm/08.sendmailop/Makefile,v 1.5 2006/03/22 18:25:43 gshapiro Exp $
 
 VOLUME=        smm/08.sendmailop
 SRCS=  op.me
 MACROS=        -me
 
-SRCDIR=        ${.CURDIR}/../../../../contrib/sendmail-8.13.4/doc/op
+SRCDIR=        ${.CURDIR}/../../../../contrib/sendmail-8.13.6/doc/op
 
 USE_PIC=       yes
 USE_EQN=       yes
index c8e6696..d88c346 100644 (file)
@@ -1,9 +1,9 @@
 # $FreeBSD: src/share/sendmail/Makefile,v 1.1.2.7 2003/05/10 17:24:25 gshapiro Exp $
-# $DragonFly: src/share/sendmail/Makefile,v 1.5 2005/07/25 00:24:32 gshapiro Exp $
+# $DragonFly: src/share/sendmail/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 #
 # Doing a make install builds /usr/share/sendmail/
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 CFDIR= cf
 CFDIRS!=       (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type d -print)
 CFFILES!=      (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type f -print)
index 53b26a5..491cef3 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.bin/vacation/Makefile,v 1.6.2.3 2002/03/25 21:31:50 gshapiro Exp $
-# $DragonFly: src/usr.bin/vacation/Makefile,v 1.6 2005/07/25 00:24:32 gshapiro Exp $
+# $DragonFly: src/usr.bin/vacation/Makefile,v 1.7 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/vacation
 
 PROG=  vacation
index 55cdd7e..0df29a1 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.sbin/editmap/Makefile,v 1.1.2.1 2002/03/25 21:29:58 gshapiro Exp $
-# $DragonFly: src/usr.sbin/editmap/Makefile,v 1.5 2005/07/25 00:24:32 gshapiro Exp $
+# $DragonFly: src/usr.sbin/editmap/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/editmap
 
 PROG=  editmap
index b9dbe87..eb408f0 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.2 (Berkeley) 9/21/96
 # $FreeBSD: src/usr.sbin/mailstats/Makefile,v 1.1.6.6 2002/03/25 21:31:43 gshapiro Exp $
-# $DragonFly: src/usr.sbin/mailstats/Makefile,v 1.5 2005/07/25 00:24:32 gshapiro Exp $
+# $DragonFly: src/usr.sbin/mailstats/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/mailstats
 
 PROG=  mailstats
index cd7cfb9..48048d6 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.4 (Berkeley) 6/10/97
 # $FreeBSD: src/usr.sbin/makemap/Makefile,v 1.2.6.6 2002/03/25 21:31:48 gshapiro Exp $
-# $DragonFly: src/usr.sbin/makemap/Makefile,v 1.5 2005/07/25 00:24:32 gshapiro Exp $
+# $DragonFly: src/usr.sbin/makemap/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/makemap
 
 PROG=  makemap
index d488b3c..c9d34dd 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.2 (Berkeley) 9/21/96
 # $FreeBSD: src/usr.sbin/praliases/Makefile,v 1.1.6.6 2002/03/25 21:31:46 gshapiro Exp $
-# $DragonFly: src/usr.sbin/praliases/Makefile,v 1.5 2005/07/25 00:24:32 gshapiro Exp $
+# $DragonFly: src/usr.sbin/praliases/Makefile,v 1.6 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 .PATH: ${SENDMAIL_DIR}/praliases
 
 PROG=  praliases
index 224b689..d98249b 100644 (file)
@@ -1,8 +1,8 @@
 #      @(#)Makefile    8.8 (Berkeley) 3/28/97
 # $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.15.2.13 2002/03/25 21:32:29 gshapiro Exp $
-# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.13 2005/09/06 18:55:49 dillon Exp $
+# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.14 2006/03/22 18:25:43 gshapiro Exp $
 
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.4
+SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail-8.13.6
 SMDIR= ${SENDMAIL_DIR}/sendmail
 .PATH: ${SMDIR}
 
index 2cb62bc..c51f62e 100644 (file)
@@ -1,22 +1,22 @@
-$DragonFly: src/usr.sbin/sendmail/mci.c.patch,v 1.1 2005/08/23 15:28:06 joerg Exp $
+$DragonFly: src/usr.sbin/sendmail/mci.c.patch,v 1.2 2006/03/22 18:25:43 gshapiro Exp $
 
 Index: mci.c
 ===================================================================
-RCS file: /home/joerg/wd/repository/dragonflybsd/src/contrib/sendmail-8.13.4/sendmail/mci.c,v
+RCS file: /home/joerg/wd/repository/dragonflybsd/src/contrib/sendmail-8.13.6/sendmail/mci.c,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 mci.c
 --- mci.c      6 Jun 2005 04:25:22 -0000       1.1.1.1
 +++ mci.c      23 Aug 2005 15:04:54 -0000
-@@ -1125,7 +1125,7 @@
+@@ -1123,7 +1123,7 @@
                size_t len;
                char *newptr;
                struct dirent *e;
 -              char newpath[MAXPATHLEN];
 +              char newpath[PATH_MAX];
-               if ((d = opendir(pathname)) == NULL)
-               {
-@@ -1134,7 +1134,7 @@
+ #if MAXPATHLEN <= MAXNAMLEN - 3
+  ERROR "MAXPATHLEN <= MAXNAMLEN - 3"
+ #endif /* MAXPATHLEN  <= MAXNAMLEN - 3 */
+@@ -1135,7 +1135,7 @@
                                        pathname, sm_errstring(errno));
                        return -1;
                }
@@ -25,7 +25,7 @@ diff -u -r1.1.1.1 mci.c
                if (sm_strlcpy(newpath, pathname, len) >= len)
                {
                        if (tTd(56, 2))
-@@ -1144,6 +1144,7 @@
+@@ -1145,6 +1145,7 @@
                }
                newptr = newpath + strlen(newpath);
                *newptr++ = '/';
@@ -33,7 +33,7 @@ diff -u -r1.1.1.1 mci.c
  
                /*
                **  repeat until no file has been removed
-@@ -1160,9 +1161,8 @@
+@@ -1161,9 +1162,8 @@
                                if (e->d_name[0] == '.')
                                        continue;