From 3feb2a4fcfcf78936e8064438b83395293aba731 Mon Sep 17 00:00:00 2001 From: adrianp Date: Mon, 30 Aug 2004 20:16:28 +0000 Subject: 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 --- mail/sendmail/Makefile | 127 +++++++++++----------- 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, 265 insertions(+), 141 deletions(-) create mode 100644 mail/sendmail/PLIST.socketmap create mode 100644 mail/sendmail/files/site.config.m4-linux create mode 100644 mail/sendmail/files/site.config.m4-socketmap create mode 100644 mail/sendmail/options.mk create mode 100644 mail/sendmail/patches/patch-ah (limited to 'mail') diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 150f2f43d2e..55a44016424 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -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 @@ CONFLICTS+= postfix-[0-9]* fastforward>=0.51nb2 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} -.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES -.include "../../databases/openldap/buildlink3.mk" -.endif +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_SASL2) && ${USE_SASL2} == YES -.include "../../security/cyrus-sasl2/buildlink3.mk" -.elif defined(USE_SASL) && ${USE_SASL} == YES -.include "../../security/cyrus-sasl/buildlink3.mk" +post-patch: make-sendmail-siteconfig +.if !empty(PKG_OPTIONS:Mtcpwrappers) + @${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG} .endif - -.if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES -.include "../../security/openssl/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mldap) + @${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG} .endif - -USE_TCPWRAPPERS?= YES -.if ${USE_TCPWRAPPERS} == YES -.include "../../security/tcp_wrappers/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mdb2) + @${CAT} ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG} .endif - -post-patch: make-sendmail-siteconfig -.if ${USE_TCPWRAPPERS} == YES - ${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG} - ${ECHO} -n ' TCPWRAPPERS' >>${DESCR_SRC} +.if !empty(PKG_OPTIONS:Mdb4) + @${CAT} ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG} .endif -.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES - ${CAT} ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG} - ${ECHO} -n ' LDAP' >>${DESCR_SRC} +.if !empty(PKG_OPTIONS:Mstarttls) + @${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG} .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} +.if !empty(PKG_OPTIONS:Msasl) + @${CAT} ${FILESDIR}/site.config.m4-sasl >>${SITECONFIG} .endif -.if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES - ${CAT} ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG} - ${ECHO} -n ' STARTTLS' >>${DESCR_SRC} +.if !empty(PKG_OPTIONS:Msasl2) + @${CAT} ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG} .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} +.if !empty(PKG_OPTIONS:Msocketmap) + @${CAT} ${FILESDIR}/site.config.m4-socketmap >>${SITECONFIG} +PLIST_SRC+= ${PKGDIR}/PLIST.socketmap .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 @@ PKG_USERS= smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program .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 --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common index ed80ecfdc2f..8b6fd42fc85 100644 --- a/mail/sendmail/Makefile.common +++ b/mail/sendmail/Makefile.common @@ -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 @@ DISTNAME= sendmail.${DIST_VERS} 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 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 @@ MAKE_ENV+= M4="${M4}" .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 --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST index 7f1d82046b3..1264226e339 100644 --- a/mail/sendmail/PLIST +++ b/mail/sendmail/PLIST @@ -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/editmap 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/bestmx_is_local.m4 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 @@ share/sendmail/feature/mailertable.m4 share/sendmail/feature/masquerade_entire_domain.m4 share/sendmail/feature/masquerade_envelope.m4 share/sendmail/feature/msp.m4 +share/sendmail/feature/mtamark.m4 share/sendmail/feature/no_default_msa.m4 share/sendmail/feature/nocanonify.m4 -share/sendmail/feature/nodns.m4 share/sendmail/feature/notsticky.m4 share/sendmail/feature/nouucp.m4 share/sendmail/feature/nullclient.m4 @@ -115,6 +122,7 @@ share/sendmail/feature/preserve_local_plus_detail.m4 share/sendmail/feature/preserve_luser_host.m4 share/sendmail/feature/promiscuous_relay.m4 share/sendmail/feature/queuegroup.m4 +share/sendmail/feature/ratecontrol.m4 share/sendmail/feature/redirect.m4 share/sendmail/feature/relay_based_on_MX.m4 share/sendmail/feature/relay_entire_domain.m4 @@ -123,6 +131,7 @@ share/sendmail/feature/relay_local_from.m4 share/sendmail/feature/relay_mail_from.m4 share/sendmail/feature/smrsh.m4 share/sendmail/feature/stickyhost.m4 +share/sendmail/feature/use_client_ptr.m4 share/sendmail/feature/use_ct_file.m4 share/sendmail/feature/use_cw_file.m4 share/sendmail/feature/uucpdomain.m4 @@ -192,6 +201,9 @@ share/sendmail/ostype/sunos3.5.m4 share/sendmail/ostype/sunos4.1.m4 share/sendmail/ostype/svr4.m4 share/sendmail/ostype/ultrix4.m4 +share/sendmail/ostype/unicos.m4 +share/sendmail/ostype/unicosmk.m4 +share/sendmail/ostype/unicosmp.m4 share/sendmail/ostype/unixware7.m4 share/sendmail/ostype/unknown.m4 share/sendmail/ostype/uxpds.m4 @@ -201,7 +213,6 @@ share/sendmail/siteconfig/uucp.cogsci.m4 share/sendmail/siteconfig/uucp.old.arpa.m4 share/sendmail/siteconfig/uucp.ucbarpa.m4 share/sendmail/siteconfig/uucp.ucbvax.m4 -@dirrm libexec/sendmail @dirrm share/sendmail/siteconfig @dirrm share/sendmail/sh @dirrm share/sendmail/ostype @@ -212,4 +223,7 @@ share/sendmail/siteconfig/uucp.ucbvax.m4 @dirrm share/sendmail/domain @dirrm share/sendmail/cf @dirrm share/sendmail -@dirrm share/examples/sendmail +@unexec ${RMDIR} %D/share/examples/sendmail 2>/dev/null || ${TRUE} +@unexec ${RMDIR} ${SMRSH_CMDDIR} 2>/dev/null || ${TRUE} +@dirrm share/doc/sendmail +@dirrm libexec/sendmail diff --git a/mail/sendmail/PLIST.socketmap b/mail/sendmail/PLIST.socketmap new file mode 100644 index 00000000000..85266472e85 --- /dev/null +++ b/mail/sendmail/PLIST.socketmap @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST.socketmap,v 1.1 2004/08/30 20:16:28 adrianp Exp $ +share/examples/sendmail/socketmapClient.pl +share/examples/sendmail/socketmapServer.pl +@dirrm share/examples/sendmail diff --git a/mail/sendmail/distinfo b/mail/sendmail/distinfo index 78b1839a898..5dcc73d06d1 100644 --- a/mail/sendmail/distinfo +++ b/mail/sendmail/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.17 2004/07/13 12:27:13 markd Exp $ +$NetBSD: distinfo,v 1.18 2004/08/30 20:16:28 adrianp Exp $ -SHA1 (sendmail.8.12.11.tar.gz) = ce1ba0e50740c548f8555f1a905d8514e6637f95 -Size (sendmail.8.12.11.tar.gz) = 1899112 bytes -SHA1 (patch-aa) = cf9a68f5e6d6fd6e13a806a7d1e6ebab18fc9c6f +SHA1 (sendmail.8.13.1.tar.gz) = ce2d3897a7dca4e75facfd48d100ccd3773e2894 +Size (sendmail.8.13.1.tar.gz) = 1963257 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) = b2e7c13de58ba90d149382e93095227c9ad39329 +SHA1 (patch-ag) = a87e1685f343703d21a42ec1df68cbba963fa178 +SHA1 (patch-ah) = 94133440eb4300545541a69fd622c3751d04fab2 diff --git a/mail/sendmail/files/site.config.m4-db2 b/mail/sendmail/files/site.config.m4-db2 index 9f13bfc1e3d..e732aee1b7d 100644 --- a/mail/sendmail/files/site.config.m4-db2 +++ b/mail/sendmail/files/site.config.m4-db2 @@ -1,3 +1,5 @@ +# $NetBSD: site.config.m4-db2,v 1.5 2004/08/30 20:16:28 adrianp Exp $ + # enable db2 APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db2') APPENDDEF(`confLIBS', `-ldb2') diff --git a/mail/sendmail/files/site.config.m4-db4 b/mail/sendmail/files/site.config.m4-db4 index 9c331e0d2ef..b54caf89885 100644 --- a/mail/sendmail/files/site.config.m4-db4 +++ b/mail/sendmail/files/site.config.m4-db4 @@ -1,3 +1,5 @@ +# $NetBSD: site.config.m4-db4,v 1.2 2004/08/30 20:16:28 adrianp Exp $ + # enable db4 APPENDDEF(`confENVDEF', `-DNEWDB -I${BUILDLINK_DIR}/include/db4') APPENDDEF(`confLIBS', `-ldb4') diff --git a/mail/sendmail/files/site.config.m4-ldap b/mail/sendmail/files/site.config.m4-ldap index f4b873105a7..0233f3f375b 100644 --- a/mail/sendmail/files/site.config.m4-ldap +++ b/mail/sendmail/files/site.config.m4-ldap @@ -1,3 +1,5 @@ +# $NetBSD: site.config.m4-ldap,v 1.5 2004/08/30 20:16:28 adrianp Exp $ + # enable ldap APPENDDEF(`confMAPDEF', `-DLDAPMAP') APPENDDEF(`confLIBS', `-lldap -llber') diff --git a/mail/sendmail/files/site.config.m4-linux b/mail/sendmail/files/site.config.m4-linux new file mode 100644 index 00000000000..e4ab28118da --- /dev/null +++ b/mail/sendmail/files/site.config.m4-linux @@ -0,0 +1,8 @@ +# $NetBSD: site.config.m4-linux,v 1.1 2004/08/30 20:16:28 adrianp Exp $ + +# man pathnames specific for Linux +define(`confMAN1EXT', `0') +define(`confMAN3EXT', `0') +define(`confMAN4EXT', `0') +define(`confMAN5EXT', `0') +define(`confMAN8EXT', `0') diff --git a/mail/sendmail/files/site.config.m4-milter b/mail/sendmail/files/site.config.m4-milter index 032cfd8d70e..086af75d2bb 100644 --- a/mail/sendmail/files/site.config.m4-milter +++ b/mail/sendmail/files/site.config.m4-milter @@ -1,2 +1,4 @@ +# $NetBSD: site.config.m4-milter,v 1.2 2004/08/30 20:16:28 adrianp Exp $ + # enable milter APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER') diff --git a/mail/sendmail/files/site.config.m4-sasl2 b/mail/sendmail/files/site.config.m4-sasl2 index 03e43159124..07b85db461a 100644 --- a/mail/sendmail/files/site.config.m4-sasl2 +++ b/mail/sendmail/files/site.config.m4-sasl2 @@ -1,4 +1,4 @@ -# $NetBSD: site.config.m4-sasl2,v 1.1 2003/03/04 00:21:32 seb Exp $ +# $NetBSD: site.config.m4-sasl2,v 1.2 2004/08/30 20:16:28 adrianp Exp $ # enable SASL 2 APPENDDEF(`confENVDEF', `-DSASL=2') diff --git a/mail/sendmail/files/site.config.m4-socketmap b/mail/sendmail/files/site.config.m4-socketmap new file mode 100644 index 00000000000..c1bed7f2d43 --- /dev/null +++ b/mail/sendmail/files/site.config.m4-socketmap @@ -0,0 +1,4 @@ +# $NetBSD: site.config.m4-socketmap,v 1.1 2004/08/30 20:16:28 adrianp Exp $ + +# enable socketmap lookups +APPENDDEF(`confMAPDEF', `-DSOCKETMAP') diff --git a/mail/sendmail/files/site.config.m4-solaris b/mail/sendmail/files/site.config.m4-solaris index 5cf44ee9bc0..408f742792d 100644 --- a/mail/sendmail/files/site.config.m4-solaris +++ b/mail/sendmail/files/site.config.m4-solaris @@ -1,7 +1,6 @@ -# $NetBSD: site.config.m4-solaris,v 1.2 2002/09/23 12:56:59 markd Exp $ +# $NetBSD: site.config.m4-solaris,v 1.3 2004/08/30 20:16:28 adrianp Exp $ # man pathnames specific for Solaris -# define(`confMAN1EXT', `0') define(`confMAN3EXT', `0') define(`confMAN4EXT', `0') diff --git a/mail/sendmail/files/site.config.m4-starttls b/mail/sendmail/files/site.config.m4-starttls index 236eb8ae627..8718173f6b4 100644 --- a/mail/sendmail/files/site.config.m4-starttls +++ b/mail/sendmail/files/site.config.m4-starttls @@ -1,3 +1,5 @@ +# $NetBSD: site.config.m4-starttls,v 1.6 2004/08/30 20:16:28 adrianp Exp $ + # enable STARTTLS APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS') APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto') diff --git a/mail/sendmail/files/site.config.m4-v6 b/mail/sendmail/files/site.config.m4-v6 index c41e607f7f9..6541cdbe64e 100644 --- a/mail/sendmail/files/site.config.m4-v6 +++ b/mail/sendmail/files/site.config.m4-v6 @@ -1,2 +1,4 @@ +# $NetBSD: site.config.m4-v6,v 1.3 2004/08/30 20:16:28 adrianp Exp $ + # enable IPv6 APPENDDEF(`confENVDEF', `-DNETINET6') diff --git a/mail/sendmail/files/site.config.m4-v6-not-solaris b/mail/sendmail/files/site.config.m4-v6-not-solaris index 2209c48b442..233493713d1 100644 --- a/mail/sendmail/files/site.config.m4-v6-not-solaris +++ b/mail/sendmail/files/site.config.m4-v6-not-solaris @@ -1 +1,4 @@ +# $NetBSD: site.config.m4-v6-not-solaris,v 1.2 2004/08/30 20:16:28 adrianp Exp $ + +# enable IPv6 - not Solaris APPENDDEF(`confENVDEF', `-DNEEDSGETIPNODE') diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk new file mode 100644 index 00000000000..b8919616354 --- /dev/null +++ b/mail/sendmail/options.mk @@ -0,0 +1,85 @@ +# $NetBSD: options.mk,v 1.1 2004/08/30 20:16:28 adrianp Exp $ + +# Global and legacy options +.if defined(USE_DB2) && !empty(USE_DB2:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= db2 +. elif defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= db4 +.endif +.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ldap +.endif +.if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= sasl +. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= sasl2 +.endif +.if defined(USE_TCPWRAPPERS) && !empty(USE_TCPWRAPPERS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= tcpwrappers +.endif +.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail +PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl sasl2 starttls tcpwrappers \ + socketmap + +.if !defined(PKG_OPTIONS.sendmail) +PKG_DEFAULT_OPTIONS+= inet6 tcpwrappers +.endif + +.include "../../mk/bsd.options.mk" + +### +### Berkeley DB version 2/4 format for on disk databases e.g. aliases +### +.if !empty(PKG_OPTIONS:Mdb2) +. include "../../databases/db/buildlink3.mk" +. elif !empty(PKG_OPTIONS:Mdb4) +. include "../../databases/db4/buildlink3.mk" +.endif + +### +### Use OpenLDAP for remote database access +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap/buildlink3.mk" +.endif + +### +### Use SASL/v2 for SMTP AUTH +### +.if !empty(PKG_OPTIONS:Msasl) +. include "../../security/cyrus-sasl/buildlink3.mk" +. elif !empty(PKG_OPTIONS:Msasl2) +. include "../../security/cyrus-sasl2/buildlink3.mk" +.endif + +### +### Use OpenSSL libraries for SMTP STARTTLS support +### +.if !empty(PKG_OPTIONS:Mstarttls) +. include "../../security/openssl/buildlink3.mk" +.endif + +### +### Use tcpwrappers for network access control to sendmail +### +.if !empty(PKG_OPTIONS:Mtcpwrappers) +. include "../../security/tcp_wrappers/buildlink3.mk" +.endif + +### +### Enable Sendmail SOCKETMAP support +### +.if !empty(PKG_OPTIONS:Msocketmap) +USE_PERL5= YES +REPLACE_PERL= contrib/socketmapClient.pl contrib/socketmapServer.pl +.endif + +### +### IPv6 support. +### +.if !empty(PKG_OPTIONS:Minet6) +.endif diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa index 4fa427d7eca..9dcaf05703e 100644 --- a/mail/sendmail/patches/patch-aa +++ b/mail/sendmail/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.17 2003/12/03 03:31:16 ben Exp $ +$NetBSD: patch-aa,v 1.18 2004/08/30 20:16:28 adrianp Exp $ ---- devtools/OS/NetBSD.orig 2002-03-21 15:59:25.000000000 -0800 -+++ devtools/OS/NetBSD -@@ -6,13 +6,15 @@ dnl Place personal settings in devtools/ - define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX') +--- devtools/OS/NetBSD.orig Sun Jun 27 00:19:35 2004 ++++ devtools/OS/NetBSD Sun Jun 27 00:24:11 2004 +@@ -7,13 +7,14 @@ + define(`confLIBS', `-lutil') define(`confENVDEF', ` -DNETISO') define(`confDEPEND_TYPE', `CC-M') -define(`confSBINGRP', `wheel') @@ -11,7 +11,6 @@ $NetBSD: patch-aa,v 1.17 2003/12/03 03:31:16 ben Exp $ -define(`confUBINGRP', `wheel') -define(`confMANOWN', `root') -define(`confMANGRP', `wheel') -+define(`confSBINGRP', `${BSD_BINOWN}') +define(`confSBINGRP', `${BSD_BINGRP}') +define(`confUBINOWN', `${BSD_BINOWN}') +define(`confUBINGRP', `${BSD_BINGRP}') diff --git a/mail/sendmail/patches/patch-ag b/mail/sendmail/patches/patch-ag index fd51a2c1625..93755d0b8c4 100644 --- a/mail/sendmail/patches/patch-ag +++ b/mail/sendmail/patches/patch-ag @@ -1,38 +1,12 @@ -$NetBSD: patch-ag,v 1.7 2004/07/13 12:27:13 markd Exp $ +$NetBSD: patch-ag,v 1.8 2004/08/30 20:16:28 adrianp Exp $ ---- include/sm/conf.h.orig 2004-01-07 13:52:16.000000000 +1300 -+++ include/sm/conf.h -@@ -780,7 +780,11 @@ extern unsigned int sleepX __P((unsigned - # ifndef LA_TYPE - # define LA_TYPE LA_SUBR - # endif /* ! LA_TYPE */ -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000) -+# define SFS_TYPE SFS_STATVFS /* use statfs() impl */ -+#else - # define SFS_TYPE SFS_MOUNT /* use statfs() impl */ -+#endif - # define SPT_TYPE SPT_PSSTRINGS /* use PS_STRINGS pointer */ - # endif /* defined(BSD4_4) && !defined(__bsdi__) && !defined(__GNU__) */ - -@@ -894,7 +898,11 @@ extern unsigned int sleepX __P((unsigned - # ifndef LA_TYPE - # define LA_TYPE LA_SUBR - # endif /* ! LA_TYPE */ -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000) -+# define SFS_TYPE SFS_STATVFS /* use statfs() impl */ -+#else - # define SFS_TYPE SFS_MOUNT /* use statfs() impl */ -+#endif - # if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1) - # undef SPT_TYPE - # define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */ -@@ -902,6 +910,9 @@ extern unsigned int sleepX __P((unsigned - # if defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) - # define HASURANDOMDEV 1 /* has /dev/urandom(4) */ - # endif /* defined(__NetBSD__) && ((__NetBSD_Version__ > 102070000) || (NetBSD1_2 > 8) || defined(NetBSD1_4) || defined(NetBSD1_3)) */ -+# if defined(__NetBSD__) -+# define SMRSH_CMDDIR "/usr/libexec/sm.bin" -+# endif /* defined(__NetBSD__) */ - # if defined(__FreeBSD__) - # define HASSETLOGIN 1 /* has setlogin(2) */ - # if __FreeBSD_version >= 227001 +--- 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 @@ + # endif + # if defined(__NetBSD__) + # define USESYSCTL 1 /* use sysctl(3) for getting ncpus */ ++# define SMRSH_CMDDIR "@@SMRSH_CMDDIR@@" + # include + # include + # endif diff --git a/mail/sendmail/patches/patch-ah b/mail/sendmail/patches/patch-ah new file mode 100644 index 00000000000..5345dd79713 --- /dev/null +++ b/mail/sendmail/patches/patch-ah @@ -0,0 +1,20 @@ +$NetBSD: patch-ah,v 1.1 2004/08/30 20:16:28 adrianp Exp $ + +--- smrsh/smrsh.8.orig Mon Aug 30 18:00:16 2004 ++++ smrsh/smrsh.8 Mon Aug 30 18:00:57 2004 +@@ -86,13 +86,9 @@ + (defaults to ``/bin:/usr/bin:/usr/ucb'') + and/or \-DSMRSH_CMDDIR=\e"\fIdir\fP\e" + to change the default program directory +-(defaults to ``/usr/adm/sm.bin''). ++(defaults to ``@@SMRSH_CMDDIR@@''). + .SH FILES +-/usr/adm/sm.bin \- default directory for restricted programs on most OSs +-.PP +-/var/adm/sm.bin \- directory for restricted programs on HP UX and Solaris +-.PP +-/usr/libexec/sm.bin \- directory for restricted programs on FreeBSD (>= 3.3) ++@@SMRSH_CMDDIR@@ \- default directory for restricted programs on most OSs + + .SH SEE ALSO + sendmail(8) -- cgit v1.2.3