[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Fri May 18 17:47:00 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-05-18 22:46:47 UTC
Commited by: guppy

Modified files:
     README doc/UPDATES1.6 src/patch.h src/mod/dns.mod/configure
     src/mod/dns.mod/configure.in

Log message:

ooo dns.mod now too :P~

---------------------- diff included ----------------------
Index: eggdrop1.6/README
diff -u eggdrop1.6/README:1.15 eggdrop1.6/README:1.16
--- eggdrop1.6/README:1.15	Wed Apr 25 22:41:35 2001
+++ eggdrop1.6/README	Fri May 18 17:46:37 2001
@@ -534,7 +534,7 @@
      (8) MAILING LIST
 
           There are currently a couple of mailing lists about eggdrop.
-          eggheads at eggdheads.org is the one relevant for posts about
+          eggheads at eggheads.org is the one relevant for posts about
           eggdrop 1.4 and up (and bug fixes, and suggestions, etc).
 
           To subscribe to the eggheads mailing list, send email to:
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.100 eggdrop1.6/doc/UPDATES1.6:1.101
--- eggdrop1.6/doc/UPDATES1.6:1.100	Fri May 18 17:35:03 2001
+++ eggdrop1.6/doc/UPDATES1.6	Fri May 18 17:46:37 2001
@@ -4,6 +4,8 @@
 
 1.6.5
 Found by  Fixed by  What...
+various   drummer/  we now detect __res_init for glibc2.2
+          guppy
           guppy     removed legacy /trace support for keep-nick
           guppy     fixed a little bug that will happen in September of 2001
           TaKeDa    show the handle when rejecting a duplicate bot connection
@@ -11,7 +13,7 @@
 slennox   Sup       Updated the help channels in the docs.
           Eule      changed the way we check for sticky bans (saves cpu)
           Eugene    fixed various formatting mistakes
-          Kevin     made the IRIX5,6 and 6-64bit OS detection into one check
+          SuperS     made the IRIX5,6 and 6-64bit OS detection into one check
  
 1.6.4 (13 April 2001)
 Found by  Fixed by  What...
Index: eggdrop1.6/src/mod/dns.mod/configure
diff -u eggdrop1.6/src/mod/dns.mod/configure:1.5 eggdrop1.6/src/mod/dns.mod/configure:1.6
--- eggdrop1.6/src/mod/dns.mod/configure:1.5	Thu Mar 23 17:17:57 2000
+++ eggdrop1.6/src/mod/dns.mod/configure	Fri May 18 17:46:37 2001
@@ -159,13 +159,147 @@
 fi
 
 fi
+
+if test "${dns_reslib_avail}" = false; then
+  dns_reslib_avail="true"
+  echo $ac_n "checking for __res_init""... $ac_c" 1>&6
+echo "configure:690: checking for __res_init" >&5
+if eval "test \"`echo '$''{'ac_cv_func___res_init'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 695 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char __res_init(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __res_init();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub___res_init) || defined (__stub_____res_init)
+choke me
+#else
+__res_init();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func___res_init=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___res_init=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'__res_init`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for __res_init in -lresolv""... $ac_c" 1>&6
+echo "configure:736: checking for __res_init in -lresolv" >&5
+ac_lib_var=`echo resolv'_'__res_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 744 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __res_init();
+
+int main() {
+__res_init()
+; return 0; }
+EOF
+if { (eval echo configure:755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  RESLIB="-lresolv"
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for __res_init in -lbind""... $ac_c" 1>&6
+echo "configure:774: checking for __res_init in -lbind" >&5
+ac_lib_var=`echo bind'_'__res_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lbind  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 782 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __res_init();
+
+int main() {
+__res_init()
+; return 0; }
+EOF
+if { (eval echo configure:793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  RESLIB="-lbind"
+else
+  echo "$ac_t""no" 1>&6
+        dns_reslib_avail="false";
+      
+fi
+    
+fi
+  
+fi
+fi
+
 echo $ac_n "checking for res_mkquery""... $ac_c" 1>&6
-echo "configure:687: checking for res_mkquery" >&5
+echo "configure:821: checking for res_mkquery" >&5
 if eval "test \"`echo '$''{'ac_cv_func_res_mkquery'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 692 "configure"
+#line 826 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char res_mkquery(); below.  */
@@ -188,7 +322,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_res_mkquery=yes"
 else
@@ -206,7 +340,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_mkquery in -lresolv""... $ac_c" 1>&6
-echo "configure:733: checking for res_mkquery in -lresolv" >&5
+echo "configure:867: checking for res_mkquery in -lresolv" >&5
 ac_lib_var=`echo resolv'_'res_mkquery | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -214,7 +348,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 741 "configure"
+#line 875 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -225,7 +359,7 @@
 res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -247,7 +381,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for res_mkquery in -lbind""... $ac_c" 1>&6
-echo "configure:774: checking for res_mkquery in -lbind" >&5
+echo "configure:908: checking for res_mkquery in -lbind" >&5
 ac_lib_var=`echo bind'_'res_mkquery | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -255,7 +389,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 782 "configure"
+#line 916 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -266,7 +400,7 @@
 res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
Index: eggdrop1.6/src/mod/dns.mod/configure.in
diff -u eggdrop1.6/src/mod/dns.mod/configure.in:1.3 eggdrop1.6/src/mod/dns.mod/configure.in:1.4
--- eggdrop1.6/src/mod/dns.mod/configure.in:1.3	Sun Mar  5 17:22:49 2000
+++ eggdrop1.6/src/mod/dns.mod/configure.in	Fri May 18 17:46:37 2001
@@ -1,6 +1,6 @@
 dnl Eggdrop compile-time configuration file for src/mod/dns.mod
 dnl
-dnl $Id: configure.in,v 1.3 2000/03/05 23:22:49 fabian Exp $
+dnl $Id: configure.in,v 1.4 2001/05/18 22:46:37 guppy Exp $
 
 dnl This file is based on the autoconf m4 macros. Special eggdrop
 dnl macros are used to optimise the size of the resulting configure
@@ -22,6 +22,18 @@
     ])dnl
   )dnl
 )dnl
+
+if test "${dns_reslib_avail}" = false; then
+  dns_reslib_avail="true"
+  AC_CHECK_FUNC(__res_init, ,
+    AC_CHECK_LIB(resolv, __res_init, RESLIB="-lresolv",
+      AC_CHECK_LIB(bind, __res_init, RESLIB="-lbind", [dnl
+        dns_reslib_avail="false";
+      ])dnl
+    )dnl
+  )dnl
+fi
+
 AC_CHECK_FUNC(res_mkquery, ,
   AC_CHECK_LIB(resolv, res_mkquery, [dnl
     if test "x${RESLIB}" != "x-lresolv"; then
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.469 eggdrop1.6/src/patch.h:1.470
--- eggdrop1.6/src/patch.h:1.469	Fri May 18 17:35:04 2001
+++ eggdrop1.6/src/patch.h	Fri May 18 17:46:37 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.469 2001/05/18 22:35:04 guppy Exp $
+ * $Id: patch.h,v 1.470 2001/05/18 22:46:37 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("990225292");		/* current unixtime */
+patch("990225549");		/* current unixtime */
 /*
  *
  *
  */
-patch("legacytrace");
+patch("res_init");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list