Attachment 215201 Details for Bug 246944 – additional improvements on top of submitter's patch

[patch] additional improvements on top of submitter's patch

mail_claws-mail.svndiff (text/plain), 3.47 KB, created by Fernando Apesteguía on 2020-06-03 16:41:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2020-06-03 16:41:32 UTC

Size: 3.47 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 537458)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	claws-mail
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail news
> 
> COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
>@@ -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
>@@ -60,10 +61,14 @@
> 
> .include "Makefile.claws"
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
>+	${WRKSRC}/src/common/ssl.c
>+
> 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 \
>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(revision 537458)
>+++ files/patch-configure.ac	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2020-04-08 14:26:12.215936000 -0700
>-+++ configure.ac	2020-04-08 14:30:01.861284000 -0700
>-@@ -1325,7 +1325,7 @@
>+--- configure.ac.orig	2019-12-16 09:16:04 UTC
>++++ configure.ac
>+@@ -1325,7 +1325,7 @@ fi
>  dnl Python *********************************************************************
>  missing_python=""
>  AM_PATH_PYTHON([2.5], [
>@@ -9,7 +9,7 @@
>  	if test x"$PYTHON_CONFIG" = x"" ; then
>  		AC_PATH_PROG(PYTHON_CONFIG, python-config)
>  	fi
>-@@ -1344,7 +1344,7 @@
>+@@ -1344,7 +1344,7 @@ AM_PATH_PYTHON([2.5], [
>  		_save_libs="$LIBS"
>  		if test x"$platform_win32" = xno; then
>  			# libpython.so
>Index: files/patch-src_common_ssl.c
>===================================================================
>--- files/patch-src_common_ssl.c	(nonexistent)
>+++ files/patch-src_common_ssl.c	(working copy)
>@@ -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
>++		"%%LOCALBASE%%/share/certs/ca-root-nss.crt",
>+ 		"/etc/pki/tls/certs/ca-bundle.crt",
>+ 		"/etc/certs/ca-bundle.crt",
>+ 		"/etc/ssl/ca-bundle.pem",
>
>Property changes on: files/patch-src_common_ssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 537458)
>+++ pkg-plist	(working copy)
>@@ -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

Flags:

portmaster: maintainer-approval+

Actions: View | Diff

Attachments on bug 246944: 215179 | 215201