Attachment 156828 Details for Bug 200244 – Full sendmail diff

[patch] Full sendmail diff

sendmail.patch (text/plain), 4.78 KB, created by John Marino on 2015-05-16 16:09:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2015-05-16 16:09:01 UTC

Size: 4.78 KB

patch

obsolete

>Index: mail/sendmail/Makefile
>===================================================================
>--- mail/sendmail/Makefile	(revision 386393)
>+++ mail/sendmail/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	sendmail
> PORTVERSION=	8.15.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail ipv6
> MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
> PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
>@@ -14,6 +14,9 @@
> CONFLICTS?=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-*
> NEED_ROOT=	yes
> 
>+USERS=		smmsp
>+GROUPS=		smmsp
>+
> USES=		cpe
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
>@@ -211,14 +214,8 @@
> .if ${PORT_OPTIONS:MMILTER}
> 	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
> .endif
>-	if ! pw groupshow smmsp; then pw groupadd smmsp -g 25; fi
>-	if ! pw usershow smmsp; then pw useradd smmsp -g smmsp -u 25 \
>-		-h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
> 	@cd ${WRKSRC} && ${FIND} cf -type f | \
> 	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
>-	@cd ${WRKSRC} && ${FIND} -d cf -type d | \
>-	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
>-	@${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST}
> .if ${PORT_OPTIONS:MDOCS}
> .for i in ${DOCS}
> 	@${ECHO_CMD} `${BASENAME} ${i}` | \
>@@ -227,7 +224,6 @@
> .if ${PORT_OPTIONS:MCYRUSLOOKUP}
> 	@${ECHO_CMD} "share/doc/sendmail/CYRUS_LOOKUP" >>${PLIST}
> .endif
>-	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >>${PLIST}
> .endif
> 
> # We want mail.local and rmail for our system.
>@@ -279,11 +275,17 @@
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}/libmilter
> 	${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
> 		${TAR} -C ${STAGEDIR}${DOCSDIR}/libmilter -xf -
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
> .endif
> .if ${PORT_OPTIONS:MCYRUSLOOKUP}
> 	${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP
> .endif
> .endif
>+	${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
> 
> mailer.base:
> 	@${SED} \
>Index: mail/sendmail/files/patch-sendmail_Makefile.m4
>===================================================================
>--- mail/sendmail/files/patch-sendmail_Makefile.m4	(revision 0)
>+++ mail/sendmail/files/patch-sendmail_Makefile.m4	(working copy)
>@@ -0,0 +1,12 @@
>+--- sendmail/Makefile.m4.orig	2014-11-11 15:49:49 UTC
>++++ sendmail/Makefile.m4
>+@@ -13,8 +13,7 @@ bldPUSH_SMLIB(`smutil')
>+ 
>+ 
>+ dnl hack: /etc/mail is not defined as "location of .cf" in the build system
>+-define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
>+-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
>++define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP'))
>+ define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
>+ `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
>+ )dnl
>Index: mail/sendmail/files/pkg-milter
>===================================================================
>--- mail/sendmail/files/pkg-milter	(revision 386393)
>+++ mail/sendmail/files/pkg-milter	(working copy)
>@@ -3,7 +3,6 @@
> 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
> %%PORTDOCS%%share/doc/sendmail/libmilter/design.html
>@@ -56,4 +55,3 @@
> %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_helo.html
> %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_negotiate.html
> %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_unknown.html
>-%%PORTDOCS%%@dirrm share/doc/sendmail/libmilter
>Index: mail/sendmail/pkg-plist
>===================================================================
>--- mail/sendmail/pkg-plist	(revision 386393)
>+++ mail/sendmail/pkg-plist	(working copy)
>@@ -1,10 +1,5 @@
>-@exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 25; fi
>-@exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 25 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
>-@exec mkdir -p /var/spool/clientmqueue
>-@exec chown smmsp:smmsp /var/spool/clientmqueue
>+@comment cannot use @dir because this is home directory of smmsp
> @exec chmod 770 /var/spool/clientmqueue
>-@unexec if pw usershow smmsp | grep -q 90:90; then pw userdel smmsp; fi
>-@comment (removed by userdel) pw groupdel smmsp
> bin/hoststat
> bin/mailq
> bin/newaliases
>@@ -29,11 +24,7 @@
> sbin/mailstats
> sbin/makemap
> sbin/praliases
>-@group smmsp
>-sbin/sendmail
>-@group
>-@comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
>-@exec chmod 2555 %D/sbin/sendmail
>+@(root,smmsp,2555) sbin/sendmail
> share/sendmail/helpfile
> %%PORTDOCS%%%%DOCSDIR%%/op.ps
> %%PORTDOCS%%%%DOCSDIR%%/op.txt

Actions: View | Diff

Attachments on bug 200244: 156828 | 156829 | 156830