Attachment #215201 for bug #246944

Lines 2-8 Link Here

(-)Makefile (-3 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= claws-mail	4	PORTNAME= claws-mail
5	PORTREVISION= 2	5	PORTREVISION= 3
6	CATEGORIES= mail news	6	CATEGORIES= mail news
7		7
8	COMMENT= Lightweight and featureful GTK+ based e-mail and news client	8	COMMENT= Lightweight and featureful GTK+ based e-mail and news client
Lines 19-25 Link Here
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 60-69 Link Here
60		61
61	.include "Makefile.claws"	62	.include "Makefile.claws"
62		63
		64	post-patch:
		65	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
		66	${WRKSRC}/src/common/ssl.c
		67
63	post-install:	68	post-install:
64	@${MKDIR} ${STAGEDIR}${DATADIR}	69	@${MKDIR} ${STAGEDIR}${DATADIR}
65	(cd ${WRKSRC}/tools && \	70	(cd ${WRKSRC}/tools && \
66	${INSTALL_SCRIPT} acroread2claws-mail.pl ca-certificates.crt \	71	${INSTALL_SCRIPT} acroread2claws-mail.pl \
67	calypso_convert.pl claws-mail-compose-insert-files.pl \	72	calypso_convert.pl claws-mail-compose-insert-files.pl \
68	cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \	73	cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \
69	eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \	74	eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \

Lines 1-6 Link Here

(-)files/patch-configure.ac (-4 / +4 lines)
1	--- configure.ac.orig 2020-04-08 14:26:12.215936000 -0700	1	--- configure.ac.orig 2019-12-16 09:16:04 UTC
2	+++ configure.ac 2020-04-08 14:30:01.861284000 -0700	2	+++ configure.ac
3	@@ -1325,7 +1325,7 @@	3	@@ -1325,7 +1325,7 @@ fi
4	dnl Python *********************************************************************	4	dnl Python *********************************************************************
5	missing_python=""	5	missing_python=""
6	AM_PATH_PYTHON([2.5], [	6	AM_PATH_PYTHON([2.5], [
Lines 9-15 Link Here
9	if test x"$PYTHON_CONFIG" = x"" ; then	9	if test x"$PYTHON_CONFIG" = x"" ; then
10	AC_PATH_PROG(PYTHON_CONFIG, python-config)	10	AC_PATH_PROG(PYTHON_CONFIG, python-config)
11	fi	11	fi
12	@@ -1344,7 +1344,7 @@	12	@@ -1344,7 +1344,7 @@ AM_PATH_PYTHON([2.5], [
13	_save_libs="$LIBS"	13	_save_libs="$LIBS"
14	if test x"$platform_win32" = xno; then	14	if test x"$platform_win32" = xno; then
15	# libpython.so	15	# libpython.so




--- 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
+		"%%LOCALBASE%%/share/certs/ca-root-nss.crt",
 		"/etc/pki/tls/certs/ca-bundle.crt",
 		"/etc/certs/ca-bundle.crt",
 		"/etc/ssl/ca-bundle.pem",

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

Return to bug 246944

Line 0 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	+ "%%LOCALBASE%%/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",