[cvslog] [CVS] Module eggdrop1.8: Change committed

cvs at eggheads.org cvs at eggheads.org
Tue Oct 19 08:21:06 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2010-10-19 14:21:06 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     aclocal.m4 config.h.in configure doc/Changes1.8 src/main.c
     src/patch.h src/tclmisc.c src/tls.c src/md5/md5.h

Log message:

Added few autoconf checks for ssl.
Added tls to tcl_status()

---------------------- diff included ----------------------
Index: eggdrop1.8/aclocal.m4
diff -u eggdrop1.8/aclocal.m4:1.8 eggdrop1.8/aclocal.m4:1.9
--- eggdrop1.8/aclocal.m4:1.8	Tue Oct 19 06:13:32 2010
+++ eggdrop1.8/aclocal.m4	Tue Oct 19 08:20:56 2010
@@ -16,7 +16,7 @@
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl
-dnl $Id: aclocal.m4,v 1.8 2010/10/19 12:13:32 pseudo Exp $
+dnl $Id: aclocal.m4,v 1.9 2010/10/19 14:20:56 pseudo Exp $
 dnl
 
 
@@ -1990,7 +1990,7 @@
     if test -z "$SSL_LIBS"; then
       AC_CHECK_LIB(ssl, SSL_accept, , [havessllib="no"], [-lcrypto])
       AC_CHECK_LIB(crypto, X509_digest, , [havessllib="no"], [-lssl])
