svn commit: r421905 - in head/mail/deforaos-mailer: . files
John Marino
marino at FreeBSD.org
Mon Sep 12 04:53:29 UTC 2016
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)
More information about the svn-ports-head
mailing list