Update to 1.6.21. Notable changes:

  - Added CIDR support to eggdrop. This includes accepting and matching b/e/I
    masks and user hosts in cidr notation.
  - Added a msg-rate config variable, to replace the current #define msgrate
    in server.mod.
  - Replaced most dns.mod preprocessor definitions with config variables.
  - Added a configure option to set the handlen while keeping compatibility with
    the older method of editing eggdrop.h directly.

  - Explicitly offer both --enable-tcl-threads and --disable-tcl-threads
    configure options that can forcefully enable or disable threaded Tcl
    library support.

  - Fixed a remote DoS in the CTCP parsing code introduced by the servmsg.c
    buffer overflow patch by Nico Golde.
    Reference: CVE-2009-1789
  - Work around Tcl8.5.10 bug 3371644 (strings starting with # could crash
    in Tcl_ConvertElement()).
  - tcl_maskhost could crash the bot.
  - Fixed a potential crash in read_lang() with lines > 512 characters in
    language files. Added support for lines of unlimited size.
  - Fixed dns.mod SIGBUS crashes on 64-bit Sparc.
  - Fixed a crash when restarting, related to bind log.

7 files changed, 56 insertions, 61 deletions

diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 97dc7088e1e..05927a536b5 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.32 2011/01/18 18:39:13 tez Exp $
+# $NetBSD: Makefile,v 1.33 2012/03/31 21:52:56 shattered Exp $
 
-DISTNAME=	eggdrop1.6.19
-PKGNAME=	eggdrop-1.6.19
-PKGREVISION=	1
+DISTNAME=	eggdrop1.6.21
+PKGNAME=	eggdrop-1.6.21
+#KGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 EXTRACT_SUFX=	.tar.bz2
 
-PATCH_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/patches/official/1.6/
-PATCHFILES=	eggdrop1.6.19+ctcpfix.patch.gz
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.eggheads.org/
 COMMENT=	IRC robot with TCL scripting and multi-channel ability
diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST
index 65cc2ab33a0..5a1d58d5917 100644
--- a/chat/eggdrop/PLIST
+++ b/chat/eggdrop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:28:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/03/31 21:52:56 shattered Exp $
 bin/eggdrop
 ${PLIST.dynamic}lib/eggdrop/assoc.so
 ${PLIST.dynamic}lib/eggdrop/blowfish.so
@@ -31,7 +31,6 @@ share/doc/eggdrop/html/app-problems.html
 share/doc/eggdrop/html/app-textsub.html
 share/doc/eggdrop/html/app-tricks.html
 share/doc/eggdrop/html/app-weird.html
-share/doc/eggdrop/html/authors.html
 share/doc/eggdrop/html/bans.html
 share/doc/eggdrop/html/botnet.html
 share/doc/eggdrop/html/compiling.html
@@ -53,6 +52,7 @@ share/doc/eggdrop/html/mod-notes.html
 share/doc/eggdrop/html/mod-seen.html
 share/doc/eggdrop/html/mod-server.html
 share/doc/eggdrop/html/mod-share.html
+share/doc/eggdrop/html/mod-transfer.html
 share/doc/eggdrop/html/mod-uptime.html
 share/doc/eggdrop/html/mod-wire.html
 share/doc/eggdrop/html/mod-woobie.html
@@ -109,6 +109,7 @@ share/eggdrop/scripts/autobotchk
 share/eggdrop/scripts/botchk
 share/eggdrop/scripts/cmd_resolve.tcl
 share/eggdrop/scripts/compat.tcl
+share/eggdrop/scripts/dccwhois.tcl
 share/eggdrop/scripts/getops.tcl
 share/eggdrop/scripts/klined.tcl
 share/eggdrop/scripts/notes2.tcl
diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo
index 6b2a21d57a9..10d285bc93c 100644
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.13 2009/06/10 13:33:39 obache Exp $
+$NetBSD: distinfo,v 1.14 2012/03/31 21:52:57 shattered Exp $
 
-SHA1 (eggdrop1.6.19+ctcpfix.patch.gz) = 6d4c5aaab0a9e2e5cf5ef4295c9af03bb7066749
-RMD160 (eggdrop1.6.19+ctcpfix.patch.gz) = 242acc5f7e8ea23dfcc2595a6cbb8da7591882c3
-Size (eggdrop1.6.19+ctcpfix.patch.gz) = 666 bytes
-SHA1 (eggdrop1.6.19.tar.bz2) = e360afc87417d6bf9a7ddca4f4a464f348e6fad9
-RMD160 (eggdrop1.6.19.tar.bz2) = cc4ccb3efe84a90621f87d2b69234ee605b0751c
-Size (eggdrop1.6.19.tar.bz2) = 811072 bytes
-SHA1 (patch-aa) = 86b4795f28893d52e98bdea1b177e67d7cde05d6
-SHA1 (patch-ab) = 95547de7c440f569cb3fce1526112ca024f55a4c
+SHA1 (eggdrop1.6.21.tar.bz2) = 98ce7220c8aff19d2f8406fcc52aa1807aa0de01
+RMD160 (eggdrop1.6.21.tar.bz2) = 1006dfd6a6e735500c2b484eb3061f1d2dfd20f8
+Size (eggdrop1.6.21.tar.bz2) = 999211 bytes
+SHA1 (patch-aa) = 0dfc560d2ef0d92c65c5afa9396da00f80257ee6
+SHA1 (patch-ab) = c43cbe9586c6a05114a3ff21eb5fe5b806e8bb05
 SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471
