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

cvs at eggheads.org cvs at eggheads.org
Wed Jul 20 04:50:45 CST 2011


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2011-07-20 10:50:45 UTC
Committer  : Thomas Sader <thommey at gmail.com>

Modified files:
     aclocal.m4 configure.ac doc/Changes1.6 src/patch.h
     src/mod/channels.mod/channels.c

Log message:

Work around Tcl8.5.10 bug 3371644. Use the autoconf macros AC_LANG_PROGRAM/AC_LANG_SOURCE.

---------------------- diff included ----------------------
Index: eggdrop1.6/aclocal.m4
diff -u eggdrop1.6/aclocal.m4:1.119 eggdrop1.6/aclocal.m4:1.120
--- eggdrop1.6/aclocal.m4:1.119	Sat Jul  9 09:07:48 2011
+++ eggdrop1.6/aclocal.m4	Wed Jul 20 04:50:35 2011
@@ -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.119 2011/07/09 15:07:48 thommey Exp $
+dnl $Id: aclocal.m4,v 1.120 2011/07/20 10:50:35 thommey Exp $
 dnl
 
 
@@ -159,11 +159,11 @@
 dnl
 AC_DEFUN([EGG_CHECK_ICC],[
   AC_CACHE_CHECK([for icc], egg_cv_var_cc_icc, [
-    AC_COMPILE_IFELSE([[
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #if !(defined(__ICC) || defined(__ECC) || defined(__INTEL_COMPILER))
   "Toto, I've a feeling we're not in Kansas anymore."
 #endif
-    ]], [
+    ]])], [
       egg_cv_var_cc_icc="yes"
     ], [
       egg_cv_var_cc_icc="no"
@@ -189,12 +189,7 @@
     AC_CACHE_CHECK([whether the compiler understands -pipe], egg_cv_var_ccpipe, [
       ac_old_CC="$CC"
       CC="$CC -pipe"
-      AC_COMPILE_IFELSE([[
-        int main ()
-        {
-          return(0);
-        }
-      ]], [
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return(0); ]])], [
         egg_cv_var_ccpipe="yes"
       ], [
         egg_cv_var_ccpipe="no"
@@ -219,12 +214,7 @@
     AC_CACHE_CHECK([whether the compiler understands -Wall], egg_cv_var_ccwall, [
       ac_old_CFLAGS="$CFLAGS"
       CFLAGS="$CFLAGS -Wall"
-      AC_COMPILE_IFELSE([[
-        int main ()
-        {
-          return(0);
-        }
-      ]], [
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return(0); ]])], [
         egg_cv_var_ccwall="yes"
       ], [
         egg_cv_var_ccwall="no"
@@ -251,24 +241,21 @@
 AC_DEFUN([EGG_CHECK_SOCKLEN_T],
 [
   AC_CACHE_CHECK([for socklen_t], egg_cv_socklen_t, [
-    AC_RUN_IFELSE([[
+    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
       #include <unistd.h>
       #include <sys/param.h>
       #include <sys/types.h>
       #include <sys/socket.h>
       #include <netinet/in.h>
       #include <arpa/inet.h>
-
-      int main()
-      {
+    ]],[[
         socklen_t test = 55;
 
         if (test != 55)
-          exit(1);
+          return(1);
 
         return(0);
-      }
-    ]], [
+    ]])], [
       egg_cv_socklen_t="yes"
     ], [
       egg_cv_socklen_t="no"
@@ -1411,6 +1398,7 @@
   fi
 ])
 
+
 dnl EGG_TCL_CHECK_NOTIFIER_INIT
 dnl
 AC_DEFUN([EGG_TCL_CHECK_NOTIFIER_INIT],
@@ -1422,7 +1410,7 @@
   # Check for Tcl_NotifierProcs member initNotifierProc
   AC_CHECK_MEMBER([Tcl_NotifierProcs.initNotifierProc], [egg_cv_var_tcl_notifier_init="yes"], [egg_cv_var_tcl_notifier_init="no"], [[#include "$TCLINC/$TCLINCFN"]])
   if test "$egg_cv_var_tcl_notifier_init" = yes; then
-    AC_DEFINE(HAVE_TCL_NOTIFIER_INIT, 1, [Define for Tcl that has the Tcl_NotiferProcs struct member initNotifierProc (8.4 and later).])
+    AC_DEFINE(HAVE_TCL_NOTIFIER_INIT, 1, [Define for Tcl that has the Tcl_NotifierProcs struct member initNotifierProc (8.4 and later).])
   fi
 ])
 
Index: eggdrop1.6/configure.ac
diff -u eggdrop1.6/configure.ac:1.42 eggdrop1.6/configure.ac:1.43
--- eggdrop1.6/configure.ac:1.42	Sat Jul  9 09:07:48 2011
+++ eggdrop1.6/configure.ac	Wed Jul 20 04:50:35 2011
@@ -1,11 +1,12 @@
 dnl configure.ac: this file is processed by autoconf to produce ./configure.
 dnl
-dnl $Id: configure.ac,v 1.42 2011/07/09 15:07:48 thommey Exp $
+dnl $Id: configure.ac,v 1.43 2011/07/20 10:50:35 thommey Exp $
 
 AC_PREREQ(2.60)
 AC_INIT([Eggdrop],[1.6.21],[bugs at eggheads.org])
 AC_COPYRIGHT([Copyright (C) 1999 - 2011 Eggheads Development Team])
-AC_REVISION($Revision: 1.42 $)
+AC_LANG([C])
+AC_REVISION($Revision: 1.43 $)
 AC_CONFIG_SRCDIR(src/eggdrop.h)
 AC_CONFIG_AUX_DIR(misc)
 AC_CONFIG_HEADER(config.h)
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.100 eggdrop1.6/doc/Changes1.6:1.101
--- eggdrop1.6/doc/Changes1.6:1.100	Sat Jul  9 09:07:48 2011
+++ eggdrop1.6/doc/Changes1.6	Wed Jul 20 04:50:35 2011
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.100 2011/07/09 15:07:48 thommey Exp $
+$Id: Changes1.6,v 1.101 2011/07/20 10:50:35 thommey Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,14 @@
 
 1.6.21 (CVS):
 
+  - Work around Tcl8.5.10 bug 3371644 (strings starting with # could crash
+    in Tcl_ConvertElement()). TCL_DONT_QUOTE_HASH can be used to work
+    around it, as long as the string is not passed to Tcl_Eval().
+    Found by: Austin
+  - Use the autoconf macros AC_LANG_PROGRAM/AC_LANG_SOURCE for sourcecode
+    to avoid warnings in autoconf >= 2.68.
+    Patch by: thommey
+
   - Make sure to account for null termination when using Tcl_ScanElement
     to generate a string representation of a list using Tcl_ConvertElement.
     A behavioural change in Tcl8.5.10 revealed this bug.
Index: eggdrop1.6/src/mod/channels.mod/channels.c
diff -u eggdrop1.6/src/mod/channels.mod/channels.c:1.108 eggdrop1.6/src/mod/channels.mod/channels.c:1.109
--- eggdrop1.6/src/mod/channels.mod/channels.c:1.108	Sun Feb 13 08:19:33 2011
+++ eggdrop1.6/src/mod/channels.mod/channels.c	Wed Jul 20 04:50:35 2011
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  *
- * $Id: channels.c,v 1.108 2011/02/13 14:19:33 simple Exp $
+ * $Id: channels.c,v 1.109 2011/07/20 10:50:35 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -368,6 +368,10 @@
   int flags;
 
   Tcl_ScanElement(src, &flags);
+/* Work around Tcl bug 3371644 (only present in 8.5.10) */
+#ifdef TCL_DONT_QUOTE_HASH
+  flags |= TCL_DONT_QUOTE_HASH;
+#endif
   Tcl_ConvertElement(src, dst, flags);
   return dst;
 }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1261 eggdrop1.6/src/patch.h:1.1262
--- eggdrop1.6/src/patch.h:1.1261	Sat Jul  9 09:07:48 2011
+++ eggdrop1.6/src/patch.h	Wed Jul 20 04:50:35 2011
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1261 2011/07/09 15:07:48 thommey Exp $
+ * $Id: patch.h,v 1.1262 2011/07/20 10:50:35 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1310220507");            /* current unixtime */
+patch("1311158928");            /* current unixtime */
 /*
  *
  *
  */
-patch("tclliststr");
+patch("tclhashcrash");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list