Date: Tue, 18 Feb 2020 19:09:10 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526471 - in head/mail/exim: . files Message-ID: <202002181909.01IJ9ATI090880@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Tue Feb 18 19:09:10 2020 New Revision: 526471 URL: https://svnweb.freebsd.org/changeset/ports/526471 Log: - Fix build for SA_EXIM option PR: 242518 Reported by: VVD <vvd at unislabs.com> > Description of fields to fill in above: 76 columns --| > PR: If and which Problem Report is related. > Submitted by: If someone else sent in the change. > Reported by: If someone else reported the issue. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > MFH: Ports tree branch name. Request approval for merge. > Relnotes: Set to 'yes' for mention in release notes. > Security: Vulnerability reference (one per line) or description. > Sponsored by: If the change was sponsored by an organization. > Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). > Empty fields above will be automatically removed. M exim/Makefile AM exim/files/extra-patch-Local-sa-exim.c Added: head/mail/exim/files/extra-patch-Local-sa-exim.c (contents, props changed) Modified: head/mail/exim/Makefile Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Tue Feb 18 19:06:36 2020 (r526470) +++ head/mail/exim/Makefile Tue Feb 18 19:09:10 2020 (r526471) @@ -96,6 +96,7 @@ IGNORE= you cannot enable DANE without DNSSEC support MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim +EXTRA_PATCHES+= files/extra-patch-Local-sa-exim.c .endif EXIM_VERSION= 4.93 @@ -550,6 +551,7 @@ pre-everything:: post-extract: .if ${PORT_OPTIONS:MSA_EXIM} @cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} + @@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local .endif do-configure: @@ -571,7 +573,6 @@ do-configure: ${WRKSRC}/OS/Makefile-Default @${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \ ${WRKSRC}/OS/Makefile-Default - @${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local @{ \ ${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \ ${ECHO_CMD} "#define SPAMC_LOCATION \"${LOCALBASE}/bin/spamc\""; \ Added: head/mail/exim/files/extra-patch-Local-sa-exim.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/exim/files/extra-patch-Local-sa-exim.c Tue Feb 18 19:09:10 2020 (r526471) @@ -0,0 +1,11 @@ +--- Local/sa-exim.c.orig 2020-02-18 20:02:59.741459000 +0100 ++++ Local/sa-exim.c 2020-02-18 20:03:42.394082000 +0100 +@@ -1218,7 +1218,7 @@ + } + + stret=write(fd, buffer, strlen(buffer)); +- CHECKERR(stret,string_sprintf("SA body write to msg"),__LINE__); ++ CHECKERR(stret,"SA body write to msg",__LINE__); + if (SAEximDebug > 8) + { + log_write(0, LOG_MAIN, "SA: Debug9: Wrote to msg; line %d (wrote %d)", line, ret);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002181909.01IJ9ATI090880>