Tue Jun 17 12:53:55 2008 UTC ()
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.


(tron)
diff -r1.138 -r1.139 pkgsrc/chat/Makefile
diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/DESCR
diff -r1.15 -r1.16 pkgsrc/chat/dircproxy/Makefile
diff -r1.4 -r1.5 pkgsrc/chat/dircproxy/PLIST
diff -r1.5 -r1.6 pkgsrc/chat/dircproxy/distinfo
diff -r0 -r1.1 pkgsrc/chat/dircproxy/options.mk
diff -r1.1.1.1 -r0 pkgsrc/chat/dircproxy-devel/DESCR
diff -r1.12 -r0 pkgsrc/chat/dircproxy-devel/Makefile
diff -r1.3 -r0 pkgsrc/chat/dircproxy-devel/PLIST
diff -r1.7 -r0 pkgsrc/chat/dircproxy-devel/distinfo
diff -r1.1 -r0 pkgsrc/chat/dircproxy-devel/options.mk
diff -r1.1.1.1 -r0 pkgsrc/chat/dircproxy-devel/files/dircproxy.sh
diff -r1.2 -r0 pkgsrc/chat/dircproxy-devel/patches/patch-aa
diff -r1.2 -r0 pkgsrc/chat/dircproxy-devel/patches/patch-ab
diff -r1.1 -r0 pkgsrc/chat/dircproxy-devel/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/chat/dircproxy/files/dircproxy.sh
diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/patches/patch-ac
diff -r1.1 -r0 pkgsrc/chat/dircproxy/patches/patch-ad
diff -r1.1 -r0 pkgsrc/chat/dircproxy/patches/patch-ae
cvs diff -r1.138 -r1.139 pkgsrc/chat/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/Makefile 2008/06/16 10:39:17 1.138
+++ pkgsrc/chat/Makefile 2008/06/17 12:53:54 1.139
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile,v 1.138 2008/06/16 10:39:17 adrianp Exp $ 1# $NetBSD: Makefile,v 1.139 2008/06/17 12:53:54 tron Exp $
2# 2#
3 3
4COMMENT= Communication programs 4COMMENT= Communication programs
5 5
6SUBDIR+= aim 6SUBDIR+= aim
7SUBDIR+= amsn 7SUBDIR+= amsn
8SUBDIR+= anope 8SUBDIR+= anope
9SUBDIR+= atheme 9SUBDIR+= atheme
10SUBDIR+= bitchbot 10SUBDIR+= bitchbot
11SUBDIR+= bitchx 11SUBDIR+= bitchx
12SUBDIR+= bitlbee 12SUBDIR+= bitlbee
13SUBDIR+= blackened 13SUBDIR+= blackened
14SUBDIR+= bnc 14SUBDIR+= bnc
15SUBDIR+= bsflite 15SUBDIR+= bsflite
16SUBDIR+= centericq 16SUBDIR+= centericq
17SUBDIR+= centerim 17SUBDIR+= centerim
18SUBDIR+= cgiirc 18SUBDIR+= cgiirc
19SUBDIR+= climm 19SUBDIR+= climm
20SUBDIR+= dccserver 20SUBDIR+= dccserver
21SUBDIR+= dircproxy 21SUBDIR+= dircproxy
22SUBDIR+= dircproxy-devel 
23SUBDIR+= eggdrop 22SUBDIR+= eggdrop
24SUBDIR+= ejabberd 23SUBDIR+= ejabberd
25SUBDIR+= ekg 24SUBDIR+= ekg
26SUBDIR+= emech 25SUBDIR+= emech
27SUBDIR+= epic4 26SUBDIR+= epic4
28SUBDIR+= epic4-doc 27SUBDIR+= epic4-doc
29SUBDIR+= finch 28SUBDIR+= finch
30SUBDIR+= fisg 29SUBDIR+= fisg
31SUBDIR+= fugu 30SUBDIR+= fugu
32SUBDIR+= gale 31SUBDIR+= gale
33SUBDIR+= gg2 32SUBDIR+= gg2
34SUBDIR+= gnomeicu 33SUBDIR+= gnomeicu
35SUBDIR+= goofey 34SUBDIR+= goofey
cvs diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/Attic/DESCR (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/Attic/DESCR 2001/10/31 20:06:20 1.1
+++ pkgsrc/chat/dircproxy/Attic/DESCR 2008/06/17 12:53:54 1.2
@@ -1,11 +1,16 @@ @@ -1,11 +1,16 @@
1dircproxy is an IRC proxy server ("bouncer") designed for people 1dircproxy is an IRC proxy server ("bouncer") designed for people
2who use IRC from lots of different workstations or clients, but wish 2who use IRC from lots of different workstations or clients, but wish
3to remain connected and see what they missed while they were away. 3to remain connected and see what they missed while they were away.
4You connect to IRC through dircproxy, and it keeps you connected to 4You connect to IRC through dircproxy, and it keeps you connected to
5the server, even after you detach your client from it. While you're 5the server, even after you detach your client from it. While you're
6detached, it logs channel and private messages as well as important 6detached, it logs channel and private messages as well as important
7events, and when you re-attach it'll let you know what you missed. 7events, and when you re-attach it'll let you know what you missed.
8 8
9This can be used to give you roughly the same functionality as 9This can be used to give you roughly the same functionality as
10using ircII and screen together, except you can use whatever IRC 10using ircII and screen together, except you can use whatever IRC
11client you like, including X ones! 11client you like, including X ones!
 12
 13* THIS IS AN UNSTABLE DEVELOPMENT RELEASE OF DIRCPROXY. IT HAS HIGHER
 14* THEN USUAL RISK OF DESTROYING YOUR SYSTEM.
 15*
 16* FOR A STABLE RELEASE USE THE LATEST 1.0.x
cvs diff -r1.15 -r1.16 pkgsrc/chat/dircproxy/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/Attic/Makefile 2008/06/12 02:14:16 1.15
+++ pkgsrc/chat/dircproxy/Attic/Makefile 2008/06/17 12:53:54 1.16
@@ -1,28 +1,32 @@ @@ -1,28 +1,32 @@
1# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:16 joerg Exp $ 1# $NetBSD: Makefile,v 1.16 2008/06/17 12:53:54 tron Exp $
2 2
3DISTNAME= dircproxy-1.0.5 3DISTNAME= dircproxy-1.2.0-beta2
4PKGREVISION= 2 4PKGNAME= ${DISTNAME:S/-beta/beta/}
 5PKGREVISION= 1
5CATEGORIES= chat 6CATEGORIES= chat
6MASTER_SITES= ftp://ftp.netsplit.com/pub/dircproxy/stable/ \ 7MASTER_SITES= http://dircproxy.securiweb.net/
7 http://dircproxy.securiweb.net/pub/1.0/ 8EXTRACT_SUFX= .tar.bz
8 9
9MAINTAINER= sb125499@ohiou.edu 10MAINTAINER= adrianp@NetBSD.org
10HOMEPAGE= http://dircproxy.securiweb.net/ 11HOMEPAGE= http://dircproxy.securiweb.net/
11COMMENT= Detachable internet relay chat proxy server 12COMMENT= Detachable internet relay chat proxy server (devel version)
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
16USE_TOOLS+= perl:run 17USE_TOOLS+= perl:run
17 18
18CONFLICTS= dircproxy-1.1.[0-9]* 19.include "options.mk"
19 20
20REPLACE_PERL= contrib/log.pl contrib/privmsg-log.pl 21CONFLICTS= dircproxy-1.[0-1].[0-9]*
 22
 23REPLACE_PERL+= contrib/log.pl contrib/privmsg-log.pl
21 24
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
23 26
24EGDIR= ${PREFIX}/share/examples/dircproxy 27EGDIR= ${PREFIX}/share/examples/dircproxy
25CONF_FILES= ${EGDIR}/dircproxyrc ${PKG_SYSCONFDIR}/dircproxyrc 28CONF_FILES= ${EGDIR:Q}/dircproxyrc.sample \
 29 ${PKG_SYSCONFDIR:Q}/dircproxyrc
26RCD_SCRIPTS= dircproxy 30RCD_SCRIPTS= dircproxy
27 31
28.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/chat/dircproxy/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/Attic/PLIST 2005/05/02 20:33:57 1.4
+++ pkgsrc/chat/dircproxy/Attic/PLIST 2008/06/17 12:53:54 1.5
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:33:57 reed Exp $ 1@comment $NetBSD: PLIST,v 1.5 2008/06/17 12:53:54 tron Exp $
2bin/dircproxy 2bin/dircproxy
3bin/dircproxy-crypt 3bin/dircproxy-crypt
4man/man1/dircproxy-crypt.1 4man/man1/dircproxy-crypt.1
5man/man1/dircproxy.1 5man/man1/dircproxy.1
6share/dircproxy/cronchk.sh 6share/dircproxy/cronchk.sh
7share/dircproxy/log.pl 7share/dircproxy/log.pl
8share/dircproxy/privmsg-log.pl 8share/dircproxy/privmsg-log.pl
9share/examples/dircproxy/dircproxyrc 9share/examples/dircproxy/dircproxyrc.sample
10share/examples/rc.d/dircproxy 10share/examples/rc.d/dircproxy
11@dirrm share/examples/dircproxy 11@dirrm share/examples/dircproxy
12@dirrm share/dircproxy 12@dirrm share/dircproxy
cvs diff -r1.5 -r1.6 pkgsrc/chat/dircproxy/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/Attic/distinfo 2007/03/17 13:47:08 1.5
+++ pkgsrc/chat/dircproxy/Attic/distinfo 2008/06/17 12:53:54 1.6
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.5 2007/03/17 13:47:08 rillig Exp $ 1$NetBSD: distinfo,v 1.6 2008/06/17 12:53:54 tron Exp $
2 2
3SHA1 (dircproxy-1.0.5.tar.gz) = eaf159d2a1303f82e079940b381c0e71b9b90c28 3SHA1 (dircproxy-1.2.0-beta2.tar.bz) = 43ab3d1b7559fd34a315c50150eebedeb4ec48db
4RMD160 (dircproxy-1.0.5.tar.gz) = 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b 4RMD160 (dircproxy-1.2.0-beta2.tar.bz) = 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369
5Size (dircproxy-1.0.5.tar.gz) = 217965 bytes 5Size (dircproxy-1.2.0-beta2.tar.bz) = 314480 bytes
6SHA1 (patch-aa) = 9c59e9f4c0cfaca7a9e000eab2a8af1b6c16329f 6SHA1 (patch-aa) = 59870074b86f1150f904e10269c654719b506f29
7SHA1 (patch-ab) = 4d2cd9dbc972e4f2f7ac20b32dc65e755796d6f0 7SHA1 (patch-ab) = c0e8706c0f1bb7a2c981d1140d1b1deb105c601b
8SHA1 (patch-ac) = 2f599b0e30c3cc2b3b801546b1df8f8ae1de2c5d 8SHA1 (patch-ac) = ad94320d493ea50603c90cd0c1e2499716496712
9SHA1 (patch-ad) = 3177586587616f9441110acf59b8751bd8dde5c3 
10SHA1 (patch-ae) = 212e7505d26442166ff77a29c9779bed34c2f255 
File Added: pkgsrc/chat/dircproxy/Attic/options.mk
# $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
PKG_SUGGESTED_OPTIONS=	ssl

.include "../../mk/bsd.options.mk"

###
### Compile with SSL support
###
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+=	--enable-ssl
.include "../../security/openssl/buildlink3.mk"
.endif

###
### Turn on debugging
###
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+=	--enable-debug
.endif
File Deleted: pkgsrc/chat/dircproxy-devel/Attic/DESCR
File Deleted: pkgsrc/chat/dircproxy-devel/Attic/Makefile
File Deleted: pkgsrc/chat/dircproxy-devel/Attic/PLIST
File Deleted: pkgsrc/chat/dircproxy-devel/Attic/distinfo
File Deleted: pkgsrc/chat/dircproxy-devel/Attic/options.mk
File Deleted: pkgsrc/chat/dircproxy-devel/files/Attic/dircproxy.sh
File Deleted: pkgsrc/chat/dircproxy-devel/patches/Attic/patch-aa
File Deleted: pkgsrc/chat/dircproxy-devel/patches/Attic/patch-ab
File Deleted: pkgsrc/chat/dircproxy-devel/patches/Attic/patch-ag
cvs diff -r1.2 -r1.3 pkgsrc/chat/dircproxy/files/Attic/dircproxy.sh (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/files/Attic/dircproxy.sh 2003/11/21 23:06:12 1.2
+++ pkgsrc/chat/dircproxy/files/Attic/dircproxy.sh 2008/06/17 12:53:54 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!@SH@ 1#!@SH@
2# 2#
3# $NetBSD: dircproxy.sh,v 1.2 2003/11/21 23:06:12 xtraeme Exp $ 3# $NetBSD: dircproxy.sh,v 1.3 2008/06/17 12:53:54 tron Exp $
4# 4#
5 5
6# PROVIDE: dircproxy 6# PROVIDE: dircproxy
7# REQUIRE: DAEMON 7# REQUIRE: DAEMON
8 8
9. /etc/rc.subr 9. /etc/rc.subr
10 10
11name="dircproxy" 11name="dircproxy"
12rcvar=$name 12rcvar=$name
13command="@PREFIX@/bin/${name}" 13command="@PREFIX@/bin/${name}"
14command_args="-f @PKG_SYSCONFDIR@/${name}rc --pid-file=/var/run/${name}.pid" 14command_args="-f @PKG_SYSCONFDIR@/${name}rc --pid-file=/var/run/${name}.pid"
15pidfile="/var/run/${name}.pid" 15pidfile="/var/run/${name}.pid"
16required_files="@PKG_SYSCONFDIR@/${name}rc" 16required_files="@PKG_SYSCONFDIR@/${name}rc"
cvs diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/patches/Attic/patch-aa 2003/06/02 15:20:08 1.1
+++ pkgsrc/chat/dircproxy/patches/Attic/patch-aa 2008/06/17 12:53:54 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.1 2003/06/02 15:20:08 jmmv Exp $ 1$NetBSD: patch-aa,v 1.2 2008/06/17 12:53:54 tron Exp $
2 2
3--- conf/Makefile.in.orig 2002-11-21 15:19:04.000000000 +0100 3--- conf/Makefile.in.orig 2006-02-18 22:39:32.000000000 +0000
4+++ conf/Makefile.in 4+++ conf/Makefile.in
5@@ -34,7 +34,7 @@ oldincludedir = /usr/include 5@@ -17,7 +17,7 @@
6  6 srcdir = @srcdir@
7 DESTDIR = 7 top_srcdir = @top_srcdir@
8  8 VPATH = @srcdir@
9-pkgdatadir = $(datadir)/@PACKAGE@ 9-pkgdatadir = $(datadir)/@PACKAGE@
10+pkgdatadir = $(datadir)/examples/@PACKAGE@ 10+pkgdatadir = $(datadir)/examples/@PACKAGE@
11 pkglibdir = $(libdir)/@PACKAGE@ 11 pkglibdir = $(libdir)/@PACKAGE@
12 pkgincludedir = $(includedir)/@PACKAGE@ 12 pkgincludedir = $(includedir)/@PACKAGE@
13  13 top_builddir = ..
cvs diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/patches/Attic/patch-ab 2005/03/10 13:31:05 1.1
+++ pkgsrc/chat/dircproxy/patches/Attic/patch-ab 2008/06/17 12:53:54 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ab,v 1.1 2005/03/10 13:31:05 tv Exp $ 1$NetBSD: patch-ab,v 1.2 2008/06/17 12:53:54 tron Exp $
2 2
3--- src/irc_net.h.orig 2002-02-06 05:07:42.000000000 -0500 3--- src/irc_net.h.orig 2006-02-18 22:39:32.000000000 +0000
4+++ src/irc_net.h 4+++ src/irc_net.h
5@@ -21,6 +21,10 @@ 5@@ -23,6 +23,10 @@
6 #include <arpa/inet.h> 6 #include <arpa/inet.h>
7 #include <time.h> 7 #include <time.h>
8  8
9+#ifndef INADDR_LOOPBACK 9+#ifndef INADDR_LOOPBACK
10+#define INADDR_LOOPBACK inet_addr("127.0.0.1") 10+#define INADDR_LOOPBACK inet_addr("127.0.0.1")
11+#endif 11+#endif
12+ 12+
13 #include "irc_prot.h" 13 #include "irc_prot.h"
14 #include "stringex.h" 14 #include "stringex.h"
15  15 #include "net.h"
cvs diff -r1.1 -r1.2 pkgsrc/chat/dircproxy/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/chat/dircproxy/patches/Attic/patch-ac 2007/03/17 13:47:08 1.1
+++ pkgsrc/chat/dircproxy/patches/Attic/patch-ac 2008/06/17 12:53:54 1.2
@@ -1,15 +1,13 @@ @@ -1,15 +1,13 @@
1$NetBSD: patch-ac,v 1.1 2007/03/17 13:47:08 rillig Exp $ 1$NetBSD: patch-ac,v 1.2 2008/06/17 12:53:54 tron Exp $
2 2
3The ?: operator returns an rvalue, not an lvalue. 3--- src/irc_server.c.orig 2006-10-07 22:07:08.000000000 +0100
4 4+++ src/irc_server.c
5--- src/dcc_net.c.orig 2001-12-21 21:15:55.000000000 +0100 5@@ -1155,7 +1155,7 @@ static int _ircserver_gotmsg(struct ircp
6+++ src/dcc_net.c 2007-03-17 14:44:21.000000000 +0100 6
7@@ -364,7 +364,7 @@ int dccnet_expunge_proxies(void) { 7 if (!strcmp(cmsg.cmd, "ACTION")) {
8 n = p->next; 8 irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
9 _dccnet_free(p); 9- "%s", cmsg.paramstarts[0]);
 10+ "%s", (cmsg.paramstarts != NULL) ? cmsg.paramstarts[0]: "none");
10  11
11- p = (l ? l->next : proxies) = n; 12 } else if (!strcmp(cmsg.cmd, "DCC")
12+ p = *(l ? &(l->next) : &(proxies)) = n; 13 && p->conn_class->dcc_proxy_incoming) {
13 } else { 
14 l = p; 
15 p = p->next; 
File Deleted: pkgsrc/chat/dircproxy/patches/Attic/patch-ad
File Deleted: pkgsrc/chat/dircproxy/patches/Attic/patch-ae