-SHA1 (patch-ad) = b3a8014bd664a22ec8c62d006ee02884df616a35
+SHA1 (patch-ad) = 9904f090a2a942a7442b1950489db0ae68a6e294
 SHA1 (patch-ae) = bdbb616282b7dc643182a35c606401850b33fdca
 SHA1 (patch-af) = 8f314d65d1a396b85e17400ee046f2ad4324a690
-SHA1 (patch-ag) = 2bade3c0aee6f1b9777ea8bb75ccf5871c4bc1fd
+SHA1 (patch-ag) = 0e69d8d867af7c1e3bb841e4fb06452f5cc1393d
 SHA1 (patch-ah) = a5360c748e16cbc3d6ae4f2968799e96007971f1
 SHA1 (patch-ai) = 77743bdf5fe790826159ffbb9246132f74a5fe38
 SHA1 (patch-ak) = 92f269a3f382a9f917d7e58c2cee5bb1d500ab6d
diff --git a/chat/eggdrop/patches/patch-aa b/chat/eggdrop/patches/patch-aa
index 124231dbf71..c91ac64646e 100644
--- a/chat/eggdrop/patches/patch-aa
+++ b/chat/eggdrop/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2007/10/18 09:15:33 obache Exp $
+$NetBSD: patch-aa,v 1.6 2012/03/31 21:52:57 shattered Exp $
 
---- configure.orig	2006-07-09 23:13:54.000000000 +0000
+--- configure.orig	2011-10-26 02:00:10.000000000 +0000
 +++ configure
-@@ -4924,7 +4924,7 @@ _ACEOF
+@@ -5248,7 +5248,7 @@ $as_echo "#define DLOPEN_1 1" >>confdefs
  
        fi
      ;;
@@ -11,9 +11,9 @@ $NetBSD: patch-aa,v 1.5 2007/10/18 09:15:33 obache Exp $
        # FreeBSD/OpenBSD/NetBSD all support dlopen() and have had plenty of
        # testing with Eggdrop.
        WEIRD_OS="no"
-@@ -5306,10 +5306,16 @@ _ACEOF
-       # Solaris defines (2^31)-1 as the limit for random() rather than RAND_MAX.
-       RANDMAX="0x7FFFFFFF"
+@@ -5525,10 +5525,16 @@ $as_echo "#define STOP_UAC 1" >>confdefs
+         SHLIB_CC="$CC -PIC"
+       fi
      ;;
 -    *BSD)
 +    *BSD | DragonFly)
diff --git a/chat/eggdrop/patches/patch-ab b/chat/eggdrop/patches/patch-ab
index 6b27ec4b0dc..57de0791bb2 100644
--- a/chat/eggdrop/patches/patch-ab
+++ b/chat/eggdrop/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.5 2009/06/10 13:33:39 obache Exp $
+$NetBSD: patch-ab,v 1.6 2012/03/31 21:52:57 shattered Exp $
 
---- src/main.c.orig	2004-07-02 21:21:08.000000000 +0000
+--- src/main.c.orig	2011-09-23 20:31:32.000000000 +0000
 +++ src/main.c
 @@ -72,7 +72,7 @@
- #  define _POSIX_SOURCE 1 /* Solaris needs this */
+ #  define _POSIX_SOURCE 1               /* Solaris needs this */
  #endif
  
 -extern char origbotname[], userfile[], botnetnick[];
 +extern char origbotname[], userfile[], botnetnick[], tempdir[];
- extern int dcc_total, conmask, cache_hit, cache_miss, max_logs, quick_logs;
+ extern int dcc_total, conmask, cache_hit, cache_miss, max_logs, quick_logs,
+            quiet_save;
  extern struct dcc_t *dcc;
- extern struct userrec *userlist;
-@@ -102,7 +102,7 @@ int con_chan = 0;       /* Foreground: c
+@@ -108,7 +108,7 @@ int con_chan = 0;       /* Foreground: c
  int term_z = 0;         /* Foreground: use the terminal as a partyline?  */
  int use_stderr = 1;     /* Send stuff to stderr instead of logfiles?     */
  
@@ -20,16 +20,16 @@ $NetBSD: patch-ab,v 1.5 2009/06/10 13:33:39 obache Exp $
  char pid_file[120];                     /* Name of the pid file     */
  char helpdir[121] = "help/";            /* Directory of help files  */
  char textdir[121] = "text/";            /* Directory for text files */
