diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sendmail/Makefile.common | 4 | ||||
| -rw-r--r-- | mail/sendmail/PLIST | 3 | ||||
| -rw-r--r-- | mail/sendmail/distinfo | 10 | ||||
| -rw-r--r-- | mail/sendmail/patches/patch-ag | 40 |
4 files changed, 44 insertions, 13 deletions
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common index f4b60b433c3..31c02d27dae 100644 --- a/mail/sendmail/Makefile.common +++ b/mail/sendmail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile.common,v 1.28.4.1 2005/12/09 00:30:18 salo Exp $ # # Makefile fragment shared with libmilter # @@ -18,7 +18,7 @@ DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail/distinfo FILESDIR?= ${.CURDIR}/../../mail/sendmail/files PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches -DIST_VERS= 8.13.4 +DIST_VERS= 8.13.5 MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \ BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \ diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST index 1ca730ca86e..0b77aa4d923 100644 --- a/mail/sendmail/PLIST +++ b/mail/sendmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/02/10 22:17:24 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.9.6.1 2005/12/09 00:30:18 salo Exp $ bin/hoststat bin/mailq bin/newaliases @@ -172,6 +172,7 @@ share/sendmail/ostype/dragonfly.m4 share/sendmail/ostype/dynix3.2.m4 share/sendmail/ostype/freebsd4.m4 share/sendmail/ostype/freebsd5.m4 +share/sendmail/ostype/freebsd6.m4 share/sendmail/ostype/gnu.m4 share/sendmail/ostype/hpux10.m4 share/sendmail/ostype/hpux11.m4 diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index c7925deac7b..1b5f18c5b95 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.22 2005/04/27 18:57:54 adrianp Exp $ +$NetBSD: distinfo,v 1.22.4.1 2005/12/09 00:30:18 salo Exp $ -SHA1 (sendmail.8.13.4.tar.gz) = 3cf14d7cafc859a2643a73dea353d7aacae35af1 -RMD160 (sendmail.8.13.4.tar.gz) = 54725031876f0980556f33a3ac088024396fb786 -Size (sendmail.8.13.4.tar.gz) = 1974606 bytes +SHA1 (sendmail.8.13.5.tar.gz) = 3c6a6caf1deaf960b340b03128df63e4cd553cde +RMD160 (sendmail.8.13.5.tar.gz) = 976af4c8c02adb7dd4a2610f905e91027c84d92d +Size (sendmail.8.13.5.tar.gz) = 1978185 bytes SHA1 (patch-aa) = b7ceece7760e3d637016da039f8429c1fb89f2cf SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27 SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13 SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28 -SHA1 (patch-ag) = a87e1685f343703d21a42ec1df68cbba963fa178 +SHA1 (patch-ag) = 1dc55dd77a3cb2617b6f05ccbbdc3b112686b87a SHA1 (patch-ah) = e6be09008b9230ffdd1560aaacbdbb2ee4fb8028 diff --git a/mail/sendmail/patches/patch-ag b/mail/sendmail/patches/patch-ag index 93755d0b8c4..fb70580cd7b 100644 --- a/mail/sendmail/patches/patch-ag +++ b/mail/sendmail/patches/patch-ag @@ -1,12 +1,42 @@ -$NetBSD: patch-ag,v 1.8 2004/08/30 20:16:28 adrianp Exp $ +$NetBSD: patch-ag,v 1.8.10.1 2005/12/09 00:30:18 salo Exp $ ---- include/sm/conf.h.orig Sun Aug 1 15:38:42 2004 -+++ include/sm/conf.h Sun Aug 1 15:40:01 2004 -@@ -916,6 +916,7 @@ +--- include/sm/conf.h.orig 2005-06-30 01:12:13.000000000 +0000 ++++ include/sm/conf.h 2005-10-24 04:26:55.000000000 +0000 +@@ -799,7 +799,11 @@ + # ifndef LA_TYPE + # define LA_TYPE LA_SUBR + # endif /* ! LA_TYPE */ ++#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900) ++# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */ ++#else + # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */ ++#endif + # define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */ + # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) && !defined(DARWIN)*/ + +@@ -914,9 +918,9 @@ + # ifndef LA_TYPE + # define LA_TYPE LA_SUBR + # endif /* ! LA_TYPE */ +-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200040000 ++# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 299000900 + # undef SFS_TYPE +-# define SFS_TYPE SFS_STATVFS ++# define SFS_TYPE SFS_STATVFS /* use <sys/statvfs.h> statfs() impl */ + # else + # define SFS_TYPE SFS_MOUNT /* use <sys/mount.h> statfs() impl */ + # endif +@@ -930,11 +934,12 @@ + # if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104170000 + # define HASSETUSERCONTEXT 1 /* BSDI-style login classes */ + # endif +-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200060000 ++# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 299000900 + # define HASCLOSEFROM 1 /* closefrom(3) added in 2.0F */ # endif # if defined(__NetBSD__) # define USESYSCTL 1 /* use sysctl(3) for getting ncpus */ -+# define SMRSH_CMDDIR "@@SMRSH_CMDDIR@@" ++# define SMRSH_CMDDIR "@@SMRSH_CMDDIR@@" # include <sys/param.h> # include <sys/sysctl.h> # endif |