diff options
Diffstat (limited to 'irc/eggdrop/files')
-rw-r--r-- | irc/eggdrop/files/patch-aa | 17 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ab | 49 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ac | 6 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ad | 6 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ae | 17 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ah | 6 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ai | 20 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-aj | 10 | ||||
-rw-r--r-- | irc/eggdrop/files/patch-ak | 18 |
9 files changed, 59 insertions, 90 deletions
diff --git a/irc/eggdrop/files/patch-aa b/irc/eggdrop/files/patch-aa deleted file mode 100644 index 4405c988b1ed..000000000000 --- a/irc/eggdrop/files/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.orig Sat Mar 30 04:48:49 2002 -+++ configure -@@ -2808,7 +2808,13 @@ - *BSD) - # FreeBSD/OpenBSD/NetBSD - SHLIB_CC="$CC -fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ if [ `echo __ELF__ | $CC -E - | grep -v '#'` = 1 ]; then -+ SHLIB_LD="ld -shared -x" -+ BEL_MOD_LD="$CC -Wl,-E $LDFLAGS" -+ else -+ SHLIB_LD="ld -Bshareable -x" -+ BEL_MOD_LD="$CC $LDFLAGS" -+ fi - cat >>confdefs.h <<\_ACEOF - #define MODULES_OK 1 - _ACEOF diff --git a/irc/eggdrop/files/patch-ab b/irc/eggdrop/files/patch-ab index 464c0127e75e..e1a09664c700 100644 --- a/irc/eggdrop/files/patch-ab +++ b/irc/eggdrop/files/patch-ab @@ -1,39 +1,38 @@ ---- src/main.c.orig Sun Jul 15 09:15:14 2001 -+++ src/main.c Thu Nov 1 12:55:48 2001 -@@ -61,7 +61,7 @@ +--- src/main.c.orig Mon May 5 06:05:32 2003 ++++ src/main.c Mon Jun 2 11:16:57 2003 +@@ -70,7 +70,7 @@ #define _POSIX_SOURCE 1 #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; -@@ -94,7 +94,7 @@ - stats? */ - int term_z = 0; /* Foreground: use the terminal as a party - line? */ --char configfile[121] = "eggdrop.conf"; /* Name of the config file */ -+char configfile[121] = __PREFIX__ "/etc/eggdrop.conf"; - char helpdir[121]; /* Directory of help files (if used) */ - char textdir[121] = ""; /* Directory for text files that get dumped */ - int keep_all_logs = 0; /* Never erase logfiles, no matter how old -@@ -709,6 +709,8 @@ - setrlimit(RLIMIT_CORE, &cdlim); +-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; +@@ -101,7 +101,7 @@ + * stats? */ + int term_z = 0; /* Foreground: use the terminal as a party + * line? */ +-char configfile[121] = "eggdrop.conf"; /* Name of the config file */ ++char configfile[121] = __PREFIX__ "eggdrop.conf"; /* Name of the config file */ + char helpdir[121] = "help/"; /* Directory of help files (if used) */ + char textdir[121] = "text/"; /* Directory for text files that get dumped */ + int keep_all_logs = 0; /* Never erase logfiles, no matter how old +@@ -735,6 +735,8 @@ } #endif -+ -+ chdir(__PREFIX__ "/share/eggdrop"); ++ chdir(__PREFIX__ "/share/eggdrop"); ++ /* Initialise context list */ for (i = 0; i < 16; i++) -@@ -809,7 +809,8 @@ + Context; +@@ -834,7 +836,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); +- 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 --git a/irc/eggdrop/files/patch-ac b/irc/eggdrop/files/patch-ac index 7c359a1ec06d..5d79af0ea591 100644 --- a/irc/eggdrop/files/patch-ac +++ b/irc/eggdrop/files/patch-ac @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig Thu Nov 23 06:56:40 2000 -+++ src/Makefile.in Thu Nov 1 12:57:48 2001 +--- src/Makefile.in.orig Mon Jun 2 11:23:55 2003 ++++ src/Makefile.in Mon Jun 2 11:24:24 2003 @@ -16,7 +16,7 @@ LD = @CC@ STRIP = @STRIP@ @@ -8,7 +8,7 @@ +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 main.o mem.o misc.o misc_file.o \ + dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ @@ -37,7 +37,7 @@ @echo "Linking eggdrop... $(EGGBUILD)" @echo "" diff --git a/irc/eggdrop/files/patch-ad b/irc/eggdrop/files/patch-ad index ca92dfc4215f..44a2ff2330d0 100644 --- a/irc/eggdrop/files/patch-ad +++ b/irc/eggdrop/files/patch-ad @@ -1,6 +1,6 @@ ---- src/mod/filesys.mod/filesys.c.orig Wed Dec 9 20:05:21 1998 -+++ src/mod/filesys.mod/filesys.c Wed Dec 9 20:09:13 1998 -@@ -458,7 +458,7 @@ +--- 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 +@@ -452,7 +452,7 @@ if (at_limit(nick)) { char xxx[1024]; diff --git a/irc/eggdrop/files/patch-ae b/irc/eggdrop/files/patch-ae index 9618875170c6..ecb59c4957a0 100644 --- a/irc/eggdrop/files/patch-ae +++ b/irc/eggdrop/files/patch-ae @@ -1,14 +1,13 @@ ---- src/mod/ctcp.mod/ctcp.c.orig Wed Dec 9 23:18:06 1998 -+++ src/mod/ctcp.mod/ctcp.c Wed Dec 9 23:18:55 1998 -@@ -155,9 +155,9 @@ +--- 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 +@@ -160,8 +160,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", -+ dprintf(DP_SERVER, "PRIVMSG %s :\001DCC CHAT chat %u %u\001\n", - nick, -- iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), -+ (unsigned)iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), - dcc[i].port); +- 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 --git a/irc/eggdrop/files/patch-ah b/irc/eggdrop/files/patch-ah index 4ab51b25201f..982f0dafdc6e 100644 --- a/irc/eggdrop/files/patch-ah +++ b/irc/eggdrop/files/patch-ah @@ -1,6 +1,6 @@ ---- src/modules.c.orig Mon Jul 16 18:54:01 2001 -+++ src/modules.c Fri Nov 2 11:49:45 2001 -@@ -94,7 +94,7 @@ +--- src/modules.c.orig Mon Jun 2 11:31:15 2003 ++++ src/modules.c Mon Jun 2 11:31:44 2003 +@@ -101,7 +101,7 @@ #ifndef STATIC /* Directory to look for modules */ diff --git a/irc/eggdrop/files/patch-ai b/irc/eggdrop/files/patch-ai index a8b10fd77fcb..2af67bd48cf7 100644 --- a/irc/eggdrop/files/patch-ai +++ b/irc/eggdrop/files/patch-ai @@ -1,23 +1,11 @@ ---- src/mod/share.mod/share.c.orig Tue Jul 17 23:53:42 2001 -+++ src/mod/share.mod/share.c Fri Nov 2 18:37:15 2001 -@@ -1121,7 +1123,8 @@ +--- src/mod/share.mod/share.c.orig Mon Jun 2 11:32:29 2003 ++++ src/mod/share.mod/share.c Mon Jun 2 11:33:20 2003 +@@ -1113,7 +1113,7 @@ int i, sock; FILE *f; - egg_snprintf(s, sizeof s, ".share.%s.%lu.users", botnetnick, now); -+ egg_snprintf(s, sizeof s, "%.100s/.share.%.32s.%lu.users", -+ tempdir, 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"); -@@ -1890,8 +1893,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.%.32s.%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 --git a/irc/eggdrop/files/patch-aj b/irc/eggdrop/files/patch-aj index 763ceb028751..905f7e1026ed 100644 --- a/irc/eggdrop/files/patch-aj +++ b/irc/eggdrop/files/patch-aj @@ -1,11 +1,11 @@ ---- src/mod/Makefile.in.orig Sat Feb 2 18:14:30 2002 -+++ src/mod/Makefile.in Sat Feb 2 21:03:57 2002 -@@ -86,7 +86,7 @@ +--- src/mod/Makefile.in.orig Mon Jun 2 11:36:50 2003 ++++ src/mod/Makefile.in Mon Jun 2 11:39:02 2003 +@@ -87,7 +87,7 @@ echo "Configuring module $${modname} ..."; \ echo ""; \ 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); \ +- (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) $(ENABLEIPV6) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ ++ (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure "$(egg_ac_parameters)" $(ENABLEIPV6) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ fi; \ done; \ echo "" diff --git a/irc/eggdrop/files/patch-ak b/irc/eggdrop/files/patch-ak index 1d8b734b3aec..13f381689b52 100644 --- a/irc/eggdrop/files/patch-ak +++ b/irc/eggdrop/files/patch-ak @@ -1,11 +1,11 @@ ---- src/eggdrop.h.orig Fri Mar 29 22:40:24 2002 -+++ src/eggdrop.h Sun Aug 18 22:51:25 2002 -@@ -68,7 +68,7 @@ +--- src/eggdrop.h.orig Mon Jun 2 11:39:45 2003 ++++ src/eggdrop.h Mon Jun 2 11:40:17 2003 +@@ -85,7 +85,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. */ + /* 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. */ |