From owner-svn-ports-head@freebsd.org Mon Sep 12 04:53:29 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7C09BD5E38; Mon, 12 Sep 2016 04:53:29 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id 77F64CEB; Mon, 12 Sep 2016 04:53:29 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C4rSKX052407; Mon, 12 Sep 2016 04:53:28 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C4rSnJ052404; Mon, 12 Sep 2016 04:53:28 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609120453.u8C4rSnJ052404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 12 Sep 2016 04:53:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421905 - in head/mail/deforaos-mailer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 04:53:29 -0000 Author: marino Date: Mon Sep 12 04:53:28 2016 New Revision: 421905 URL: https://svnweb.freebsd.org/changeset/ports/421905 Log: mail/deforaos-mailer: Support non-base SSL including no SSLv3 (LibreSSL) Approved by: SSL blanket Added: head/mail/deforaos-mailer/files/patch-src_mailer.c (contents, props changed) head/mail/deforaos-mailer/files/patch-tests_Makefile (contents, props changed) Modified: head/mail/deforaos-mailer/Makefile Modified: head/mail/deforaos-mailer/Makefile ============================================================================== --- head/mail/deforaos-mailer/Makefile Mon Sep 12 04:30:35 2016 (r421904) +++ head/mail/deforaos-mailer/Makefile Mon Sep 12 04:53:28 2016 (r421905) @@ -18,10 +18,9 @@ LIB_DEPENDS= libSystem.so:devel/deforaos libDesktop.so:x11/deforaos-libdesktop USE_GNOME= gtk20 -USES= desktop-file-utils pkgconfig +USES= desktop-file-utils pkgconfig ssl INSTALLS_ICONS= yes USE_LDCONFIG= yes -USE_OPENSSL= yes MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man Added: head/mail/deforaos-mailer/files/patch-src_mailer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/deforaos-mailer/files/patch-src_mailer.c Mon Sep 12 04:53:28 2016 (r421905) @@ -0,0 +1,14 @@ +--- src/mailer.c.orig 2016-02-20 14:36:22 UTC ++++ src/mailer.c +@@ -373,7 +373,11 @@ Mailer * mailer_new(void) + /* ssl */ + SSL_load_error_strings(); + SSL_library_init(); ++#ifndef OPENSSL_NO_SSL3 + if((mailer->ssl_ctx = SSL_CTX_new(SSLv3_client_method())) == NULL ++#else ++ if((mailer->ssl_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL ++#endif + || SSL_CTX_set_cipher_list(mailer->ssl_ctx, + SSL_DEFAULT_CIPHER_LIST) != 1 + || SSL_CTX_load_verify_locations(mailer->ssl_ctx, NULL, Added: head/mail/deforaos-mailer/files/patch-tests_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/deforaos-mailer/files/patch-tests_Makefile Mon Sep 12 04:53:28 2016 (r421905) @@ -0,0 +1,11 @@ +--- tests/Makefile.orig 2016-09-12 04:36:41 UTC ++++ tests/Makefile +@@ -27,7 +27,7 @@ $(OBJDIR)date$(EXEEXT): $(date_OBJS) + $(CC) -o $(OBJDIR)date$(EXEEXT) $(date_OBJS) $(date_LDFLAGS) + + email_OBJS = $(OBJDIR)email.o +-email_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) ++email_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags openssl` + email_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L$(OBJDIR)../src -Wl,-rpath,$(OBJDIR)../src -lMailer + + $(OBJDIR)email$(EXEEXT): $(email_OBJS)