2e85bc7502
* rfc2045mkboundary.c was broken in 0.68 Changes 0.68: * rfc2045/rfc2045mkboundary.c (rfc2045_mk_boundary): truncate the hostname portion of the boundary to 30 chars. * courier/doc/courier.sgml: Remove descriptions of some configuration files that were moved to the courier-authlib package a while ago. They don't belong here any more. * courier/submit.C: Use the authenticated address, instead of the return address, for domain-based virtual configuration. * courier/libs/cfilename.c (config_has_vhost): Checks whether vhost.[ip] exists. * courier/module.esmtp/courieresmtpd.c (main): Only set a message's virtual host if vhost.[ip] exists. * courier/module.esmtp/esmtpclient.c (get_sourceaddr): Make sure the input buffer is null-terminated. * courier/submit.C (getrcpts): If there's no vhost setting from the sender's IP address (this includes local mail!) if vhost.domain exists, use [domain] as the virtual host. * Remove config_search(), which simply called config_localfilename(). Change all current callers to call config_localfilename(). * courier/libs/cfilename.c (config_set_local_vhost): saves a string that gets appended as a suffix, by config_localfilename(), and if that filename exists, that's returned as the filename, otherwise it's the original string without the suffix. config_get_local_vhost() returns the suffix string. to config_set_local_vhost(). * courier/libs/comsubmitclient.c (submit_fork): If config_get_local_vhost(), add a -vhost parameter to submit(). * courier/submit.C (cppmain): -vhost sets config_set_local_vhost(). * courier/submit2.C (closectl): New COMCTLFILE_VHOST parameter in the config file, taken from the vhost setting. * courier/libs/comctlfile.c (ctlfile_setvhost): If COMCTLFILE_VHOST is set, call ctlfile_setvhost(), return an indication if the vhost has changed. Absence of a COMCTLFILE_VHOST treated as a discrete "(null)" setting. * courier/module.esmtp/esmtpclient.c (esmtpchild): If ctlfile_setvhost() then disconnect the current socket, if one is open. * courier/module.esmtp/esmtpclient.c (get_sourceaddr): The IP address specified in ipout or ip6out overrides SOURCE_ADDRESS and SOURCE_ADDRESS_IPV6 environment variable. * courier/module.local/localmail.c (main): Call ctlfile_setvhost(). * courier/module.uucp/uucp.c (uux): Call ctlfile_setvhost(). * courier/module.dsn/dsn.c (main): Call ctlfile_setvhost(). * liblock/mail.c (dotlock_exists): Quell a compiler warning. * courier/courierd.dist.in SOURCE_ADDRESS: Add a note that this setting is deprecated.
66 lines
2.1 KiB
Makefile
66 lines
2.1 KiB
Makefile
# $NetBSD: Makefile,v 1.20 2012/06/09 11:45:39 adam Exp $
|
|
|
|
DISTNAME= courier-${COURIER_VERSION}
|
|
PKGNAME= ${DISTNAME:S/-/tcpd-/}
|
|
CATEGORIES= net
|
|
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
|
|
EXTRACT_SUFX= .tar.bz2
|
|
|
|
MAINTAINER= pkgsrc-users@NetBSD.org
|
|
COMMENT= Courier TCP socket and TLS servers
|
|
HOMEPAGE= http://www.courier-mta.org/
|
|
|
|
CONFLICTS= courier-imap<4.1.1
|
|
|
|
PKG_DESTDIR_SUPPORT= user-destdir
|
|
|
|
USE_TOOLS+= gmake
|
|
USE_LANGUAGES= c c++
|
|
|
|
.include "options.mk"
|
|
|
|
.include "../../mail/courier-mta/Makefile.common"
|
|
|
|
# This package doesn't need to depend on courier-authlib -- just fake
|
|
# out the top-level configure script that thinks it needs
|
|
# courierauthconfig.
|
|
#
|
|
CONFIGURE_ENV+= ac_cv_path_COURIERAUTHCONFIG=${TRUE:Q}
|
|
|
|
# These are files required by the Courier configure scripts.
|
|
WRKSRC_FILES= courier/courier.c config.guess config.sub \
|
|
configure depcomp install-sh ltmain.sh missing \
|
|
sysconftool
|
|
WRKSRC_FILES+= Makefile.in courier.spec.in courier.lpspec.in \
|
|
dbobj.h.in dbobj.config.in courier.service.in \
|
|
courier.sysvinit.in
|
|
|
|
# These are subdirectories containing libraries used by couriertcpd.
|
|
WRKSRC_SUBDIRS= bdbobj numlib soxwrap md5 random128 unicode \
|
|
rfc822 rfc1035 liblock waitlib tcpd
|
|
|
|
EXTRACT_ELEMENTS= ${WRKSRC_FILES:S/^/${DISTNAME}\//}
|
|
EXTRACT_ELEMENTS+= ${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
|
|
|
|
BUILD_DIRS= ${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
|
|
INSTALLATION_DIRS= bin sbin ${PKGMANDIR}/man1 ${DOCDIR}
|
|
|
|
REQD_DIRS= ${DOCDIR}
|
|
MAKE_DIRS+= ${COURIER_STATEDIR}
|
|
|
|
do-install:
|
|
${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd \
|
|
${DESTDIR}${PREFIX}/sbin/couriertcpd
|
|
${INSTALL_MAN} ${WRKSRC}/tcpd/couriertcpd.1 \
|
|
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertcpd.1
|
|
${INSTALL_DATA} ${WRKSRC}/tcpd/couriertcpd.html \
|
|
${DESTDIR}${DOCDIR}/couriertcpd.html
|
|
|
|
${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertls \
|
|
${DESTDIR}${PREFIX}/bin/couriertls
|
|
${INSTALL_MAN} ${WRKSRC}/tcpd/couriertls.1 \
|
|
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertls.1
|
|
${INSTALL_DATA} ${WRKSRC}/tcpd/couriertls.html \
|
|
${DESTDIR}${DOCDIR}/couriertls.html
|
|
|
|
.include "../../mk/bsd.pkg.mk"
|