Date: Sat, 2 Sep 2023 14:29:48 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2391c64feda2 - main - deskutils/calibre: Fix fetch Message-ID: <202309021429.382ETmw2011676@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2391c64feda2b0a2105d44eafb6dd1a59b2aaf9f commit 2391c64feda2b0a2105d44eafb6dd1a59b2aaf9f 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: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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309021429.382ETmw2011676>