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.

20 files changed, 53 insertions, 216 deletions

diff --git a/chat/Makefile b/chat/Makefile
index fa2b8a264b2..7e65e281668 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2008/06/16 10:39:17 adrianp Exp $
+# $NetBSD: Makefile,v 1.139 2008/06/17 12:53:54 tron Exp $
 #
 
 COMMENT=	Communication programs
@@ -19,7 +19,6 @@ SUBDIR+=	cgiirc
 SUBDIR+=	climm
 SUBDIR+=	dccserver
 SUBDIR+=	dircproxy
-SUBDIR+=	dircproxy-devel
 SUBDIR+=	eggdrop
 SUBDIR+=	ejabberd
 SUBDIR+=	ekg
diff --git a/chat/dircproxy-devel/DESCR b/chat/dircproxy-devel/DESCR
deleted file mode 100644
index 9e04678d92f..00000000000
--- a/chat/dircproxy-devel/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-dircproxy is an IRC proxy server ("bouncer") designed for people
-who use IRC from lots of different workstations or clients, but wish
-to remain connected and see what they missed while they were away.
-You connect to IRC through dircproxy, and it keeps you connected to
-the server, even after you detach your client from it.  While you're
-detached, it logs channel and private messages as well as important
-events, and when you re-attach it'll let you know what you missed.
-
-This can be used to give you roughly the same functionality as
-using ircII and screen together, except you can use whatever IRC
-client you like, including X ones!
-
-* THIS IS AN UNSTABLE DEVELOPMENT RELEASE OF DIRCPROXY.  IT HAS HIGHER
-* THEN USUAL RISK OF DESTROYING YOUR SYSTEM.
-*
-* FOR A STABLE RELEASE USE THE LATEST 1.0.x
diff --git a/chat/dircproxy-devel/Makefile b/chat/dircproxy-devel/Makefile
deleted file mode 100644
index 61db3f107cd..00000000000
--- a/chat/dircproxy-devel/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2008/06/13 11:46:21 tron Exp $
-
-DISTNAME=	dircproxy-1.2.0-beta2
-PKGNAME=	${DISTNAME:S/-beta/beta/}
-PKGREVISION=	1
-CATEGORIES=	chat
-MASTER_SITES=	http://dircproxy.securiweb.net/
-EXTRACT_SUFX=	.tar.bz
-
-MAINTAINER=	adrianp@NetBSD.org
-HOMEPAGE=	http://dircproxy.securiweb.net/
-COMMENT=	Detachable internet relay chat proxy server (devel version)
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		perl:run
-
-.include "options.mk"
-
-CONFLICTS=		dircproxy-1.[0-1].[0-9]*
-
-REPLACE_PERL+=		contrib/log.pl contrib/privmsg-log.pl
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-EGDIR=			${PREFIX}/share/examples/dircproxy
-CONF_FILES=		${EGDIR:Q}/dircproxyrc.sample \
-			${PKG_SYSCONFDIR:Q}/dircproxyrc
-RCD_SCRIPTS=		dircproxy
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/chat/dircproxy-devel/PLIST b/chat/dircproxy-devel/PLIST
deleted file mode 100644
index 817a89af39e..00000000000
--- a/chat/dircproxy-devel/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/19 15:47:35 adrianp Exp $
-bin/dircproxy
-bin/dircproxy-crypt
-man/man1/dircproxy-crypt.1
-man/man1/dircproxy.1
-share/dircproxy/cronchk.sh
-share/dircproxy/log.pl
-share/dircproxy/privmsg-log.pl
-share/examples/dircproxy/dircproxyrc.sample
-share/examples/rc.d/dircproxy
-@dirrm share/examples/dircproxy
-@dirrm share/dircproxy
diff --git a/chat/dircproxy-devel/distinfo b/chat/dircproxy-devel/distinfo
deleted file mode 100644
index cddc36c6082..00000000000
--- a/chat/dircproxy-devel/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.7 2007/10/13 19:41:23 adrianp Exp $
-
-SHA1 (dircproxy-1.2.0-beta2.tar.bz) = 43ab3d1b7559fd34a315c50150eebedeb4ec48db
-RMD160 (dircproxy-1.2.0-beta2.tar.bz) = 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369
-Size (dircproxy-1.2.0-beta2.tar.bz) = 314480 bytes
-SHA1 (patch-aa) = 59870074b86f1150f904e10269c654719b506f29
-SHA1 (patch-ab) = c0e8706c0f1bb7a2c981d1140d1b1deb105c601b
-SHA1 (patch-ag) = ad94320d493ea50603c90cd0c1e2499716496712
diff --git a/chat/dircproxy-devel/files/dircproxy.sh b/chat/dircproxy-devel/files/dircproxy.sh
deleted file mode 100644
index 3edaf6d9d3d..00000000000
--- a/chat/dircproxy-devel/files/dircproxy.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!@SH@
-#
-# $NetBSD: dircproxy.sh,v 1.1.1.1 2005/04/03 14:18:02 adrianp Exp $
-#
-
-# PROVIDE: dircproxy
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="dircproxy"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-command_args="-f @PKG_SYSCONFDIR@/${name}rc --pid-file=/var/run/${name}.pid"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}rc"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/chat/dircproxy-devel/patches/patch-aa b/chat/dircproxy-devel/patches/patch-aa
deleted file mode 100644
index 1c98c4923b9..00000000000
--- a/chat/dircproxy-devel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/02/19 15:47:35 adrianp Exp $
-
---- conf/Makefile.in.orig	2006-02-18 22:39:32.000000000 +0000
-+++ conf/Makefile.in
-@@ -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-devel/patches/patch-ab b/chat/dircproxy-devel/patches/patch-ab
deleted file mode 100644
index b9628d15a42..00000000000
--- a/chat/dircproxy-devel/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/02/19 15:47:35 adrianp Exp $
-
---- src/irc_net.h.orig	2006-02-18 22:39:32.000000000 +0000
-+++ src/irc_net.h
-@@ -23,6 +23,10 @@
- #include <arpa/inet.h>
- #include <time.h>
- 
-+#ifndef INADDR_LOOPBACK
-+#define INADDR_LOOPBACK inet_addr("127.0.0.1")
-+#endif
-+
- #include "irc_prot.h"
- #include "stringex.h"
- #include "net.h"
diff --git a/chat/dircproxy-devel/patches/patch-ag b/chat/dircproxy-devel/patches/patch-ag
deleted file mode 100644
index ff62485baec..00000000000
--- a/chat/dircproxy-devel/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/10/13 19:41:23 adrianp Exp $
-
---- 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");
- 
-         } else if (!strcmp(cmsg.cmd, "DCC")
-                    && p->conn_class->dcc_proxy_incoming) {
diff --git a/chat/dircproxy/DESCR b/chat/dircproxy/DESCR
index 156dccfe4b7..9e04678d92f 100644
--- a/chat/dircproxy/DESCR
+++ b/chat/dircproxy/DESCR
@@ -9,3 +9,8 @@ events, and when you re-attach it'll let you know what you missed.
 This can be used to give you roughly the same functionality as
 using ircII and screen together, except you can use whatever IRC
 client you like, including X ones!
+
+* THIS IS AN UNSTABLE DEVELOPMENT RELEASE OF DIRCPROXY.  IT HAS HIGHER
+* THEN USUAL RISK OF DESTROYING YOUR SYSTEM.
+*
+* FOR A STABLE RELEASE USE THE LATEST 1.0.x
diff --git a/chat/dircproxy/Makefile b/chat/dircproxy/Makefile
index 07091b03c6b..5b468059e0a 100644
--- a/chat/dircproxy/Makefile
+++ b/chat/dircproxy/Makefile
@@ -1,28 +1,32 @@
-# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:16 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/17 12:53:54 tron Exp $
 
-DISTNAME=	dircproxy-1.0.5
-PKGREVISION=	2
+DISTNAME=	dircproxy-1.2.0-beta2
+PKGNAME=	${DISTNAME:S/-beta/beta/}
+PKGREVISION=	1
 CATEGORIES=	chat
-MASTER_SITES=	ftp://ftp.netsplit.com/pub/dircproxy/stable/ \
-		http://dircproxy.securiweb.net/pub/1.0/
+MASTER_SITES=	http://dircproxy.securiweb.net/
+EXTRACT_SUFX=	.tar.bz
 
-MAINTAINER=	sb125499@ohiou.edu
+MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://dircproxy.securiweb.net/
-COMMENT=	Detachable internet relay chat proxy server
+COMMENT=	Detachable internet relay chat proxy server (devel version)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		perl:run
 
-CONFLICTS=		dircproxy-1.1.[0-9]*
+.include "options.mk"
 
-REPLACE_PERL=		contrib/log.pl contrib/privmsg-log.pl
+CONFLICTS=		dircproxy-1.[0-1].[0-9]*
+
+REPLACE_PERL+=		contrib/log.pl contrib/privmsg-log.pl
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/dircproxy
-CONF_FILES=		${EGDIR}/dircproxyrc ${PKG_SYSCONFDIR}/dircproxyrc
+CONF_FILES=		${EGDIR:Q}/dircproxyrc.sample \
+			${PKG_SYSCONFDIR:Q}/dircproxyrc
 RCD_SCRIPTS=		dircproxy
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/dircproxy/PLIST b/chat/dircproxy/PLIST
index 4765e283a85..726aa73ac3b 100644
--- a/chat/dircproxy/PLIST
+++ b/chat/dircproxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:33:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/06/17 12:53:54 tron Exp $
 bin/dircproxy
 bin/dircproxy-crypt
 man/man1/dircproxy-crypt.1
@@ -6,7 +6,7 @@ man/man1/dircproxy.1
 share/dircproxy/cronchk.sh
 share/dircproxy/log.pl
 share/dircproxy/privmsg-log.pl
-share/examples/dircproxy/dircproxyrc
+share/examples/dircproxy/dircproxyrc.sample
 share/examples/rc.d/dircproxy
 @dirrm share/examples/dircproxy
 @dirrm share/dircproxy
diff --git a/chat/dircproxy/distinfo b/chat/dircproxy/distinfo
index 27fa61d9518..bbf39f20994 100644
--- a/chat/dircproxy/distinfo
+++ b/chat/dircproxy/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/03/17 13:47:08 rillig Exp $
+$NetBSD: distinfo,v 1.6 2008/06/17 12:53:54 tron Exp $
 
-SHA1 (dircproxy-1.0.5.tar.gz) = eaf159d2a1303f82e079940b381c0e71b9b90c28
-RMD160 (dircproxy-1.0.5.tar.gz) = 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b
-Size (dircproxy-1.0.5.tar.gz) = 217965 bytes
-SHA1 (patch-aa) = 9c59e9f4c0cfaca7a9e000eab2a8af1b6c16329f
-SHA1 (patch-ab) = 4d2cd9dbc972e4f2f7ac20b32dc65e755796d6f0
-SHA1 (patch-ac) = 2f599b0e30c3cc2b3b801546b1df8f8ae1de2c5d
-SHA1 (patch-ad) = 3177586587616f9441110acf59b8751bd8dde5c3
-SHA1 (patch-ae) = 212e7505d26442166ff77a29c9779bed34c2f255
+SHA1 (dircproxy-1.2.0-beta2.tar.bz) = 43ab3d1b7559fd34a315c50150eebedeb4ec48db
+RMD160 (dircproxy-1.2.0-beta2.tar.bz) = 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369
+Size (dircproxy-1.2.0-beta2.tar.bz) = 314480 bytes
+SHA1 (patch-aa) = 59870074b86f1150f904e10269c654719b506f29
+SHA1 (patch-ab) = c0e8706c0f1bb7a2c981d1140d1b1deb105c601b
+SHA1 (patch-ac) = ad94320d493ea50603c90cd0c1e2499716496712
diff --git a/chat/dircproxy/files/dircproxy.sh b/chat/dircproxy/files/dircproxy.sh
index a963002a686..378746d0132 100644
--- a/chat/dircproxy/files/dircproxy.sh
+++ b/chat/dircproxy/files/dircproxy.sh
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: dircproxy.sh,v 1.2 2003/11/21 23:06:12 xtraeme Exp $
+# $NetBSD: dircproxy.sh,v 1.3 2008/06/17 12:53:54 tron Exp $
 #
 
 # PROVIDE: dircproxy
diff --git a/chat/dircproxy-devel/options.mk b/chat/dircproxy/options.mk
index c2a9617c4b5..9ddd73155f2 100644
--- a/chat/dircproxy-devel/options.mk
+++ b/chat/dircproxy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/02/19 15:47:35 adrianp Exp $
+# $NetBSD: options.mk,v 1.1 2008/06/17 12:53:54 tron Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dircproxy
 PKG_SUPPORTED_OPTIONS=	ssl debug
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)) {