From owner-svn-ports-all@freebsd.org Thu Jun 4 05:48:35 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6DEE332C726; Thu, 4 Jun 2020 05:48:35 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49cvw32JQhz3YFP; Thu, 4 Jun 2020 05:48:35 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A6511A37A; Thu, 4 Jun 2020 05:48:35 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0545mZlx013903; Thu, 4 Jun 2020 05:48:35 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0545mY5a013900; Thu, 4 Jun 2020 05:48:34 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202006040548.0545mY5a013900@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Thu, 4 Jun 2020 05:48:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537868 - in head/mail/claws-mail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/mail/claws-mail: . files X-SVN-Commit-Revision: 537868 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2020 05:48:35 -0000 Author: fernape Date: Thu Jun 4 05:48:34 2020 New Revision: 537868 URL: https://svnweb.freebsd.org/changeset/ports/537868 Log: mail/claws-mail: make it depend on security/ca_root_nss Instead of installing the Win certs bundle. A new patch is needed so it looks for certs by default in out LOCALBASE PR: 246944 Submitted by: ps.ports@smyrak.com Reviewed by: portmaster@bsdforge.com (maintainer) Added: head/mail/claws-mail/files/patch-src_common_ssl.c (contents, props changed) Modified: head/mail/claws-mail/Makefile head/mail/claws-mail/files/patch-configure.ac head/mail/claws-mail/pkg-plist Modified: head/mail/claws-mail/Makefile ============================================================================== --- head/mail/claws-mail/Makefile Thu Jun 4 04:47:43 2020 (r537867) +++ head/mail/claws-mail/Makefile Thu Jun 4 05:48:34 2020 (r537868) @@ -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 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ 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 @@ THEMES_RUN_DEPENDS= claws-mail-themes>0:x11-themes/cla .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 \ Modified: head/mail/claws-mail/files/patch-configure.ac ============================================================================== --- head/mail/claws-mail/files/patch-configure.ac Thu Jun 4 04:47:43 2020 (r537867) +++ head/mail/claws-mail/files/patch-configure.ac Thu Jun 4 05:48:34 2020 (r537868) @@ -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 Added: head/mail/claws-mail/files/patch-src_common_ssl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/claws-mail/files/patch-src_common_ssl.c Thu Jun 4 05:48:34 2020 (r537868) @@ -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", Modified: head/mail/claws-mail/pkg-plist ============================================================================== --- head/mail/claws-mail/pkg-plist Thu Jun 4 04:47:43 2020 (r537867) +++ head/mail/claws-mail/pkg-plist Thu Jun 4 05:48:34 2020 (r537868) @@ -236,7 +236,6 @@ libdata/pkgconfig/claws-mail.pc 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