Date: Thu, 16 Aug 2018 08:56:17 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477315 - in head/mail/sendmail: . files Message-ID: <201808160856.w7G8uHsP042228@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Thu Aug 16 08:56:17 2018 New Revision: 477315 URL: https://svnweb.freebsd.org/changeset/ports/477315 Log: - make portlint happier Modified: head/mail/sendmail/Makefile head/mail/sendmail/files/patch-FreeBSD head/mail/sendmail/files/patch-bsd4.4.m4 head/mail/sendmail/files/patch-cfhead.m4 head/mail/sendmail/files/patch-doc-op-Makefile head/mail/sendmail/files/patch-mail.local.8 head/mail/sendmail/files/patch-mail.local.c head/mail/sendmail/files/patch-makeinfo.sh head/mail/sendmail/files/patch-rmail.c head/mail/sendmail/files/patch-sm_os_freebsd.h head/mail/sendmail/files/patch-smrsh.8 Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/Makefile Thu Aug 16 08:56:17 2018 (r477315) @@ -166,14 +166,14 @@ do-configure: .if ${PORT_OPTIONS:MGDBM} @(if [ ! -e "${LOCALBASE}/lib/libgdbm_compat.so" ] ; then \ ${ECHO_MSG} "===> option COMPAT is missing in databases/gdbm."; \ - ${FALSE}; \ - fi) + ${FALSE}; \ + fi) .endif .if ${PORT_OPTIONS:MBLACKLISTD} @(if [ ! -e "${DESTDIR}/usr/lib/libblacklist.so" ] ; then \ ${ECHO_MSG} "===> libblacklist.so not found. Please update to FreeBSD 11"; \ - ${FALSE}; \ - fi) + ${FALSE}; \ + fi) .endif ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ Modified: head/mail/sendmail/files/patch-FreeBSD ============================================================================== --- head/mail/sendmail/files/patch-FreeBSD Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-FreeBSD Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- devtools/OS/FreeBSD.orig 2003-07-03 03:07:45.000000000 +0200 -+++ devtools/OS/FreeBSD 2013-11-16 07:06:27.000000000 +0100 -@@ -6,7 +6,7 @@ +--- devtools/OS/FreeBSD.orig 2014-03-05 00:59:45 UTC ++++ devtools/OS/FreeBSD +@@ -6,7 +6,7 @@ dnl Place personal settings in devtools/ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX') define(`confLIBS', `-lutil') Modified: head/mail/sendmail/files/patch-bsd4.4.m4 ============================================================================== --- head/mail/sendmail/files/patch-bsd4.4.m4 Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-bsd4.4.m4 Thu Aug 16 08:56:17 2018 (r477315) @@ -1,7 +1,7 @@ ---- cf/ostype/bsd4.4.m4.orig 1999-04-24 07:37:40.000000000 +0200 -+++ cf/ostype/bsd4.4.m4 2008-05-04 11:55:42.000000000 +0200 -@@ -17,4 +17,5 @@ - VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $') +--- cf/ostype/bsd4.4.m4.orig 2014-03-05 00:59:45 UTC ++++ cf/ostype/bsd4.4.m4 +@@ -17,4 +17,5 @@ divert(0) + VERSIONID(`$Id: bsd4.4.m4,v 8.15 2013-11-22 20:51:15 ca Exp $') ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl +ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl Modified: head/mail/sendmail/files/patch-cfhead.m4 ============================================================================== --- head/mail/sendmail/files/patch-cfhead.m4 Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-cfhead.m4 Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- cf/m4/cfhead.m4.orig 2004-01-28 23:02:22.000000000 +0100 -+++ cf/m4/cfhead.m4 2008-05-04 11:55:42.000000000 +0200 -@@ -268,7 +268,8 @@ +--- cf/m4/cfhead.m4.orig 2015-02-28 00:20:38 UTC ++++ cf/m4/cfhead.m4 +@@ -269,7 +269,8 @@ define(`_REC_AUTH_', `$.$?{auth_type}(au define(`_REC_FULL_AUTH_', `$.$?{auth_type}(user=${auth_authen} $?{auth_author}author=${auth_author} $.mech=${auth_type}') define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)') define(`_REC_END_', `for $u; $|; Modified: head/mail/sendmail/files/patch-doc-op-Makefile ============================================================================== --- head/mail/sendmail/files/patch-doc-op-Makefile Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-doc-op-Makefile Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- doc/op/Makefile.orig 2011-08-01 19:46:12.000000000 +0200 -+++ doc/op/Makefile 2011-08-01 19:47:45.000000000 +0200 -@@ -12,7 +12,7 @@ +--- doc/op/Makefile.orig 2014-03-05 00:59:45 UTC ++++ doc/op/Makefile +@@ -12,7 +12,7 @@ PS2PDF_CMD= ps2pdf PIC= ${PIC_CMD} -C EQNASCII= ${EQN_CMD} -C -Tascii EQNPS= ${EQN_CMD} -C -Tps Modified: head/mail/sendmail/files/patch-mail.local.8 ============================================================================== --- head/mail/sendmail/files/patch-mail.local.8 Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-mail.local.8 Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- mail.local/mail.local.8.orig 2003-10-20 22:26:51.000000000 +0200 -+++ mail.local/mail.local.8 2008-05-04 11:55:42.000000000 +0200 -@@ -16,9 +16,9 @@ +--- mail.local/mail.local.8.orig 2014-03-05 00:59:45 UTC ++++ mail.local/mail.local.8 +@@ -16,9 +16,9 @@ mail.local \- store mail in a mailbox .SH SYNOPSIS .B mail.local @@ -12,7 +12,7 @@ \fIfrom\fR|\fB\-r\fR .IR from ] .RB [ \-h -@@ -38,6 +38,11 @@ +@@ -38,6 +38,11 @@ The options are as follows: .B \-7 Do not advertise 8BITMIME support in LMTP mode. .TP @@ -24,7 +24,7 @@ .B \-b Return a permanent error instead of a temporary error if a mailbox exceeds quota. -@@ -56,6 +61,13 @@ +@@ -56,6 +61,13 @@ Specify the sender's name. .TP .B \-l Turn on LMTP mode. @@ -38,7 +38,7 @@ .TP .BI \-r " from" Specify the sender's name (for backward compatibility). -@@ -120,7 +132,7 @@ +@@ -120,7 +132,7 @@ Used to set the appropriate time zone on .SH FILES .PD 0.2v .TP 2.2i @@ -47,7 +47,7 @@ temporary files .TP /var/mail/user -@@ -131,7 +143,6 @@ +@@ -131,7 +143,6 @@ lock file for a user's default mailbox .PD .SH SEE ALSO mail(1), Modified: head/mail/sendmail/files/patch-mail.local.c ============================================================================== --- head/mail/sendmail/files/patch-mail.local.c Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-mail.local.c Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- mail.local/mail.local.c.orig 2008-02-19 08:13:30.000000000 +0100 -+++ mail.local/mail.local.c 2008-05-04 11:59:31.000000000 +0200 -@@ -153,6 +153,8 @@ +--- mail.local/mail.local.c.orig 2014-06-12 17:30:47 UTC ++++ mail.local/mail.local.c +@@ -153,6 +153,8 @@ int ExitVal = EX_OK; /* sysexits.h erro bool HoldErrs = false; /* Hold errors in ErrBuf */ bool LMTPMode = false; bool BounceQuota = false; /* permanent error when over quota */ @@ -9,7 +9,7 @@ bool CloseMBDB = false; char *HomeMailFile = NULL; /* store mail in homedir */ -@@ -234,12 +236,12 @@ +@@ -234,12 +236,12 @@ main(argc, argv) sm_exit(EX_CONFIG); } #if HASHSPOOL @@ -25,7 +25,7 @@ # endif /* _FFR_SPOOL_PATH */ #endif /* HASHSPOOL */ { -@@ -249,6 +251,10 @@ +@@ -249,6 +251,10 @@ main(argc, argv) EightBitMime = false; break; @@ -36,7 +36,7 @@ case 'b': /* bounce mail when over quota. */ BounceQuota = true; break; -@@ -342,6 +348,10 @@ +@@ -342,6 +348,10 @@ main(argc, argv) break; #endif /* HASHSPOOL || _FFR_SPOOL_PATH */ @@ -47,7 +47,7 @@ case '?': default: usage(); -@@ -351,7 +361,8 @@ +@@ -351,7 +361,8 @@ main(argc, argv) argv += optind; /* initialize biff structures */ @@ -57,7 +57,7 @@ err = sm_mbdb_initialize(mbdbname); if (err != EX_OK) -@@ -1273,6 +1284,7 @@ +@@ -1273,6 +1284,7 @@ tryagain: /* Get the starting offset of the new message */ curoff = lseek(mbfd, (off_t) 0, SEEK_END); @@ -65,7 +65,7 @@ (void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n", name, (LONGLONG_T) curoff); -@@ -1335,7 +1347,7 @@ +@@ -1335,7 +1347,7 @@ tryagain: } /* Flush to disk, don't wait for update. */ @@ -74,7 +74,7 @@ { mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno)); err3: -@@ -1402,7 +1414,7 @@ +@@ -1402,7 +1414,7 @@ err0: (void) setreuid(0, 0); /* Attempt to truncate back to pre-write size */ goto err3; } @@ -83,7 +83,7 @@ notifybiff(biffmsg); if (setreuid(0, 0) < 0) -@@ -1582,9 +1594,9 @@ +@@ -1582,9 +1594,9 @@ usage() { ExitVal = EX_USAGE; # if _FFR_SPOOL_PATH Modified: head/mail/sendmail/files/patch-makeinfo.sh ============================================================================== --- head/mail/sendmail/files/patch-makeinfo.sh Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-makeinfo.sh Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- cf/sh/makeinfo.sh.orig 1999-02-07 08:26:25.000000000 +0100 -+++ cf/sh/makeinfo.sh 2008-05-04 11:55:42.000000000 +0200 -@@ -52,7 +52,7 @@ +--- cf/sh/makeinfo.sh.orig 2014-03-05 00:59:45 UTC ++++ cf/sh/makeinfo.sh +@@ -52,7 +52,7 @@ then else host=`uname -n` fi Modified: head/mail/sendmail/files/patch-rmail.c ============================================================================== --- head/mail/sendmail/files/patch-rmail.c Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-rmail.c Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- rmail/rmail.c.orig 2001-09-18 23:45:29.000000000 +0200 -+++ rmail/rmail.c 2008-05-04 11:55:42.000000000 +0200 -@@ -276,7 +276,11 @@ +--- rmail/rmail.c.orig 2014-03-05 00:59:45 UTC ++++ rmail/rmail.c +@@ -276,7 +276,11 @@ main(argc, argv) args[i++] = _PATH_SENDMAIL; /* Build sendmail's argument list. */ args[i++] = "-G"; /* relay submission */ args[i++] = "-oee"; /* No errors, just status. */ Modified: head/mail/sendmail/files/patch-sm_os_freebsd.h ============================================================================== --- head/mail/sendmail/files/patch-sm_os_freebsd.h Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-sm_os_freebsd.h Thu Aug 16 08:56:17 2018 (r477315) @@ -1,4 +1,4 @@ ---- include/sm/os/sm_os_freebsd.h.orig +--- include/sm/os/sm_os_freebsd.h.orig 2014-03-05 00:59:45 UTC +++ include/sm/os/sm_os_freebsd.h @@ -34,7 +34,11 @@ # define SM_CONF_SHM 1 Modified: head/mail/sendmail/files/patch-smrsh.8 ============================================================================== --- head/mail/sendmail/files/patch-smrsh.8 Thu Aug 16 08:48:04 2018 (r477314) +++ head/mail/sendmail/files/patch-smrsh.8 Thu Aug 16 08:56:17 2018 (r477315) @@ -1,6 +1,6 @@ ---- smrsh/smrsh.8.orig 2004-08-06 05:55:35.000000000 +0200 -+++ smrsh/smrsh.8 2008-05-04 11:55:42.000000000 +0200 -@@ -39,7 +39,7 @@ +--- smrsh/smrsh.8.orig 2014-03-05 00:59:45 UTC ++++ smrsh/smrsh.8 +@@ -39,7 +39,7 @@ Briefly, .I smrsh limits programs to be in a single directory, by default @@ -9,7 +9,7 @@ allowing the system administrator to choose the set of acceptable commands, and to the shell builtin commands ``exec'', ``exit'', and ``echo''. It also rejects any commands with the characters -@@ -50,13 +50,12 @@ +@@ -50,13 +50,12 @@ It allows ``||'' and ``&&'' to enable co ``"|exec /usr/local/bin/filter || exit 75"'' .PP Initial pathnames on programs are stripped,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808160856.w7G8uHsP042228>