Pullup ticket 2894 - requested by tron

security update

Revisions pulled up:
- pkgsrc/www/neon/Makefile		by patch
- pkgsrc/www/neon/PLIST			by patch
- pkgsrc/www/neon/distinfo		by patch

Files added:
pkgsrc/www/neon/patches/patch-ab	by patch

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Mon Sep 14 16:48:44 UTC 2009

   Modified Files:
           pkgsrc/www/neon: Makefile PLIST distinfo
           pkgsrc/www/neon/patches: patch-ab
   Removed Files:
           pkgsrc/www/neon/patches: patch-aa

   Log Message:
   Update "neon" package to version 0.29. Changes since version 0.28.5:
   * Interface changes:
     o none, API and ABI backwards-compatible with 0.28.x and 0.27.x
   * New interfaces and features:
     o added NTLM auth support for Unix builds (Kai Sommerfeld,
       Daniel Stenberg)
     o ne_auth.h: added NE_AUTH_GSSAPI and NE_AUTH_NTLM auth protocol codes
     o added ne_acl3744.h, updated WebDAV ACL support (Henrik Holst)
     o added built-in SOCKS v4/v4a/v5 support: ne_socket.h:ne_sock_proxy(),
       and ne_session.h:ne_session_socks_proxy()
     o added support for system-default proxies: ne_session_system_proxy(),
       implemented using libproxy where available
     o ne_session.h: added NE_SESSFLAG_EXPECT100 session flag,
       SSL verification failure bits extended by NE_SSL_BADCHAIN and
       NE_SSL_REVOKED, better handling of failures within the cert chain
       (thanks to Ludwig Nussel)
     o ne_socket.h: ne_sock_writev() (Julien Reichel), ne_sock_set_error(),
       ne_iaddr_raw(), ne_iaddr_parse()
     o ne_string.h: ne_buffer_qappend(), ne_strnqdup()
   * Deprecated interfaces:
     o ne_acl.h is obsoleted by ne_acl3744.h (but is still present)
     o obsolete feature "NE_FEATURE_SOCKS" now never marked present
   * Other changes:
     o fix handling of "stale" flag in RFC2069-style Digest auth challenge
     o ne_free() implemented as a function on Win32 (thanks to Helge Hess)
     o symbol versioning used for new symbols, where supported
     o ensure SSL connections are closed cleanly with OpenSSL
     o fix build with OpenSSL 1.0 beta
     o updated Polish (pl) translation (Arfrever Frehtes Taifersar Arahesis)
   * SECURITY (CVE-2009-2473): Fix "billion laughs" attack against expat;
     could allow a Denial of Service attack by a malicious server.
   * SECURITY (CVE-2009-2474): Fix handling of an embedded NUL byte in a
     certificate subject name; could allow an undetected MITM attack against
     an SSL server if a trusted CA issues such a cert.

   Tested by Daniel Horecki with SVN client.


   To generate a diff of this commit:
   cvs rdiff -u -r1.48 -r1.49 pkgsrc/www/neon/Makefile
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/neon/PLIST
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/neon/distinfo
   cvs rdiff -u -r1.1 -r0 pkgsrc/www/neon/patches/patch-aa
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/neon/patches/patch-ab

4 files changed, 66 insertions, 7 deletions

diff --git a/www/neon/Makefile b/www/neon/Makefile
index a05d954ea3a..dc8b1c3eea9 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.45 2009/04/06 12:54:06 markd Exp $
+# $NetBSD: Makefile,v 1.45.2.1 2009/09/15 13:32:04 spz Exp $
 
-DISTNAME=	neon-0.28.3
+DISTNAME=	neon-0.29.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.webdav.org/neon/
 COMMENT=	HTTP and WebDAV client library
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -20,6 +21,8 @@ CONFIGURE_ARGS+=	--with-ssl=yes
 
 PKGCONFIG_OVERRIDE=	neon.pc.in
 TEST_TARGET=		check
+#selftest needs perl
+#USE_TOOLS+=		perl
 
 .include "options.mk"
 
diff --git a/www/neon/PLIST b/www/neon/PLIST
index 0501b03817c..51d38073ec7 100644
--- a/www/neon/PLIST
+++ b/www/neon/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 22:00:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18.2.1 2009/09/15 13:32:04 spz Exp $
 bin/neon-config
 include/neon/ne_207.h
 include/neon/ne_acl.h
