summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/sendmail/Makefile11
-rw-r--r--mail/sendmail/Makefile.common5
-rw-r--r--mail/sendmail/PLIST11
-rw-r--r--mail/sendmail/distinfo7
-rw-r--r--mail/sendmail/files/site.config.m4-sasl25
-rw-r--r--mail/sendmail/patches/patch-ag62
6 files changed, 24 insertions, 77 deletions
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 2d2c18c35aa..e49022b5478 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/01/28 22:03:39 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2003/03/04 00:21:31 seb Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -23,7 +23,9 @@ USE_DB2?= NO
.include "../../databases/openldap/buildlink2.mk"
.endif
-.if defined(USE_SASL) && ${USE_SASL} == YES
+.if defined(USE_SASL2) && ${USE_SASL2} == YES
+.include "../../security/cyrus-sasl2/buildlink2.mk"
+.elif defined(USE_SASL) && ${USE_SASL} == YES
.include "../../security/cyrus-sasl/buildlink2.mk"
.endif
@@ -56,7 +58,10 @@ post-patch: make-sendmail-siteconfig
${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
${ECHO} -n ' STARTTLS' >>${DESCR_SRC}
.endif
-.if defined(USE_SASL) && ${USE_SASL} == YES
+.if defined(USE_SASL2) && ${USE_SASL2} == YES
+ ${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
+ ${ECHO} -n ' SASL2' >>${DESCR_SRC}
+.elif defined(USE_SASL) && ${USE_SASL} == YES
${CAT} ${FILESDIR}/site.config.m4-sasl >>${SITECONFIG}
${ECHO} -n ' SASL' >>${DESCR_SRC}
.endif
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index e6627fcc303..910c15cf3e8 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2002/10/03 03:59:24 itojun Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/03/04 00:21:31 seb Exp $
#
# Makefile fragment shared with libmilter
#
DISTNAME= sendmail.${DIST_VERS}
CATEGORIES= mail
-PKGREVISION= 1
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
@@ -19,7 +18,7 @@ DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail/distinfo
FILESDIR?= ${.CURDIR}/../../mail/sendmail/files
PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
-DIST_VERS= 8.12.6
+DIST_VERS= 8.12.8
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 831f7623e9c..840bc3915df 100644
--- a/mail/sendmail/PLIST
+++ b/mail/sendmail/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/23 12:56:58 markd Exp $
-bin/newaliases
-bin/mailq
+@comment $NetBSD: PLIST,v 1.4 2003/03/04 00:21:31 seb Exp $
bin/hoststat
+bin/mailq
+bin/newaliases
bin/purgestat
bin/vacation
etc/mailer.conf.sendmail
@@ -11,11 +11,12 @@ man/cat1/mailq.0
man/cat1/newaliases.0
man/cat1/vacation.0
man/cat5/aliases.0
-man/cat8/makemap.0
-man/cat8/smrsh.0
+man/cat8/editmap.0
man/cat8/mailstats.0
+man/cat8/makemap.0
man/cat8/praliases.0
man/cat8/sendmail.0
+man/cat8/smrsh.0
sbin/editmap
sbin/mailstats
sbin/makemap
diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo
index e6e168c8fd3..f5a09e23c1d 100644
--- a/mail/sendmail/distinfo
+++ b/mail/sendmail/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.9 2002/10/03 03:59:24 itojun Exp $
+$NetBSD: distinfo,v 1.10 2003/03/04 00:21:31 seb Exp $
-SHA1 (sendmail.8.12.6.tar.gz) = 17680259264ba7fd42739ce77cab68dd9e099df9
-Size (sendmail.8.12.6.tar.gz) = 1867436 bytes
+SHA1 (sendmail.8.12.8.tar.gz) = 8fdec57e4c8b91298e5dc757a7b856b3e3f90fc8
+Size (sendmail.8.12.8.tar.gz) = 1881693 bytes
SHA1 (patch-aa) = 8a4563ece8ba8cee01081d49e486393f26ee1484
SHA1 (patch-ab) = a2abf6e78772e257e2a1973e7730159ff24a91aa
SHA1 (patch-ac) = 96c19300b4188dbcbd202768eea912f675dadc27
SHA1 (patch-ad) = 7232cc7ceb46a2dbf631d61185e4c6ca4af18a13
SHA1 (patch-ae) = ae06caa125fe4d4fc85123dc0a5d0016cd099ebd
SHA1 (patch-af) = d26481845328adad6d46fdf797785ec2ad003e28
-SHA1 (patch-ag) = dbc5fc93448239f56471b482818e16668de4aa83
diff --git a/mail/sendmail/files/site.config.m4-sasl2 b/mail/sendmail/files/site.config.m4-sasl2
new file mode 100644
index 00000000000..03e43159124
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4-sasl2
@@ -0,0 +1,5 @@
+# $NetBSD: site.config.m4-sasl2,v 1.1 2003/03/04 00:21:32 seb Exp $
+
+# enable SASL 2
+APPENDDEF(`confENVDEF', `-DSASL=2')
+APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail/patches/patch-ag b/mail/sendmail/patches/patch-ag
deleted file mode 100644
index a11b100b9cf..00000000000
--- a/mail/sendmail/patches/patch-ag
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2002/10/03 03:59:24 itojun Exp $
-
-http://www.sendmail.org/smrsh.adv.txt
-
---- smrsh/smrsh.c.orig Sat May 25 11:41:31 2002
-+++ smrsh/smrsh.c Thu Oct 3 12:56:10 2002
-@@ -57,6 +57,8 @@
- #include <sm/limits.h>
- #include <sm/string.h>
- #include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
-@@ -145,6 +147,7 @@
- char *newenv[2];
- char pathbuf[1000];
- char specialbuf[32];
-+ struct stat st;
-
- #ifndef DEBUG
- # ifndef LOG_MAIL
-@@ -302,6 +305,38 @@
- (void) sm_io_fprintf(smioout, SM_TIME_DEFAULT,
- "Trying %s\n", cmdbuf);
- #endif /* DEBUG */
-+ if (stat(cmdbuf, &st) < 0)
-+ {
-+ /* can't stat it */
-+ fprintf(stderr,
-+ "%s: %s not available for sendmail programs (stat failed)\n",
-+ prg, cmd);
-+ if (p != NULL)
-+ *p = ' ';
-+#ifndef DEBUG
-+ syslog(LOG_CRIT, "uid %d: attempt to use %s (stat failed)",
-+ (int) getuid(), cmd);
-+#endif /* ! DEBUG */
-+ exit(EX_UNAVAILABLE);
-+ }
-+ if (!S_ISREG(st.st_mode)
-+#ifdef S_ISLNK
-+ && !S_ISLNK(st.st_mode)
-+#endif /* S_ISLNK */
-+ )
-+ {
-+ /* can't stat it */
-+ fprintf(stderr,
-+ "%s: %s not available for sendmail programs (not a file)\n",
-+ prg, cmd);
-+ if (p != NULL)
-+ *p = ' ';
-+#ifndef DEBUG
-+ syslog(LOG_CRIT, "uid %d: attempt to use %s (not a file)",
-+ (int) getuid(), cmd);
-+#endif /* ! DEBUG */
-+ exit(EX_UNAVAILABLE);
-+ }
- if (access(cmdbuf, X_OK) < 0)
- {
- /* oops.... crack attack possiblity */
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 02:59:06 +0000