svn commit: r382826 - in head/irc/unreal: . files

[Mathieu Arnold]

Author: mat
Date: Tue Mar 31 14:44:16 2015
New Revision: 382826
URL: https://svnweb.freebsd.org/changeset/ports/382826
QAT: https://qat.redports.org/buildarchive/r382826/

Log:
  Make it build with LibreSSL. [1]
  While there, catch up with new options behaviors.
  
  PR:		198491 [1]
  Submitted by:	Bernard Spil [1]
  Sponsored by:	Absolight

Added:
  head/irc/unreal/files/patch-configure   (contents, props changed)
  head/irc/unreal/files/patch-configure.ac   (contents, props changed)
  head/irc/unreal/files/patch-include_dynconf.h   (contents, props changed)
  head/irc/unreal/files/patch-src_random.c   (contents, props changed)
Modified:
  head/irc/unreal/Makefile

Modified: head/irc/unreal/Makefile
==============================================================================
--- head/irc/unreal/Makefile	Tue Mar 31 14:33:33 2015	(r382825)
+++ head/irc/unreal/Makefile	Tue Mar 31 14:44:16 2015	(r382826)
@@ -74,8 +74,7 @@ IPV6_CONFIGURE_ENABLE=	inet6
 SSL_CONFIGURE_ENABLE=	ssl
 SSL_USE=	OPENSSL=yes
 REMOTE_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-REMOTE_CONFIGURE_ON=	--enable-libcurl=${LOCALBASE}
-REMOTE_CONFIGURE_OFF=	--disable-libcurl
+REMOTE_CONFIGURE_ENABLE=	--enable-libcurl=${LOCALBASE}
 PREFIXAQ_CONFIGURE_ENABLE=	prefixaq
 
 SQLMOD=		${PORTNAME}/SQLMod.tar.gz

Added: head/irc/unreal/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/unreal/files/patch-configure	Tue Mar 31 14:44:16 2015	(r382826)
@@ -0,0 +1,59 @@
+--- configure.orig	2014-07-26 15:42:10 UTC
++++ configure
+@@ -3876,6 +3876,47 @@ fi
+ 
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5
++$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
++if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypto  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char RAND_egd ();
++int
++main ()
++{
++return RAND_egd ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_crypto_RAND_egd=yes
++else
++  ac_cv_lib_crypto_RAND_egd=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_crypto_RAND_egd" >&5
++$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
++if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
++
++$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
++
++fi
+ 
+ 
+ 
+@@ -6495,7 +6536,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ip6" >&5
+ $as_echo "$ac_cv_ip6" >&6; }
+ 	if test "$ac_cv_ip6" = "no"; then
+-		as_fn_error $? "Your system does not support IPv6 so it will not be enabled" "$LINENO" 5
++		echo $? "Your system does not support IPv6 so it will not be enabled" "$LINENO" 5
+ 	else
+ 
+ $as_echo "#define INET6 /**/" >>confdefs.h

Added: head/irc/unreal/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/unreal/files/patch-configure.ac	Tue Mar 31 14:44:16 2015	(r382826)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2014-07-26 15:42:10 UTC
++++ configure.ac
+@@ -93,6 +93,8 @@ AC_CHECK_LIB(socket, socket,
+ AC_CHECK_LIB(nsl, inet_ntoa,
+ 	[IRCDLIBS="$IRCDLIBS-lnsl "
+ 		INETLIB="-lnsl"])
++AC_CHECK_LIB(crypto, RAND_egd, 
++		AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd]))
+ 
+ AC_SUBST(IRCDLIBS)
+ AC_SUBST(MKPASSWDLIBS)

Added: head/irc/unreal/files/patch-include_dynconf.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/unreal/files/patch-include_dynconf.h	Tue Mar 31 14:44:16 2015	(r382826)
@@ -0,0 +1,14 @@
+--- include/dynconf.h.orig	2014-07-26 15:42:10 UTC
++++ include/dynconf.h
+@@ -204,7 +204,11 @@ extern MODVAR aConfiguration iConf;
+ #define SHOWCONNECTINFO			iConf.show_connect_info
+ #define OPER_ONLY_STATS			iConf.oper_only_stats
+ #define ANTI_SPAM_QUIT_MSG_TIME		iConf.anti_spam_quit_message_time
++#ifdef HAVE_RAND_EGD
+ #define USE_EGD				iConf.use_egd
++#else
++#define USE_EGD				0
++#endif
+ #define EGD_PATH			iConf.egd_path
+ 
+ #define ircnetwork			iConf.network.x_ircnetwork

Added: head/irc/unreal/files/patch-src_random.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/unreal/files/patch-src_random.c	Tue Mar 31 14:44:16 2015	(r382826)
@@ -0,0 +1,20 @@
+--- src/random.c.orig	2014-07-26 15:42:10 UTC
++++ src/random.c
+@@ -163,7 +163,7 @@ unsigned char mdbuf[16];
+ void init_random()
+ {
+ struct {
+-#ifdef USE_SSL
++#if defined(USE_SSL)
+ 	char egd[32];			/* from EGD */
+ #endif
+ #ifndef _WIN32
+@@ -187,7 +187,7 @@ MEMORYSTATUS mstat;
+ 
+ 	/* Grab non-OS specific "random" data */
+ #ifdef USE_SSL
+- #if OPENSSL_VERSION_NUMBER >= 0x000907000
++ #if OPENSSL_VERSION_NUMBER >= 0x000907000 && defined(HAVE_RAND_EGD)
+ 	if (EGD_PATH) {
+ 		n = RAND_query_egd_bytes(EGD_PATH, rdat.egd, sizeof(rdat.egd));
+ 	}