Sat Mar 31 21:52:57 2012 UTC ()
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.


(shattered)
diff -r1.32 -r1.33 pkgsrc/chat/eggdrop/Makefile
diff -r1.13 -r1.14 pkgsrc/chat/eggdrop/PLIST
diff -r1.13 -r1.14 pkgsrc/chat/eggdrop/distinfo
diff -r1.5 -r1.6 pkgsrc/chat/eggdrop/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/chat/eggdrop/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/chat/eggdrop/patches/patch-ad
diff -r1.7 -r1.8 pkgsrc/chat/eggdrop/patches/patch-ag
cvs diff -r1.32 -r1.33 pkgsrc/chat/eggdrop/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/Makefile 2011/01/18 18:39:13 1.32
+++ pkgsrc/chat/eggdrop/Makefile 2012/03/31 21:52:56 1.33
@@ -1,25 +1,22 @@ @@ -1,25 +1,22 @@
1# $NetBSD: Makefile,v 1.32 2011/01/18 18:39:13 tez Exp $ 1# $NetBSD: Makefile,v 1.33 2012/03/31 21:52:56 shattered Exp $
2 2
3DISTNAME= eggdrop1.6.19 3DISTNAME= eggdrop1.6.21
4PKGNAME= eggdrop-1.6.19 4PKGNAME= eggdrop-1.6.21
5PKGREVISION= 1 5#KGREVISION= 1
6CATEGORIES= chat 6CATEGORIES= chat
7MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/ 7MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10PATCH_SITES= ftp://ftp.eggheads.org/pub/eggdrop/patches/official/1.6/ 
11PATCHFILES= eggdrop1.6.19+ctcpfix.patch.gz 
12 
13MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.eggheads.org/ 11HOMEPAGE= http://www.eggheads.org/
15COMMENT= IRC robot with TCL scripting and multi-channel ability 12COMMENT= IRC robot with TCL scripting and multi-channel ability
16 13
17PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
18 15
19MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
20 17
21PLIST_VARS= dynamic 18PLIST_VARS= dynamic
22GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
24CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include" 21CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
25 22
cvs diff -r1.13 -r1.14 pkgsrc/chat/eggdrop/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/PLIST 2009/06/14 18:28:43 1.13
+++ pkgsrc/chat/eggdrop/PLIST 2012/03/31 21:52:56 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:28:43 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.14 2012/03/31 21:52:56 shattered Exp $
2bin/eggdrop 2bin/eggdrop
3${PLIST.dynamic}lib/eggdrop/assoc.so 3${PLIST.dynamic}lib/eggdrop/assoc.so
4${PLIST.dynamic}lib/eggdrop/blowfish.so 4${PLIST.dynamic}lib/eggdrop/blowfish.so
5${PLIST.dynamic}lib/eggdrop/channels.so 5${PLIST.dynamic}lib/eggdrop/channels.so
6${PLIST.dynamic}lib/eggdrop/compress.so 6${PLIST.dynamic}lib/eggdrop/compress.so
7${PLIST.dynamic}lib/eggdrop/console.so 7${PLIST.dynamic}lib/eggdrop/console.so
8${PLIST.dynamic}lib/eggdrop/ctcp.so 8${PLIST.dynamic}lib/eggdrop/ctcp.so
9${PLIST.dynamic}lib/eggdrop/dns.so 9${PLIST.dynamic}lib/eggdrop/dns.so
10${PLIST.dynamic}lib/eggdrop/filesys.so 10${PLIST.dynamic}lib/eggdrop/filesys.so
11${PLIST.dynamic}lib/eggdrop/irc.so 11${PLIST.dynamic}lib/eggdrop/irc.so
12${PLIST.dynamic}lib/eggdrop/notes.so 12${PLIST.dynamic}lib/eggdrop/notes.so
13${PLIST.dynamic}lib/eggdrop/seen.so 13${PLIST.dynamic}lib/eggdrop/seen.so
14${PLIST.dynamic}lib/eggdrop/server.so 14${PLIST.dynamic}lib/eggdrop/server.so
@@ -21,48 +21,48 @@ share/doc/eggdrop/BANS @@ -21,48 +21,48 @@ share/doc/eggdrop/BANS
21share/doc/eggdrop/BOTNET 21share/doc/eggdrop/BOTNET
22share/doc/eggdrop/FIRST-SCRIPT 22share/doc/eggdrop/FIRST-SCRIPT
23share/doc/eggdrop/MODULES 23share/doc/eggdrop/MODULES
24share/doc/eggdrop/PARTYLINE 24share/doc/eggdrop/PARTYLINE
25share/doc/eggdrop/TEXT-SUBSTITUTIONS 25share/doc/eggdrop/TEXT-SUBSTITUTIONS
26share/doc/eggdrop/TRICKS 26share/doc/eggdrop/TRICKS
27share/doc/eggdrop/USERS 27share/doc/eggdrop/USERS
28share/doc/eggdrop/tcl-commands.doc 28share/doc/eggdrop/tcl-commands.doc
29share/doc/eggdrop/html/about.html 29share/doc/eggdrop/html/about.html
30share/doc/eggdrop/html/app-problems.html 30share/doc/eggdrop/html/app-problems.html
31share/doc/eggdrop/html/app-textsub.html 31share/doc/eggdrop/html/app-textsub.html
32share/doc/eggdrop/html/app-tricks.html 32share/doc/eggdrop/html/app-tricks.html
33share/doc/eggdrop/html/app-weird.html 33share/doc/eggdrop/html/app-weird.html
34share/doc/eggdrop/html/authors.html 
35share/doc/eggdrop/html/bans.html 34share/doc/eggdrop/html/bans.html
36share/doc/eggdrop/html/botnet.html 35share/doc/eggdrop/html/botnet.html
37share/doc/eggdrop/html/compiling.html 36share/doc/eggdrop/html/compiling.html
38share/doc/eggdrop/html/egg-core.html 37share/doc/eggdrop/html/egg-core.html
39share/doc/eggdrop/html/faqs.html 38share/doc/eggdrop/html/faqs.html
40share/doc/eggdrop/html/features.html 39share/doc/eggdrop/html/features.html
41share/doc/eggdrop/html/index.html 40share/doc/eggdrop/html/index.html
42share/doc/eggdrop/html/install.html 41share/doc/eggdrop/html/install.html
43share/doc/eggdrop/html/mod-assoc.html 42share/doc/eggdrop/html/mod-assoc.html
44share/doc/eggdrop/html/mod-blowfish.html 43share/doc/eggdrop/html/mod-blowfish.html
45share/doc/eggdrop/html/mod-channels.html 44share/doc/eggdrop/html/mod-channels.html
46share/doc/eggdrop/html/mod-compress.html 45share/doc/eggdrop/html/mod-compress.html
47share/doc/eggdrop/html/mod-console.html 46share/doc/eggdrop/html/mod-console.html
48share/doc/eggdrop/html/mod-ctcp.html 47share/doc/eggdrop/html/mod-ctcp.html
49share/doc/eggdrop/html/mod-dns.html 48share/doc/eggdrop/html/mod-dns.html
50share/doc/eggdrop/html/mod-filesys.html 49share/doc/eggdrop/html/mod-filesys.html
51share/doc/eggdrop/html/mod-irc.html 50share/doc/eggdrop/html/mod-irc.html
52share/doc/eggdrop/html/mod-notes.html 51share/doc/eggdrop/html/mod-notes.html
53share/doc/eggdrop/html/mod-seen.html 52share/doc/eggdrop/html/mod-seen.html
54share/doc/eggdrop/html/mod-server.html 53share/doc/eggdrop/html/mod-server.html
55share/doc/eggdrop/html/mod-share.html 54share/doc/eggdrop/html/mod-share.html
 55share/doc/eggdrop/html/mod-transfer.html
