Attachment 206682 Details for Bug 238133 – svn-diff-libesmtp-openssl111

[patch] svn-diff-libesmtp-openssl111

svn-diff-libesmtp (text/plain), 3.48 KB, created by Walter Schwarzenfeld on 2019-08-18 23:03:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-08-18 23:03:22 UTC

Size: 3.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 509243)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libesmtp
> PORTVERSION=	1.0.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://www.stafford.uklinux.net/libesmtp/ \
>@@ -16,8 +16,6 @@
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 
>-BROKEN_SSL=	openssl111
>-
> USES=		gmake libtool tar:bzip2
> GNU_CONFIGURE=	yes
> # require-all-recipients (implied by enable-all) is required for Balsa
>Index: files/patch-openssl111
>===================================================================
>--- files/patch-openssl111	(nonexistent)
>+++ files/patch-openssl111	(working copy)
>@@ -0,0 +1,87 @@
>+--- configure
>++++ configure
>+@@ -11896,9 +11896,9 @@ fi
>+ 
>+ fi
>+ if test x$with_openssl != xno ; then
>+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
>+-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
>+-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
>++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_new in -lssl" >&5
>++$as_echo_n "checking for SSL_new in -lssl... " >&6; }
>++if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then :
>+   $as_echo_n "(cached) " >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+@@ -11913,27 +11913,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+ #ifdef __cplusplus
>+ extern "C"
>+ #endif
>+-char SSL_library_init ();
>++char SSL_new ();
>+ int
>+ main ()
>+ {
>+-return SSL_library_init ();
>++return SSL_new ();
>+   ;
>+   return 0;
>+ }
>+ _ACEOF
>+ if ac_fn_c_try_link "$LINENO"; then :
>+-  ac_cv_lib_ssl_SSL_library_init=yes
>++  ac_cv_lib_ssl_SSL_new=yes
>+ else
>+-  ac_cv_lib_ssl_SSL_library_init=no
>++  ac_cv_lib_ssl_SSL_new=no
>+ fi
>+ rm -f core conftest.err conftest.$ac_objext \
>+     conftest$ac_exeext conftest.$ac_ext
>+ LIBS=$ac_check_lib_save_LIBS
>+ fi
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
>+-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
>+-if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
>++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
>++$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
>++if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then :
>+ 
>+ 				with_openssl=yes
>+ 				LIBS="-lssl -lcrypto $LIBS"
>+--- smtp-tls.c
>++++ smtp-tls.c
>+@@ -64,10 +64,12 @@ openssl_mutexcb (int mode, int n,
>+ 		 const char *file __attribute__ ((unused)),
>+ 		 int line __attribute__ ((unused)))
>+ {
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L
>+   if (mode & CRYPTO_LOCK)
>+     pthread_mutex_lock (&openssl_mutex[n]);
>+   else
>+     pthread_mutex_unlock (&openssl_mutex[n]);
>++#endif
>+ }
>+ #endif
>+ 
>+@@ -76,7 +78,7 @@ starttls_init (void)
>+ {
>+   if (tls_init)
>+     return 1;
>+-
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L
>+ #ifdef USE_PTHREADS
>+   /* Set up mutexes for the OpenSSL library */
>+   if (openssl_mutex == NULL)
>+@@ -94,9 +96,12 @@ starttls_init (void)
>+       CRYPTO_set_locking_callback (openssl_mutexcb);
>+     }
>+ #endif
>+-  tls_init = 1;
>+   SSL_load_error_strings ();
>+   SSL_library_init ();
>++#else
>++  OPENSSL_init_ssl(0, NULL);
>++#endif
>++  tls_init = 1;
>+   return 1;
>+ }
>
>Property changes on: files/patch-openssl111
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 238133: 204615 | 206682