summaryrefslogtreecommitdiff
path: root/chat/eggdrop/patches
diff options
context:
space:
mode:
Diffstat (limited to 'chat/eggdrop/patches')
-rw-r--r--chat/eggdrop/patches/patch-aa28
-rw-r--r--chat/eggdrop/patches/patch-ab32
-rw-r--r--chat/eggdrop/patches/patch-ac14
-rw-r--r--chat/eggdrop/patches/patch-ad8
-rw-r--r--chat/eggdrop/patches/patch-ae8
-rw-r--r--chat/eggdrop/patches/patch-af8
-rw-r--r--chat/eggdrop/patches/patch-ag43
-rw-r--r--chat/eggdrop/patches/patch-ah16
-rw-r--r--chat/eggdrop/patches/patch-ai14
-rw-r--r--chat/eggdrop/patches/patch-aj13
-rw-r--r--chat/eggdrop/patches/patch-ak12
11 files changed, 92 insertions, 104 deletions
diff --git a/chat/eggdrop/patches/patch-aa b/chat/eggdrop/patches/patch-aa
index 0b15a00b702..35f7a0aa0ac 100644
--- a/chat/eggdrop/patches/patch-aa
+++ b/chat/eggdrop/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2003/01/16 08:23:47 salo Exp $
+$NetBSD: patch-aa,v 1.3 2004/12/03 12:15:54 adam Exp $
---- configure.orig Sat Mar 30 04:48:49 2002
+--- configure.orig 2004-08-22 22:34:02.000000000 +0000
+++ 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"
+@@ -5306,7 +5306,13 @@ _ACEOF
+ *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
++ else
+ SHLIB_LD="ld -Bshareable -x"
+ BEL_MOD_LD="$CC $LDFLAGS"
-+ fi
- cat >>confdefs.h <<\_ACEOF
- #define MODULES_OK 1
- _ACEOF
++ fi
+ ;;
+ Darwin)
+ # Mac OS X
diff --git a/chat/eggdrop/patches/patch-ab b/chat/eggdrop/patches/patch-ab
index 2b1451b8d8c..e356234d689 100644
--- a/chat/eggdrop/patches/patch-ab
+++ b/chat/eggdrop/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2003/05/24 16:43:05 salo Exp $
+$NetBSD: patch-ab,v 1.4 2004/12/03 12:15:54 adam Exp $
---- src/main.c.orig 2003-05-04 22:15:53.000000000 +0200
-+++ src/main.c 2003-05-24 16:56:20.000000000 +0200
-@@ -70,7 +70,7 @@
- #define _POSIX_SOURCE 1
+--- src/main.c.orig 2004-07-02 21:21:08.000000000 +0000
++++ src/main.c
+@@ -72,7 +72,7 @@
+ # define _POSIX_SOURCE 1 /* Solaris needs this */
#endif
-extern char origbotname[], userfile[], botnetnick[];
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.3 2003/05/24 16:43:05 salo Exp $
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] = __PKG_SYSCONFDIR__ "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 @@
+@@ -102,7 +102,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? */
+
+-char configfile[121] = "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 */
+@@ -726,6 +726,8 @@ int main(int argc, char **argv)
}
#endif
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.3 2003/05/24 16:43:05 salo Exp $
/* Initialise context list */
for (i = 0; i < 16; i++)
Context;
-@@ -834,7 +836,8 @@
+@@ -825,7 +827,8 @@ int main(int argc, char **argv)
cache_miss = 0;
cache_hit = 0;
if (!pid_file[0])
diff --git a/chat/eggdrop/patches/patch-ac b/chat/eggdrop/patches/patch-ac
index 1e34e3b6fdc..60e2f74cc2a 100644
--- a/chat/eggdrop/patches/patch-ac
+++ b/chat/eggdrop/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $
+$NetBSD: patch-ac,v 1.4 2004/12/03 12:15:54 adam Exp $
---- src/Makefile.in.orig 2003-05-04 22:15:53.000000000 +0200
-+++ src/Makefile.in 2003-05-24 16:58:42.000000000 +0200
+--- src/Makefile.in.orig 2004-07-25 11:17:34.000000000 +0000
++++ src/Makefile.in
@@ -4,6 +4,7 @@
SHELL = @SHELL@
top_srcdir = @top_srcdir@
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $
VPATH = @srcdir@
@SET_MAKE@
-@@ -16,7 +17,7 @@
+@@ -16,7 +17,7 @@ CC = @CC@
LD = @CC@
STRIP = @STRIP@
CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
@@ -19,12 +19,12 @@ $NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $
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 \
-@@ -37,7 +38,7 @@
- @echo "Linking eggdrop... $(EGGBUILD)"
+@@ -37,7 +38,7 @@ doofus:
+ @echo "Linking eggdrop $(EGGBUILD)."
@echo ""
@touch mod/mod.xlibs
- $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
+ $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
$(STRIP) ../$(EGGEXEC)
- @echo "Successful compile: $(EGGEXEC)"
@echo ""
+ @echo "Successful compile: $(EGGEXEC)"
diff --git a/chat/eggdrop/patches/patch-ad b/chat/eggdrop/patches/patch-ad
index d90982a970b..1e56456697f 100644
--- a/chat/eggdrop/patches/patch-ad
+++ b/chat/eggdrop/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $
+$NetBSD: patch-ad,v 1.2 2004/12/03 12:15:54 adam Exp $
---- 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 2004-07-02 21:02:02.000000000 +0000
++++ src/mod/filesys.mod/filesys.c
+@@ -461,7 +461,7 @@ static int do_dcc_send(int idx, char *di
if (at_limit(nick)) {
char xxx[1024];
diff --git a/chat/eggdrop/patches/patch-ae b/chat/eggdrop/patches/patch-ae
index 88c8bdc6026..294a07464da 100644
--- a/chat/eggdrop/patches/patch-ae
+++ b/chat/eggdrop/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2003/05/24 16:43:05 salo Exp $
+$NetBSD: patch-ae,v 1.3 2004/12/03 12:15:54 adam Exp $
---- src/mod/ctcp.mod/ctcp.c.orig 2003-05-04 22:15:53.000000000 +0200
-+++ src/mod/ctcp.mod/ctcp.c 2003-05-24 17:01:36.000000000 +0200
-@@ -160,8 +160,8 @@
+--- src/mod/ctcp.mod/ctcp.c.orig 2004-06-14 01:14:07.000000000 +0000
++++ src/mod/ctcp.mod/ctcp.c
+@@ -161,8 +161,8 @@ static int ctcp_CHAT(char *nick, char *u
/* 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 */
diff --git a/chat/eggdrop/patches/patch-af b/chat/eggdrop/patches/patch-af
index 0b008593f2e..3330fdf37df 100644
--- a/chat/eggdrop/patches/patch-af
+++ b/chat/eggdrop/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.1 2004/03/11 06:37:50 minskim Exp $
+$NetBSD: patch-af,v 1.2 2004/12/03 12:15:54 adam Exp $
---- src/mod/uptime.mod/uptime.c.orig 2003-05-04 17:05:33.000000000 -0500
+--- src/mod/uptime.mod/uptime.c.orig 2004-06-14 01:14:07.000000000 +0000
+++ src/mod/uptime.mod/uptime.c
-@@ -34,8 +34,8 @@
- #define MAKING_UPTIME
+@@ -35,8 +35,8 @@
+
#include "uptime.h"
#include "../module.h"
-#include "../server.mod/server.h"
diff --git a/chat/eggdrop/patches/patch-ag b/chat/eggdrop/patches/patch-ag
index 1297714f426..020e1f4d122 100644
--- a/chat/eggdrop/patches/patch-ag
+++ b/chat/eggdrop/patches/patch-ag
@@ -1,34 +1,35 @@
-$NetBSD: patch-ag,v 1.5 2004/08/27 06:29:06 jlam Exp $
+$NetBSD: patch-ag,v 1.6 2004/12/03 12:15:54 adam Exp $
---- Makefile.in.orig Tue Feb 27 20:06:27 2001
-+++ Makefile.in Fri Nov 2 11:40:10 2001
-@@ -42,7 +42,7 @@
-
- # make modules
- SHLIB_CC = @SHLIB_CC@
+--- Makefile.in.orig 2004-07-25 11:17:33.000000000 +0000
++++ Makefile.in
+@@ -38,7 +38,7 @@ SHLIB_CC = @SHLIB_CC@
+ # Linker
+ LD = @CC@
+ MOD_LD = @MOD_LD@
-SHLIB_LD = @SHLIB_LD@
+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@
- SHLIB_STRIP = @SHLIB_STRIP@
- MOD_EXT = @MOD_EXT@
-@@ -61,6 +61,7 @@
- # stuff for Tcl
- XREQS = @TCL_REQS@
+ # 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.
XLIBS = @TCL_LIBS@ @LIBS@
+XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@
- TCLLIB = @TCLLIB@
- TCLLIBFN = @TCLLIBFN@
+ MODULE_XLIBS = @MODULE_XLIBS@
-@@ -86,29 +87,29 @@
+ # Shouldn't need to touch anything below here.
+@@ -89,30 +90,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)' \
--'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=' 'MODOBJS='
-+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=' 'MODOBJS='
+-'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS='
++'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)'
+-'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)'
MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
@@ -46,12 +47,12 @@ $NetBSD: patch-ag,v 1.5 2004/08/27 06:29:06 jlam Exp $
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)' \
- 'MOD_EXT=$(MOD_EXT)'
+ '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)' \
-'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \
- 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
+ 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o'
MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
diff --git a/chat/eggdrop/patches/patch-ah b/chat/eggdrop/patches/patch-ah
index 8e0fe4e03ee..288a7991a43 100644
--- a/chat/eggdrop/patches/patch-ah
+++ b/chat/eggdrop/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $
+$NetBSD: patch-ah,v 1.2 2004/12/03 12:15:54 adam Exp $
---- 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 @@
- #ifndef STATIC
+--- src/modules.c.orig 2004-07-25 11:17:34.000000000 +0000
++++ src/modules.c
+@@ -106,7 +106,7 @@ int xtra_unpack();
+ static int module_rename(char *name, char *newname);
- /* Directory to look for modules */
+ #ifndef STATIC
-char moddir[121] = "modules/";
+char moddir[121] = __PREFIX__ "/lib/eggdrop/";
+ #endif
- #else
-
+ #ifdef STATIC
diff --git a/chat/eggdrop/patches/patch-ai b/chat/eggdrop/patches/patch-ai
index 0b83eed669c..2370443facc 100644
--- a/chat/eggdrop/patches/patch-ai
+++ b/chat/eggdrop/patches/patch-ai
@@ -1,18 +1,18 @@
-$NetBSD: patch-ai,v 1.2 2003/05/24 16:43:06 salo Exp $
+$NetBSD: patch-ai,v 1.3 2004/12/03 12:15:54 adam Exp $
---- src/mod/share.mod/share.c.orig 2003-05-04 22:15:53.000000000 +0200
-+++ src/mod/share.mod/share.c 2003-05-24 17:05:28.000000000 +0200
-@@ -1113,7 +1113,8 @@
+--- src/mod/share.mod/share.c.orig 2004-07-02 21:02:02.000000000 +0000
++++ src/mod/share.mod/share.c
+@@ -1120,7 +1120,8 @@ static void share_ufsend(int idx, char *
int i, sock;
FILE *f;
-- egg_snprintf(s, sizeof s, ".share.%s.%lu.users", botnetnick, now);
+- egg_snprintf(s, sizeof s, ".share.%s.%li.users", botnetnick, now);
+ egg_snprintf(s, sizeof s, "%.100s/.share.%.32s.%lu.users",
-+ tempdir, botnetnick, now);
++ 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");
-@@ -1883,8 +1884,8 @@
+@@ -1889,8 +1890,8 @@ static void start_sending_users(int idx)
struct chanuserrec *ch;
struct chanset_t *cst;
diff --git a/chat/eggdrop/patches/patch-aj b/chat/eggdrop/patches/patch-aj
deleted file mode 100644
index 14b000b7ee4..00000000000
--- a/chat/eggdrop/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/05/24 16:43:06 salo Exp $
-
---- src/mod/Makefile.in.orig 2003-05-04 22:15:53.000000000 +0200
-+++ src/mod/Makefile.in 2003-05-24 17:07:41.000000000 +0200
-@@ -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) $(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/chat/eggdrop/patches/patch-ak b/chat/eggdrop/patches/patch-ak
index c8abc1a9feb..629080766ee 100644
--- a/chat/eggdrop/patches/patch-ak
+++ b/chat/eggdrop/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.2 2003/05/24 16:43:06 salo Exp $
+$NetBSD: patch-ak,v 1.3 2004/12/03 12:15:54 adam Exp $
---- src/eggdrop.h.orig 2003-05-04 22:15:53.000000000 +0200
-+++ src/eggdrop.h 2003-05-24 17:09:54.000000000 +0200
-@@ -85,7 +85,7 @@
+--- src/eggdrop.h.orig 2004-07-25 11:17:34.000000000 +0000
++++ src/eggdrop.h
+@@ -75,7 +75,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
++#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. */
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 08:49:12 +0000