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

cvs at eggheads.org cvs at eggheads.org
Wed Oct 6 13:07:57 CST 2010


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

Modified files:
     aclocal.m4 configure doc/Changes1.8 src/patch.h
     src/compat/gethostbyname2.h src/compat/in6.c src/compat/in6.h
     src/compat/inet_ntop.c src/compat/inet_ntop.h
     src/compat/inet_pton.h src/mod/transfer.mod/transfer.c

Log message:

Fixed some problems with IPv6 autodetection and system headers.

---------------------- diff included ----------------------
Index: eggdrop1.8/aclocal.m4
diff -u eggdrop1.8/aclocal.m4:1.4 eggdrop1.8/aclocal.m4:1.5
--- eggdrop1.8/aclocal.m4:1.4	Wed Aug 11 09:57:50 2010
+++ eggdrop1.8/aclocal.m4	Wed Oct  6 13:07:47 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.4 2010/08/11 15:57:50 thommey Exp $
+dnl $Id: aclocal.m4,v 1.5 2010/10/06 19:07:47 pseudo Exp $
 dnl
 
 
@@ -1818,32 +1818,37 @@
 [
 if test "$enable_ipv6" = "yes"; then
   AC_CHECK_FUNCS([inet_pton gethostbyname2])
-  AC_CHECK_TYPES([struct in6_addr], egg_cv_var_have_in6_addr="yes",
-    egg_cv_var_have_in6_addr="no", [#include <netinet/in.h>])
+  AC_CHECK_TYPES([struct in6_addr], egg_cv_var_have_in6_addr="yes", egg_cv_var_have_in6_addr="no", [
+    #include <sys/types.h>
+    #include <netinet/in.h>
+  ])
   if test "$egg_cv_var_have_in6_addr" = "yes"; then
     # Check for in6addr_any
     AC_CACHE_CHECK([for the in6addr_any constant], [egg_cv_var_have_in6addr_any], [
-      AC_TRY_COMPILE([#include <netinet/in.h>],
-        [struct in6_addr i6 = in6addr_any;],
-        egg_cv_var_have_in6addr_any="yes",
-        egg_cv_var_have_in6addr_any="no"
-      )
+      AC_TRY_COMPILE([
+        #include <sys/types.h>
+        #include <netinet/in.h>
+      ], [struct in6_addr i6 = in6addr_any;],
+      [egg_cv_var_have_in6addr_any="yes"], [egg_cv_var_have_in6addr_any="no"])
     ])
     if test "$egg_cv_var_have_in6addr_any" = "yes"; then
       AC_DEFINE(HAVE_IN6ADDR_ANY, 1, [Define to 1 if you have the in6addr_any constant.])
     fi
     # Check for in6addr_loopback
     AC_CACHE_CHECK([for the in6addr_loopback constant], [egg_cv_var_have_in6addr_loopback], [
-      AC_TRY_COMPILE([#include <netinet/in.h>],
-        [struct in6_addr i6 = in6addr_loopback;],
-        egg_cv_var_have_in6addr_loopback="yes",
-        egg_cv_var_have_in6addr_loopback="no"
-      )
+      AC_TRY_COMPILE([
+        #include <sys/types.h>
+        #include <netinet/in.h>
+      ], [struct in6_addr i6 = in6addr_loopback;],
+      [egg_cv_var_have_in6addr_loopback="yes"], [egg_cv_var_have_in6addr_loopback="no"])
     ])
     if test "$egg_cv_var_have_in6addr_loopback" = "yes"; then
       AC_DEFINE(HAVE_IN6ADDR_LOOPBACK, 1, [Define to 1 if you have the in6addr_loopback constant.])
     fi
-    AC_CHECK_TYPES([struct sockaddr_in6], , , [#include <netinet/in.h>])
+    AC_CHECK_TYPES([struct sockaddr_in6], , , [
+      #include <sys/types.h>
+      #include <netinet/in.h>
+    ])
   else
     AC_MSG_NOTICE([no in6_addr found, skipping dependent checks. Custom definitions will be used.])
   fi
Index: eggdrop1.8/configure
diff -u eggdrop1.8/configure:1.5 eggdrop1.8/configure:1.6
--- eggdrop1.8/configure:1.5	Wed Aug 11 09:58:19 2010
+++ eggdrop1.8/configure	Wed Oct  6 13:07:47 2010
@@ -6806,7 +6806,6 @@
 main ()
 {
   char *data, *data2, *data3;
-  const char *cdata2;
   int i, pagesize;
   int fd, fd2;
 
@@ -6831,10 +6830,10 @@
   fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
   if (fd2 < 0)
     return 4;
-  cdata2 = "";
-  if (write (fd2, cdata2, 1) != 1)
+  data2 = "";
+  if (write (fd2, data2, 1) != 1)
     return 5;
-  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
   if (data2 == MAP_FAILED)
     return 6;
   for (i = 0; i < pagesize; ++i)
@@ -8068,7 +8067,10 @@
 fi
 done
 
-  ac_fn_c_check_type "$LINENO" "struct in6_addr" "ac_cv_type_struct_in6_addr" "#include <netinet/in.h>
+  ac_fn_c_check_type "$LINENO" "struct in6_addr" "ac_cv_type_struct_in6_addr" "
+    #include <sys/types.h>
+    #include <netinet/in.h>
+
 "
 if test "x$ac_cv_type_struct_in6_addr" = x""yes; then :
 
@@ -8091,7 +8093,10 @@
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <netinet/in.h>
+
+        #include <sys/types.h>
+        #include <netinet/in.h>
+
 int
 main ()
 {
@@ -8104,7 +8109,6 @@
   egg_cv_var_have_in6addr_any="yes"
 else
   egg_cv_var_have_in6addr_any="no"
-
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -8125,7 +8129,10 @@
 
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <netinet/in.h>
+
+        #include <sys/types.h>
+        #include <netinet/in.h>
+
 int
 main ()
 {
@@ -8138,7 +8145,6 @@
   egg_cv_var_have_in6addr_loopback="yes"
 else
   egg_cv_var_have_in6addr_loopback="no"
-
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -8150,7 +8156,10 @@
 $as_echo "#define HAVE_IN6ADDR_LOOPBACK 1" >>confdefs.h
 
     fi
-    ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "#include <netinet/in.h>
+    ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "
+      #include <sys/types.h>
+      #include <netinet/in.h>
+
 "
 if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
 
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.14 eggdrop1.8/doc/Changes1.8:1.15
--- eggdrop1.8/doc/Changes1.8:1.14	Tue Oct  5 11:38:24 2010
+++ eggdrop1.8/doc/Changes1.8	Wed Oct  6 13:07:47 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.14 2010/10/05 17:38:24 pseudo Exp $
+$Id: Changes1.8,v 1.15 2010/10/06 19:07:47 pseudo Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,9 @@
 
 1.8.0 (CVS):
 
+  - Fixed some problems with IPv6 autodetection and system headers.
+    Patch by: pseudo
+
   - Made some corrections to the contributors list, removed a duplicate entry.
     Patch by: pseudo
 
Index: eggdrop1.8/src/compat/gethostbyname2.h
diff -u eggdrop1.8/src/compat/gethostbyname2.h:1.2 eggdrop1.8/src/compat/gethostbyname2.h:1.3
--- eggdrop1.8/src/compat/gethostbyname2.h:1.2	Mon Aug 23 15:27:40 2010
+++ eggdrop1.8/src/compat/gethostbyname2.h	Wed Oct  6 13:07:47 2010
@@ -2,7 +2,7 @@
  * gethostbyname2.h
  *   prototypes for gethostbyname2.c
  *
- * $Id: gethostbyname2.h,v 1.2 2010/08/23 21:27:40 pseudo Exp $
+ * $Id: gethostbyname2.h,v 1.3 2010/10/06 19:07:47 pseudo Exp $
  */
 /*
  * Copyright (C) 2010 Eggheads Development Team
@@ -22,9 +22,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#ifndef _EGG_COMPAT_GETHOSTBYNAME2
+#define _EGG_COMPAT_GETHOSTBYNAME2
+
+#include "src/main.h"
 
 #include <netdb.h>
 #ifdef HAVE_SYS_SOCKET_H
@@ -35,3 +36,4 @@
 #if defined IPV6 && !defined HAVE_GETHOSTBYNAME2
 struct hostent *gethostbyname2(const char *name, int af);
 #endif
+#endif /* _EGG_COMPAT_GETHOSTBYNAME2 */
Index: eggdrop1.8/src/compat/in6.c
diff -u eggdrop1.8/src/compat/in6.c:1.1 eggdrop1.8/src/compat/in6.c:1.2
--- eggdrop1.8/src/compat/in6.c:1.1	Thu Aug  5 12:12:05 2010
+++ eggdrop1.8/src/compat/in6.c	Wed Oct  6 13:07:47 2010
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#include "in6.h"
+
 #ifdef IPV6
 
 #ifndef HAVE_IN6ADDR_ANY
Index: eggdrop1.8/src/compat/in6.h
diff -u eggdrop1.8/src/compat/in6.h:1.1 eggdrop1.8/src/compat/in6.h:1.2
--- eggdrop1.8/src/compat/in6.h:1.1	Thu Aug  5 12:12:05 2010
+++ eggdrop1.8/src/compat/in6.h	Wed Oct  6 13:07:47 2010
@@ -1,7 +1,7 @@
 /*
  * in6.h -- various IPv6 related definitions and macros
  *
- * $Id: in6.h,v 1.1 2010/08/05 18:12:05 pseudo Exp $
+ * $Id: in6.h,v 1.2 2010/10/06 19:07:47 pseudo Exp $
  */
 /*
  * Copyright (C) 2010 Eggheads Development Team
@@ -23,6 +23,7 @@
 
 #ifdef IPV6
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
Index: eggdrop1.8/src/compat/inet_ntop.c
diff -u eggdrop1.8/src/compat/inet_ntop.c:1.2 eggdrop1.8/src/compat/inet_ntop.c:1.3
--- eggdrop1.8/src/compat/inet_ntop.c:1.2	Mon Aug 23 15:27:40 2010
+++ eggdrop1.8/src/compat/inet_ntop.c	Wed Oct  6 13:07:47 2010
@@ -1,7 +1,7 @@
 /*
  * inet_ntop.c -- provides inet_ntop() if necessary
  *
- * $Id: inet_ntop.c,v 1.2 2010/08/23 21:27:40 pseudo Exp $
+ * $Id: inet_ntop.c,v 1.3 2010/10/06 19:07:47 pseudo Exp $
  */
 /*
  * Portions Copyright (C) 2010 Eggheads Development Team
@@ -23,7 +23,7 @@
 
 #include "inet_ntop.h"
 
-#if defined IPV6 && !defined HAVE_INET_NTOP
+#ifndef HAVE_INET_NTOP
 /*
  * Copyright (c) 1996-1999 by Internet Software Consortium.
  *
@@ -64,7 +64,9 @@
  */
 
 static const char *inet_ntop4 (const u_char *src, char *dst, socklen_t size);
+#ifdef IPV6
 static const char *inet_ntop6 (const u_char *src, char *dst, socklen_t size);
+#endif
 
 /* char *
  * inet_ntop(af, src, dst, size)
Index: eggdrop1.8/src/compat/inet_ntop.h
diff -u eggdrop1.8/src/compat/inet_ntop.h:1.2 eggdrop1.8/src/compat/inet_ntop.h:1.3
--- eggdrop1.8/src/compat/inet_ntop.h:1.2	Mon Aug 23 15:27:40 2010
+++ eggdrop1.8/src/compat/inet_ntop.h	Wed Oct  6 13:07:47 2010
@@ -2,7 +2,7 @@
  * inet_ntop.h
  *   prototypes for inet_ntop.c
  *
- * $Id: inet_ntop.h,v 1.2 2010/08/23 21:27:40 pseudo Exp $
+ * $Id: inet_ntop.h,v 1.3 2010/10/06 19:07:47 pseudo Exp $
  */
 /*
  * Copyright (C) 2010 Eggheads Development Team
@@ -22,17 +22,18 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#ifndef _EGG_COMPAT_INET_NTOP_H
+#define _EGG_COMPAT_INET_NTOP_H
+
+#include "src/main.h"
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
 #endif
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#if defined IPV6 && !defined HAVE_INET_NTOP
+#ifndef HAVE_INET_NTOP
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #endif
+#endif /* _EGG_COMPAT_INET_NTOP_H */
Index: eggdrop1.8/src/compat/inet_pton.h
diff -u eggdrop1.8/src/compat/inet_pton.h:1.1 eggdrop1.8/src/compat/inet_pton.h:1.2
--- eggdrop1.8/src/compat/inet_pton.h:1.1	Thu Aug  5 12:12:05 2010
+++ eggdrop1.8/src/compat/inet_pton.h	Wed Oct  6 13:07:47 2010
@@ -2,7 +2,7 @@
  * inet_pton.h
  *   prototypes for inet_pton.c
  *
- * $Id: inet_pton.h,v 1.1 2010/08/05 18:12:05 pseudo Exp $
+ * $Id: inet_pton.h,v 1.2 2010/10/06 19:07:47 pseudo Exp $
  */
 /*
  * Copyright (C) 2010 Eggheads Development Team
@@ -22,9 +22,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#ifndef _EGG_COMPAT_INET_PTON_H
+#define _EGG_COMPAT_INET_PTON_H
+
+# include "src/main.h"
 
 #ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
@@ -35,3 +36,4 @@
 #ifndef HAVE_INET_PTON
 int inet_pton(int af, const char *src, void *dst);
 #endif
+#endif /* _EGG_COMPAT_INET_PTON_H */
Index: eggdrop1.8/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.8/src/mod/transfer.mod/transfer.c:1.3 eggdrop1.8/src/mod/transfer.mod/transfer.c:1.4
--- eggdrop1.8/src/mod/transfer.mod/transfer.c:1.3	Thu Aug  5 12:12:05 2010
+++ eggdrop1.8/src/mod/transfer.mod/transfer.c	Wed Oct  6 13:07:47 2010
@@ -1,7 +1,7 @@
 /*
  * transfer.c -- part of transfer.mod
  *
- * $Id: transfer.c,v 1.3 2010/08/05 18:12:05 pseudo Exp $
+ * $Id: transfer.c,v 1.4 2010/10/06 19:07:47 pseudo Exp $
  *
  * Copyright (C) 1997 Robey Pointer
  * Copyright (C) 1999 - 2010 Eggheads Development Team
@@ -30,7 +30,7 @@
 /* sigh sunos */
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include "src/mod/module.h"
 #include "src/tandem.h"
 
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.7 eggdrop1.8/src/patch.h:1.8
--- eggdrop1.8/src/patch.h:1.7	Mon Sep 27 13:38:14 2010
+++ eggdrop1.8/src/patch.h	Wed Oct  6 13:07:47 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.7 2010/09/27 19:38:14 pseudo Exp $
+ * $Id: patch.h,v 1.8 2010/10/06 19:07:47 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1285615166");            /* current unixtime */
+patch("1286391628");            /* current unixtime */
 /*
  *
  *
  */
-patch("dnssettings");
+patch("v6fix");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list