FreeBSD Bugzilla – Attachment 112349 Details for
Bug 153752
Updated port: irc/eggdrop 1.6.20
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
eggdrop1.6.20.ports.patch
eggdrop1.6.20.ports.patch (text/plain), 28.30 KB, created by
Kristian Kræmmer Nielsen
on 2011-01-07 07:10:01 UTC
(
hide
)
Description:
eggdrop1.6.20.ports.patch
Filename:
MIME Type:
Creator:
Kristian Kræmmer Nielsen
Created:
2011-01-07 07:10:01 UTC
Size:
28.30 KB
patch
obsolete
>diff -Nur eggdrop-1.6.9+ctcpfix/Makefile eggdrop/Makefile >--- eggdrop-1.6.9+ctcpfix/Makefile 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/Makefile 2011-01-07 07:47:38.000000000 +0100 >@@ -2,28 +2,26 @@ > # Date created: 18.01.2003 > # Whom: Ulrich Spoerlein <q@uni.de> > # >+# Last updated by: Kristian Kræmmer Nielsen <freebsd.ports@com.jkkn.dk> >+# Date: January 7th, 2011 >+# > # $FreeBSD: ports/irc/eggdrop/Makefile,v 1.28 2010/12/04 03:25:02 beech Exp $ > # > > PORTNAME= eggdrop >-PORTVERSION= 1.6.19 >-PORTREVISION= 2 >+PORTVERSION= 1.6.20 > CATEGORIES= irc > MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/ \ >- LOCAL/beech >+ http://www.egghelp.org/files/patches/:ssl > DISTNAME= ${PORTNAME}${PORTVERSION} >- >-PATCHFILES= ${PORTNAME}-${PORTVERSION}-ssl-rootie.patch.gz:ssl \ >- eggdrop1.6.19+ctcpfix.patch.gz:ctcpfix >-PATCH_SITES= http://www.egghelp.org/files/patches/:ssl \ >- ftp://ftp.eggheads.org/pub/eggdrop/patches/official/1.6/:ctcpfix >+DISTFILES= ${PORTNAME}${PORTVERSION}.tar.bz2 \ >+ ${PORTNAME}-${PORTVERSION}-ssl.zip:ssl > > MAINTAINER= beech@FreeBSD.org > COMMENT= The most popular open source Internet Relay Chat bot > >-USE_TCL= 82+ >+USE_TCL= 85+ > >-USE_BZIP2= yes > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \ > --with-tclinc=${TCL_INCLUDEDIR}/tcl.h >@@ -37,15 +35,15 @@ > > .include <bsd.port.pre.mk> > >+LICENSE= GPLv2 >+ > .if defined(WITH_SSL) >+EXTRA_PATCHES= ${WRKDIR}/eggdrop-1.6.20-ssl.patch >+ > CFLAGS+= -DHAVE_OPENSSL > CONFIGURE_ARGS+= --with-ssl > .endif > >-.if !defined(WITH_SSL) >-CONFIGURE_ARGS+= --without-ssl >-.endif >- > post-patch: > @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \ > > ${WRKSRC}/eggdrop.conf.sample >@@ -53,7 +51,7 @@ > post-configure: > @(cd ${WRKSRC}; ${MAKE} config) > # Workaround broken relative path in SSL-patch >- @(cd ${WRKSRC}/src && ${LN} -fs ../config.h) >+# @(cd ${WRKSRC}/src && ${LN} -fs ../config.h) > > do-install: > ${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin >@@ -97,10 +95,18 @@ > ${DATADIR}/language ";" > @${MKDIR} ${DATADIR}/scripts > .for f in CONTENTS action.fix.tcl autobotchk alltools.tcl botchk \ >- cmd_resolve.tcl compat.tcl getops.tcl klined.tcl notes2.tcl ques5.tcl \ >- sentinel.tcl userinfo.tcl weed >+ cmd_resolve.tcl compat.tcl dccwhois.tcl getops.tcl klined.tcl notes2.tcl ques5.tcl \ >+ quotepass.tcl quotepong.tcl sentinel.tcl userinfo.tcl weed > ${INSTALL_DATA} ${WRKSRC}/scripts/${f} ${DATADIR}/scripts > .endfor >+ @${MKDIR} ${DATADIR}/scripts/help >+.for f in cmd_resolve.help userinfo.help >+ ${INSTALL_DATA} ${WRKSRC}/scripts/help/${f} ${DATADIR}/scripts/help >+.endfor >+ @${MKDIR} ${DATADIR}/scripts/help/msg >+.for f in userinfo.help >+ ${INSTALL_DATA} ${WRKSRC}/scripts/help/msg/${f} ${DATADIR}/scripts/help/msg >+.endfor > .for f in cmds1.help cmds2.help core.help > ${INSTALL_DATA} ${WRKSRC}/help/${f} ${DATADIR}/help > .endfor >@@ -113,9 +119,9 @@ > .endfor > .if !defined(NOPORTDOCS) > @${MKDIR} ${DOCSDIR} >-.for f in ABOUT AUTHORS BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \ >+.for f in ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \ > FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO \ >- TEXT-SUBSTITUTIONS TRICKS UPDATES1.6 USERS WEIRD-MESSAGES \ >+ TEXT-SUBSTITUTIONS TRICKS Changes1.6 USERS WEIRD-MESSAGES \ > tcl-commands.doc > ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} > .endfor >diff -Nur eggdrop-1.6.9+ctcpfix/distinfo eggdrop/distinfo >--- eggdrop-1.6.9+ctcpfix/distinfo 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/distinfo 2011-01-07 05:52:05.000000000 +0100 >@@ -1,9 +1,4 @@ >-MD5 (eggdrop1.6.19.tar.bz2) = b706bbe4fdd05964e0ea0cd920f28539 >-SHA256 (eggdrop1.6.19.tar.bz2) = 2e211a0fd20abd382c280807f9430102cd9b95991e359b3bede042549dd7b3cf >-SIZE (eggdrop1.6.19.tar.bz2) = 811072 >-MD5 (eggdrop-1.6.19-ssl-rootie.patch.gz) = 6d477d54e16afff3215b9b53e34a0521 >-SHA256 (eggdrop-1.6.19-ssl-rootie.patch.gz) = 94b06c392da5f13c04cc1d3e87b52e3c2ed9af8ba58cf360f121bb0a06f49ce3 >-SIZE (eggdrop-1.6.19-ssl-rootie.patch.gz) = 9285 >-MD5 (eggdrop1.6.19+ctcpfix.patch.gz) = 86d159a5e3460ec8fb30cb1a27a32acc >-SHA256 (eggdrop1.6.19+ctcpfix.patch.gz) = 2f01f00692c29fb9568721d80cf38289031a09bc15d2fac483ad16aec4b788a7 >-SIZE (eggdrop1.6.19+ctcpfix.patch.gz) = 666 >+SHA256 (eggdrop1.6.20.tar.bz2) = 5d3b3f3c8988d054d6ba97b84b43e9620c062d57d2606eaa9f652c598aa44c6f >+SIZE (eggdrop1.6.20.tar.bz2) = 993262 >+SHA256 (eggdrop-1.6.20-ssl.zip) = 2fab9c498e5e1f0cb3b3d07e74ae146e38de2bcd6b851c228a0a2e4ff84b4805 >+SIZE (eggdrop-1.6.20-ssl.zip) = 9186 >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-eggdrop.conf eggdrop/files/patch-eggdrop.conf >--- eggdrop-1.6.9+ctcpfix/files/patch-eggdrop.conf 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-eggdrop.conf 2011-01-07 06:26:53.000000000 +0100 >@@ -1,10 +1,12 @@ >---- eggdrop.conf.orig Mon May 5 00:05:32 2003 >-+++ eggdrop.conf Wed Mar 3 21:17:14 2004 >-@@ -1,2 +1,2 @@ >+--- eggdrop.conf 2010-07-05 14:07:05.000000000 +0200 >++++ eggdrop.conf 2011-01-07 06:13:49.000000000 +0100 >+@@ -1,4 +1,4 @@ > -#! /path/to/executable/eggdrop > +#!%%PREFIX%%/bin/eggdrop > # ^- This should contain a fully qualified path to your Eggdrop executable. >-@@ -420,7 +420,7 @@ >+ # >+ # $Id: eggdrop.conf,v 1.66 2010/07/05 12:07:05 pseudo Exp $ >+@@ -444,7 +444,7 @@ > # If you run the bot from the compilation directory, you will want to set > # this to "". If you use 'make install' (like all good kiddies do ;), this > # is a fine default. Otherwise, use your head :) >@@ -12,16 +14,16 @@ > +set mod-path "%%PREFIX%%/lib/eggdrop/" > > >- #### DNS MODULE #### >-@@ -812,6 +812,11 @@ >- you.need.to.change.this:6667 >+ #### BLOWFISH MODULE #### >+@@ -842,6 +842,11 @@ > another.example.com:7000:password > } >-+ >+ > +# Set this option, if you want a SSL connection to the IRC Server(s) specified > +# above. This setting applies to all servers, so make sure they all support SSL > +# connections. Eggdrop has to be compiled with SSL support for this to work! > +set use-ssl 0 >- >- # This setting makes the bot try to get his original nickname back if its >- # primary nickname is already in use. >++ >+ # Number of seconds to wait between transmitting queued lines to the server. >+ # Lower this value at your own risk. ircd is known to start flood control >+ # at 512 bytes/2 seconds. >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src-Makefile.in eggdrop/files/patch-src-Makefile.in >--- eggdrop-1.6.9+ctcpfix/files/patch-src-Makefile.in 1970-01-01 01:00:00.000000000 +0100 >+++ eggdrop/files/patch-src-Makefile.in 2011-01-07 06:34:32.000000000 +0100 >@@ -0,0 +1,11 @@ >+--- src/Makefile.in 2011-01-07 06:12:27.000000000 +0100 >++++ src/Makefile.in 2011-01-07 06:33:20.000000000 +0100 >+@@ -18,7 +18,7 @@ >+ LD = @CC@ >+ STRIP = @STRIP@ >+ CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) >+-CPPFLAGS = @CPPFLAGS@ >++CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"' >+ >+ eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ >+ dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__Makefile.in eggdrop/files/patch-src__Makefile.in >--- eggdrop-1.6.9+ctcpfix/files/patch-src__Makefile.in 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__Makefile.in 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- src/Makefile.in.orig Mon Feb 9 22:42:35 2004 >-+++ src/Makefile.in Mon Feb 9 22:43:23 2004 >-@@ -18,7 +18,7 @@ >- LD = @CC@ >- STRIP = @STRIP@ >- CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) >--CPPFLAGS = @CPPFLAGS@ >-+CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"' >- >- eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ >- dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__eggdrop.h eggdrop/files/patch-src__eggdrop.h >--- eggdrop-1.6.9+ctcpfix/files/patch-src__eggdrop.h 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__eggdrop.h 1970-01-01 01:00:00.000000000 +0100 >@@ -1,9 +0,0 @@ >---- src/eggdrop.h.orig Mon Jun 2 11:39:45 2003 >-+++ src/eggdrop.h Mon Jun 2 11:40:17 2003 >-@@ -77,7 +77,7 @@ >- /* Language stuff */ >--#define LANGDIR "./language" /* language file directory */ >-+#define LANGDIR __PREFIX__ "/share/eggdrop/language" /* language file directory */ >- #define BASELANG "english" /* language which always gets loaded before >- all other languages. You do not want to >- change this. */ >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__main.c eggdrop/files/patch-src__main.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src__main.c 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__main.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,37 +0,0 @@ >---- src/main.c.orig Mon May 5 06:05:32 2003 >-+++ src/main.c Mon Jun 2 11:16:57 2003 >-@@ -73,6 +73,6 @@ >- #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 struct dcc_t *dcc; >- extern struct userrec *userlist; >-@@ -102,7 +102,7 @@ >- int term_z = 0; /* Foreground: use the terminal as a partyline? */ >- int use_stderr = 1; /* Send stuff to stderr instead of logfiles? */ >- >--char configfile[121] = "eggdrop.conf"; /* Default config file name */ >-+char configfile[121] = __PREFIX__ "/etc/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 */ >-@@ -732,6 +732,8 @@ >- } >- #endif >- >-+ chdir(__PREFIX__ "/share/eggdrop"); >-+ >- /* Initialise context list */ >- for (i = 0; i < 16; i++) >- Context; >-@@ -831,7 +833,7 @@ >- cache_miss = 0; >- cache_hit = 0; >- if (!pid_file[0]) >-- egg_snprintf(pid_file, sizeof pid_file, "pid.%s", botnetnick); >-+ egg_snprintf(pid_file, sizeof pid_file, "%.100s/pid.%.32s", tempdir, botnetnick); >- >- /* Check for pre-existing eggdrop! */ >- f = fopen(pid_file, "r"); >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__md5__md5c.c eggdrop/files/patch-src__md5__md5c.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src__md5__md5c.c 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__md5__md5c.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,18 +0,0 @@ >---- src/md5/md5c.c.orig Fri Sep 3 14:08:28 2004 >-+++ src/md5/md5c.c Fri Sep 3 14:04:51 2004 >-@@ -25,6 +25,7 @@ >- >- #include "compat/compat.h" >- >-+#ifdef EGG_SSL_EXT >- typedef unsigned long MD5_u32plus; >- >- typedef struct { >-@@ -33,6 +34,7 @@ >- unsigned char buffer[64]; >- MD5_u32plus block[16]; >- } MD5_CTX; >-+#endif >- >- /* >- * The basic MD5 functions. >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__mod__Makefile.in eggdrop/files/patch-src__mod__Makefile.in >--- eggdrop-1.6.9+ctcpfix/files/patch-src__mod__Makefile.in 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__mod__Makefile.in 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- src/mod/Makefile.in.orig Mon Jun 2 11:36:50 2003 >-+++ src/mod/Makefile.in Mon Jun 2 11:39:02 2003 >-@@ -86,7 +86,7 @@ >- echo ""; \ >- echo "Configuring module '$${modname}'."; \ >- if test ! -d $$i; then mkdir $$i; fi; \ >-- (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ >-+ (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ >- fi; \ >- done; \ >- echo "" >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__mod__ctcp.mod__ctcp.c eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src__mod__ctcp.mod__ctcp.c 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,13 +0,0 @@ >---- src/mod/ctcp.mod/ctcp.c.orig Mon Jun 2 11:27:58 2003 >-+++ src/mod/ctcp.mod/ctcp.c Mon Jun 2 11:29:29 2003 >-@@ -161,8 +161,8 @@ >- /* Do me a favour and don't change this back to a CTCP reply, >- * CTCP replies are NOTICE's this has to be a PRIVMSG >- * -poptix 5/1/1997 */ >-- dprintf(DP_SERVER, "PRIVMSG %s :\001DCC CHAT chat %lu %u\001\n", >-- nick, iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), >-+ dprintf(DP_SERVER, "PRIVMSG %s :\001DCC CHAT chat %u %u\001\n", >-+ nick, (unsigned)iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), >- dcc[i].port); >- return 1; >- } >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__mod__filesys.mod__filesys.c eggdrop/files/patch-src__mod__filesys.mod__filesys.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src__mod__filesys.mod__filesys.c 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__mod__filesys.mod__filesys.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,11 +0,0 @@ >---- src/mod/filesys.mod/filesys.c.orig Mon Jun 2 11:25:01 2003 >-+++ src/mod/filesys.mod/filesys.c Mon Jun 2 11:25:46 2003 >-@@ -461,7 +461,7 @@ >- if (at_limit(nick)) { >- char xxx[1024]; >- >-- sprintf(xxx, "%d*%s%s", 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); >- my_free(s); >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__mod__share.mod__share.c eggdrop/files/patch-src__mod__share.mod__share.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src__mod__share.mod__share.c 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__mod__share.mod__share.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,22 +0,0 @@ >---- src/mod/share.mod/share.c.orig Mon May 5 00:05:33 2003 >-+++ src/mod/share.mod/share.c Tue Nov 18 16:51:41 2003 >-@@ -1120,7 +1120,7 @@ >- int i, sock; >- FILE *f; >- >-- egg_snprintf(s, sizeof s, ".share.%s.%li.users", botnetnick, now); >-+ egg_snprintf(s, sizeof s, "%.100s/.share.%.32s.%lu.users", tempdir, botnetnick, now); >- if (!(b_status(idx) & STAT_SHARE)) { >- dprintf(idx, "s e You didn't ask; you just started sending.\n"); >- dprintf(idx, "s e Ask before sending the userfile.\n"); >-@@ -1889,8 +1889,8 @@ >- struct chanuserrec *ch; >- struct chanset_t *cst; >- >-- egg_snprintf(share_file, sizeof share_file, ".share.%s.%lu", dcc[idx].nick, >-- now); >-+ egg_snprintf(share_file, sizeof share_file, "%.100s/.share.%s.%lu", >-+ tempdir, dcc[idx].nick, now); >- if (dcc[idx].u.bot->uff_flags & UFF_OVERRIDE) { >- debug1("NOTE: Sharing aggressively with %s, overriding its local bots.", >- dcc[idx].nick); >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src__modules.c eggdrop/files/patch-src__modules.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src__modules.c 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/files/patch-src__modules.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,8 +0,0 @@ >---- src/modules.c.orig Mon Jun 2 11:31:15 2003 >-+++ src/modules.c Mon Jun 2 11:31:44 2003 >-@@ -120,4 +120,4 @@ >- #ifndef STATIC >--char moddir[121] = "modules/"; >-+char moddir[121] = __PREFIX__ "/lib/eggdrop/"; >- #endif >- >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src_eggdrop.h eggdrop/files/patch-src_eggdrop.h >--- eggdrop-1.6.9+ctcpfix/files/patch-src_eggdrop.h 1970-01-01 01:00:00.000000000 +0100 >+++ eggdrop/files/patch-src_eggdrop.h 2011-01-07 06:27:47.000000000 +0100 >@@ -0,0 +1,11 @@ >+--- src/eggdrop.h 2011-01-07 06:12:27.000000000 +0100 >++++ src/eggdrop.h 2011-01-07 06:14:26.000000000 +0100 >+@@ -64,7 +64,7 @@ >+ >+ >+ /* Language stuff */ >+-#define LANGDIR "./language" /* language file directory */ >++#define LANGDIR __PREFIX__ "/share/eggdrop/language" /* language file directory */ >+ #define BASELANG "english" /* language which always gets loaded before >+ all other languages. You do not want to >+ change this. */ >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src_main.c eggdrop/files/patch-src_main.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src_main.c 1970-01-01 01:00:00.000000000 +0100 >+++ eggdrop/files/patch-src_main.c 2011-01-07 06:31:39.000000000 +0100 >@@ -0,0 +1,29 @@ >+--- src/main.c 2011-01-07 06:12:27.000000000 +0100 >++++ src/main.c 2011-01-07 06:16:35.000000000 +0100 >+@@ -72,7 +72,7 @@ >+ # 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, >+ quiet_save; >+ extern struct dcc_t *dcc; >+@@ -105,7 +105,7 @@ >+ int term_z = 0; /* Foreground: use the terminal as a partyline? */ >+ int use_stderr = 1; /* Send stuff to stderr instead of logfiles? */ >+ >+-char configfile[121] = "eggdrop.conf"; /* Default config file name */ >++char configfile[121] = __PREFIX__ "/etc/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 */ >+@@ -1064,7 +1064,7 @@ >+ cache_miss = 0; >+ cache_hit = 0; >+ if (!pid_file[0]) >+- egg_snprintf(pid_file, sizeof pid_file, "pid.%s", botnetnick); >++ egg_snprintf(pid_file, sizeof pid_file, "%s/pid.%s", tempdir, botnetnick); >+ >+ /* Check for pre-existing eggdrop! */ >+ f = fopen(pid_file, "r"); >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src_mod_share.mod__share.c eggdrop/files/patch-src_mod_share.mod__share.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src_mod_share.mod__share.c 1970-01-01 01:00:00.000000000 +0100 >+++ eggdrop/files/patch-src_mod_share.mod__share.c 2011-01-07 06:32:11.000000000 +0100 >@@ -0,0 +1,22 @@ >+--- src/mod/share.mod/share.c 2010-02-18 10:52:30.000000000 +0100 >++++ src/mod/share.mod/share.c 2011-01-07 06:22:16.000000000 +0100 >+@@ -1122,7 +1122,7 @@ >+ int i, sock; >+ FILE *f; >+ >+- egg_snprintf(s, sizeof s, ".share.%s.%li.users", botnetnick, now); >++ egg_snprintf(s, sizeof s, "%s/.share.%s.%li.users", tempdir, botnetnick, now); >+ if (!(b_status(idx) & STAT_SHARE)) { >+ dprintf(idx, "s e You didn't ask; you just started sending.\n"); >+ dprintf(idx, "s e Ask before sending the userfile.\n"); >+@@ -1891,8 +1891,8 @@ >+ struct chanuserrec *ch; >+ struct chanset_t *cst; >+ >+- egg_snprintf(share_file, sizeof share_file, ".share.%s.%lu", dcc[idx].nick, >+- now); >++ egg_snprintf(share_file, sizeof share_file, "%s/.share.%s.%lu", >++ tempdir, dcc[idx].nick, now); >+ if (dcc[idx].u.bot->uff_flags & UFF_OVERRIDE) { >+ debug1("NOTE: Sharing aggressively with %s, overriding its local bots.", >+ dcc[idx].nick); >diff -Nur eggdrop-1.6.9+ctcpfix/files/patch-src_modules.c eggdrop/files/patch-src_modules.c >--- eggdrop-1.6.9+ctcpfix/files/patch-src_modules.c 1970-01-01 01:00:00.000000000 +0100 >+++ eggdrop/files/patch-src_modules.c 2011-01-07 06:29:59.000000000 +0100 >@@ -0,0 +1,11 @@ >+--- src/modules.c 2011-01-07 06:12:27.000000000 +0100 >++++ src/modules.c 2011-01-07 06:21:42.000000000 +0100 >+@@ -118,7 +118,7 @@ >+ static int module_rename(char *name, char *newname); >+ >+ #ifndef STATIC >+-char moddir[121] = "modules/"; >++char moddir[121] = __PREFIX__ "/lib/eggdrop/"; >+ #endif >+ >+ #ifdef STATIC >diff -Nur eggdrop-1.6.9+ctcpfix/pkg-plist eggdrop/pkg-plist >--- eggdrop-1.6.9+ctcpfix/pkg-plist 2011-01-07 05:34:20.000000000 +0100 >+++ eggdrop/pkg-plist 2011-01-07 07:18:57.000000000 +0100 >@@ -16,6 +16,79 @@ > lib/eggdrop/transfer.so > lib/eggdrop/uptime.so > lib/eggdrop/wire.so >+%%PORTDOCS%%%%DOCSDIR%%/ABOUT >+%%PORTDOCS%%%%DOCSDIR%%/BANS >+%%PORTDOCS%%%%DOCSDIR%%/BOTNET >+%%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT >+%%PORTDOCS%%%%DOCSDIR%%/COMPILE-GUIDE >+%%PORTDOCS%%%%DOCSDIR%%/CONTENTS >+%%PORTDOCS%%%%DOCSDIR%%/Changes1.6 >+%%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT >+%%PORTDOCS%%%%DOCSDIR%%/KNOWN-PROBLEMS >+%%PORTDOCS%%%%DOCSDIR%%/MODULES >+%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE >+%%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO >+%%PORTDOCS%%%%DOCSDIR%%/TEXT-SUBSTITUTIONS >+%%PORTDOCS%%%%DOCSDIR%%/TRICKS >+%%PORTDOCS%%%%DOCSDIR%%/USERS >+%%PORTDOCS%%%%DOCSDIR%%/WEIRD-MESSAGES >+%%PORTDOCS%%%%DOCSDIR%%/html/about.html >+%%PORTDOCS%%%%DOCSDIR%%/html/app-problems.html >+%%PORTDOCS%%%%DOCSDIR%%/html/app-textsub.html >+%%PORTDOCS%%%%DOCSDIR%%/html/app-tricks.html >+%%PORTDOCS%%%%DOCSDIR%%/html/app-weird.html >+%%PORTDOCS%%%%DOCSDIR%%/html/bans.html >+%%PORTDOCS%%%%DOCSDIR%%/html/botnet.html >+%%PORTDOCS%%%%DOCSDIR%%/html/compiling.html >+%%PORTDOCS%%%%DOCSDIR%%/html/egg-core.html >+%%PORTDOCS%%%%DOCSDIR%%/html/faqs.html >+%%PORTDOCS%%%%DOCSDIR%%/html/features.html >+%%PORTDOCS%%%%DOCSDIR%%/html/index.html >+%%PORTDOCS%%%%DOCSDIR%%/html/install.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-assoc.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-blowfish.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-channels.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-compress.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-console.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-ctcp.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-dns.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-filesys.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-irc.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-notes.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-seen.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-server.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-share.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-transfer.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-uptime.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-wire.html >+%%PORTDOCS%%%%DOCSDIR%%/html/mod-woobie.html >+%%PORTDOCS%%%%DOCSDIR%%/html/news.html >+%%PORTDOCS%%%%DOCSDIR%%/html/party.html >+%%PORTDOCS%%%%DOCSDIR%%/html/patch-howto.html >+%%PORTDOCS%%%%DOCSDIR%%/html/readme.html >+%%PORTDOCS%%%%DOCSDIR%%/html/starting.html >+%%PORTDOCS%%%%DOCSDIR%%/html/tcl-commands.html >+%%PORTDOCS%%%%DOCSDIR%%/html/users.html >+%%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS >+%%PORTDOCS%%%%DOCSDIR%%/settings/core.settings >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.assoc >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.blowfish >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.channels >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.compress >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.console >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.ctcp >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.dns >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.filesys >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.irc >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.notes >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.seen >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.server >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.share >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.transfer >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.wire >+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie >+%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc > %%DATADIR%%/help/assoc.help > %%DATADIR%%/help/chaninfo.help > %%DATADIR%%/help/channels.help >@@ -27,16 +100,12 @@ > %%DATADIR%%/help/ctcp.help > %%DATADIR%%/help/filesys.help > %%DATADIR%%/help/irc.help >-%%DATADIR%%/help/notes.help >-%%DATADIR%%/help/seen.help >-%%DATADIR%%/help/server.help >-%%DATADIR%%/help/share.help >-%%DATADIR%%/help/transfer.help >-%%DATADIR%%/help/uptime.help >-%%DATADIR%%/help/wire.help > %%DATADIR%%/help/msg/irc.help > %%DATADIR%%/help/msg/notes.help > %%DATADIR%%/help/msg/seen.help >+%%DATADIR%%/help/notes.help >+%%DATADIR%%/help/seen.help >+%%DATADIR%%/help/server.help > %%DATADIR%%/help/set/channels.help > %%DATADIR%%/help/set/cmds1.help > %%DATADIR%%/help/set/compress.help >@@ -48,11 +117,10 @@ > %%DATADIR%%/help/set/server.help > %%DATADIR%%/help/set/share.help > %%DATADIR%%/help/set/transfer.help >-%%DATADIR%%/language/core.danish.lang >-%%DATADIR%%/language/core.english.lang >-%%DATADIR%%/language/core.finnish.lang >-%%DATADIR%%/language/core.french.lang >-%%DATADIR%%/language/core.german.lang >+%%DATADIR%%/help/share.help >+%%DATADIR%%/help/transfer.help >+%%DATADIR%%/help/uptime.help >+%%DATADIR%%/help/wire.help > %%DATADIR%%/language/assoc.danish.lang > %%DATADIR%%/language/assoc.english.lang > %%DATADIR%%/language/assoc.finnish.lang >@@ -63,6 +131,11 @@ > %%DATADIR%%/language/console.finnish.lang > %%DATADIR%%/language/console.french.lang > %%DATADIR%%/language/console.german.lang >+%%DATADIR%%/language/core.danish.lang >+%%DATADIR%%/language/core.english.lang >+%%DATADIR%%/language/core.finnish.lang >+%%DATADIR%%/language/core.french.lang >+%%DATADIR%%/language/core.german.lang > %%DATADIR%%/language/filesys.danish.lang > %%DATADIR%%/language/filesys.english.lang > %%DATADIR%%/language/filesys.finnish.lang >@@ -90,97 +163,31 @@ > %%DATADIR%%/scripts/botchk > %%DATADIR%%/scripts/cmd_resolve.tcl > %%DATADIR%%/scripts/compat.tcl >+%%DATADIR%%/scripts/dccwhois.tcl > %%DATADIR%%/scripts/getops.tcl >+%%DATADIR%%/scripts/help/cmd_resolve.help >+%%DATADIR%%/scripts/help/msg/userinfo.help >+%%DATADIR%%/scripts/help/userinfo.help > %%DATADIR%%/scripts/klined.tcl > %%DATADIR%%/scripts/notes2.tcl > %%DATADIR%%/scripts/ques5.tcl >+%%DATADIR%%/scripts/quotepass.tcl >+%%DATADIR%%/scripts/quotepong.tcl > %%DATADIR%%/scripts/sentinel.tcl > %%DATADIR%%/scripts/userinfo.tcl > %%DATADIR%%/scripts/weed > %%DATADIR%%/text/banner > %%DATADIR%%/text/motd >-%%PORTDOCS%%%%DOCSDIR%%/ABOUT >-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS >-%%PORTDOCS%%%%DOCSDIR%%/BANS >-%%PORTDOCS%%%%DOCSDIR%%/BOTNET >-%%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT >-%%PORTDOCS%%%%DOCSDIR%%/COMPILE-GUIDE >-%%PORTDOCS%%%%DOCSDIR%%/CONTENTS >-%%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT >-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-PROBLEMS >-%%PORTDOCS%%%%DOCSDIR%%/MODULES >-%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE >-%%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO >-%%PORTDOCS%%%%DOCSDIR%%/TEXT-SUBSTITUTIONS >-%%PORTDOCS%%%%DOCSDIR%%/TRICKS >-%%PORTDOCS%%%%DOCSDIR%%/UPDATES1.6 >-%%PORTDOCS%%%%DOCSDIR%%/USERS >-%%PORTDOCS%%%%DOCSDIR%%/WEIRD-MESSAGES >-%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc >-%%PORTDOCS%%%%DOCSDIR%%/html/about.html >-%%PORTDOCS%%%%DOCSDIR%%/html/app-problems.html >-%%PORTDOCS%%%%DOCSDIR%%/html/app-textsub.html >-%%PORTDOCS%%%%DOCSDIR%%/html/app-tricks.html >-%%PORTDOCS%%%%DOCSDIR%%/html/app-weird.html >-%%PORTDOCS%%%%DOCSDIR%%/html/authors.html >-%%PORTDOCS%%%%DOCSDIR%%/html/bans.html >-%%PORTDOCS%%%%DOCSDIR%%/html/botnet.html >-%%PORTDOCS%%%%DOCSDIR%%/html/compiling.html >-%%PORTDOCS%%%%DOCSDIR%%/html/egg-core.html >-%%PORTDOCS%%%%DOCSDIR%%/html/faqs.html >-%%PORTDOCS%%%%DOCSDIR%%/html/features.html >-%%PORTDOCS%%%%DOCSDIR%%/html/index.html >-%%PORTDOCS%%%%DOCSDIR%%/html/install.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-assoc.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-blowfish.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-channels.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-compress.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-console.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-ctcp.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-dns.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-filesys.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-irc.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-notes.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-seen.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-server.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-share.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-uptime.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-wire.html >-%%PORTDOCS%%%%DOCSDIR%%/html/mod-woobie.html >-%%PORTDOCS%%%%DOCSDIR%%/html/news.html >-%%PORTDOCS%%%%DOCSDIR%%/html/party.html >-%%PORTDOCS%%%%DOCSDIR%%/html/patch-howto.html >-%%PORTDOCS%%%%DOCSDIR%%/html/readme.html >-%%PORTDOCS%%%%DOCSDIR%%/html/starting.html >-%%PORTDOCS%%%%DOCSDIR%%/html/tcl-commands.html >-%%PORTDOCS%%%%DOCSDIR%%/html/users.html >-%%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS >-%%PORTDOCS%%%%DOCSDIR%%/settings/core.settings >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.assoc >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.blowfish >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.channels >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.compress >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.console >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.ctcp >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.dns >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.filesys >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.irc >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.notes >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.seen >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.server >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.share >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.transfer >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.wire >-%%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie > @dirrm %%DATADIR%%/text >+@dirrm %%DATADIR%%/scripts/help/msg >+@dirrm %%DATADIR%%/scripts/help > @dirrm %%DATADIR%%/scripts > @dirrm %%DATADIR%%/language > @dirrm %%DATADIR%%/help/set > @dirrm %%DATADIR%%/help/msg > @dirrm %%DATADIR%%/help >-@dirrmtry %%DATADIR%% >-%%PORTDOCS%%@dirrm %%DOCSDIR%%/settings >-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html >-%%PORTDOCS%%@dirrm %%DOCSDIR%% >+@dirrm %%DATADIR%% >+@dirrm %%PORTDOCS%%%%DOCSDIR%%/settings >+@dirrm %%PORTDOCS%%%%DOCSDIR%%/html >+@dirrm %%PORTDOCS%%%%DOCSDIR%% > @dirrm lib/eggdrop
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=112349">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 153752
: 112349