From 8994d3d32b92fb97ff2ce6e31c74e9a270b8adb3 Mon Sep 17 00:00:00 2001 From: Jochen Neumeister Date: Mon, 15 Oct 2018 16:46:32 +0000 Subject: [PATCH] Fix build with OpenSSL 1.1.x PR: 232220 Submitted by: Nathan Sponsored by: Netzkommune GmbH --- www/mod_webauth/Makefile | 3 +- www/mod_webauth/files/patch-configure | 98 +++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 www/mod_webauth/files/patch-configure diff --git a/www/mod_webauth/Makefile b/www/mod_webauth/Makefile index d955d16ddcd4..faf0b3ad6970 100644 --- a/www/mod_webauth/Makefile +++ b/www/mod_webauth/Makefile @@ -3,6 +3,7 @@ PORTNAME= mod_webauth PORTVERSION= 4.7.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webauth.stanford.edu/dist/ DISTNAME= webauth-${PORTVERSION} @@ -13,7 +14,7 @@ COMMENT= Apache module for authenticating users with Kerberos v5 LIB_DEPENDS= libcurl.so:ftp/curl \ libsasl2.so:security/cyrus-sasl2 -USES= apache:2.2+ libtool pathfix pkgconfig ssl +USES= apache:2.4 libtool pathfix pkgconfig ssl USE_OPENLDAP= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/www/mod_webauth/files/patch-configure b/www/mod_webauth/files/patch-configure new file mode 100644 index 000000000000..34e3cb10ad22 --- /dev/null +++ b/www/mod_webauth/files/patch-configure @@ -0,0 +1,98 @@ +--- configure.orig 2018-10-13 05:39:44 UTC ++++ configure +@@ -23425,9 +23425,9 @@ fi + fi + + if test x"$rra_reduced_depends" = xtrue; 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 ${ac_cv_lib_ssl_SSL_library_init+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 ++$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } ++if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23441,27 +23441,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char SSL_CTX_new (); + int + main () + { +-return SSL_library_init (); ++return SSL_CTX_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_CTX_new=yes + else +- ac_cv_lib_ssl_SSL_library_init=no ++ ac_cv_lib_ssl_SSL_CTX_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" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 ++$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } ++if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then : + OPENSSL_LIBS=-lssl + else + if test x"true" = xtrue; then : +@@ -23470,9 +23470,9 @@ fi + fi + + else +- { $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 ${ac_cv_lib_ssl_SSL_library_init+:} false; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 ++$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } ++if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -23486,27 +23486,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #ifdef __cplusplus + extern "C" + #endif +-char SSL_library_init (); ++char SSL_CTX_new (); + int + main () + { +-return SSL_library_init (); ++return SSL_CTX_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_CTX_new=yes + else +- ac_cv_lib_ssl_SSL_library_init=no ++ ac_cv_lib_ssl_SSL_CTX_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" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 ++$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } ++if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then : + OPENSSL_LIBS="-lssl $CRYPTO_LIBS" + else + if test x"true" = xtrue; then :