+include/neon/ne_acl3744.h
 include/neon/ne_alloc.h
 include/neon/ne_auth.h
 include/neon/ne_basic.h
@@ -160,6 +161,7 @@ share/doc/${PKGNAME}/html/refstatus.html
 share/doc/${PKGNAME}/html/reftok.html
 share/doc/${PKGNAME}/html/refvers.html
 share/doc/${PKGNAME}/html/refxml.html
+share/doc/${PKGNAME}/html/security.html
 share/doc/${PKGNAME}/html/using.html
 share/doc/${PKGNAME}/html/xml.html
 share/locale/cs/LC_MESSAGES/neon.mo
diff --git a/www/neon/distinfo b/www/neon/distinfo
index ff0a311d087..9bac52b80ce 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2009/04/06 12:54:06 markd Exp $
+$NetBSD: distinfo,v 1.18.2.1 2009/09/15 13:32:04 spz Exp $
 
-SHA1 (neon-0.28.3.tar.gz) = 544a92dbfba144ec600506cadbda92ae0b0eb9b0
-RMD160 (neon-0.28.3.tar.gz) = de6666a3f0e006e208b38a8133b43f647e35ddf8
-Size (neon-0.28.3.tar.gz) = 799681 bytes
+SHA1 (neon-0.29.0.tar.gz) = 8d2e1609b2a3b13a6e68e58c26b1d708302e05ef
+RMD160 (neon-0.29.0.tar.gz) = 338f6ff1589a01dee66cd31a72c45f3a57914ab8
+Size (neon-0.29.0.tar.gz) = 879186 bytes
+SHA1 (patch-ab) = da95144b8c4ebc7cdd5ae0dfdb86d457c43ec58d
diff --git a/www/neon/patches/patch-ab b/www/neon/patches/patch-ab
new file mode 100644
index 00000000000..ae6f51a62da
--- /dev/null
+++ b/www/neon/patches/patch-ab
@@ -0,0 +1,53 @@
+$NetBSD: patch-ab,v 1.2.2.2 2009/09/15 13:32:04 spz Exp $
+
+--- src/ne_socket.c.orig	2009-08-18 14:16:07.000000000 +0100
++++ src/ne_socket.c	2009-09-14 13:40:37.000000000 +0100
+@@ -1192,6 +1192,9 @@
+         in6.sin6_port = htons(port);
+         /* fill in the _family field for AIX 4.3, which forgets to do so. */
+         in6.sin6_family = AF_INET6;
++#ifdef __NetBSD__
++	in6.sin6_len = sizeof in6;
++#endif
+ 
+         return bind(fd, (struct sockaddr *)&in6, sizeof in6);
+     } else
+@@ -1210,6 +1213,9 @@
+         }
+         in.sin_port = htons(port);
+         in.sin_family = AF_INET;
++#ifdef __NetBSD__
++	in.sin_len = sizeof in;
++#endif
+ 
+         return bind(fd, (struct sockaddr *)&in, sizeof in);
+     }
+@@ -1329,7 +1335,7 @@
+ 
+     ia = ne_calloc(sizeof *ia);
+ #ifdef USE_GETADDRINFO
+-    ia->ai_addr = ne_malloc(sizeof *ia);
++    ia->ai_addr = ne_malloc(len);
+     ia->ai_addrlen = len;
+     memcpy(ia->ai_addr, sad, len);
+     ia->ai_family = saun.sa.sa_family;
+@@ -1365,6 +1371,9 @@
+ 	ia->ai_addr = (struct sockaddr *)in4;
+ 	ia->ai_addrlen = sizeof *in4;
+ 	in4->sin_family = AF_INET;
++#ifdef __NetBSD__
++	in4->sin_len = sizeof *in4;
++#endif
+ 	memcpy(&in4->sin_addr.s_addr, raw, sizeof in4->sin_addr.s_addr);
+     }
+ #ifdef AF_INET6
+@@ -1374,6 +1383,9 @@
+ 	ia->ai_addr = (struct sockaddr *)in6;
+ 	ia->ai_addrlen = sizeof *in6;
+ 	in6->sin6_family = AF_INET6;
++#ifdef __NetBSD__
++	in6->sin6_len = sizeof *in6;
++#endif
+ 	memcpy(&in6->sin6_addr, raw, sizeof in6->sin6_addr.s6_addr);
+     }
+ #endif