From nobody Tue Nov 12 20:56:37 2024 X-Original-To: dev-commits-ports-branches@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 4XnzH93H6Lz5cbTJ; Tue, 12 Nov 2024 20:56:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnzH91hLdz4HqG; Tue, 12 Nov 2024 20:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731444997; 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=YeydYw4w/i42pQ3/04Ezm5ZkTSDFACxdChaOulpwwIQ=; b=xwYPz511JV3F/eOy0sEqBMPs2CAiGqBZ0t7i3AztKAycx4oU/gMTMqtGFU58dAO3WLKpNX tcGhvMzGvXq6eNB/BGBoPxSIg60zmlCZfl6SZ0hER6CuaMofVUzvFmbYxQOll/daonxbsj Dx9eU52VljoCYsyPNpTe5yteoedv2rDU7SA+aHsqNvlVVLuB+HWFy/SAaLr9egUcva7kLk iC7/azwLJZnJM7uRy2ihu1i6U6BKs303USOmDSMV8hwU564p41wyfjvgrAjflb1PCGA+j+ ekM3qYeZMcIV5tXku3w+SREFzwGWWK2ii3HcHhSTSGNVzkgAIni9ipxnV0VORQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731444997; 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=YeydYw4w/i42pQ3/04Ezm5ZkTSDFACxdChaOulpwwIQ=; b=EriTivxUngwf/7v8D7DThHba5RL8xLHXftoaJD9SAcEc/Xvz4pxU/UCtq0dtMqwHICnxwa CFet9i9hnulz4aaUn11REZj3NHLgYbEIO+q6JyLHxYrWUsYwvpG9mXozSIDYs3Tvfu8UCh f59iS4J3p1VAZ8SSV7Doa18UcMlr3QiNccqvnbF47s0sjFmxQFG+aeEjLleh2w1gM9FDiI Vjus+fbv9q9AO23DxFvrFS0ajoAEdrvaGWH32kdYIxOis3M9PnCg9yOrRSi67SK5p6JDJZ Az7aadqQCVngVy/qXu9oMW/M6VQ/qOi4jzXhFlFPvj1yke662nfg/+qyh4VlMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731444997; a=rsa-sha256; cv=none; b=Qk481uNBOs5HNzVYY4mrtxyO0YHXaqXutwW/gj5ES1oBhsF3fGCJEGiYMOcUz1lBPru1MO rKZFZo8+xme7+XBqqQaHXXXhG/AWIYshkQjwYron6yb5IHtWbrWR3JoHWdpc+EQDAjzUze hOlwrJTPuGh4N9rQRZyIhk07FsJr7Ogmw7pQZRaigpNV7i83YySrwELhJD7Am0QvBZc/gz SzBTx+qy5ji/6Mk8LOaUiR2MUQo95mS4jRyNmD4qy2JlYc47EYSsDpQOnJ1UqjiFWSgYgz 3J3xf5ch7rObW/4QT47Wz+EnzJ+l0wSQyPDD4lOncXJ2VVGHJWHs+wqsMSBDfw== 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 4XnzH90x8MzQFf; Tue, 12 Nov 2024 20:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ACKubxV021909; Tue, 12 Nov 2024 20:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ACKubqT021906; Tue, 12 Nov 2024 20:56:37 GMT (envelope-from git) Date: Tue, 12 Nov 2024 20:56:37 GMT Message-Id: <202411122056.4ACKubqT021906@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 6f65b525e807 - 2024Q4 - deskutils/calibre: Fix build on 13.3 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 6f65b525e807b82e29c78fa112c568661a780254 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f65b525e807b82e29c78fa112c568661a780254 commit 6f65b525e807b82e29c78fa112c568661a780254 Author: Guido Falsi AuthorDate: 2024-11-12 20:49:57 +0000 Commit: Guido Falsi CommitDate: 2024-11-12 20:56:23 +0000 deskutils/calibre: Fix build on 13.3 Recent changes depend on an OpenSSL 3.x define. Just define it for older releases. Reported by: pkg-fallout MFH: 2024Q4 (cherry picked from commit d450feb023678e6579cee6eaf37730a12adb08ae) --- deskutils/calibre/files/patch-src_calibre_utils_certgen.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/deskutils/calibre/files/patch-src_calibre_utils_certgen.c b/deskutils/calibre/files/patch-src_calibre_utils_certgen.c new file mode 100644 index 000000000000..1c47b5f7cf56 --- /dev/null +++ b/deskutils/calibre/files/patch-src_calibre_utils_certgen.c @@ -0,0 +1,13 @@ +--- src/calibre/utils/certgen.c.orig 2024-11-08 03:00:49 UTC ++++ src/calibre/utils/certgen.c +@@ -22,6 +22,10 @@ + #include + #include + ++#if __FreeBSD_version < 1400092 ++#define X509_REQ_VERSION_1 1 ++#endif ++ + static PyObject* + set_error_with_detail(const char *where, const char* detail) { + char *suffix = NULL, buf[1024];