-@@ -726,6 +726,8 @@ int main(int argc, char **argv)
-   }
+@@ -963,6 +963,8 @@ int main(int arg_c, char **arg_v)
+   setrlimit(RLIMIT_CORE, &cdlim);
  #endif
  
 +  chdir(__PREFIX__ "/share/eggdrop");
 +
+ #ifdef DEBUG_CONTEXT
    /* Initialise context list */
    for (i = 0; i < 16; i++)
-     Context;
-@@ -825,7 +827,8 @@ int main(int argc, char **argv)
+@@ -1075,7 +1077,8 @@ int main(int arg_c, char **arg_v)
    cache_miss = 0;
    cache_hit = 0;
    if (!pid_file[0])
diff --git a/chat/eggdrop/patches/patch-ad b/chat/eggdrop/patches/patch-ad
index 80eadcb76da..01dfdbce13c 100644
--- a/chat/eggdrop/patches/patch-ad
+++ b/chat/eggdrop/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.3 2007/10/18 09:15:34 obache Exp $
+$NetBSD: patch-ad,v 1.4 2012/03/31 21:52:57 shattered Exp $
 
---- src/mod/filesys.mod/filesys.c.orig	2006-05-29 01:56:08.000000000 +0000
+--- src/mod/filesys.mod/filesys.c.orig	2011-02-13 14:19:33.000000000 +0000
 +++ src/mod/filesys.mod/filesys.c
 @@ -464,7 +464,7 @@ static int do_dcc_send(int idx, char *di
    if (at_limit(nick)) {
      char xxx[1024];
  
--    sprintf(xxx, "%d*%s%s", strlen(dccdir), dccdir, dir);
+-    sprintf(xxx, "%d*%s%s", (int) strlen(dccdir), dccdir, dir);
 +    sprintf(xxx, "%lu*%s%s", strlen(dccdir), dccdir, dir);
      queue_file(xxx, fn, dcc[idx].nick, nick);
      dprintf(idx, "Queued: %s to %s\n", fn, nick);
diff --git a/chat/eggdrop/patches/patch-ag b/chat/eggdrop/patches/patch-ag
index da4cd77550a..980c7fd0e7d 100644
--- a/chat/eggdrop/patches/patch-ag
+++ b/chat/eggdrop/patches/patch-ag
@@ -1,25 +1,25 @@
-$NetBSD: patch-ag,v 1.7 2007/10/18 09:15:34 obache Exp $
+$NetBSD: patch-ag,v 1.8 2012/03/31 21:52:57 shattered Exp $
 
---- Makefile.in.orig	2004-08-28 06:43:21.000000000 +0000
+--- Makefile.in.orig	2010-03-14 18:21:59.000000000 +0000
 +++ Makefile.in
-@@ -38,7 +38,7 @@ SHLIB_CC = @SHLIB_CC@
- # Linker
- LD = @CC@
- MOD_LD = @MOD_LD@
+@@ -51,7 +51,7 @@ MOD_STRIP = @MOD_STRIP@
+ 
+ # make 'modules'
+ SHLIB_CC = @SHLIB_CC@
 -SHLIB_LD = @SHLIB_LD@
 +SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@
+ SHLIB_STRIP = @SHLIB_STRIP@
+ MOD_EXT = @MOD_EXT@
  
- # Stripping
- # To turn STRIP off, use 'STRIP = touch' not 'STRIP ='.
-@@ -64,6 +64,7 @@ TCLLIBFN = @TCLLIBFN@
- # XLIBS will be linked with everything; MODULE_XLIBS will only be linked with
- # the actual module objects.
+@@ -71,6 +71,7 @@ XREQS = @TCL_REQS@
+ # XLIBS will be linked with everything
+ # MODULE_XLIBS will only be linked with the module objects
  XLIBS = @TCL_LIBS@ @LIBS@
 +XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@
  MODULE_XLIBS = @MODULE_XLIBS@
  
- # Shouldn't need to touch anything below here.
-@@ -89,30 +90,30 @@ egg_install_msg =  echo "" && \
+ # You shouldn't need to edit anything below this line.
+@@ -95,30 +96,30 @@ egg_install_msg =  echo "" && \
  MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
  'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
  'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
@@ -27,9 +27,9 @@ $NetBSD: patch-ag,v 1.7 2007/10/18 09:15:34 obache Exp $
 +'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS='
  
  MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
--'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
-+'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
- 'MODULE_XLIBS=$(MODULE_XLIBS)'
+-'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' \
++'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \
+ 'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)'
  
  MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
  'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
@@ -38,19 +38,19 @@ $NetBSD: patch-ag,v 1.7 2007/10/18 09:15:34 obache Exp $
 +'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
  'MODOBJS=mod/*.o'
  
- MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD) -g' \
- 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
+ MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
+ 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \
  'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
 -'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS='
 +'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS='
  
  MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
--'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
-+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
+-'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \
++'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \
  'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)'
  
- MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
- 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DSTATIC $(CFLGS)' \
+ MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+ 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=$(DEBCFLGS) $(CFLGS) -DSTATIC' \
 -'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
 +'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \
  'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o'