ports/71305: Please update irc/eggdrop to newest version

Andrew A. Khlebutin andreyh at perm.ru
Thu Sep 2 18:40:23 UTC 2004


>Number:         71305
>Category:       ports
>Synopsis:       Please update irc/eggdrop to newest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 02 18:40:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Andrew A. Khlebutin
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD hydra.pstu.ru 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #1: Thu Aug 5 21:47:21 YEKST 2004 root at hydra.pstu.ru:/usr/obj/usr/src/sys/hydra i386


	
>Description:
    Update irc/eggdrop to newest version
>How-To-Repeat:
	
>Fix:

	

diff -ruN eggdrop.orig/Makefile eggdrop/Makefile
--- eggdrop.orig/Makefile	Thu May 27 07:28:57 2004
+++ eggdrop/Makefile	Thu Sep  2 23:44:00 2004
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	eggdrop
-PORTVERSION=	1.6.15
-PORTREVISION=	4
+PORTVERSION=	1.6.17
 CATEGORIES=	irc tcl84 ipv6
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 DISTNAME=	${PORTNAME:S/-//}${PORTVERSION}
 
-PATCHFILES=	eggdrop1.6.15-ssl.fixed.diff.gz
-PATCH_SITES=	http://www.egghelp.org/files/patches/
-PATCH_WRKSRC=	${WRKDIR}
-
 MAINTAINER=	q at uni.de
 COMMENT=	The most popular open source Internet Relay Chat bot
 
+PATCH_WRKSRC=	${WRKDIR}
+USE_BZIP2=	yes
+
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(WITHOUT_TCL)
@@ -107,9 +105,9 @@
 	@cd ${WRKSRC}/text && ${INSTALL_DATA} banner motd ${DATADIR}/text
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/settings ${DOCSDIR}/html
-	@cd ${WRKSRC}/doc && ${INSTALL_DATA} BOTNET tcl-commands.doc tricks \
-		BUG-REPORT first_script.txt KNOWN-PROBLEMS MODULES PARTYLINE \
-		text-substitutions.doc UPDATES1.5 UPDATES1.6 ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${INSTALL_DATA} BANS BOTNET BUG-REPORT FIRST-SCRIPT \
+		KNOWN-PROBLEMS MODULES PARTYLINE TEXT-SUBSTITUTIONS TRICKS \
+		UPDATES1.6 USERS tcl-commands.doc ${DOCSDIR}
 	@cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html
 	@cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${DOCSDIR}/settings
 .endif
diff -ruN eggdrop.orig/distinfo eggdrop/distinfo
--- eggdrop.orig/distinfo	Thu May 27 04:10:39 2004
+++ eggdrop/distinfo	Thu Sep  2 17:48:05 2004
@@ -1,4 +1,2 @@
-MD5 (eggdrop1.6.15.tar.gz) = f1f0c3e8b914d626c06a567560f737dd
-SIZE (eggdrop1.6.15.tar.gz) = 961868
-MD5 (eggdrop1.6.15-ssl.fixed.diff.gz) = ac2a146dc1ec2c4e28bf8e77178fae74
-SIZE (eggdrop1.6.15-ssl.fixed.diff.gz) = 20318
+MD5 (eggdrop1.6.17.tar.bz2) = 68e181201483dee398f9904e8652e6ca
+SIZE (eggdrop1.6.17.tar.bz2) = 805376
diff -ruN eggdrop.orig/files/patch-Makefile.in eggdrop/files/patch-Makefile.in
--- eggdrop.orig/files/patch-Makefile.in	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-Makefile.in	Thu Sep  2 18:08:49 2004
@@ -0,0 +1,20 @@
+--- eggdrop1.6.17/src/Makefile.in.orig	Sun Jul 25 17:17:34 2004
++++ eggdrop1.6.17/src/Makefile.in	Thu Sep  2 18:07:10 2004
+@@ -16,7 +16,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 \
+@@ -37,7 +37,7 @@
+ 	@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) $(XSSL_LIBS) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat/mod.xlibs`
+ 	$(STRIP) ../$(EGGEXEC)
+ 	@echo ""
+ 	@echo "Successful compile: $(EGGEXEC)"
diff -ruN eggdrop.orig/files/patch-ab eggdrop/files/patch-ab
--- eggdrop.orig/files/patch-ab	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ab	Thu Jan  1 05:00:00 1970
@@ -1,38 +0,0 @@
---- eggdrop1.6.15/src/main.c.orig	Mon May  5 06:05:32 2003
-+++ eggdrop1.6.15/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;
- 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__ "/etc/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");
-+
-   /* Initialise context list */
-   for (i = 0; i < 16; i++)
-     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);
- 
-   /* Check for pre-existing eggdrop! */
-   f = fopen(pid_file, "r");
diff -ruN eggdrop.orig/files/patch-ac eggdrop/files/patch-ac
--- eggdrop.orig/files/patch-ac	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ac	Thu Jan  1 05:00:00 1970
@@ -1,20 +0,0 @@
---- eggdrop1.6.15/src/Makefile.in.orig	Mon Feb  9 22:42:35 2004
-+++ eggdrop1.6.15/src/Makefile.in	Mon Feb  9 22:43:23 2004
-@@ -17,7 +17,7 @@
- STRIP = @STRIP@
- #CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
- CFLAGS = @CFLAGS@ -I$(XSSL_INCLUDE) -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 \
-@@ -39,7 +39,7 @@
- 	@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) $(XSSL_LIBS) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
-+	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
- 	$(STRIP) ../$(EGGEXEC)
- 	@echo "Successful compile: $(EGGEXEC)"
- 	@echo ""
diff -ruN eggdrop.orig/files/patch-ad eggdrop/files/patch-ad
--- eggdrop.orig/files/patch-ad	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ad	Thu Jan  1 05:00:00 1970
@@ -1,11 +0,0 @@
---- eggdrop1.6.15/src/mod/filesys.mod/filesys.c.orig	Mon Jun  2 11:25:01 2003
-+++ eggdrop1.6.15/src/mod/filesys.mod/filesys.c	Mon Jun  2 11:25:46 2003
-@@ -452,7 +452,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 -ruN eggdrop.orig/files/patch-ae eggdrop/files/patch-ae
--- eggdrop.orig/files/patch-ae	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ae	Thu Jan  1 05:00:00 1970
@@ -1,13 +0,0 @@
---- eggdrop1.6.15/src/mod/ctcp.mod/ctcp.c.orig	Mon Jun  2 11:27:58 2003
-+++ eggdrop1.6.15/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",
--                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 -ruN eggdrop.orig/files/patch-ah eggdrop/files/patch-ah
--- eggdrop.orig/files/patch-ah	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ah	Thu Jan  1 05:00:00 1970
@@ -1,11 +0,0 @@
---- eggdrop1.6.15/src/modules.c.orig	Mon Jun  2 11:31:15 2003
-+++ eggdrop1.6.15/src/modules.c	Mon Jun  2 11:31:44 2003
-@@ -101,7 +101,7 @@
- #ifndef STATIC
- 
- /* Directory to look for modules */
--char moddir[121] = "modules/";
-+char moddir[121] = __PREFIX__ "/lib/eggdrop/";
- 
- #else
- 
diff -ruN eggdrop.orig/files/patch-ai eggdrop/files/patch-ai
--- eggdrop.orig/files/patch-ai	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ai	Thu Jan  1 05:00:00 1970
@@ -1,22 +0,0 @@
---- eggdrop1.6.15/src/mod/share.mod/share.c.orig	Mon May  5 00:05:33 2003
-+++ eggdrop1.6.15/src/mod/share.mod/share.c	Tue Nov 18 16:51:41 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);
-   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 +1883,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 -ruN eggdrop.orig/files/patch-aj eggdrop/files/patch-aj
--- eggdrop.orig/files/patch-aj	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-aj	Thu Jan  1 05:00:00 1970
@@ -1,11 +0,0 @@
---- eggdrop1.6.15/src/mod/Makefile.in.orig	Mon Jun  2 11:36:50 2003
-+++ eggdrop1.6.15/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) $(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 -ruN eggdrop.orig/files/patch-ak eggdrop/files/patch-ak
--- eggdrop.orig/files/patch-ak	Thu May 27 07:28:57 2004
+++ eggdrop/files/patch-ak	Thu Jan  1 05:00:00 1970
@@ -1,11 +0,0 @@
---- eggdrop1.6.15/src/eggdrop.h.orig	Mon Jun  2 11:39:45 2003
-+++ eggdrop1.6.15/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.                              */
diff -ruN eggdrop.orig/files/patch-eggdrop.conf eggdrop/files/patch-eggdrop.conf
--- eggdrop.orig/files/patch-eggdrop.conf	Thu May 27 04:10:40 2004
+++ eggdrop/files/patch-eggdrop.conf	Thu Sep  2 18:29:41 2004
@@ -1,12 +1,12 @@
---- eggdrop1.6.15/eggdrop.conf.orig	Mon May  5 00:05:32 2003
-+++ eggdrop1.6.15/eggdrop.conf	Wed Mar  3 21:17:14 2004
+--- eggdrop1.6.17/eggdrop.conf.orig	Sun Aug 22 04:43:27 2004
++++ eggdrop1.6.17/eggdrop.conf	Thu Sep  2 18:26:51 2004
 @@ -1,4 +1,4 @@
 -#! /path/to/executable/eggdrop
 +#!%%PREFIX%%/bin/eggdrop
  # ^- This should contain a fully qualified path to your Eggdrop executable.
  #
- # $Id: eggdrop.conf,v 1.26 2003/04/17 04:38:33 wcc Exp $
-@@ -422,7 +422,7 @@
+ # $Id: eggdrop.conf,v 1.40 2004/08/21 22:43:27 wcc Exp $
+@@ -420,7 +420,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 :)
@@ -15,15 +15,3 @@
  
  
  #### DNS MODULE ####
-@@ -814,6 +814,11 @@
-   you.need.to.change.this:6667
-   another.example.com:7000
- }
-+
-+# 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.
diff -ruN eggdrop.orig/files/patch-eggdrop.h eggdrop/files/patch-eggdrop.h
--- eggdrop.orig/files/patch-eggdrop.h	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-eggdrop.h	Thu Sep  2 18:25:09 2004
@@ -0,0 +1,20 @@
+--- eggdrop1.6.17/src/eggdrop.h.orig	Sun Jul 25 17:17:34 2004
++++ eggdrop1.6.17/src/eggdrop.h	Thu Sep  2 18:24:22 2004
+@@ -60,7 +60,7 @@
+  *       You should leave this at 32 characters and modify nick-len in the
+  *       configuration file instead.
+  */
+-#define HANDLEN 9   /* valid values 9->NICKMAX  */
++#define HANDLEN 32   /* valid values 9->NICKMAX  */
+ #define NICKMAX 32  /* valid values HANDLEN->32 */
+ 
+ 
+@@ -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
+                                  all other languages. You do not want to
+                                  change this.                              */
diff -ruN eggdrop.orig/files/patch-main.c eggdrop/files/patch-main.c
--- eggdrop.orig/files/patch-main.c	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-main.c	Thu Sep  2 18:35:06 2004
@@ -0,0 +1,38 @@
+--- eggdrop1.6.17/src/main.c.orig	Sat Jul  3 03:21:08 2004
++++ eggdrop1.6.17/src/main.c	Thu Sep  2 18:01:22 2004
+@@ -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;
+ 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 */
+@@ -726,6 +726,8 @@
+   }
+ #endif
+ 
++    chdir(__PREFIX__ "/share/eggdrop");
++
+   /* Initialise context list */
+   for (i = 0; i < 16; i++)
+     Context;
+@@ -825,7 +827,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 -ruN eggdrop.orig/files/patch-mod::ctcp.mod::ctcp.c eggdrop/files/patch-mod::ctcp.mod::ctcp.c
--- eggdrop.orig/files/patch-mod::ctcp.mod::ctcp.c	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-mod::ctcp.mod::ctcp.c	Thu Sep  2 18:14:24 2004
@@ -0,0 +1,13 @@
+--- eggdrop1.6.17/src/mod/ctcp.mod/ctcp.c.orig	Mon Jun 14 07:14:07 2004
++++ eggdrop1.6.17/src/mod/ctcp.mod/ctcp.c	Thu Sep  2 18:13:36 2004
+@@ -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 -ruN eggdrop.orig/files/patch-mod::filesys.mod::filesys.c eggdrop/files/patch-mod::filesys.mod::filesys.c
--- eggdrop.orig/files/patch-mod::filesys.mod::filesys.c	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-mod::filesys.mod::filesys.c	Thu Sep  2 18:11:51 2004
@@ -0,0 +1,11 @@
+--- eggdrop1.6.17/src/mod/filesys.mod/filesys.c.orig	Sat Jul  3 03:02:02 2004
++++ eggdrop1.6.17/src/mod/filesys.mod/filesys.c	Thu Sep  2 18:10:27 2004
+@@ -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 -ruN eggdrop.orig/files/patch-mod::share.mod::share.c eggdrop/files/patch-mod::share.mod::share.c
--- eggdrop.orig/files/patch-mod::share.mod::share.c	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-mod::share.mod::share.c	Thu Sep  2 18:37:39 2004
@@ -0,0 +1,22 @@
+--- eggdrop1.6.17/src/mod/share.mod/share.c.orig	Sat Jul  3 03:02:02 2004
++++ eggdrop1.6.17/src/mod/share.mod/share.c	Thu Sep  2 18:32:07 2004
+@@ -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 -ruN eggdrop.orig/files/patch-modules.c eggdrop/files/patch-modules.c
--- eggdrop.orig/files/patch-modules.c	Thu Jan  1 05:00:00 1970
+++ eggdrop/files/patch-modules.c	Thu Sep  2 18:16:27 2004
@@ -0,0 +1,11 @@
+--- eggdrop1.6.17/src/modules.c.orig	Sun Jul 25 17:17:34 2004
++++ eggdrop1.6.17/src/modules.c	Thu Sep  2 18:15:36 2004
+@@ -106,7 +106,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 -ruN eggdrop.orig/pkg-plist eggdrop/pkg-plist
--- eggdrop.orig/pkg-plist	Thu May 27 07:28:57 2004
+++ eggdrop/pkg-plist	Fri Sep  3 00:00:46 2004
@@ -44,30 +44,37 @@
 %%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%%/language/assoc.danish.lang
 %%DATADIR%%/language/assoc.english.lang
+%%DATADIR%%/language/assoc.finnish.lang
 %%DATADIR%%/language/assoc.french.lang
 %%DATADIR%%/language/assoc.german.lang
 %%DATADIR%%/language/console.danish.lang
 %%DATADIR%%/language/console.english.lang
+%%DATADIR%%/language/console.finnish.lang
 %%DATADIR%%/language/console.french.lang
 %%DATADIR%%/language/console.german.lang
 %%DATADIR%%/language/filesys.danish.lang
 %%DATADIR%%/language/filesys.english.lang
+%%DATADIR%%/language/filesys.finnish.lang
 %%DATADIR%%/language/filesys.french.lang
 %%DATADIR%%/language/filesys.german.lang
 %%DATADIR%%/language/notes.danish.lang
 %%DATADIR%%/language/notes.english.lang
+%%DATADIR%%/language/notes.finnish.lang
 %%DATADIR%%/language/notes.french.lang
 %%DATADIR%%/language/notes.german.lang
 %%DATADIR%%/language/transfer.danish.lang
 %%DATADIR%%/language/transfer.english.lang
+%%DATADIR%%/language/transfer.finnish.lang
 %%DATADIR%%/language/transfer.french.lang
 %%DATADIR%%/language/transfer.german.lang
 %%DATADIR%%/language/wire.danish.lang
 %%DATADIR%%/language/wire.english.lang
+%%DATADIR%%/language/wire.finnish.lang
 %%DATADIR%%/language/wire.french.lang
 %%DATADIR%%/language/wire.german.lang
 %%DATADIR%%/scripts/CONTENTS
@@ -86,17 +93,18 @@
 %%DATADIR%%/scripts/weed
 %%DATADIR%%/text/banner
 %%DATADIR%%/text/motd
+%%PORTDOCS%%%%DOCSDIR%%/BANS
 %%PORTDOCS%%%%DOCSDIR%%/BOTNET
-%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc
-%%PORTDOCS%%%%DOCSDIR%%/tricks
 %%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT
-%%PORTDOCS%%%%DOCSDIR%%/first_script.txt
+%%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN-PROBLEMS
 %%PORTDOCS%%%%DOCSDIR%%/MODULES
 %%PORTDOCS%%%%DOCSDIR%%/PARTYLINE
-%%PORTDOCS%%%%DOCSDIR%%/text-substitutions.doc
-%%PORTDOCS%%%%DOCSDIR%%/UPDATES1.5
+%%PORTDOCS%%%%DOCSDIR%%/TEXT-SUBSTITUTIONS
+%%PORTDOCS%%%%DOCSDIR%%/TRICKS
 %%PORTDOCS%%%%DOCSDIR%%/UPDATES1.6
+%%PORTDOCS%%%%DOCSDIR%%/USERS
+%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc
 %%PORTDOCS%%%%DOCSDIR%%/html/about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/app-problems.html
 %%PORTDOCS%%%%DOCSDIR%%/html/app-textsub.html
@@ -111,7 +119,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/features.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ipv6.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mod-assoc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mod-blowfish.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mod-channels.html
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list