From nobody Mon Aug 07 23:40:34 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKXr31Hzpz4plvC; Mon, 7 Aug 2023 23:40:35 +0000 (UTC) (envelope-from git@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 4RKXr30rg7z4XDJ; Mon, 7 Aug 2023 23:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691451635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O92zzSlP1uj8ffeHVmiM4HlDFnCCBQrKDmJyie3Q/Nw=; b=YnmYN85UVgXEOu1Jzow8OwZkcSmBJeOlMeC71jCAlWmKtBibm+tWlC67UqsQO2JxQAaFB2 r6/7tTkloCUPO9dxuQHcxVlytaoo/h0jh9J3XYJbN0a6cVO6wOr/znstgmIrhjCwvnpUBK aKdyugI588/JuYPU5WWrkyQiiS6o1pjgavdygyg944qLeSCySGbN41YVEklb9zpfsCPlxW 7duWZ3a2r6JscI5l+2DzhxINBW8QScvAfl2QxNba3jH/elL55PBoYIKP3Ekch9ofcdaq2Y O2yu4QA8rfvIMifjedxcFSvBTYmdnGRhAyaLFsH5m4c5k9lDExw1bA1YqlGyuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691451635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O92zzSlP1uj8ffeHVmiM4HlDFnCCBQrKDmJyie3Q/Nw=; b=cCMfhQKVXKqTtnMTGISTZElN9z/bAIZtk6uMzsGWkIpsJ2xvjMbSbO7IfWC7FtC5wyIuiz fZ5C8kIyil4vfuddTB28Dv7C2CSOIKmjeCZLQTJb8aawetpBl+O6o4CJB+t0CEJaA51ofT uNP2tKOOa0In7uf1UerxF5eYcdwYc5Q+Ht92zWlEDGo89IM5MoP3mc4erWsOBw+7zl/aSD 665nL37o22lYVSm2PCio/fPeRMZoSwqR42/2w96pg5K4MHMhn5vmcoVtppJ/IwRR9p4fAL UAgT2IwLQQ2sFRxDKLDTWrxOVwkBg1o36ZLhjVdjYWcTJLbNFxdQfeL2UMtvKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691451635; a=rsa-sha256; cv=none; b=FCtmE6pSDKI5rHFuHrx8o8KCd7yWTBX2Noft/oY4rgADm08mZ7U7CnQANokfJsELpxX2AM yJ02lHQCgVoT9d/q/q7ymPt4XedH9kLb5YO0kFOBKgFvJ61GJaeAFKynCNftzVZOWurJCV jM4TDbaU6TEh+m6P86wwAEItdV25IKihnZ3fjXoRozu+Nx+k8ZBqOto/8jApqLXy0PgXz8 AMPWh/w/Ii+IQllaN/lzUay3+aIDfKS3XLdy4cQfblvimmh31RecVFVPlQIGKuOWheieCO RGmCivCZ4tGJxml4994VcCfhBqNL55ykm84Bgjn+KIq3srlE62CjYh/dKsuOXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKXr26wlpz1BBH; Mon, 7 Aug 2023 23:40:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377NeYme052101; Mon, 7 Aug 2023 23:40:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377NeYVS052100; Mon, 7 Aug 2023 23:40:34 GMT (envelope-from git) Date: Mon, 7 Aug 2023 23:40:34 GMT Message-Id: <202308072340.377NeYVS052100@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: e1cfb4d87150 - main - mail/datovka: Fix build with openssl3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1cfb4d871508757e27f4b7568cf02a82e78e6a8 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1cfb4d871508757e27f4b7568cf02a82e78e6a8 commit e1cfb4d871508757e27f4b7568cf02a82e78e6a8 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-07 16:28:40 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-07 22:00:18 +0000 mail/datovka: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- mail/datovka/Makefile | 8 +------- mail/datovka/files/patch-src_crypto_crypto.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/mail/datovka/Makefile b/mail/datovka/Makefile index 7e956c32bbf8..b9b2c561db02 100644 --- a/mail/datovka/Makefile +++ b/mail/datovka/Makefile @@ -19,10 +19,4 @@ USE_GL= gl USE_QT= buildtools core gui network printsupport sql svg websockets \ widgets -.include - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L -.endif - -.include +.include diff --git a/mail/datovka/files/patch-src_crypto_crypto.c b/mail/datovka/files/patch-src_crypto_crypto.c new file mode 100644 index 000000000000..098dd144f94c --- /dev/null +++ b/mail/datovka/files/patch-src_crypto_crypto.c @@ -0,0 +1,12 @@ +--- src/crypto/crypto.c.orig 2023-08-07 16:26:04 UTC ++++ src/crypto/crypto.c +@@ -312,7 +312,9 @@ int crypto_init(void) + OpenSSL_add_all_algorithms(); + + ERR_load_crypto_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_CMS_strings(); ++#endif + //ERR_free_strings(); + + if (NULL != ca_certs) {