- Update to 0.28.3

* SECURITY (CVE-2008-3746): Fix potential NULL pointer dereference
  in Digest domain parameter support; could allow a DoS by a
  malicious server

PR:		127085
Submitted by:	bf <bf2006a@yahoo.com>
Approved by:	portmgr (linimon)
Security:	http://www.vuxml.org/freebsd/755fa519-80a9-11dd-8de5-0030843d3802.html

6 files changed, 14 insertions, 22 deletions

diff --git a/www/neon28/Makefile b/www/neon28/Makefile
index aed81c8095bc..bd5132d87038 100644
--- a/www/neon28/Makefile
+++ b/www/neon28/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	neon28
-PORTVERSION=	0.28.2
-PORTREVISION=	1
+PORTVERSION=	0.28.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
@@ -41,7 +40,7 @@ CONFIGURE_ARGS=	--with-ssl \
 		--enable-xml \
 		--enable-shared \
 		--with-expat \
-		--with-libs=${PREFIX}
+		--with-libs=${LOCALBASE}:${PREFIX}
 
 MAN1=	neon-config.1
 MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
@@ -55,7 +54,7 @@ MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
 	ne_ssl_cert_cmp.3 ne_ssl_cert_identity.3 ne_ssl_cert_read.3 \
 	ne_ssl_clicert_read.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
 	ne_ssl_trust_cert.3 ne_status.3 ne_token.3 ne_version_match.3 \
-	ne_xml_create.3 neon.3
+	ne_xml_create.3 neon.3 ne_set_connect_timeout.3
 MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
 	ne_addr_resolve.3 ne_addr_destroy.3 \
 	ne_addr_resolve.3 ne_addr_error.3 \
@@ -112,17 +111,15 @@ MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
 	ne_xml_create.3 ne_xml_destroy.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/neon
 
 .include <bsd.port.pre.mk>
 
-DOCSDIR:=	${DOCSDIR:S/28//}
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
 .ifndef NOPORTDOCS
 	(cd ${WRKSRC} ; ${MAKE} install-html)
-	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/neon28/distinfo b/www/neon28/distinfo
index 2e880455ece8..d1ebf52a087d 100644
--- a/www/neon28/distinfo
+++ b/www/neon28/distinfo
@@ -1,3 +1,3 @@
-MD5 (neon-0.28.2.tar.gz) = b99b3f44e8507ae2d17362f1b34aaf02
-SHA256 (neon-0.28.2.tar.gz) = d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
-SIZE (neon-0.28.2.tar.gz) = 797944
+MD5 (neon-0.28.3.tar.gz) = 47599a328862ce64ac3c52726d6daa12
+SHA256 (neon-0.28.3.tar.gz) = 90dee51b4c70bc50ce2fa106ca945349b81cd86c90aa9d4dbff73abb284fcdc2
+SIZE (neon-0.28.3.tar.gz) = 799681
diff --git a/www/neon28/pkg-plist b/www/neon28/pkg-plist
index eb27c3582bb4..2cb90629dc14 100644
--- a/www/neon28/pkg-plist
+++ b/www/neon28/pkg-plist
@@ -81,7 +81,6 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refxml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
-%%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/neon
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index aed81c8095bc..bd5132d87038 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	neon28
-PORTVERSION=	0.28.2
-PORTREVISION=	1
+PORTVERSION=	0.28.3
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/ \
 		http://keyserver.kjsl.com/~jharris/distfiles/
@@ -41,7 +40,7 @@ CONFIGURE_ARGS=	--with-ssl \
 		--enable-xml \
 		--enable-shared \
 		--with-expat \
-		--with-libs=${PREFIX}
+		--with-libs=${LOCALBASE}:${PREFIX}
 
 MAN1=	neon-config.1
 MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
@@ -55,7 +54,7 @@ MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
 	ne_ssl_cert_cmp.3 ne_ssl_cert_identity.3 ne_ssl_cert_read.3 \
 	ne_ssl_clicert_read.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
 	ne_ssl_trust_cert.3 ne_status.3 ne_token.3 ne_version_match.3 \
-	ne_xml_create.3 neon.3
+	ne_xml_create.3 neon.3 ne_set_connect_timeout.3
 MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
 	ne_addr_resolve.3 ne_addr_destroy.3 \
 	ne_addr_resolve.3 ne_addr_error.3 \
@@ -112,17 +111,15 @@ MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
 	ne_xml_create.3 ne_xml_destroy.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/neon
 
 .include <bsd.port.pre.mk>
 
-DOCSDIR:=	${DOCSDIR:S/28//}
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
 .ifndef NOPORTDOCS
 	(cd ${WRKSRC} ; ${MAKE} install-html)
-	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/neon29/distinfo b/www/neon29/distinfo
index 2e880455ece8..d1ebf52a087d 100644
--- a/www/neon29/distinfo
+++ b/www/neon29/distinfo
@@ -1,3 +1,3 @@
-MD5 (neon-0.28.2.tar.gz) = b99b3f44e8507ae2d17362f1b34aaf02
-SHA256 (neon-0.28.2.tar.gz) = d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
-SIZE (neon-0.28.2.tar.gz) = 797944
+MD5 (neon-0.28.3.tar.gz) = 47599a328862ce64ac3c52726d6daa12
+SHA256 (neon-0.28.3.tar.gz) = 90dee51b4c70bc50ce2fa106ca945349b81cd86c90aa9d4dbff73abb284fcdc2
+SIZE (neon-0.28.3.tar.gz) = 799681
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index eb27c3582bb4..2cb90629dc14 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -81,7 +81,6 @@ libdata/pkgconfig/neon.pc
 %%PORTDOCS%%%%DOCSDIR%%/html/refxml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
-%%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/neon