Attachment 197932 Details for Bug 232088 – Fix OpenSSL 1.x build

[patch] Fix OpenSSL 1.x build

sipp (text/plain), 2.99 KB, created by Nathan on 2018-10-08 21:25:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-10-08 21:25:02 UTC

Size: 2.99 KB

patch

obsolete

>benchmarks/sipp:
>
>* Fix OpenSSL 1.1.x build
>
>PR:		231931
>Submitted by:	Nathan <ndowens@yahoo.com>
>Index: benchmarks/sipp/Makefile
>===================================================================
>--- benchmarks/sipp/Makefile	(revision 481499)
>+++ benchmarks/sipp/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	sipp
> PORTVERSION=	3.5.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	benchmarks net
> MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
> 
>@@ -15,14 +15,12 @@
> BROKEN_mips=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
> BROKEN_mips64=		fails to compile: stat.hpp:307: error: ISO C++ does not support long long
> BROKEN_powerpc64=	fails to compile: stat.hpp:307: error: ISO C++ does not support long long
>-BROKEN_SSL=		openssl-devel
>-BROKEN_SSL_REASON_openssl-devel=	configure: error: ssl library missing
> 
> BUILD_DEPENDS=	help2man:misc/help2man
> 
> PLIST_FILES=	bin/sipp man/man1/sipp.1.gz
> 
>-USES=		autoreconf gmake ncurses
>+USES=		autoreconf gmake pkgconfig ncurses
> GNU_CONFIGURE=	yes
> 
> OPTIONS_DEFINE=	OPENSSL GSL PCAP RTPSTREAM SCTP
>Index: benchmarks/sipp/files/patch-configure.ac
>===================================================================
>--- benchmarks/sipp/files/patch-configure.ac	(nonexistent)
>+++ benchmarks/sipp/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,24 @@
>+--- configure.ac.orig	2018-10-08 21:17:06 UTC
>++++ configure.ac
>+@@ -137,14 +137,18 @@ AC_SEARCH_LIBS([shutdown], [socket])
>+ 
>+ # Conditional build with OpenSSL
>+ if test "$openssl" = 'yes'; then
>+-    AC_CHECK_HEADERS([openssl/md5.h],,[AC_MSG_ERROR([<openssl/md5.h> header missing])])
>++# Conditional build with OpenSSL
>++if test "$openssl" = 'yes'; then
>+     AC_CHECK_HEADERS([openssl/bio.h],,[AC_MSG_ERROR([<openssl/bio.h> header missing])])
>+     AC_CHECK_HEADERS([openssl/err.h],,[AC_MSG_ERROR([<openssl/err.h> header missing])])
>+     AC_CHECK_HEADERS([openssl/rand.h],,[AC_MSG_ERROR([<openssl/rand.h> header missing])])
>+     AC_CHECK_HEADERS([openssl/ssl.h],,[AC_MSG_ERROR([<openssl/ssl.h> header missing])])
>+     AC_CHECK_HEADERS([openssl/x509v3.h],,[AC_MSG_ERROR([<openssl/x509v3.h> header missing])])
>+-    AC_CHECK_LIB([ssl], [SSL_library_init],,[AC_MSG_ERROR([ssl library missing])])
>+-    AC_CHECK_LIB([crypto], [CRYPTO_num_locks],,[AC_MSG_ERROR([crypto library missing])])
>++    AC_CHECK_LIB([ssl], [SSL_CTX_new],,[AC_MSG_ERROR([ssl library missing])])
>++    AC_CHECK_LIB([crypto], [CRYPTO_free],,[AC_MSG_ERROR([crypto library missing])])
>++fi
>++# For Makefile.am
>++AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = "yes")
>+ fi
>+ # For Makefile.am
>+ AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = "yes")
>
>Property changes on: benchmarks/sipp/files/patch-configure.ac
>___________________________________________________________________
>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 232088: 197931 | 197932 | 197933 | 197934