Update eggdrop to 1.6.19+ctcpfix, say, 1.6.19nb1.

Eggdrop Changes

  1.6.19+ctcpfix (14 May 2009):
    - Fixed another bug in the CTCP parsing code introduced by the servmsg.c
      buffer overflow patch in 1.6.19.
    * Patch by: thommey


  1.6.19 (18 April 2008):
    - Update the recommended TCL version to 8.5
    * Patch by: guppy

    - Updated Copyright dates
    - added [sL] and thommey to the AUTHORS file
    * Patch by: guppy

    - load blowfish by default
    * Patch by: guppy

    - added a TCL to handle the PONG :<cookie> junk on some EFnet servers
    * Patch by: [sL], guppy

    - add a simple TCL to handle the PASS <numbers> junk on some Undernet
      servers
    * Patch by: guppy

    - add support for chanmode +T
    * Patch by: Thomas "thommey" Sader

    - CTCP parsing was broken by the servmsg.c buffer overflow patch
    * Patch by: Thomas "thommey" Sader

    - Fixed a couple of typos in the FEATURES file.
    * Patch by: Tomas Szaniszlo

    - Fixed two buffer overflows in servmsg.c (CVE-2007-2807).
    * Found by: Bow Sineath - Patch by: Nico Golde / Wcc

    - Fixed compatibility problems with certain time_t implementations.
    * Found by: various - Patch by: Tothwolf

    - Complete raw traffic wasn't getting logged in some cases; only the raw
      command itself was. Fixed.
    * Patch by: mrBuG

5 files changed, 22 insertions, 28 deletions

diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 6544b0a5e67..a5c0ac520d7 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.30 2008/04/12 22:42:58 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2009/06/10 13:33:39 obache Exp $
 
-DISTNAME=	eggdrop1.6.18
-PKGNAME=	eggdrop-1.6.18
+DISTNAME=	eggdrop1.6.19
+PKGNAME=	eggdrop-1.6.19
+PKGREVISION=	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
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+MAKE_JOBS_SAFE=	no
+
 PLIST_VARS=		dynamic
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST
index c6bcf31c7f4..540fcdbe9dd 100644
--- a/chat/eggdrop/PLIST
+++ b/chat/eggdrop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:42:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/10 13:33:39 obache Exp $
 bin/eggdrop
 ${PLIST.dynamic}lib/eggdrop/assoc.so
 ${PLIST.dynamic}lib/eggdrop/blowfish.so
@@ -113,6 +113,8 @@ share/eggdrop/scripts/getops.tcl
 share/eggdrop/scripts/klined.tcl
 share/eggdrop/scripts/notes2.tcl
 share/eggdrop/scripts/ques5.tcl
+share/eggdrop/scripts/quotepass.tcl
+share/eggdrop/scripts/quotepong.tcl
 share/eggdrop/scripts/sentinel.tcl
 share/eggdrop/scripts/userinfo.tcl
 share/eggdrop/scripts/weed
diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo
index 359d2e6d893..6b2a21d57a9 100644
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.12 2007/10/18 09:15:33 obache Exp $
+$NetBSD: distinfo,v 1.13 2009/06/10 13:33:39 obache Exp $
 
-SHA1 (eggdrop1.6.18.tar.bz2) = a5c27578324ad718e224248dc54dfd268df9f71e
-RMD160 (eggdrop1.6.18.tar.bz2) = 06480616c23bff2b1209e03b5e25b55818c4b195
-Size (eggdrop1.6.18.tar.bz2) = 783676 bytes
+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) = ac7aa4b3cb32e53b7e6abe828191afe153a1bbb1
+SHA1 (patch-ab) = 95547de7c440f569cb3fce1526112ca024f55a4c
 SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471
 SHA1 (patch-ad) = b3a8014bd664a22ec8c62d006ee02884df616a35
 SHA1 (patch-ae) = bdbb616282b7dc643182a35c606401850b33fdca
@@ -14,4 +17,3 @@ SHA1 (patch-ah) = a5360c748e16cbc3d6ae4f2968799e96007971f1
 SHA1 (patch-ai) = 77743bdf5fe790826159ffbb9246132f74a5fe38
 SHA1 (patch-ak) = 92f269a3f382a9f917d7e58c2cee5bb1d500ab6d
 SHA1 (patch-al) = 0b0438be382d9d9e0115235fd469bcded6679e3b
-SHA1 (patch-am) = c55fa35a544d50f56a7d179ad23fdcbde3518328
diff --git a/chat/eggdrop/patches/patch-ab b/chat/eggdrop/patches/patch-ab
index e356234d689..6b27ec4b0dc 100644
--- a/chat/eggdrop/patches/patch-ab
+++ b/chat/eggdrop/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2004/12/03 12:15:54 adam Exp $
+$NetBSD: patch-ab,v 1.5 2009/06/10 13:33:39 obache Exp $
 
 --- src/main.c.orig	2004-07-02 21:21:08.000000000 +0000
 +++ src/main.c
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.4 2004/12/03 12:15:54 adam Exp $
  int use_stderr = 1;     /* Send stuff to stderr instead of logfiles?     */
  
 -char configfile[121] = "eggdrop.conf";  /* Default config file name */
-+char configfile[121] = __PKG_SYSCONFDIR__ "eggdrop.conf";  /* Default config file name */
++char configfile[121] = __PKG_SYSCONFDIR__ "/eggdrop.conf";  /* Default config file name */
  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 */
diff --git a/chat/eggdrop/patches/patch-am b/chat/eggdrop/patches/patch-am
deleted file mode 100644
index 3819790b763..00000000000
--- a/chat/eggdrop/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.2 2007/10/18 09:15:34 obache Exp $
-
-Fix for http://www.eggheads.org/bugzilla/show_bug.cgi?id=462
-
---- src/mod/server.mod/servmsg.c.orig	2006-03-28 02:35:51.000000000 +0000
-+++ src/mod/server.mod/servmsg.c
-@@ -461,7 +461,8 @@ static int gotmsg(char *from, char *msg)
-   to = newsplit(&msg);
-   fixcolon(msg);
-   /* Only check if flood-ctcp is active */
--  strcpy(uhost, from);
-+  strncpy(uhost, from, UHOSTMAX);
-+  uhost[UHOSTMAX] = '\0';
-   nick = splitnick(&uhost);
-   if (flud_ctcp_thr && detect_avalanche(msg)) {
-     if (!ignoring) {