From 24c0de6dbb6082ad97f0698515559a5ccd14d5ca Mon Sep 17 00:00:00 2001 From: adrianp Date: Sat, 13 Oct 2007 22:56:55 +0000 Subject: Remove obsolete patches for recent update. (from tron@) --- chat/dircproxy-devel/patches/patch-ac | 43 ----------------------------- chat/dircproxy-devel/patches/patch-ad | 51 ----------------------------------- chat/dircproxy-devel/patches/patch-ae | 13 --------- chat/dircproxy-devel/patches/patch-af | 13 --------- 4 files changed, 120 deletions(-) delete mode 100644 chat/dircproxy-devel/patches/patch-ac delete mode 100644 chat/dircproxy-devel/patches/patch-ad delete mode 100644 chat/dircproxy-devel/patches/patch-ae delete mode 100644 chat/dircproxy-devel/patches/patch-af (limited to 'chat') diff --git a/chat/dircproxy-devel/patches/patch-ac b/chat/dircproxy-devel/patches/patch-ac deleted file mode 100644 index cdd81e23e7a..00000000000 --- a/chat/dircproxy-devel/patches/patch-ac +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/06/30 15:53:18 tron Exp $ - ---- src/irc_server.c.orig 2006-02-18 22:39:32.000000000 +0000 -+++ src/irc_server.c 2006-06-30 16:44:53.000000000 +0100 -@@ -587,9 +587,10 @@ - ; - if (strcmp(ss->str,s->str)) // this line is not already present - ss->next = s; -- else -+ else { - free(s->str); - free(s); -+ } - } else { - p->serversupported = s; - } -@@ -788,7 +789,7 @@ - free(s); - - /* Was in the squelch list, so remove it and stop looking */ -- s = (l ? l->next : p->squelch_modes) = n; -+ s = *(l ? &l->next : &p->squelch_modes) = n; - squelch = 1; - break; - } else { -@@ -817,7 +818,7 @@ - if (p->squelch_modes) { - struct strlist *s, *l; - -- l = 0; -+ l = NULL; - s = p->squelch_modes; - - while (s) { -@@ -829,7 +830,7 @@ - free(s); - - /* Was in the squelch list, so remove it and stop looking */ -- s = (l ? l->next : p->squelch_modes) = n; -+ s = *(l ? &l->next : &p->squelch_modes) = n; - squelch = 1; - break; - } else { diff --git a/chat/dircproxy-devel/patches/patch-ad b/chat/dircproxy-devel/patches/patch-ad deleted file mode 100644 index 202baa450b9..00000000000 --- a/chat/dircproxy-devel/patches/patch-ad +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/04/28 13:23:25 tron Exp $ - ---- src/irc_log.c.orig 2006-02-18 22:39:32.000000000 +0000 -+++ src/irc_log.c 2006-04-28 14:06:01.000000000 +0100 -@@ -58,7 +58,7 @@ - - - /* Log time format for strftime(3) */ --#define LOG_TIME_FORMAT "%H:%M" -+#define LOG_TIME_FORMAT "[%H:%M] " - - /* User log time format */ - #define LOG_USER_TIME_FORMAT "[%d %b %H:%M] " -@@ -952,13 +952,13 @@ - diff = now - when; - - if (diff < 82800L) { /* Within 23 hours [hh:mm] */ -- strftime(tbuf, sizeof(tbuf), "%H:%M", localtime(&when)); -+ strftime(tbuf, sizeof(tbuf), "[%H:%M] ", localtime(&when)); - } else if (diff < 518400L) { /* Within 6 days [day hh:mm] */ -- strftime(tbuf, sizeof(tbuf), "%a %H:%M", localtime(&when)); -+ strftime(tbuf, sizeof(tbuf), "[%a %H:%M] ", localtime(&when)); - } else if (diff < 25920000L) { /* Within 300 days [d mon] */ -- strftime(tbuf, sizeof(tbuf), "%d %b", localtime(&when)); -+ strftime(tbuf, sizeof(tbuf), "[%d %b] ", localtime(&when)); - } else { /* Otherwise [d mon yyyy] */ -- strftime(tbuf, sizeof(tbuf), "%d %b %Y", localtime(&when)); -+ strftime(tbuf, sizeof(tbuf), "[%d %b %Y] ", localtime(&when)); - } - } else { - strftime(tbuf, sizeof(tbuf), LOG_TIME_FORMAT, localtime(&when)); -@@ -988,15 +988,15 @@ - - /* Send the line */ - if (event == IRC_LOG_MSG) { -- net_send(p->client_sock, ":%s PRIVMSG %s :[%s] %s\r\n", frm, to, tbuf, msg); -+ net_send(p->client_sock, ":%s PRIVMSG %s :%s%s\r\n", frm, to, tbuf, msg); - } else if (event == IRC_LOG_ACTION) { -- net_send(p->client_sock, ":%s PRIVMSG %s :\001ACTION [%s] %s\001\r\n", frm, to, tbuf, msg); -+ net_send(p->client_sock, ":%s PRIVMSG %s :\001ACTION %s%s\001\r\n", frm, to, tbuf, msg); - } else if (event == IRC_LOG_CTCP) { -- net_send(p->client_sock, ":%s PRIVMSG %s :\001%s [%s]%s%s\001\r\n", src, to, eventtext, tbuf, (strlen(msg) ? " " : ""), msg); -+ net_send(p->client_sock, ":%s PRIVMSG %s :\001%s %s%s%s\001\r\n", src, to, eventtext, tbuf, (strlen(msg) ? " " : ""), msg); - } else if (event == IRC_LOG_NOTICE) { - ircclient_send_notice(p, "%s", msg); - } else { -- net_send(p->client_sock, ":%s PRIVMSG %s :[%s] %s\r\n", src, to, tbuf, msg); -+ net_send(p->client_sock, ":%s PRIVMSG %s :%s%s\r\n", src, to, tbuf, msg); - } - - free(ll); diff --git a/chat/dircproxy-devel/patches/patch-ae b/chat/dircproxy-devel/patches/patch-ae deleted file mode 100644 index d69f3b748cc..00000000000 --- a/chat/dircproxy-devel/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2006/06/30 15:53:18 tron Exp $ - ---- src/dcc_net.c.orig 2006-02-18 22:39:32.000000000 +0000 -+++ src/dcc_net.c 2006-06-30 16:49:06.000000000 +0100 -@@ -368,7 +368,7 @@ - n = p->next; - _dccnet_free(p); - -- p = (l ? l->next : proxies) = n; -+ p = *(l ? &l->next : &proxies) = n; - } else { - l = p; - p = p->next; diff --git a/chat/dircproxy-devel/patches/patch-af b/chat/dircproxy-devel/patches/patch-af deleted file mode 100644 index e992a42b160..00000000000 --- a/chat/dircproxy-devel/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/06/30 15:53:18 tron Exp $ - ---- src/net.c.orig 2006-02-18 22:39:32.000000000 +0000 -+++ src/net.c 2006-06-30 16:50:54.000000000 +0100 -@@ -459,7 +459,7 @@ - return 0; - } - -- l = &(buff == SB_IN ? s->in_buff_last : s->out_buff_last); -+ l = (buff == SB_IN) ? &s->in_buff_last : &s->out_buff_last; - - /* Check whether we can just add to the existing buffer */ - if ((mode == SM_RAW) && *l && ((*l)->mode == mode)) { -- cgit v1.2.3