Attachment 198484 Details for Bug 232550 – patchfile

patchfile

bitchx_configure.patch.txt (text/plain), 3.36 KB, created by dan.mashal on 2018-10-23 01:17:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dan.mashal

Created: 2018-10-23 01:17:36 UTC

Size: 3.36 KB

patch

obsolete

>diff -ur BitchX-1.2.1.orig/configure BitchX-1.2.1/configure
>--- BitchX-1.2.1.orig/configure	2017-03-06 23:17:29.667012724 +1100
>+++ BitchX-1.2.1/configure	2017-03-06 23:38:43.921378493 +1100
>@@ -10557,9 +10557,9 @@
> case "$with_ssl" in
>     yes|check)
> 
>-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
>-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
>-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
>+echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
>+echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
>+if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   ac_check_lib_save_LIBS=$LIBS
>@@ -10577,11 +10577,11 @@
> #endif
> /* We use char because int might match the return type of a gcc2
>    builtin and then its argument prototype would still apply.  */
>-char SSLeay ();
>+char ERR_get_error ();
> int
> main ()
> {
>-SSLeay ();
>+ERR_get_error ();
>   ;
>   return 0;
> }
>@@ -10608,20 +10608,20 @@
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; }; then
>-  ac_cv_lib_crypto_SSLeay=yes
>+  ac_cv_lib_crypto_ERR_get_error=yes
> else
>   echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
> 
>-ac_cv_lib_crypto_SSLeay=no
>+ac_cv_lib_crypto_ERR_get_error=no
> fi
> rm -f conftest.err conftest.$ac_objext \
>       conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
>-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
>-if test $ac_cv_lib_crypto_SSLeay = yes; then
>+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
>+echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
>+if test $ac_cv_lib_crypto_ERR_get_error = yes; then
>   cat >>confdefs.h <<_ACEOF
> #define HAVE_LIBCRYPTO 1
> _ACEOF
>@@ -10630,7 +10630,7 @@
> 
> fi
> 
>-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
>+      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
> 
> echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
> echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
>@@ -14756,12 +14756,6 @@
>             SHLIB_LD="ld -shared"
>         fi
>         ;;
>-      FreeBSD-2.2*)
>-        SHLIB_LD="ld -Bshareable"
>-        ;;
>-      FreeBSD-2*)
>-        SHLIB_LD="ld -Bshareable"
>-        ;;
>       FreeBSD*)
>         SHLIB_CFLAGS="-fPIC"
>         SHLIB_LD="$CC -shared"
>@@ -16237,12 +16231,6 @@
>             SHLIB_LD="ld -shared"
>         fi
>         ;;
>-      FreeBSD-2.2*)
>-        SHLIB_LD="ld -Bshareable"
>-        ;;
>-      FreeBSD-2*)
>-        SHLIB_LD="ld -Bshareable"
>-        ;;
>       FreeBSD*)
>         SHLIB_CFLAGS="-fPIC"
>         SHLIB_LD="$CC -shared"
>diff -ur BitchX-1.2.1.orig/configure.in BitchX-1.2.1/configure.in
>--- BitchX-1.2.1.orig/configure.in	2017-03-06 23:17:29.703012732 +1100
>+++ BitchX-1.2.1/configure.in	2017-03-06 23:38:36.453320386 +1100
>@@ -559,8 +559,8 @@
> esac
> case "$with_ssl" in
>     yes|check)
>-      AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
>-      if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
>+      AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
>+      if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
>         AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
>       fi
>       if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then

Flags:

koobs: maintainer-approval? (ports-secteam)

Actions: View

Attachments on bug 232550: 198484 | 198643