Replace "dircproxy" package with with "dircproxy-devel" package and

remove the later. The old version 1.0.5 is unmaintained, has a remote
DoS vulnerability and is less reliable than version 1.2.0beta2.

Approved by Adrian Portelli.

5 files changed, 22 insertions, 63 deletions

diff --git a/chat/dircproxy/patches/patch-aa b/chat/dircproxy/patches/patch-aa
index a4c68809e51..2428d380bc2 100644
--- a/chat/dircproxy/patches/patch-aa
+++ b/chat/dircproxy/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2003/06/02 15:20:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/17 12:53:54 tron Exp $
 
---- conf/Makefile.in.orig	2002-11-21 15:19:04.000000000 +0100
+--- conf/Makefile.in.orig	2006-02-18 22:39:32.000000000 +0000
 +++ conf/Makefile.in
-@@ -34,7 +34,7 @@ oldincludedir = /usr/include
- 
- DESTDIR =
- 
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/examples/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- 
+ top_builddir = ..
diff --git a/chat/dircproxy/patches/patch-ab b/chat/dircproxy/patches/patch-ab
index 1c4a7cde3f8..a356d91dbc8 100644
--- a/chat/dircproxy/patches/patch-ab
+++ b/chat/dircproxy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/03/10 13:31:05 tv Exp $
+$NetBSD: patch-ab,v 1.2 2008/06/17 12:53:54 tron Exp $
 
---- src/irc_net.h.orig	2002-02-06 05:07:42.000000000 -0500
+--- src/irc_net.h.orig	2006-02-18 22:39:32.000000000 +0000
 +++ src/irc_net.h
-@@ -21,6 +21,10 @@
+@@ -23,6 +23,10 @@
  #include <arpa/inet.h>
  #include <time.h>
  
@@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.1 2005/03/10 13:31:05 tv Exp $
 +
  #include "irc_prot.h"
  #include "stringex.h"
- 
+ #include "net.h"
diff --git a/chat/dircproxy/patches/patch-ac b/chat/dircproxy/patches/patch-ac
index ed011110081..a2868bfb83f 100644
--- a/chat/dircproxy/patches/patch-ac
+++ b/chat/dircproxy/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2007/03/17 13:47:08 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2008/06/17 12:53:54 tron Exp $
 
-The ?: operator returns an rvalue, not an lvalue.
-
---- src/dcc_net.c.orig	2001-12-21 21:15:55.000000000 +0100
-+++ src/dcc_net.c	2007-03-17 14:44:21.000000000 +0100
-@@ -364,7 +364,7 @@ int dccnet_expunge_proxies(void) {
-       n = p->next;
-       _dccnet_free(p);
+--- src/irc_server.c.orig	2006-10-07 22:07:08.000000000 +0100
++++ src/irc_server.c
+@@ -1155,7 +1155,7 @@ static int _ircserver_gotmsg(struct ircp
+       
+         if (!strcmp(cmsg.cmd, "ACTION")) {
+           irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
+-                     "%s", cmsg.paramstarts[0]);
++                     "%s", (cmsg.paramstarts != NULL) ?  cmsg.paramstarts[0]: "none");
  
--      p = (l ? l->next : proxies) = n;
-+      p = *(l ? &(l->next) : &(proxies)) = n;
-     } else {
-       l = p;
-       p = p->next;
+         } else if (!strcmp(cmsg.cmd, "DCC")
+                    && p->conn_class->dcc_proxy_incoming) {
diff --git a/chat/dircproxy/patches/patch-ad b/chat/dircproxy/patches/patch-ad
deleted file mode 100644
index 8c9142f8c6f..00000000000
--- a/chat/dircproxy/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/03/17 13:47:08 rillig Exp $
-
-The ?: operator returns an rvalue, not an lvalue.
-
---- src/irc_server.c.orig	2002-01-31 15:56:37.000000000 +0100
-+++ src/irc_server.c	2007-03-17 14:43:55.000000000 +0100
-@@ -700,7 +700,7 @@ static int _ircserver_gotmsg(struct ircp
-               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 {
-@@ -741,7 +741,7 @@ static int _ircserver_gotmsg(struct ircp
-               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/patches/patch-ae b/chat/dircproxy/patches/patch-ae
deleted file mode 100644
index a14bd676074..00000000000
--- a/chat/dircproxy/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/03/17 13:47:08 rillig Exp $
-
-The ?: operator returns an rvalue, not an lvalue.
-
---- src/net.c.orig	2002-01-01 18:55:23.000000000 +0100
-+++ src/net.c	2007-03-17 14:45:03.000000000 +0100
-@@ -459,7 +459,7 @@ static int _net_buffer(struct sockinfo *
-     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)) {