Attachment #215179 for bug #246944

Lines 19-25 Link Here

(-)Makefile (-2 / +3 lines)
19	libexpat.so:textproc/expat2 \	19	libexpat.so:textproc/expat2 \
20	libfontconfig.so:x11-fonts/fontconfig \	20	libfontconfig.so:x11-fonts/fontconfig \
21	libnettle.so:security/nettle	21	libnettle.so:security/nettle
22	RUN_DEPENDS= mime-support>0:misc/mime-support	22	RUN_DEPENDS= mime-support>0:misc/mime-support \
		23	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
23		24
24	USES= autoreconf compiler:c++11-lang cpe desktop-file-utils gettext \	25	USES= autoreconf compiler:c++11-lang cpe desktop-file-utils gettext \
25	gettext-tools gnome pathfix pkgconfig python:3.5+ shebangfix ssl xorg	26	gettext-tools gnome pathfix pkgconfig python:3.5+ shebangfix ssl xorg
Lines 63-69 Link Here
63	post-install:	64	post-install:
64	@${MKDIR} ${STAGEDIR}${DATADIR}	65	@${MKDIR} ${STAGEDIR}${DATADIR}
65	(cd ${WRKSRC}/tools && \	66	(cd ${WRKSRC}/tools && \
66	${INSTALL_SCRIPT} acroread2claws-mail.pl ca-certificates.crt \	67	${INSTALL_SCRIPT} acroread2claws-mail.pl \
67	calypso_convert.pl claws-mail-compose-insert-files.pl \	68	calypso_convert.pl claws-mail-compose-insert-files.pl \
68	cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \	69	cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \
69	eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \	70	eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \

Lines 236-242 Link Here

(-)pkg-plist (-1 lines)
236	man/man1/claws-mail.1.gz	236	man/man1/claws-mail.1.gz
237	share/applications/claws-mail.desktop	237	share/applications/claws-mail.desktop
238	%%DATADIR%%/acroread2claws-mail.pl	238	%%DATADIR%%/acroread2claws-mail.pl
239	%%DATADIR%%/ca-certificates.crt
240	%%DATADIR%%/calypso_convert.pl	239	%%DATADIR%%/calypso_convert.pl
241	%%DATADIR%%/claws-mail-compose-insert-files.pl	240	%%DATADIR%%/claws-mail-compose-insert-files.pl
242	%%DATADIR%%/cm-reparent.pl	241	%%DATADIR%%/cm-reparent.pl




--- src/common/ssl.c.orig	2018-12-21 09:33:36 UTC
+++ src/common/ssl.c
@@ -196,6 +196,9 @@ const gchar *claws_ssl_get_cert_file(void)
 #ifndef G_OS_WIN32
 	const char *cert_files[]={
 		"/etc/ssl/cert.pem",
+		// Also search in LOCALBASE directory to
+		// workaround potential lack of /etc symlink
+		"/usr/local/share/certs/ca-root-nss.crt",
 		"/etc/pki/tls/certs/ca-bundle.crt",
 		"/etc/certs/ca-bundle.crt",
 		"/etc/ssl/ca-bundle.pem",

Return to bug 246944

Added Link Here

(-)files/patch-src_common_ssl.c (+12 lines)
1	--- src/common/ssl.c.orig 2018-12-21 09:33:36 UTC
2	+++ src/common/ssl.c
3	@@ -196,6 +196,9 @@ const gchar *claws_ssl_get_cert_file(void)
4	#ifndef G_OS_WIN32
5	const char *cert_files[]={
6	"/etc/ssl/cert.pem",
7	+ // Also search in LOCALBASE directory to
8	+ // workaround potential lack of /etc symlink
9	+ "/usr/local/share/certs/ca-root-nss.crt",
10	"/etc/pki/tls/certs/ca-bundle.crt",
11	"/etc/certs/ca-bundle.crt",
12	"/etc/ssl/ca-bundle.pem",