[cvslog] (2003-05-07 04:45:20 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Tue May 6 22:45:20 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-05-07 04:45:20 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     acconfig.h aclocal.m4 config.h.in configure.in doc/UPDATES1.6
     src/eggdrop.h src/modules.c src/patch.h src/compat/inet_ntop.c
     src/compat/inet_ntop.h

Log message:

* Don't compile inet_ntop compatability code unless USE_IPV6 is defined.
* typedef socklen_t to int if non-existant.

---------------------- diff included ----------------------
Index: eggdrop1.6/acconfig.h
diff -u eggdrop1.6/acconfig.h:1.16 eggdrop1.6/acconfig.h:1.17
--- eggdrop1.6/acconfig.h:1.16	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/acconfig.h	Tue May  6 23:45:10 2003
@@ -5,11 +5,14 @@
  * acconfig.h
  *   template file autoheader uses when building config.h.in
  * 
- * $Id: acconfig.h,v 1.16 2003/04/01 05:33:40 wcc Exp $
+ * $Id: acconfig.h,v 1.17 2003/05/07 04:45:10 wcc Exp $
  */
 
 /* Define if you want to enable IPv6 support. */
 #undef HAVE_IPV6
+
+/* Define if you have support for socklen_t. */
+#undef HAVE_SOCKLEN_T
 
 /* Define if modules will work on your system. */
 #undef MODULES_OK
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.66 eggdrop1.6/aclocal.m4:1.67
--- eggdrop1.6/aclocal.m4:1.66	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/aclocal.m4	Tue May  6 23:45:10 2003
@@ -1,7 +1,7 @@
 dnl aclocal.m4
 dnl   macros autoconf uses when building configure from configure.in
 dnl
-dnl $Id: aclocal.m4,v 1.66 2003/04/01 05:33:40 wcc Exp $
+dnl $Id: aclocal.m4,v 1.67 2003/05/07 04:45:10 wcc Exp $
 dnl
 
 
@@ -71,8 +71,7 @@
 }
 ], egg_cv_ipv6_supported=yes, egg_cv_ipv6_supported=no,
 egg_cv_ipv6_supported=no)])
-if test "$egg_cv_ipv6_supported" = "yes"
-then
+if test "$egg_cv_ipv6_supported" = "yes"; then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
@@ -85,8 +84,7 @@
 AC_MSG_CHECKING(whether or not you enabled IPv6 support)
 AC_ARG_ENABLE(ipv6, [  --enable-ipv6           enable IPv6 support],
 [ ac_cv_ipv6="yes"
-  if test "$egg_cv_ipv6_supported" = "no"
-  then
+  if test "$egg_cv_ipv6_supported" = "no"; then
     ac_cv_ipv6="no"
   fi
   AC_MSG_RESULT($ac_cv_ipv6)
@@ -94,12 +92,37 @@
 [ ac_cv_ipv6="no"
   AC_MSG_RESULT(no)
 ])
-if test "$ac_cv_ipv6" = "yes"
-then
+if test "$ac_cv_ipv6" = "yes"; then
   AC_DEFINE(HAVE_IPV6)
   ENABLEIPV6="--enable-ipv6"
 fi
 AC_SUBST(ENABLEIPV6)
+])dnl
+
+dnl  EGG_CHECK_SOCKLEN_T()
+dnl
+AC_DEFUN(EGG_CHECK_SOCKLEN_T, [dnl
+AC_MSG_CHECKING(for socklen_t)
+AC_CACHE_VAL(egg_cv_socklen_t,[
+  AC_TRY_RUN([
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int main()
+{
+  socklen_t test = sizeof(int);
+
+  return test;
+}
+  ],
+egg_cv_socklen_t=yes, egg_cv_socklen_t=no, egg_cv_socklen_t=no)])
+if test "$egg_cv_socklen_t" = "yes"; then
+  AC_DEFINE(HAVE_SOCKLEN_T)
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
 ])dnl
 
 dnl  EGG_CHECK_CCPIPE()
Index: eggdrop1.6/config.h.in
diff -u eggdrop1.6/config.h.in:1.30 eggdrop1.6/config.h.in:1.31
--- eggdrop1.6/config.h.in:1.30	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/config.h.in	Tue May  6 23:45:10 2003
@@ -5,11 +5,14 @@
  * acconfig.h
  *   template file autoheader uses when building config.h.in
  * 
- * $Id: config.h.in,v 1.30 2003/04/01 05:33:40 wcc Exp $
+ * $Id: config.h.in,v 1.31 2003/05/07 04:45:10 wcc Exp $
  */
 
 /* Define if you want to enable IPv6 support. */
 #undef HAVE_IPV6
+
+/* Define if you have support for socklen_t. */
+#undef HAVE_SOCKLEN_T
 
 /* Define if modules will work on your system. */
 #undef MODULES_OK
Index: eggdrop1.6/configure.in
diff -u eggdrop1.6/configure.in:1.54 eggdrop1.6/configure.in:1.55
--- eggdrop1.6/configure.in:1.54	Mon Mar 31 23:33:40 2003
+++ eggdrop1.6/configure.in	Tue May  6 23:45:10 2003
@@ -57,6 +57,7 @@
 # Check for IPv6 support
 EGG_IPV6_SUPPORTED
 EGG_IPV6_OPTIONS
