From nobody Sat Sep 02 14:29:48 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 4RdHNY1gSkz4rWWQ; Sat, 2 Sep 2023 14:29:49 +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 4RdHNY06hYz3XZP; Sat, 2 Sep 2023 14:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693664989; 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=2IC8Q6MprpOGOt5iPPQIsEUX0s4FgA6YONSpE2MSskc=; b=rUxs6y3ZKc8rQXyDT95+N3zU84Wk+nkW8MyBMfPZuWf7tKim8NLKXmmIuloz+mB027nH6G OvlbjMW9iA3KIxAVqDShsfKylTSlIsZAMluOHaIv6HMXSBKXQuiBQcHVhqmoO3J29nki+6 DsoeQdXXek0zWtdcWqcxY3UZUQ0IRdMLyaOPIeOPHzFyELA0WlwG7REqEQinaYzjFqhL9A IlyzniY2vO5PVUdUr/kWFOgLAallLSNCMLAz/UQyzqeCPtS+OdM3lE2SO4OEBEJ7MADLl5 5xy+uFDH73CoT9rgsmSO8LaUYwrfQogPgskXXStyiKUHIPwDGAVvDzJJfSk1Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693664989; a=rsa-sha256; cv=none; b=ZSauO3eDS5XmihuhTuO+UGdaKfq2Tw6ZSbMLY2w4Nya40jJuN8zM0CVI8aKasxS6FxX/YF gXpGA+mHP6x9CryiwyjPzVcseLrkRxcouRF5OQOc6BuS9f1lEhiHnJ2Chg9chTC5lF0OXS qgdq4s9pqR1uNXEp/qypykvSv3dDH+EdfS/hJXeeKznAXJqyNVowh02cKkS+93yA8FCi+Q TnUFXstq0LzZStyz8jGh5AJdCC6KFD3zNdCz2n1GQjqZZI75HdcWU29VOz5NOUyCPmCAJM WE0050N35YdhDwYVKKEfCiS5hiC3QaCnHjvQaTehl1uW5nvv8utBVv+X739XgQ== 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=1693664989; 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=2IC8Q6MprpOGOt5iPPQIsEUX0s4FgA6YONSpE2MSskc=; b=qtDB7RUOe13Z07EQCW+2fgwgBzAGnlrXJqRHZ9WaLZb40n9qHJZWlchWI3gmsXpo7NREgF KI5yt2vzcjPgJHloEc9Kvin7dEKyG98w/rs5S/f2iLuoVDYF2DxI1Z5E+AGPa/IbetCetl yyIaVTCcNoin1e8zqWx2Vzke3dT/pMOFDqyHtOuYUFVfplENJhe1aqFzsf6iDcv+G7/zds +IPlLefpwkLdxo4cIdSVmY1z7TXnHjWYvuz065sN0KQTbh2o/mqSqrrYRu6rLLWn5zWkjU FbL8Jx6oYh9cxZ2LoC45QCGc7YXWeq1xSgCQ98WOxlDcKBTVqnDwPgn0asLSiA== 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 4RdHNX5vL5zm0D; Sat, 2 Sep 2023 14:29:48 +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 382ETm1Y011679; Sat, 2 Sep 2023 14:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 382ETmw2011676; Sat, 2 Sep 2023 14:29:48 GMT (envelope-from git) Date: Sat, 2 Sep 2023 14:29:48 GMT Message-Id: <202309021429.382ETmw2011676@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 2391c64feda2 - main - deskutils/calibre: Fix fetch 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2391c64feda2b0a2105d44eafb6dd1a59b2aaf9f Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2391c64feda2b0a2105d44eafb6dd1a59b2aaf9f commit 2391c64feda2b0a2105d44eafb6dd1a59b2aaf9f Author: Guido Falsi AuthorDate: 2023-09-02 14:28:32 +0000 Commit: Guido Falsi CommitDate: 2023-09-02 14:29:43 +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 --- 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 8dc883649902..13128464ad70 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -1,12 +1,9 @@ PORTNAME= calibre PORTVERSION= 6.25.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 \ @@ -109,7 +108,7 @@ ISOCODESWRKSRC!= ${BSDMAKE} -C ${.CURDIR}/../../misc/iso-codes -V WRKSRC 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 78586696f728..42afb3ee89d5 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,8 +1,6 @@ TIMESTAMP = 1692342529 SHA256 (calibre/calibre-6.25.0.tar.xz) = e20841d915089a1f00b0c1ac042b1578a5e0c95fa59422cdcb6e3fd8b349c2fd SIZE (calibre/calibre-6.25.0.tar.xz) = 42763304 -SHA256 (calibre/cacert.pem) = 5fadcae90aa4ae041150f8e2d26c37d980522cdb49f923fc1e1b5eb8d74e71ad -SIZE (calibre/cacert.pem) = 215902 SHA256 (calibre/kovidgoyal-calibre-translations-3ba8a9a_GH0.tar.gz) = 4913d4fe5807d369d0112f6146268850a7c6ee8b100a4c3bab33c8acf786a446 SIZE (calibre/kovidgoyal-calibre-translations-3ba8a9a_GH0.tar.gz) = 71912636 SHA256 (calibre/LibreOffice-dictionaries-b47a96b_GH0.tar.gz) = bd80de75c61d8db327b11dfff28b4c2d757a4857f820197c5982f3056f436ba9