Skip to content

Commit

Permalink
deskutils/calibre: Fix fetch
Browse files Browse the repository at this point in the history
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
  • Loading branch information
madpilot78 committed Sep 2, 2023
1 parent f6afbee commit 2391c64
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
11 changes: 5 additions & 6 deletions deskutils/calibre/Makefile
@@ -1,19 +1,18 @@
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
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 \
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions 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
Expand Down

0 comments on commit 2391c64

Please sign in to comment.