Date: Sat, 2 Sep 2023 14:34:47 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 3bb8698c86ce - 2023Q3 - deskutils/calibre: Fix fetch Message-ID: <202309021434.382EYliO027797@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=3bb8698c86ce66cedd7ce15e08160063e165f0c1 commit 3bb8698c86ce66cedd7ce15e08160063e165f0c1 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2023-09-02 14:28:32 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309021434.382EYliO027797>