+EGG_CHECK_SOCKLEN_T
 
 # Checks for library functions
 AC_CHECK_FUNCS(clock getrusage setpgid uname sigaction sigemptyset rename strcasecmp strncasecmp getdtablesize memset random srandom)
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.500 eggdrop1.6/doc/UPDATES1.6:1.501
--- eggdrop1.6/doc/UPDATES1.6:1.500	Sun May  4 19:49:44 2003
+++ eggdrop1.6/doc/UPDATES1.6	Tue May  6 23:45:10 2003
@@ -1,10 +1,13 @@
-$Id: UPDATES1.6,v 1.500 2003/05/05 00:49:44 wcc Exp $
+$Id: UPDATES1.6,v 1.501 2003/05/07 04:45:10 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by  Fixed by  What...
+paladinz  Wcc       don't compile inet_ntop compatability code unless USE_IPV6
+                    is defined
+KuNgFo0   Wcc       typedef socklen_t to int if non-existant
 various   TaKeDa    fixed an uninitialized variable in putlog()
 
 1.6.15 (04 May 2003)
Index: eggdrop1.6/src/compat/inet_ntop.c
diff -u eggdrop1.6/src/compat/inet_ntop.c:1.2 eggdrop1.6/src/compat/inet_ntop.c:1.3
--- eggdrop1.6/src/compat/inet_ntop.c:1.2	Wed Apr  2 15:16:22 2003
+++ eggdrop1.6/src/compat/inet_ntop.c	Tue May  6 23:45:10 2003
@@ -21,17 +21,13 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.2 2003/04/02 21:16:22 wcc Exp $";
+static const char rcsid[] = "$Id: inet_ntop.c,v 1.3 2003/05/07 04:45:10 wcc Exp $";
 #endif
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$BINDId: inet_ntop.c,v 1.8 1999/10/13 16:39:28 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "main.h"
 #include "inet_ntop.h"
 
-#ifndef HAVE_INET_NTOP
+#if defined (USE_IPV6) && !defined(HAVE_INET_NTOP)
 
 #include <sys/param.h>
 #include <sys/types.h>
Index: eggdrop1.6/src/compat/inet_ntop.h
diff -u eggdrop1.6/src/compat/inet_ntop.h:1.1 eggdrop1.6/src/compat/inet_ntop.h:1.2
--- eggdrop1.6/src/compat/inet_ntop.h:1.1	Tue Apr  1 16:58:08 2003
+++ eggdrop1.6/src/compat/inet_ntop.h	Tue May  6 23:45:10 2003
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 /*
- * $Id: inet_ntop.h,v 1.1 2003/04/01 22:58:08 wcc Exp $
+ * $Id: inet_ntop.h,v 1.2 2003/05/07 04:45:10 wcc Exp $
  */
 
 #ifndef _EGG_COMPAT_INET_NTOP_H
@@ -32,10 +32,14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#ifndef HAVE_INET_NTOP
+#ifdef USE_IPV6
+#  ifndef HAVE_INET_NTOP
 const char *egg_inet_ntop(int af, const void *src, char *dst, socklen_t size);
+#  else
+#    define egg_inet_ntop inet_ntop
+#  endif
 #else
-#  define egg_inet_ntop inet_ntop
+#  define egg_inet_ntop 0
 #endif
 
 #endif /* !_EGG_COMPAT_INET_NTOP_H */
Index: eggdrop1.6/src/eggdrop.h
diff -u eggdrop1.6/src/eggdrop.h:1.47 eggdrop1.6/src/eggdrop.h:1.48
--- eggdrop1.6/src/eggdrop.h:1.47	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/eggdrop.h	Tue May  6 23:45:10 2003
@@ -4,7 +4,7 @@
  *
  *   IF YOU ALTER THIS FILE, YOU NEED TO RECOMPILE THE BOT.
  *
- * $Id: eggdrop.h,v 1.47 2003/04/17 01:55:57 wcc Exp $
+ * $Id: eggdrop.h,v 1.48 2003/05/07 04:45:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -195,6 +195,9 @@
 #  define sigemptyset(x) ((*(int *)(x))=0)
 #endif
 
+#if !HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
 
 /*
  *    Handy aliases for memory tracking and core dumps
Index: eggdrop1.6/src/modules.c
diff -u eggdrop1.6/src/modules.c:1.84 eggdrop1.6/src/modules.c:1.85
--- eggdrop1.6/src/modules.c:1.84	Wed Apr 16 20:55:57 2003
+++ eggdrop1.6/src/modules.c	Tue May  6 23:45:10 2003
@@ -4,7 +4,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: modules.c,v 1.84 2003/04/17 01:55:57 wcc Exp $
+ * $Id: modules.c,v 1.85 2003/05/07 04:45:10 wcc Exp $
  */
 /* 
  * Copyright (C) 1997 Robey Pointer
@@ -563,6 +563,7 @@
   (Function) file_readable,
   (Function) getprotocol,
   (Function) open_listen_by_af,
+  /* 288 - 291 */
   (Function) egg_inet_ntop
 };
 
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.991 eggdrop1.6/src/patch.h:1.992
--- eggdrop1.6/src/patch.h:1.991	Tue May  6 19:23:25 2003
+++ eggdrop1.6/src/patch.h	Tue May  6 23:45:10 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.991 2003/05/07 00:23:25 wcc Exp $
+ * $Id: patch.h,v 1.992 2003/05/07 04:45:10 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1052266995");            /* current unixtime */
+patch("1052279861");            /* current unixtime */
 /*
  *
  *
  */
-patch("ipv6doc");
+patch("inet_ntop_compat");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list