Attachment 215179 Details for Bug 246944 – ports patch with additional upstream patch

[patch] ports patch with additional upstream patch

claws-mail.patch (text/plain), 1.85 KB, created by Piotr Smyrak on 2020-06-02 20:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Smyrak

Created: 2020-06-02 20:38:39 UTC

Size: 1.85 KB

patch

obsolete

>--- Makefile.orig	2020-06-02 21:49:46.321857000 +0200
>+++ Makefile	2020-06-02 21:53:08.145498000 +0200
>@@ -19,7 +19,8 @@
> 		libexpat.so:textproc/expat2 \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libnettle.so:security/nettle
>-RUN_DEPENDS=	mime-support>0:misc/mime-support
>+RUN_DEPENDS=	mime-support>0:misc/mime-support \
>+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
> USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gettext \
> 		gettext-tools gnome pathfix pkgconfig python:3.5+ shebangfix ssl xorg
>@@ -63,7 +64,7 @@
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
> 	(cd ${WRKSRC}/tools && \
>-		${INSTALL_SCRIPT} acroread2claws-mail.pl ca-certificates.crt \
>+		${INSTALL_SCRIPT} acroread2claws-mail.pl \
> 		calypso_convert.pl claws-mail-compose-insert-files.pl \
> 		cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \
> 		eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \
>--- pkg-plist.orig	2020-06-02 22:06:19.443635000 +0200
>+++ pkg-plist	2020-06-02 22:05:47.809203000 +0200
>@@ -236,7 +236,6 @@
> man/man1/claws-mail.1.gz
> share/applications/claws-mail.desktop
> %%DATADIR%%/acroread2claws-mail.pl
>-%%DATADIR%%/ca-certificates.crt
> %%DATADIR%%/calypso_convert.pl
> %%DATADIR%%/claws-mail-compose-insert-files.pl
> %%DATADIR%%/cm-reparent.pl
>--- /dev/null	2020-06-02 22:18:43.465508000 +0200
>+++ files/patch-src_common_ssl.c	2020-06-02 22:17:55.432944000 +0200
>@@ -0,0 +1,12 @@
>+--- 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",

Actions: View | Diff

Attachments on bug 246944: 215179 | 215201