56share/doc/eggdrop/html/mod-uptime.html 56share/doc/eggdrop/html/mod-uptime.html
57share/doc/eggdrop/html/mod-wire.html 57share/doc/eggdrop/html/mod-wire.html
58share/doc/eggdrop/html/mod-woobie.html 58share/doc/eggdrop/html/mod-woobie.html
59share/doc/eggdrop/html/news.html 59share/doc/eggdrop/html/news.html
60share/doc/eggdrop/html/party.html 60share/doc/eggdrop/html/party.html
61share/doc/eggdrop/html/patch-howto.html 61share/doc/eggdrop/html/patch-howto.html
62share/doc/eggdrop/html/readme.html 62share/doc/eggdrop/html/readme.html
63share/doc/eggdrop/html/starting.html 63share/doc/eggdrop/html/starting.html
64share/doc/eggdrop/html/tcl-commands.html 64share/doc/eggdrop/html/tcl-commands.html
65share/doc/eggdrop/html/users.html 65share/doc/eggdrop/html/users.html
66share/eggdrop/help/cmds1.help 66share/eggdrop/help/cmds1.help
67share/eggdrop/help/cmds2.help 67share/eggdrop/help/cmds2.help
68share/eggdrop/help/core.help 68share/eggdrop/help/core.help
@@ -99,24 +99,25 @@ share/eggdrop/language/transfer.french.l @@ -99,24 +99,25 @@ share/eggdrop/language/transfer.french.l
99share/eggdrop/language/transfer.german.lang 99share/eggdrop/language/transfer.german.lang
100share/eggdrop/language/wire.danish.lang 100share/eggdrop/language/wire.danish.lang
101share/eggdrop/language/wire.english.lang 101share/eggdrop/language/wire.english.lang
102share/eggdrop/language/wire.finnish.lang 102share/eggdrop/language/wire.finnish.lang
103share/eggdrop/language/wire.french.lang 103share/eggdrop/language/wire.french.lang
104share/eggdrop/language/wire.german.lang 104share/eggdrop/language/wire.german.lang
105share/eggdrop/scripts/CONTENTS 105share/eggdrop/scripts/CONTENTS
106share/eggdrop/scripts/action.fix.tcl 106share/eggdrop/scripts/action.fix.tcl
107share/eggdrop/scripts/alltools.tcl 107share/eggdrop/scripts/alltools.tcl
108share/eggdrop/scripts/autobotchk 108share/eggdrop/scripts/autobotchk
109share/eggdrop/scripts/botchk 109share/eggdrop/scripts/botchk
110share/eggdrop/scripts/cmd_resolve.tcl 110share/eggdrop/scripts/cmd_resolve.tcl
111share/eggdrop/scripts/compat.tcl 111share/eggdrop/scripts/compat.tcl
 112share/eggdrop/scripts/dccwhois.tcl
