From nobody Sat Sep 02 14:34:47 2023 X-Original-To: dev-commits-ports-all@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 4RdHVJ0XSyz4rYFn; Sat, 2 Sep 2023 14:34:48 +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 4RdHVJ06Z1z3Yrm; Sat, 2 Sep 2023 14:34:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693665288; 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=C13UvhWI6CDvmBqPU80H29OXzyjr6Vc8SQ65YBVP+Gw=; b=PubRqaq42poT1bPK6m9VEtrCaOmh/CY/R29qId7TZNXdwEHfUjtwO71+WKi8trJ6QiwBrM VBuaduCVP3FBG8qzZ0lv907Y1PrbCaymOSCF1sXf3VvjB7uLIaK7RPdQvlSPZ5BfWL2Ig1 DXRZrDYo23ClOATSeMne6DeJp+gwNbHD/zXbs+ZdLzD6mjBaR6sHl6jRSqpgVSr44R5uzt 3QObhIYaBWGrJKh1qhX8LR8T7dGQD6fcObN/j4lAJzJ/mjoTC/wRF6/fFu07fzogtwZ88W FOyEw5XO0cleuo27aj3uA+OSEct+d6wufgyPjmbsZLqDNtIBpKDy7WXUup6nDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693665288; a=rsa-sha256; cv=none; b=MwDfDDyZiw7gzegfaUPqx257SUIOYP5+uB6jw3kDPhG4ka9gG3UsJBONCcxcjxlgVB942N mVXyoUEF/rQVk1NfNCKSAvlON/5UesXhBcDjxdAOPA9/G00E+zFkmKvEZ2cxfOQHhYTQNI FaRT6iT0OLJRikZ0maLynQZ93XgzF+qSSXrX1VYsCu3hetnuzDvAqvUMYSAhXFQrc7IUF0 hELpHZOFyAJSkIGQEFr+huTOYYhIIv172kYJoJPrLqCI/onSEsPAycOxaF3PWltPpHDbuM /KqdCJZLzHzLohR3r/rccu51c3TpZzZEHVdJkwssOtFkovGZpneQUrSHpAuBMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693665288; 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=C13UvhWI6CDvmBqPU80H29OXzyjr6Vc8SQ65YBVP+Gw=; b=eyLK8eyVAaCXSNst76KQd/ilsmyUBQ/XD41Sr3yKGkNjUnAvnpAe9mIKx6l3rJXKWsSGBq Rfm1lY5WqnZDYhn8kNeUlLty+J8OLP0v62JVAGhSi+9ih7Aba4fB82lB2iXDqJrlymsSZL uYlTWkefeFeiZEjmvvXm7O4ZZOCVVt3E36h7K0s7ji2ebYAByAlR+DH0PfVqeh5jk2lhcT CzU+wA8cL+b2T6kbsgJnFgGFzTE0K+pjQf3rAKUHWqVVEo0EfnK8nWxDdsKMSYjVq5QyUt OuNa8qUlQIlUh78h4q7hpg6jrMp0o5to1Jl27lobVl1XAybufTPJCDMjqEbz1A== 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 4RdHVH6K1szmnL; Sat, 2 Sep 2023 14:34:47 +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 382EYlTI027800; Sat, 2 Sep 2023 14:34:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 382EYliO027797; Sat, 2 Sep 2023 14:34:47 GMT (envelope-from git) Date: Sat, 2 Sep 2023 14:34:47 GMT Message-Id: <202309021434.382EYliO027797@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: 3bb8698c86ce - 2023Q3 - deskutils/calibre: Fix fetch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 3bb8698c86ce66cedd7ce15e08160063e165f0c1 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bb8698c86ce66cedd7ce15e08160063e165f0c1 commit 3bb8698c86ce66cedd7ce15e08160063e165f0c1 Author: Guido Falsi AuthorDate: 2023-09-02 14:28:32 +0000 Commit: Guido Falsi CommitDate: 2023-09-02 14:31:26 +0000 deskutils/calibre: Fix fetch Grab mozilla-ca-certs.pem file from security/ca_root_nss instead of fetching a changing file from the net. This avoids checksum errors when the file is rerolled. Reported by: pkg-fallout (cherry picked from commit 2391c64feda2b0a2105d44eafb6dd1a59b2aaf9f) --- deskutils/calibre/Makefile | 11 +++++------ deskutils/calibre/distinfo | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 4d0f94acbbd7..9faf2d9294fb 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,12 +1,9 @@ PORTNAME= calibre PORTVERSION= 6.22.0 CATEGORIES= deskutils python -MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ \ - https://curl.haxx.se/ca/:cacert -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - cacert.pem:cacert +MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTFILES:C/:[^:]+$//:Ncacert.pem} MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application @@ -14,6 +11,8 @@ WWW= https://calibre-ebook.com/ LICENSE= GPLv3 + +EXTRACT_DEPENDS=${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libpoppler-qt6.so:graphics/poppler-qt6 \ libwmflite.so:graphics/libwmf \ @@ -104,7 +103,7 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ post-extract: @${MV} ${WRKSRC_translations} ${WRKSRC}/src/translations - @${CP} ${DISTDIR}/${DIST_SUBDIR}/cacert.pem ${WRKSRC}/resources/mozilla-ca-certs.pem + @${CP} ${LOCALBASE}/share/certs/ca-root-nss.crt ${WRKSRC}/resources/mozilla-ca-certs.pem @${CP} ${FILESDIR}/user-agent-data.json ${WRKSRC}/resources post-patch: diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index e594fe6ed03d..d5076911bb90 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,8 +1,6 @@ TIMESTAMP = 1688111798 SHA256 (calibre/calibre-6.22.0.tar.xz) = 4c15dd11fe8c04feb885e63ab8069526d65cf929e117804d26085c0ae4e8a547 SIZE (calibre/calibre-6.22.0.tar.xz) = 42822576 -SHA256 (calibre/cacert.pem) = fb1ecd641d0a02c01bc9036d513cb658bbda62a75e246bedbc01764560a639f0 -SIZE (calibre/cacert.pem) = 216583 SHA256 (calibre/kovidgoyal-calibre-translations-d911cab_GH0.tar.gz) = 625b6bed69e376bd05de2b1b76e1c2b21846e31beb6bb2e957cf2aa472c29fb7 SIZE (calibre/kovidgoyal-calibre-translations-d911cab_GH0.tar.gz) = 71813621 SHA256 (calibre/LibreOffice-dictionaries-8b6fc85_GH0.tar.gz) = dcbdeddb3c7c8df2d340ae381bbefd8ee6a64b7a6c79a6ad6e0d095463dcd2a3