Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Nov 2003 21:56:40 +0100 (CET)
From:      Ulrich Spoerlein <q@uni.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/59434: [MAINTAINER] irc/eggdrop: Restore required patch that got lost during update
Message-ID:  <200311182056.hAIKueYL003786@roadrunner.q.local>
Resent-Message-ID: <200311182100.hAIL0boP092348@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         59434
>Category:       ports
>Synopsis:       [MAINTAINER] irc/eggdrop: Restore required patch that got lost during update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 18 13:00:37 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 5.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #2: Thu Nov 13 18:16:19 CET 2003
>Description:
During the update to 1.6.15 one patch-file did not contain all changes.
Thanks to Dariusz Kulinski for spotting!

>How-To-Repeat:
>Fix:

Revive the second part of patch-ai. See also:
http://www.freebsd.org/cgi/cvsweb.cgi/ports/irc/eggdrop/files/patch-ai.diff?r1=1.1&r2=1.2&f=h

--- eggdrop-1.6.15_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/eggdrop/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	18 Oct 2003 21:59:59 -0000	1.5
+++ Makefile	18 Nov 2003 20:51:07 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	eggdrop
 PORTVERSION=	1.6.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc tcl84
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 DISTNAME=	${PORTNAME:S/-//}${PORTVERSION}
Index: files/patch-ai
===================================================================
RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ai,v
retrieving revision 1.2
diff -u -u -r1.2 patch-ai
--- files/patch-ai	11 Jun 2003 05:44:25 -0000	1.2
+++ files/patch-ai	18 Nov 2003 20:51:07 -0000
@@ -1,5 +1,5 @@
---- 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
+--- 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
 @@ -1113,7 +1113,7 @@
    int i, sock;
    FILE *f;
@@ -9,3 +9,14 @@
    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);
--- eggdrop-1.6.15_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311182056.hAIKueYL003786>