mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- update to 8.13.2

Browse Source 
- new option SENDMAIL_WITH_SHARED_MILTER
This commit is contained in:
Dirk Meyer 2004-12-16 16:33:54 +00:00
parent c3d954814a
commit dd2d358e67
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=124220
5 changed files with 90 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mail/sendmail/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= sendmail
PORTVERSION= 8.13.1
PORTVERSION= 8.13.2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
@ -34,6 +34,7 @@ SENDMAIL= ${PREFIX}/sbin/sendmail
BASEMAIL= /usr/libexec/sendmail/sendmail
PLIST_SUB+= PREFIX=${PREFIX:S=${PREFIX}/==}
PKGMESSAGE= ${WRKSRC}/pkg-message
MILTER_SOVER?= 3
# Options to define Features:
# SENDMAIL_WITHOUT_IPV6=yes
@ -52,6 +53,7 @@ PKGMESSAGE= ${WRKSRC}/pkg-message
# SENDMAIL_WITH_SOCKETMAP=yes
# SENDMAIL_WITH_CYRUSLOOKUP=yes
# SENDMAIL_WITH_PICKY_HELO_CHECK=yes
# SENDMAIL_WITH_SHARED_MILTER=yes
.if defined(SENDMAIL_WITH_SMTPS) && !defined(SENDMAIL_WITH_TLS) && !defined(WITH_TLS)
SENDMAIL_WITH_TLS=yes
@ -204,7 +206,7 @@ CONFLICTS+= sendmail*+tls*-8.*
# Build site.config.m4
.if exists(${DESTDIR}/etc/mail/mailer.conf)
SITE+= ${FILESDIR}/site.config.m4
.if ! defined(SENDMAIL_WITHOUT_IPV6)
.if !defined(SENDMAIL_WITHOUT_IPV6)
SITE+= ${FILESDIR}/site.config.m4.ipv6
.endif
.endif
@ -217,7 +219,7 @@ SITE+= ${FILESDIR}/site.config.m4.sasl2
.if defined(SENDMAIL_WITH_LDAP)
SITE+= ${FILESDIR}/site.config.m4.ldap
.endif
.if ! defined(SENDMAIL_WITHOUT_MILTER)
.if !defined(SENDMAIL_WITHOUT_MILTER)
SITE+= ${FILESDIR}/site.config.m4.milter
.endif
.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
@ -233,6 +235,15 @@ PLIST_SUB+= ETCPORT="@comment "
PLIST_SUB+= ETCPORT=""
.endif
.if !defined(SENDMAIL_WITHOUT_MILTER)
.if defined(SENDMAIL_WITH_SHARED_MILTER)
PLIST_SUB+= MILTER_SHARED=""
PLIST_SUB+= MILTER_SOVER=${MILTER_SOVER}
.else
PLIST_SUB+= MILTER_SHARED="@comment "
.endif
.endif
post-extract:
@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sm-client.sh \
> ${WRKSRC}/sm-client.sh
@ -242,6 +253,16 @@ post-extract:
-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
.if !defined(SENDMAIL_WITHOUT_MILTER) && defined(SENDMAIL_WITH_SHARED_MILTER)
@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
${CP} ${FILESDIR}/sharedlibrary.m4 \
${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
@${MV} ${WRKSRC}/libsharedmilter/Makefile.m4 \
${WRKSRC}/libsharedmilter/Makefile.m4.sed
@${SED} -e 's=`library=`sharedlibrary=' \
${WRKSRC}/libsharedmilter/Makefile.m4.sed \
> ${WRKSRC}/libsharedmilter/Makefile.m4
.endif
pre-configure:
.if defined(AUTO_ENABLED_TLS)
@ -304,13 +325,16 @@ do-configure:
post-build:
( cd ${WRKSRC}/doc/op && ${MAKE} op.txt )
.if ! defined(SENDMAIL_WITHOUT_MILTER)
.if !defined(SENDMAIL_WITHOUT_MILTER)
( cd ${WRKSRC}/libmilter && ${MAKE} )
.if defined(SENDMAIL_WITH_SHARED_MILTER)
( cd ${WRKSRC}/libsharedmilter && ${MAKE} )
.endif
.endif
pre-install:
@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
.if ! defined(SENDMAIL_WITHOUT_MILTER)
.if !defined(SENDMAIL_WITHOUT_MILTER)
@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
.endif
if ! pw groupshow smmsp; then pw groupadd smmsp -g 25; fi
@ -337,7 +361,7 @@ pre-install:
post-install:
( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
( cd ${WRKSRC}/rmail && ${MAKE} force-install )
.if ! defined(SENDMAIL_WITHOUT_MILTER)
.if !defined(SENDMAIL_WITHOUT_MILTER)
${MKDIR} ${PREFIX}/include/libmilter
${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
${WRKSRC}/include/libmilter/mfdef.h \
@ -345,6 +369,12 @@ post-install:
${INSTALL_DATA} \
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
${PREFIX}/lib/
.if defined(SENDMAIL_WITH_SHARED_MILTER)
${INSTALL_SCRIPT} \
${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
${LN} -s libmilter.so.${MILTER_SOVER} ${PREFIX}/lib/libmilter.so
.endif
.endif
.if exists(${DESTDIR}/etc/mail/mailer.conf)
${INSTALL_SCRIPT} ${WRKSRC}/sm-client.sh \
@ -378,7 +408,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
.if ! defined(SENDMAIL_WITHOUT_MILTER)
.if !defined(SENDMAIL_WITHOUT_MILTER)
${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
${MKDIR} ${DOCSDIR}/libmilter
@${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
@ -450,7 +480,7 @@ tls-install:
.include <bsd.port.pre.mk>
.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
.if ! defined(WITH_OPENSSL_BASE)
.if !defined(WITH_OPENSSL_BASE)
SITE+= ${FILESDIR}/site.config.m4.ssl
.endif
SITE+= ${FILESDIR}/site.config.m4.tls

4
mail/sendmail/distinfo
View File

@ -1,2 +1,2 @@
MD5 (sendmail.8.13.1.tar.gz) = 5407db289086261d7e7a09920d2ea14e
SIZE (sendmail.8.13.1.tar.gz) = 1963257
MD5 (sendmail.8.13.2.tar.gz) = 0331828b9dcf7aa20e02992502c6f41f
SIZE (sendmail.8.13.2.tar.gz) = 1966188

27
mail/sendmail/files/patch-aa
View File

@ -104,19 +104,19 @@ diff -ur mail.local/mail.local.8.orig mail.local/mail.local.8
getservbyname(3),
comsat(8),
diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
--- mail.local/mail.local.c.orig Mon Nov 3 19:38:29 2003
+++ mail.local/mail.local.c Tue May 18 07:56:42 2004
--- mail.local/mail.local.c.orig Mon Nov 1 21:42:42 2004
+++ mail.local/mail.local.c Thu Dec 16 05:25:26 2004
@@ -144,6 +144,8 @@
bool HoldErrs = false; /* Hold errors in ErrBuf */
bool LMTPMode = false;
bool BounceQuota = false; /* permanent error when over quota */
+bool NoBiff = false;
+bool NoFsync = false;
bool CloseMBDB = false;
char *HomeMailFile = NULL; /* store mail in homedir */
#if HASHSPOOL
@@ -205,9 +207,9 @@
exit(EX_CONFIG);
@@ -223,9 +225,9 @@
sm_exit(EX_CONFIG);
}
#if HASHSPOOL
- while ((ch = getopt(argc, argv, "7bdD:f:h:r:lH:p:n")) != -1)
@ -127,7 +127,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
#endif /* HASHSPOOL */
{
switch(ch)
@@ -216,6 +218,10 @@
@@ -234,6 +236,10 @@
EightBitMime = false;
break;
@ -138,7 +138,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
case 'b': /* bounce mail when over quota. */
BounceQuota = true;
break;
@@ -307,6 +313,10 @@
@@ -325,6 +331,10 @@
break;
#endif /* HASHSPOOL */
@ -149,7 +149,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
case '?':
default:
usage();
@@ -316,7 +326,8 @@
@@ -334,7 +344,8 @@
argv += optind;
/* initialize biff structures */
@ -159,7 +159,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
err = sm_mbdb_initialize(mbdbname);
if (err != EX_OK)
@@ -1239,6 +1250,7 @@
@@ -1256,6 +1267,7 @@
/* Get the starting offset of the new message */
curoff = lseek(mbfd, (off_t) 0, SEEK_END);
@ -167,7 +167,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
(void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n",
name, (LONGLONG_T) curoff);
@@ -1301,7 +1313,7 @@
@@ -1318,7 +1330,7 @@
}
/* Flush to disk, don't wait for update. */
@ -176,7 +176,7 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
{
mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno));
err3:
@@ -1368,7 +1380,7 @@
@@ -1385,7 +1397,7 @@
/* Attempt to truncate back to pre-write size */
goto err3;
}
@ -185,14 +185,13 @@ diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
notifybiff(biffmsg);
if (setreuid(0, 0) < 0)
@@ -1547,7 +1559,8 @@
@@ -1564,7 +1576,7 @@
usage()
{
ExitVal = EX_USAGE;
- mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ...");
+ mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ...");
+
exit(ExitVal);
sm_exit(ExitVal);
}
diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c

2
mail/sendmail/files/pkg-milter
View File

@ -1,6 +1,8 @@
include/libmilter/mfapi.h
include/libmilter/mfdef.h
lib/libmilter.a
%%MILTER_SHARED%%lib/libmilter.so.%%MILTER_SOVER%%
%%MILTER_SHARED%%lib/libmilter.so
@dirrm include/libmilter
%%PORTDOCS%%share/doc/sendmail/MILTER
%%PORTDOCS%%share/doc/sendmail/libmilter/api.html

35
mail/sendmail/files/sharedlibrary.m4 Normal file
View File

@ -0,0 +1,35 @@
divert(-1)
#
# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
#
# Definitions for Makefile construction for sendmail
#
# $Id: library.m4,v 8.10 2001/02/14 04:39:38 gshapiro Exp $
#
divert(0)dnl
include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
bldPUSH_TARGET(bldCURRENT_PRODUCT.so)dnl
bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
divert(bldTARGETS_SECTION)
bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
${LD} ${LDOPTS_SO} confSONAME bldCURRENT_PRODUCT.so.${MILTER_SOVER} -o bldCURRENT_PRODUCT.so ${bldCURRENT_PRODUCT`OBJS'}
ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so
ifdef(`bldINSTALLABLE', ` ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}')
bldCURRENT_PRODUCT-clean:
rm -f ${OBJS} bldCURRENT_PRODUCT.so ${MANPAGES}
divert(0)
COPTS+= confCCOPTS_SO