Changes 1.1.15:

o Limit the maximum number of available descriptors if necessary,
  avoiding a possible overflow of fd_sets.

o Added absolute timestamp to logformat, in preparation for new
  module.

o Fixed problem involving non-blocking connects in socks clients
  on Linux.

o Prototype related tests during configure are rewritten.
  Might require prototypes for some platforms to be readded.

o Compilation fixes for AIX 5.1-ML03 with IBM Visual Age C/C++ V5.
  Based on patch from Kieron Curtis2 <KCURTIS2@uk.ibm.com>.

o A 'an macro' version of the sockd.8 manual page.
  Submitted by Tony Leneis <tony@cvrreg.com>.

o Upgrade to autoconf 2.59, libtool 1.5.10 and automake 1.9.3.

o Patch to code for shutting down idle sockd processes, from
  William Adams <wlarip@earthlink.net>.  NOT ENABLED.

o Add test for setegid(), use replacement if not found.
  Replacement code based on patch by <rainer.doerntge@dlh.de>.

o Do not warn at runtime about SO_{SND,RCV}LOWAT socket options if not
  supported by OS.  Based on patch from William Adams <wlarip@earthlink.net>.

o enable setegid() call after moving it to correct place;
  William Adams <wlarip@earthlink.net>.

o Support for socksification of getipnodebyname(), contributed by
  Lennart Dahlström <lennart@appgate.com>.

o Support for socksification of getaddrinfo(), contributed by
  Motoyuki Kasahara <m-kasahr@sra.co.jp>.

o Fix some problems with descriptor passing on platforms without
  cmsghdr.

o AIX 5.1 ML-03 compilation fixes for IBM Visual Age C/C++ compiler
  version 5 by Kieron Curtis2 <KCURTIS2@uk.ibm.com>.

o Remove usage of SO_BSDCOMPAT, obsolete and causes warnings with
  version 2.6 Linux kernels.  Noted by Adrian Bridgett <adrian@smop.co.uk>.

4 files changed, 56 insertions, 28 deletions

diff --git a/net/dante/Makefile b/net/dante/Makefile
index c003f31a021..eb338bc3db8 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:17:49 tv Exp $
-#
+# $NetBSD: Makefile,v 1.15 2005/04/04 10:00:54 adam Exp $
 
-DISTNAME=		dante-1.1.14
-PKGREVISION=		1
-CATEGORIES=		net security
-MASTER_SITES=		ftp://ftp.inet.no/pub/socks/
+DISTNAME=	dante-1.1.15
+CATEGORIES=	net security
+MASTER_SITES=	ftp://ftp.inet.no/pub/socks/
 
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.inet.no/dante/
-COMMENT=		BSD-licensed socks 4/5 proxy suite
+MAINTAINER=	rh@NetBSD.org
+HOMEPAGE=	http://www.inet.no/dante/
+COMMENT=	BSD-licensed socks 4/5 proxy suite
 
-CONFLICTS=		socks4-[0-9]*
-
-USE_BUILDLINK3=		YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+CONFLICTS=	socks4-[0-9]*
 
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-socks-conf=${PKG_SYSCONFDIR}/socks.conf
 CONFIGURE_ARGS+=	--with-sockd-conf=${PKG_SYSCONFDIR}/sockd.conf
 
diff --git a/net/dante/distinfo b/net/dante/distinfo
index e7162fca80d..b6934a87748 100644
--- a/net/dante/distinfo
+++ b/net/dante/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:13:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/04/04 10:00:54 adam Exp $
 
-SHA1 (dante-1.1.14.tar.gz) = 1d2bc99a8a9a56101de687ada259cbad8ad1c6ad
-RMD160 (dante-1.1.14.tar.gz) = 4bc47da9b96902f2c144b29854f3995d8520f5fd
-Size (dante-1.1.14.tar.gz) = 804081 bytes
-SHA1 (patch-aa) = c581f950378da250643453b27698b213f8341a25
+SHA1 (dante-1.1.15.tar.gz) = fc96775fb33a78774032c33a964d6d48f68cf54b
+RMD160 (dante-1.1.15.tar.gz) = 59296b48e25d21dd9d653fa932bdfd0d91ef68fc
+Size (dante-1.1.15.tar.gz) = 839660 bytes
+SHA1 (patch-aa) = 856884522529122afe037fff610ce89a978d2a2b
+SHA1 (patch-ab) = e4aabf55e51bd3dc2f6e90301a04f288043f1e7b
diff --git a/net/dante/patches/patch-aa b/net/dante/patches/patch-aa
index d149d15667f..6dc2d331895 100644
--- a/net/dante/patches/patch-aa
+++ b/net/dante/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/07/12 14:47:04 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/04/04 10:00:54 adam Exp $
 
---- capi/Makefile.in.orig	Mon Jun 24 10:52:57 2002
+--- capi/Makefile.in.orig	2005-01-24 10:26:23.000000000 +0000
 +++ capi/Makefile.in
-@@ -31,7 +31,7 @@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
+@@ -168,7 +168,7 @@ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
 -includedir = @includedir@
 +includedir = @includedir@/dante
- oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
diff --git a/net/dante/patches/patch-ab b/net/dante/patches/patch-ab
new file mode 100644
index 00000000000..d9364c75b29
--- /dev/null
+++ b/net/dante/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.5 2005/04/04 10:00:54 adam Exp $
+
+--- configure.orig	2005-01-24 10:12:25.000000000 +0000
++++ configure
+@@ -19858,7 +19858,6 @@ else
+ echo "${ECHO_T}no" >&6
+     #autoconf_compflags is set to "-g -O2" with GCC
+     #override CFLAGS when running configure to avoid this
+-    CFLAGS="$CFLAGS $autoconf_compflags"
+ fi
+ 
+ #-Wall ?
+@@ -25304,7 +25303,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <unistd.h>
+ 
+ struct hostent *
+-gethostbyaddr( const char *, int, int
++gethostbyaddr( const char *, socklen_t, int
+ );
+ int
+ main ()
+@@ -25346,7 +25345,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_PROT_GETHOSTBYADDR_2 int
++#define HAVE_PROT_GETHOSTBYADDR_2 socklen_t
+ _ACEOF
+ 
+ cat >>confdefs.h <<_ACEOF