Date: Thu, 12 Nov 2020 11:22:09 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r554951 - in branches/2020Q4/mail/cclient: . files Message-ID: <202011121122.0ACBM932044580@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fernape Date: Thu Nov 12 11:22:09 2020 New Revision: 554951 URL: https://svnweb.freebsd.org/changeset/ports/554951 Log: MFH: r554949 mail/cclient: Unbreak in 11.4 and 12.2 Dimitry sent a more generic patch that workarounds the problem in mail/cclient instead of its consumers. Related to r554904. PR: 250740 Submitted by: dim@FreeBSD.org Reported by: colin@fbug.ksac.uk Approved by: ports-secteam (blanket, build fix) Added: branches/2020Q4/mail/cclient/files/patch-src_c-client_c-client.h - copied unchanged from r554949, head/mail/cclient/files/patch-src_c-client_c-client.h Modified: branches/2020Q4/mail/cclient/Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/mail/cclient/Makefile ============================================================================== --- branches/2020Q4/mail/cclient/Makefile Thu Nov 12 11:20:04 2020 (r554950) +++ branches/2020Q4/mail/cclient/Makefile Thu Nov 12 11:22:09 2020 (r554951) @@ -3,7 +3,7 @@ PORTNAME= cclient PORTVERSION= 2007f -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= mail devel MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ Copied: branches/2020Q4/mail/cclient/files/patch-src_c-client_c-client.h (from r554949, head/mail/cclient/files/patch-src_c-client_c-client.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q4/mail/cclient/files/patch-src_c-client_c-client.h Thu Nov 12 11:22:09 2020 (r554951, copy of r554949, head/mail/cclient/files/patch-src_c-client_c-client.h) @@ -0,0 +1,26 @@ +--- src/c-client/c-client.h.orig 2011-07-23 00:20:18 UTC ++++ src/c-client/c-client.h +@@ -39,7 +39,23 @@ extern "C" { + #endif + + #include "mail.h" /* primary interfaces */ ++ ++#ifdef __cplusplus /* undo hacks before including OS headers */ ++#undef private ++#undef and ++#undef or ++#undef not ++#endif ++ + #include "osdep.h" /* OS-dependent routines */ ++ ++#ifdef __cplusplus /* redo hacks after including OS headers */ ++#define private cclientPrivate ++#define and cclientAnd ++#define or cclientOr ++#define not cclientNot ++#endif ++ + #include "rfc822.h" /* RFC822 and MIME routines */ + #include "smtp.h" /* SMTP sending routines */ + #include "nntp.h" /* NNTP sending routines */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011121122.0ACBM932044580>