From owner-svn-ports-all@freebsd.org Thu Nov 12 11:22:09 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C58912E6FD0; Thu, 12 Nov 2020 11:22:09 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CWzhd5DNhz3RDg; Thu, 12 Nov 2020 11:22:09 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6719258E8; Thu, 12 Nov 2020 11:22:09 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ACBM9kH044582; Thu, 12 Nov 2020 11:22:09 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ACBM932044580; Thu, 12 Nov 2020 11:22:09 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202011121122.0ACBM932044580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Thu, 12 Nov 2020 11:22:09 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in branches/2020Q4/mail/cclient: . files X-SVN-Commit-Revision: 554951 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2020 11:22:09 -0000 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 */