112share/eggdrop/scripts/getops.tcl 113share/eggdrop/scripts/getops.tcl
113share/eggdrop/scripts/klined.tcl 114share/eggdrop/scripts/klined.tcl
114share/eggdrop/scripts/notes2.tcl 115share/eggdrop/scripts/notes2.tcl
115share/eggdrop/scripts/ques5.tcl 116share/eggdrop/scripts/ques5.tcl
116share/eggdrop/scripts/quotepass.tcl 117share/eggdrop/scripts/quotepass.tcl
117share/eggdrop/scripts/quotepong.tcl 118share/eggdrop/scripts/quotepong.tcl
118share/eggdrop/scripts/sentinel.tcl 119share/eggdrop/scripts/sentinel.tcl
119share/eggdrop/scripts/userinfo.tcl 120share/eggdrop/scripts/userinfo.tcl
120share/eggdrop/scripts/weed 121share/eggdrop/scripts/weed
121share/examples/eggdrop/eggdrop.conf 122share/examples/eggdrop/eggdrop.conf
122@pkgdir share/eggdrop/help/msg 123@pkgdir share/eggdrop/help/msg
cvs diff -r1.13 -r1.14 pkgsrc/chat/eggdrop/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/distinfo 2009/06/10 13:33:39 1.13
+++ pkgsrc/chat/eggdrop/distinfo 2012/03/31 21:52:57 1.14
@@ -1,19 +1,16 @@ @@ -1,19 +1,16 @@
1$NetBSD: distinfo,v 1.13 2009/06/10 13:33:39 obache Exp $ 1$NetBSD: distinfo,v 1.14 2012/03/31 21:52:57 shattered Exp $
2 2
3SHA1 (eggdrop1.6.19+ctcpfix.patch.gz) = 6d4c5aaab0a9e2e5cf5ef4295c9af03bb7066749 3SHA1 (eggdrop1.6.21.tar.bz2) = 98ce7220c8aff19d2f8406fcc52aa1807aa0de01
4RMD160 (eggdrop1.6.19+ctcpfix.patch.gz) = 242acc5f7e8ea23dfcc2595a6cbb8da7591882c3 4RMD160 (eggdrop1.6.21.tar.bz2) = 1006dfd6a6e735500c2b484eb3061f1d2dfd20f8
5Size (eggdrop1.6.19+ctcpfix.patch.gz) = 666 bytes 5Size (eggdrop1.6.21.tar.bz2) = 999211 bytes
6SHA1 (eggdrop1.6.19.tar.bz2) = e360afc87417d6bf9a7ddca4f4a464f348e6fad9 6SHA1 (patch-aa) = 0dfc560d2ef0d92c65c5afa9396da00f80257ee6
7RMD160 (eggdrop1.6.19.tar.bz2) = cc4ccb3efe84a90621f87d2b69234ee605b0751c 7SHA1 (patch-ab) = c43cbe9586c6a05114a3ff21eb5fe5b806e8bb05
8Size (eggdrop1.6.19.tar.bz2) = 811072 bytes 
9SHA1 (patch-aa) = 86b4795f28893d52e98bdea1b177e67d7cde05d6 
10SHA1 (patch-ab) = 95547de7c440f569cb3fce1526112ca024f55a4c 
11SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471 8SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471
12SHA1 (patch-ad) = b3a8014bd664a22ec8c62d006ee02884df616a35 9SHA1 (patch-ad) = 9904f090a2a942a7442b1950489db0ae68a6e294
13SHA1 (patch-ae) = bdbb616282b7dc643182a35c606401850b33fdca 10SHA1 (patch-ae) = bdbb616282b7dc643182a35c606401850b33fdca
14SHA1 (patch-af) = 8f314d65d1a396b85e17400ee046f2ad4324a690 11SHA1 (patch-af) = 8f314d65d1a396b85e17400ee046f2ad4324a690
15SHA1 (patch-ag) = 2bade3c0aee6f1b9777ea8bb75ccf5871c4bc1fd 12SHA1 (patch-ag) = 0e69d8d867af7c1e3bb841e4fb06452f5cc1393d
16SHA1 (patch-ah) = a5360c748e16cbc3d6ae4f2968799e96007971f1 13SHA1 (patch-ah) = a5360c748e16cbc3d6ae4f2968799e96007971f1
17SHA1 (patch-ai) = 77743bdf5fe790826159ffbb9246132f74a5fe38 14SHA1 (patch-ai) = 77743bdf5fe790826159ffbb9246132f74a5fe38
18SHA1 (patch-ak) = 92f269a3f382a9f917d7e58c2cee5bb1d500ab6d 15SHA1 (patch-ak) = 92f269a3f382a9f917d7e58c2cee5bb1d500ab6d
19SHA1 (patch-al) = 0b0438be382d9d9e0115235fd469bcded6679e3b 16SHA1 (patch-al) = 0b0438be382d9d9e0115235fd469bcded6679e3b
cvs diff -r1.5 -r1.6 pkgsrc/chat/eggdrop/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/patches/Attic/patch-aa 2007/10/18 09:15:33 1.5
+++ pkgsrc/chat/eggdrop/patches/Attic/patch-aa 2012/03/31 21:52:57 1.6
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-aa,v 1.5 2007/10/18 09:15:33 obache Exp $ 1$NetBSD: patch-aa,v 1.6 2012/03/31 21:52:57 shattered Exp $
2 2
3--- configure.orig 2006-07-09 23:13:54.000000000 +0000 3--- configure.orig 2011-10-26 02:00:10.000000000 +0000
4+++ configure 4+++ configure
5@@ -4924,7 +4924,7 @@ _ACEOF 5@@ -5248,7 +5248,7 @@ $as_echo "#define DLOPEN_1 1" >>confdefs
6  6
7 fi 7 fi
8 ;; 8 ;;
9- *BSD) 9- *BSD)
10+ *BSD | DragonFly) 10+ *BSD | DragonFly)
11 # FreeBSD/OpenBSD/NetBSD all support dlopen() and have had plenty of 11 # FreeBSD/OpenBSD/NetBSD all support dlopen() and have had plenty of
12 # testing with Eggdrop. 12 # testing with Eggdrop.
13 WEIRD_OS="no" 13 WEIRD_OS="no"
14@@ -5306,10 +5306,16 @@ _ACEOF 14@@ -5525,10 +5525,16 @@ $as_echo "#define STOP_UAC 1" >>confdefs
15 # Solaris defines (2^31)-1 as the limit for random() rather than RAND_MAX. 15 SHLIB_CC="$CC -PIC"
16 RANDMAX="0x7FFFFFFF" 16 fi
17 ;; 17 ;;
18- *BSD) 18- *BSD)
19+ *BSD | DragonFly) 19+ *BSD | DragonFly)
20 # FreeBSD/OpenBSD/NetBSD 20 # FreeBSD/OpenBSD/NetBSD
21 SHLIB_CC="$CC -fPIC" 21 SHLIB_CC="$CC -fPIC"
22- SHLIB_LD="ld -Bshareable -x" 22- SHLIB_LD="ld -Bshareable -x"
23+ if [ `echo __ELF__ | $CC -E - | grep -v '#'` = 1 ]; then 23+ if [ `echo __ELF__ | $CC -E - | grep -v '#'` = 1 ]; then
24+ SHLIB_LD="ld -shared -x" 24+ SHLIB_LD="ld -shared -x"
25+ BEL_MOD_LD="$CC -Wl,-E $LDFLAGS" 25+ BEL_MOD_LD="$CC -Wl,-E $LDFLAGS"
26+ else 26+ else
27+ SHLIB_LD="ld -Bshareable -x" 27+ SHLIB_LD="ld -Bshareable -x"
28+ BEL_MOD_LD="$CC $LDFLAGS" 28+ BEL_MOD_LD="$CC $LDFLAGS"
29+ fi 29+ fi
cvs diff -r1.5 -r1.6 pkgsrc/chat/eggdrop/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/patches/Attic/patch-ab 2009/06/10 13:33:39 1.5
+++ pkgsrc/chat/eggdrop/patches/Attic/patch-ab 2012/03/31 21:52:57 1.6
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1$NetBSD: patch-ab,v 1.5 2009/06/10 13:33:39 obache Exp $ 1$NetBSD: patch-ab,v 1.6 2012/03/31 21:52:57 shattered Exp $
2 2
3--- src/main.c.orig 2004-07-02 21:21:08.000000000 +0000 3--- src/main.c.orig 2011-09-23 20:31:32.000000000 +0000
4+++ src/main.c 4+++ src/main.c
5@@ -72,7 +72,7 @@ 5@@ -72,7 +72,7 @@
6 # define _POSIX_SOURCE 1 /* Solaris needs this */ 6 # define _POSIX_SOURCE 1 /* Solaris needs this */
7 #endif 7 #endif
8  8
9-extern char origbotname[], userfile[], botnetnick[]; 9-extern char origbotname[], userfile[], botnetnick[];
10+extern char origbotname[], userfile[], botnetnick[], tempdir[]; 10+extern char origbotname[], userfile[], botnetnick[], tempdir[];
11 extern int dcc_total, conmask, cache_hit, cache_miss, max_logs, quick_logs; 11 extern int dcc_total, conmask, cache_hit, cache_miss, max_logs, quick_logs,
 12 quiet_save;
