pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/sendmail Update of sendmail to 8.13.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/0b81f3cc89bc
branches: trunk
changeset: 480118:0b81f3cc89bc
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Mon Aug 30 20:16:28 2004 +0000
description:
Update of sendmail to 8.13.1
pkgsrc changes:
- move to use options.mk framework
- solaris support tidy-up
- fix linux man page extension handling bug
- allow for a user defined smrsh directory
- update MASTER_SITES
- optional SOCKETMAP support and sample script installation
- ok'ed snj@/wiz@
Summary of some of the major changes include:
- New map "socket" to query maps via TCP/IP sockets.
- Connection rate control as well as control over the number of incoming open
connections.
- Several LDAP enhancements such as LDAP recursion and LDAP URI support.
- Message quarantining.
- AUTH EXTERNAL will only be enabled if STARTTLS was successful and the client
has been authenticated, i.e., {verify} is OK.
- Basic support for certificate revocation lists.
- New queue timeouts for DSN messages.
- Experimental support for MTAMark.
For a full list of changes see:
- http://www.sendmail.org/8.13.0.html
- http://www.sendmail.org/8.13.1.html
diffstat:
mail/sendmail/Makefile | 137 ++++++++++-----------
mail/sendmail/Makefile.common | 46 ++++---
mail/sendmail/PLIST | 22 ++-
mail/sendmail/PLIST.socketmap | 4 +
mail/sendmail/distinfo | 11 +-
mail/sendmail/files/site.config.m4-db2 | 2 +
mail/sendmail/files/site.config.m4-db4 | 2 +
mail/sendmail/files/site.config.m4-ldap | 2 +
mail/sendmail/files/site.config.m4-linux | 8 +
mail/sendmail/files/site.config.m4-milter | 2 +
mail/sendmail/files/site.config.m4-sasl2 | 2 +-
mail/sendmail/files/site.config.m4-socketmap | 4 +
mail/sendmail/files/site.config.m4-solaris | 3 +-
mail/sendmail/files/site.config.m4-starttls | 2 +
mail/sendmail/files/site.config.m4-v6 | 2 +
mail/sendmail/files/site.config.m4-v6-not-solaris | 3 +
mail/sendmail/options.mk | 85 +++++++++++++
mail/sendmail/patches/patch-aa | 11 +-
mail/sendmail/patches/patch-ag | 48 +-----
mail/sendmail/patches/patch-ah | 20 +++
20 files changed, 270 insertions(+), 146 deletions(-)
diffs (truncated from 675 to 300 lines):
diff -r ab46b98dcf13 -r 0b81f3cc89bc mail/sendmail/Makefile
--- a/mail/sendmail/Makefile Mon Aug 30 19:59:25 2004 +0000
+++ b/mail/sendmail/Makefile Mon Aug 30 20:16:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2004/07/21 23:30:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.73 2004/08/30 20:16:28 adrianp Exp $
.include "../../mail/sendmail/Makefile.common"
@@ -10,99 +10,96 @@
MESSAGE_SRC= ${WRKDIR}/.MESSAGE_SRC
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-.if ${OPSYS} == "SunOS"
-USE_DB2?= YES
-.else
-USE_DB2?= NO
-.endif
-.if defined(USE_DB4) && ${USE_DB4} == YES
-.include "../../databases/db4/buildlink3.mk"
-.elif ${USE_DB2} == YES
-.include "../../databases/db/buildlink3.mk"
-.endif
+SMRSH_CMDDIR?= ${PREFIX}/libexec/sm.bin
+PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR}
+
+SUBST_CLASSES= paths
+SUBST_STAGE.paths= pre-build
+SUBST_FILES.paths= ${WRKDIR}/mailer.conf include/sm/conf.h smrsh/smrsh.8
+SUBST_SED.paths= -e "s|@@PREFIX@@|${PREFIX}|g" \
+ -e "s|@@SMRSH_CMDDIR@@|${SMRSH_CMDDIR}|g"
+SUBST_MESSAGE.paths= Fixing paths.
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
-.include "../../databases/openldap/buildlink3.mk"
+post-patch: make-sendmail-siteconfig
+.if !empty(PKG_OPTIONS:Mtcpwrappers)
+ @${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mldap)
+ @${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mdb2)
+ @${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Mdb4)
+ @${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
.endif
-
-.if defined(USE_SASL2) && ${USE_SASL2} == YES
-.include "../../security/cyrus-sasl2/buildlink3.mk"
-.elif defined(USE_SASL) && ${USE_SASL} == YES
-.include "../../security/cyrus-sasl/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mstarttls)
+ @${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Msasl)
+ @${CAT} ${FILESDIR}/site.config.m4-sasl >>${SITECONFIG}
.endif
-
-.if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
-.include "../../security/openssl/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Msasl2)
+ @${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
+.endif
+.if !empty(PKG_OPTIONS:Msocketmap)
+ @${CAT} ${FILESDIR}/site.config.m4-socketmap >>${SITECONFIG}
+PLIST_SRC+= ${PKGDIR}/PLIST.socketmap
.endif
-USE_TCPWRAPPERS?= YES
-.if ${USE_TCPWRAPPERS} == YES
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.endif
-
-post-patch: make-sendmail-siteconfig
-.if ${USE_TCPWRAPPERS} == YES
- ${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
- ${ECHO} -n ' TCPWRAPPERS' >>${DESCR_SRC}
-.endif
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
- ${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
- ${ECHO} -n ' LDAP' >>${DESCR_SRC}
-.endif
-.if defined(USE_DB4) && ${USE_DB4} == YES
- ${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
- ${ECHO} -n ' DB4' >>${DESCR_SRC}
-.elif ${USE_DB2} == YES
- ${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
- ${ECHO} -n ' DB2' >>${DESCR_SRC}
-.endif
-.if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES
- ${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
- ${ECHO} -n ' STARTTLS' >>${DESCR_SRC}
-.endif
-.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
- ${ECHO} >>${DESCR_SRC}
+post-extract:
+ @${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
do-build:
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
post-build:
- ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
- <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
- ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- ${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
-.if ${USE_DB2} == YES
- ${ECHO} "" >>${MESSAGE_SRC}
- ${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >>${MESSAGE_SRC}
- ${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >>${MESSAGE_SRC}
- ${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true"
- ${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true"
+ @${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
+ @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+
+.if !empty(PKG_OPTIONS:Mdb2)
+ @${ECHO} "" >>${MESSAGE_SRC}
+ @${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >>${MESSAGE_SRC}
+ @${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >>${MESSAGE_SRC}
.endif
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/libexec/sendmail
post-install:
+ ${INSTALL_DATA_DIR} ${SMRSH_CMDDIR}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sendmail
${INSTALL_DATA_DIR} ${PREFIX}/share/sendmail
- ${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/share/examples/sendmail/mailer.conf
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sendmail
+ ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
+ ${PREFIX}/share/examples/sendmail/
cd ${WRKSRC}/cf && ${PAX} -rw -pp -pm . ${PREFIX}/share/sendmail
${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
-.if ${USE_DB2} == YES
- ${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
+
+.if !empty(PKG_OPTIONS:Mdb2)
+ @${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
.endif
- ${INSTALL_DATA} ${WRKSRC}/obj.`uname -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsm/libsm.a \
+
+ ${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsm/libsm.a \
${PREFIX}/lib
+
${INSTALL_DATA} \
- ${WRKSRC}/obj.`uname -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsmutil/libsmutil.a \
+ ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ - | ${SED} s/sun4./sun4/`/libsmutil/libsmutil.a \
${PREFIX}/lib
+.if !empty(PKG_OPTIONS:Msocketmap)
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmapClient.pl \
+ ${PREFIX}/share/examples/sendmail
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmapServer.pl \
+ ${PREFIX}/share/examples/sendmail
+.endif
+
+ ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/sendmail
+ ${INSTALL_DATA} ${WRKSRC}/cf/README ${PREFIX}/share/doc/sendmail
+ ${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${PREFIX}/share/doc/sendmail
+ ${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail
+ ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail
+
USE_PKGINSTALL= yes
PKG_GROUPS= smmsp
PKG_USERS= smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program
@@ -110,4 +107,4 @@
.include "../../mk/bsd.pkg.mk"
# has to be below include for bsd.pkg.mk, else substition fails
-OBJDIR!= ${ECHO} obj.`uname -srm | ${TR} \ . | ${TR} \/ -`
+OBJDIR!= ${ECHO} obj.`${UNAME} -srm | ${TR} \ . | ${TR} \/ -`
diff -r ab46b98dcf13 -r 0b81f3cc89bc mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common Mon Aug 30 19:59:25 2004 +0000
+++ b/mail/sendmail/Makefile.common Mon Aug 30 20:16:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/05/09 21:14:43 snj Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/08/30 20:16:28 adrianp Exp $
#
# Makefile fragment shared with libmilter
#
@@ -7,27 +7,25 @@
CATEGORIES= mail
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/
+ ftp://ftp.ayamura.org/pub/sendmail/
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.sendmail.org/
LICENSE= no-profit
-DISTINFO_FILE?= ${.CURDIR}/../../mail/sendmail/distinfo
-FILESDIR?= ${.CURDIR}/../../mail/sendmail/files
-PATCHDIR?= ${.CURDIR}/../../mail/sendmail/patches
+DISTINFO_FILE?= ${.CURDIR}/../../wip/sendmail813/distinfo
+FILESDIR?= ${.CURDIR}/../../wip/sendmail813/files
+PATCHDIR?= ${.CURDIR}/../../wip/sendmail813/patches
-DIST_VERS= 8.12.11
+DIST_VERS= 8.13.1
MAKE_ENV+= BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}" \
BUILDLINK_DIR="${BUILDLINK_DIR}"
SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
-BUILD_DEFS+= USE_INET6 USE_TCPWRAPPERS USE_OPENLDAP USE_DB2 \
- USE_SASL USE_SASL2 USE_STARTTLS USE_DB4
-DESCR_SRC= ${WRKDIR}/.DESCR_SRC
+BUILD_DEFS+= SMRSH_CMDDIR
WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
USE_BUILDLINK3= YES
@@ -36,21 +34,27 @@
.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS.sendmail?= inet6 tcpwrappers
+
+.include "options.mk"
+
make-sendmail-siteconfig:
- ${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
- ${CHMOD} +w ${SITECONFIG}
- ${CP} ${PKGDIR}/DESCR ${DESCR_SRC}
- ${ECHO} '---' >>${DESCR_SRC}
- ${ECHO} -n 'compiled features:' >>${DESCR_SRC}
-.if defined(USE_INET6) && ${USE_INET6} == YES
- ${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
+ @${CP} ${FILESDIR}/site.config.m4 ${SITECONFIG}
+ @${CHMOD} +w ${SITECONFIG}
+
+.if !empty(PKG_OPTIONS:Minet6)
+ @${CAT} ${FILESDIR}/site.config.m4-v6 >>${SITECONFIG}
.if ${OPSYS} != "SunOS" && ${OPSYS} != "BSDOS"
- ${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
+ @${CAT} ${FILESDIR}/site.config.m4-v6-not-solaris >>${SITECONFIG}
.endif
- ${ECHO} -n ' INET6' >>${DESCR_SRC}
.endif
+
.if ${OPSYS} == "SunOS"
- ${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
+ @${CAT} ${FILESDIR}/site.config.m4-solaris >>${SITECONFIG}
.endif
- ${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
- ${ECHO} -n ' MILTER' >>${DESCR_SRC}
+
+.if ${OPSYS} == "Linux"
+ @${CAT} ${FILESDIR}/site.config.m4-linux >>${SITECONFIG}
+.endif
+
+ @${CAT} ${FILESDIR}/site.config.m4-milter >>${SITECONFIG}
diff -r ab46b98dcf13 -r 0b81f3cc89bc mail/sendmail/PLIST
--- a/mail/sendmail/PLIST Mon Aug 30 19:59:25 2004 +0000
+++ b/mail/sendmail/PLIST Mon Aug 30 20:16:28 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/06/23 11:02:02 cjep Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/08/30 20:16:28 adrianp Exp $
bin/hoststat
bin/mailq
bin/newaliases
@@ -22,6 +22,11 @@
sbin/mailstats
sbin/makemap
sbin/praliases
+share/doc/sendmail/README
+share/doc/sendmail/RELEASE_NOTES
+share/doc/sendmail/SECURITY
+share/doc/sendmail/op.me
+share/doc/sendmail/op.ps
share/examples/sendmail/mailer.conf
share/misc/helpfile
share/sendmail/README
@@ -88,12 +93,14 @@
share/sendmail/feature/bitdomain.m4
share/sendmail/feature/blacklist_recipients.m4
share/sendmail/feature/compat_check.m4
+share/sendmail/feature/conncontrol.m4
share/sendmail/feature/delay_checks.m4
share/sendmail/feature/dnsbl.m4
share/sendmail/feature/domaintable.m4
share/sendmail/feature/enhdnsbl.m4
share/sendmail/feature/generics_entire_domain.m4
share/sendmail/feature/genericstable.m4
+share/sendmail/feature/greet_pause.m4
share/sendmail/feature/ldap_routing.m4
share/sendmail/feature/limited_masquerade.m4
share/sendmail/feature/local_lmtp.m4
@@ -105,9 +112,9 @@
Home |
Main Index |
Thread Index |
Old Index