From owner-svn-ports-all@freebsd.org Tue Mar 30 11:10:20 2021 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 571BF5C23A7; Tue, 30 Mar 2021 11:10:20 +0000 (UTC) (envelope-from ume@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F8mvJ20KBz4YkM; Tue, 30 Mar 2021 11:10:20 +0000 (UTC) (envelope-from ume@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 32D8425426; Tue, 30 Mar 2021 11:10:20 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12UBAJFQ002637; Tue, 30 Mar 2021 11:10:19 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12UBAIvd002628; Tue, 30 Mar 2021 11:10:18 GMT (envelope-from ume@FreeBSD.org) Message-Id: <202103301110.12UBAIvd002628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Tue, 30 Mar 2021 11:10:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569547 - in head/mail: cyrus-imapd25 cyrus-imapd25/files cyrus-imapd30 cyrus-imapd30/files cyrus-imapd32 cyrus-imapd32/files X-SVN-Group: ports-head X-SVN-Commit-Author: ume X-SVN-Commit-Paths: in head/mail: cyrus-imapd25 cyrus-imapd25/files cyrus-imapd30 cyrus-imapd30/files cyrus-imapd32 cyrus-imapd32/files X-SVN-Commit-Revision: 569547 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: Tue, 30 Mar 2021 11:10:20 -0000 Author: ume Date: Tue Mar 30 11:10:17 2021 New Revision: 569547 URL: https://svnweb.freebsd.org/changeset/ports/569547 Log: better macro checking. Reported by: nork Modified: head/mail/cyrus-imapd25/Makefile head/mail/cyrus-imapd25/files/patch-imap__tls.c head/mail/cyrus-imapd25/files/patch-imtest__imtest.c head/mail/cyrus-imapd30/Makefile head/mail/cyrus-imapd30/files/patch-imap__tls.c head/mail/cyrus-imapd30/files/patch-imtest__imtest.c head/mail/cyrus-imapd32/Makefile head/mail/cyrus-imapd32/files/patch-imap__tls.c head/mail/cyrus-imapd32/files/patch-imtest__imtest.c Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd25/Makefile Tue Mar 30 11:10:17 2021 (r569547) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.5.17 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 25 Modified: head/mail/cyrus-imapd25/files/patch-imap__tls.c ============================================================================== --- head/mail/cyrus-imapd25/files/patch-imap__tls.c Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd25/files/patch-imap__tls.c Tue Mar 30 11:10:17 2021 (r569547) @@ -4,9 +4,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); @@ -14,9 +14,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(c_ctx, off); SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback); Modified: head/mail/cyrus-imapd25/files/patch-imtest__imtest.c ============================================================================== --- head/mail/cyrus-imapd25/files/patch-imtest__imtest.c Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd25/files/patch-imtest__imtest.c Tue Mar 30 11:10:17 2021 (r569547) @@ -4,9 +4,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(tls_ctx, off); SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback); Modified: head/mail/cyrus-imapd30/Makefile ============================================================================== --- head/mail/cyrus-imapd30/Makefile Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd30/Makefile Tue Mar 30 11:10:17 2021 (r569547) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.0.15 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 30 Modified: head/mail/cyrus-imapd30/files/patch-imap__tls.c ============================================================================== --- head/mail/cyrus-imapd30/files/patch-imap__tls.c Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd30/files/patch-imap__tls.c Tue Mar 30 11:10:17 2021 (r569547) @@ -4,9 +4,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); @@ -14,9 +14,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(c_ctx, off); SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback); Modified: head/mail/cyrus-imapd30/files/patch-imtest__imtest.c ============================================================================== --- head/mail/cyrus-imapd30/files/patch-imtest__imtest.c Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd30/files/patch-imtest__imtest.c Tue Mar 30 11:10:17 2021 (r569547) @@ -4,9 +4,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(tls_ctx, off); SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback); Modified: head/mail/cyrus-imapd32/Makefile ============================================================================== --- head/mail/cyrus-imapd32/Makefile Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd32/Makefile Tue Mar 30 11:10:17 2021 (r569547) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.2.6 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 32 Modified: head/mail/cyrus-imapd32/files/patch-imap__tls.c ============================================================================== --- head/mail/cyrus-imapd32/files/patch-imap__tls.c Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd32/files/patch-imap__tls.c Tue Mar 30 11:10:17 2021 (r569547) @@ -4,9 +4,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif const char *tls_versions = config_getstring(IMAPOPT_TLS_VERSIONS); @@ -14,9 +14,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(c_ctx, off); SSL_CTX_set_info_callback(c_ctx, apps_ssl_info_callback); Modified: head/mail/cyrus-imapd32/files/patch-imtest__imtest.c ============================================================================== --- head/mail/cyrus-imapd32/files/patch-imtest__imtest.c Tue Mar 30 10:24:25 2021 (r569546) +++ head/mail/cyrus-imapd32/files/patch-imtest__imtest.c Tue Mar 30 11:10:17 2021 (r569547) @@ -4,9 +4,9 @@ off |= SSL_OP_ALL; /* Work around all known bugs */ off |= SSL_OP_NO_SSLv2; /* Disable insecure SSLv2 */ off |= SSL_OP_NO_SSLv3; /* Disable insecure SSLv3 */ -+#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#if defined(SSL_OP_NO_COMPRESSION) off |= SSL_OP_NO_COMPRESSION; /* Disable TLS compression */ -+#endif // (OPENSSL_VERSION_NUMBER >= 0x1000000fL) ++#endif SSL_CTX_set_options(tls_ctx, off); SSL_CTX_set_info_callback(tls_ctx, apps_ssl_info_callback);