12 extern struct dcc_t *dcc; 13 extern struct dcc_t *dcc;
13 extern struct userrec *userlist; 14@@ -108,7 +108,7 @@ int con_chan = 0; /* Foreground: c
14@@ -102,7 +102,7 @@ int con_chan = 0; /* Foreground: c 
15 int term_z = 0; /* Foreground: use the terminal as a partyline? */ 15 int term_z = 0; /* Foreground: use the terminal as a partyline? */
16 int use_stderr = 1; /* Send stuff to stderr instead of logfiles? */ 16 int use_stderr = 1; /* Send stuff to stderr instead of logfiles? */
17  17
18-char configfile[121] = "eggdrop.conf"; /* Default config file name */ 18-char configfile[121] = "eggdrop.conf"; /* Default config file name */
19+char configfile[121] = __PKG_SYSCONFDIR__ "/eggdrop.conf"; /* Default config file name */ 19+char configfile[121] = __PKG_SYSCONFDIR__ "/eggdrop.conf"; /* Default config file name */
20 char pid_file[120]; /* Name of the pid file */ 20 char pid_file[120]; /* Name of the pid file */
21 char helpdir[121] = "help/"; /* Directory of help files */ 21 char helpdir[121] = "help/"; /* Directory of help files */
22 char textdir[121] = "text/"; /* Directory for text files */ 22 char textdir[121] = "text/"; /* Directory for text files */
23@@ -726,6 +726,8 @@ int main(int argc, char **argv) 23@@ -963,6 +963,8 @@ int main(int arg_c, char **arg_v)
24 } 24 setrlimit(RLIMIT_CORE, &cdlim);
25 #endif 25 #endif
26  26
27+ chdir(__PREFIX__ "/share/eggdrop"); 27+ chdir(__PREFIX__ "/share/eggdrop");
28+ 28+
 29 #ifdef DEBUG_CONTEXT