-      AC_CHECK_FUNCS([EVP_md5 EVP_sha1 hex_to_string string_to_hex], , [[
+      AC_CHECK_FUNCS([EVP_md5 EVP_sha1 a2i_IPADDRESS hex_to_string string_to_hex], , [[
         havessllib="no"
         break
       ]])
@@ -2016,6 +2016,7 @@
           AC_DEFINE([__int64], [long long], [Define this to a 64-bit type on Cygwin to satisfy OpenSSL dependencies.])
         ])
       fi
+      AC_CHECK_FUNCS([RAND_status])
       AC_DEFINE(TLS, 1, [Define this to enable SSL support.])
       EGG_MD5_COMPAT
     fi
Index: eggdrop1.8/config.h.in
diff -u eggdrop1.8/config.h.in:1.6 eggdrop1.8/config.h.in:1.7
--- eggdrop1.8/config.h.in:1.6	Tue Oct 19 06:13:32 2010
+++ eggdrop1.8/config.h.in	Tue Oct 19 08:20:56 2010
@@ -55,6 +55,9 @@
 /* Defines the current Eggdrop version. */
 #undef EGG_VERSION
 
+/* Define to 1 if you have the `a2i_IPADDRESS' function. */
+#undef HAVE_A2I_IPADDRESS
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
@@ -231,6 +234,9 @@
 /* Define to 1 if you have the `random' function. */
 #undef HAVE_RANDOM
 
+/* Define to 1 if you have the `RAND_status' function. */
+#undef HAVE_RAND_STATUS
+
 /* Define to 1 if you have the `rename' function. */
 #undef HAVE_RENAME
 
Index: eggdrop1.8/configure
diff -u eggdrop1.8/configure:1.9 eggdrop1.8/configure:1.10
--- eggdrop1.8/configure:1.9	Tue Oct 19 06:13:32 2010
+++ eggdrop1.8/configure	Tue Oct 19 08:20:56 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.4 .
+# From configure.ac Revision: 1.5 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for Eggdrop 1.8.0.
 #
@@ -8507,7 +8507,7 @@
   havessllib="no"
 fi
 
-      for ac_func in EVP_md5 EVP_sha1 hex_to_string string_to_hex
+      for ac_func in EVP_md5 EVP_sha1 a2i_IPADDRESS hex_to_string string_to_hex
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -8562,6 +8562,17 @@
 fi
 
       fi
+      for ac_func in RAND_status
+do :
+  ac_fn_c_check_func "$LINENO" "RAND_status" "ac_cv_func_RAND_status"
+if test "x$ac_cv_func_RAND_status" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RAND_STATUS 1
+_ACEOF
+
+fi
+done
+
 
 $as_echo "#define TLS 1" >>confdefs.h
 
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.20 eggdrop1.8/doc/Changes1.8:1.21
--- eggdrop1.8/doc/Changes1.8:1.20	Tue Oct 19 06:13:32 2010
+++ eggdrop1.8/doc/Changes1.8	Tue Oct 19 08:20:56 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.20 2010/10/19 12:13:32 pseudo Exp $
+$Id: Changes1.8,v 1.21 2010/10/19 14:20:56 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,10 @@
 
 1.8.0 (CVS):
 
+  - Added few autoconf checks for ssl.
+  - Added tls to tcl_status()
+    Patch by: pseudo
+
   - Added full SSL support including Tcl commands.
   - Added support for certificate authentication.
   - Added support for botnet and partyline encryption using ssl.
Index: eggdrop1.8/src/main.c
diff -u eggdrop1.8/src/main.c:1.4 eggdrop1.8/src/main.c:1.5
--- eggdrop1.8/src/main.c:1.4	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/main.c	Tue Oct 19 08:20:56 2010
@@ -5,7 +5,7 @@
  *   command line arguments
  *   context and assert debugging
  *
- * $Id: main.c,v 1.4 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: main.c,v 1.5 2010/10/19 14:20:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -313,6 +313,12 @@
     dprintf(-x, "Compiled without IPv6 support\n");
 #endif
 
+#ifdef TLS
+    dprintf(-x, "Compiled with TLS support\n");
+#else
+    dprintf(-x, "Compiled without TLS support\n");
+#endif
+
     dprintf(-x, "Configure flags: %s\n", EGG_AC_ARGS);
 #ifdef CCFLAGS
     dprintf(-x, "Compile flags: %s\n", CCFLAGS);
@@ -508,6 +514,9 @@
 #ifdef IPV6
         printf("IPv6, ");
 #endif
+#ifdef TLS
+        printf("TLS, ");
+#endif
         printf("handlen=%d\n", HANDLEN);
         bg_send_quit(BG_ABORT);
         exit(0);
Index: eggdrop1.8/src/md5/md5.h
diff -u eggdrop1.8/src/md5/md5.h:1.2 eggdrop1.8/src/md5/md5.h:1.3
--- eggdrop1.8/src/md5/md5.h:1.2	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/md5/md5.h	Tue Oct 19 08:20:56 2010
@@ -9,6 +9,8 @@
 #ifndef _MD5_H
 #define _MD5_H
 
+#include "src/main.h"
+
 #ifdef HAVE_OPENSSL_MD5
 #  include <openssl/md5.h>
 #else
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.11 eggdrop1.8/src/patch.h:1.12
--- eggdrop1.8/src/patch.h:1.11	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/patch.h	Tue Oct 19 08:20:56 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.11 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: patch.h,v 1.12 2010/10/19 14:20:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1287489296");            /* current unixtime */
+patch("1287498044");            /* current unixtime */
 /*
  *
  *
  */
-patch("tls");
+patch("tlsa2i");
 /*
  *
  *
Index: eggdrop1.8/src/tclmisc.c
diff -u eggdrop1.8/src/tclmisc.c:1.3 eggdrop1.8/src/tclmisc.c:1.4
--- eggdrop1.8/src/tclmisc.c:1.3	Sun Oct 10 12:22:47 2010
+++ eggdrop1.8/src/tclmisc.c	Tue Oct 19 08:20:56 2010
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.3 2010/10/10 18:22:47 pseudo Exp $
+ * $Id: tclmisc.c,v 1.4 2010/10/19 14:20:56 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -787,6 +787,14 @@
     Tcl_AppendElement(irp, "disabled");
 #endif
   }
+  if ((argc < 2) || !strcmp(argv[1], "tls")) {
+    Tcl_AppendElement(irp, "tls");
+#ifdef TLS
+    Tcl_AppendElement(irp, SSLeay_version(SSLEAY_VERSION));
+#else
+    Tcl_AppendElement(irp, "disabled");
+#endif
+  }
   if ((argc < 2) || !strcmp(argv[1], "cache")) {
     Tcl_AppendElement(irp, "usercache");
     snprintf(s, sizeof s, "%4.1f", 100.0 *
Index: eggdrop1.8/src/tls.c
diff -u eggdrop1.8/src/tls.c:1.1 eggdrop1.8/src/tls.c:1.2
--- eggdrop1.8/src/tls.c:1.1	Tue Oct 19 06:13:33 2010
+++ eggdrop1.8/src/tls.c	Tue Oct 19 08:20:56 2010
@@ -4,7 +4,7 @@
  *   Certificate handling
  *   OpenSSL initialization and shutdown
  *
- * $Id: tls.c,v 1.1 2010/10/19 12:13:33 pseudo Exp $
+ * $Id: tls.c,v 1.2 2010/10/19 14:20:56 pseudo Exp $
  */
 /*
  * Written by Rumen Stoyanov <pseudo at egg6.net>
@@ -77,7 +77,7 @@
   static char rand_file[120];
   FILE *fh;
 
-#if OPENSSL_VERSION_NUMBER >= 0x00905100
+#ifdef HAVE_RAND_STATUS
   if (RAND_status())
     return 0;     /* Status OK */
 #endif
@@ -103,7 +103,7 @@
     RAND_seed(&c, sizeof(c));
     RAND_seed(stackdata, sizeof(stackdata));
   }
-#if OPENSSL_VERSION_NUMBER >= 0x00905100
+#ifdef HAVE_RAND_STATUS
   if (!RAND_status())
     return 2;   /* pseudo random data still not ehough */
 #endif
----------------------- End of diff -----------------------


More information about the Changes mailing list