29 /* Initialise context list */ 30 /* Initialise context list */
30 for (i = 0; i < 16; i++) 31 for (i = 0; i < 16; i++)
31 Context; 32@@ -1075,7 +1077,8 @@ int main(int arg_c, char **arg_v)
32@@ -825,7 +827,8 @@ int main(int argc, char **argv) 
33 cache_miss = 0; 33 cache_miss = 0;
34 cache_hit = 0; 34 cache_hit = 0;
35 if (!pid_file[0]) 35 if (!pid_file[0])
36- egg_snprintf(pid_file, sizeof pid_file, "pid.%s", botnetnick); 36- egg_snprintf(pid_file, sizeof pid_file, "pid.%s", botnetnick);
37+ egg_snprintf(pid_file, sizeof pid_file, "%.100s/pid.%.32s", 37+ egg_snprintf(pid_file, sizeof pid_file, "%.100s/pid.%.32s",
38+ tempdir, botnetnick); 38+ tempdir, botnetnick);
39  39
40 /* Check for pre-existing eggdrop! */ 40 /* Check for pre-existing eggdrop! */
41 f = fopen(pid_file, "r"); 41 f = fopen(pid_file, "r");
cvs diff -r1.3 -r1.4 pkgsrc/chat/eggdrop/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/patches/Attic/patch-ad 2007/10/18 09:15:34 1.3
+++ pkgsrc/chat/eggdrop/patches/Attic/patch-ad 2012/03/31 21:52:57 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.3 2007/10/18 09:15:34 obache Exp $ 1$NetBSD: patch-ad,v 1.4 2012/03/31 21:52:57 shattered Exp $
2 2
3--- src/mod/filesys.mod/filesys.c.orig 2006-05-29 01:56:08.000000000 +0000 3--- src/mod/filesys.mod/filesys.c.orig 2011-02-13 14:19:33.000000000 +0000
4+++ src/mod/filesys.mod/filesys.c 4+++ src/mod/filesys.mod/filesys.c
5@@ -464,7 +464,7 @@ static int do_dcc_send(int idx, char *di 5@@ -464,7 +464,7 @@ static int do_dcc_send(int idx, char *di
6 if (at_limit(nick)) { 6 if (at_limit(nick)) {
7 char xxx[1024]; 7 char xxx[1024];
8  8
9- sprintf(xxx, "%d*%s%s", strlen(dccdir), dccdir, dir); 9- sprintf(xxx, "%d*%s%s", (int) strlen(dccdir), dccdir, dir);
10+ sprintf(xxx, "%lu*%s%s", strlen(dccdir), dccdir, dir); 10+ sprintf(xxx, "%lu*%s%s", strlen(dccdir), dccdir, dir);
11 queue_file(xxx, fn, dcc[idx].nick, nick); 11 queue_file(xxx, fn, dcc[idx].nick, nick);
12 dprintf(idx, "Queued: %s to %s\n", fn, nick); 12 dprintf(idx, "Queued: %s to %s\n", fn, nick);
13 my_free(s); 13 my_free(s);
cvs diff -r1.7 -r1.8 pkgsrc/chat/eggdrop/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/chat/eggdrop/patches/Attic/patch-ag 2007/10/18 09:15:34 1.7
+++ pkgsrc/chat/eggdrop/patches/Attic/patch-ag 2012/03/31 21:52:57 1.8
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1$NetBSD: patch-ag,v 1.7 2007/10/18 09:15:34 obache Exp $ 1$NetBSD: patch-ag,v 1.8 2012/03/31 21:52:57 shattered Exp $
2 2
3--- Makefile.in.orig 2004-08-28 06:43:21.000000000 +0000 3--- Makefile.in.orig 2010-03-14 18:21:59.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -38,7 +38,7 @@ SHLIB_CC = @SHLIB_CC@ 5@@ -51,7 +51,7 @@ MOD_STRIP = @MOD_STRIP@
6 # Linker 6
7 LD = @CC@ 7 # make 'modules'
8 MOD_LD = @MOD_LD@ 8 SHLIB_CC = @SHLIB_CC@
9-SHLIB_LD = @SHLIB_LD@ 9-SHLIB_LD = @SHLIB_LD@
10+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@ 10+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@
 11 SHLIB_STRIP = @SHLIB_STRIP@
 12 MOD_EXT = @MOD_EXT@
11  13
12 # Stripping 14@@ -71,6 +71,7 @@ XREQS = @TCL_REQS@
13 # To turn STRIP off, use 'STRIP = touch' not 'STRIP ='. 15 # XLIBS will be linked with everything
14@@ -64,6 +64,7 @@ TCLLIBFN = @TCLLIBFN@ 16 # MODULE_XLIBS will only be linked with the module objects
15 # XLIBS will be linked with everything; MODULE_XLIBS will only be linked with 
16 # the actual module objects. 
17 XLIBS = @TCL_LIBS@ @LIBS@ 17 XLIBS = @TCL_LIBS@ @LIBS@
18+XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@ 18+XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@
19 MODULE_XLIBS = @MODULE_XLIBS@ 19 MODULE_XLIBS = @MODULE_XLIBS@
20  20
21 # Shouldn't need to touch anything below here. 21 # You shouldn't need to edit anything below this line.
22@@ -89,30 +90,30 @@ egg_install_msg = echo "" && \ 22@@ -95,30 +96,30 @@ egg_install_msg = echo "" && \
23 MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \ 23 MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
24 'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \ 24 'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
25 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \ 25 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
26-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS=' 26-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS='
27+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS=' 27+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS='
28  28
29 MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \ 29 MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
30-'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \ 30-'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' \
31+'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \ 31+'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \
32 'MODULE_XLIBS=$(MODULE_XLIBS)' 32 'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)'
33  33
34 MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \ 34 MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
35 'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \ 35 'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
36 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \ 36 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
37-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \ 37-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
38+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \ 38+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
39 'MODOBJS=mod/*.o' 39 'MODOBJS=mod/*.o'
40  40
41 MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD) -g' \ 41 MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
42 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \ 42 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \
43 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \ 43 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
44-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS=' 44-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS='
45+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS=' 45+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS='
46  46
47 MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \ 47 MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
48-'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \ 48-'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \
49+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \ 49+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \
50 'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)' 50 'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)'
51  51
52 MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \ 52 MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
53 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DSTATIC $(CFLGS)' \ 53 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=$(DEBCFLGS) $(CFLGS) -DSTATIC' \
54-'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \ 54-'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
55+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \ 55+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \
56 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o' 56 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o'
57  57
58 MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 58 MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)'