svn commit: r473964 - in head: benchmarks/flowgrind devel/liboop net-im/gale net-mgmt/sblim-wbemcli net/ntp net/ntp-devel net/xmlrpc-c www/libwww www/libwww/files

Thu Jul 5 11:32:35 UTC 2018

Author: dbaio
Date: Thu Jul  5 11:32:32 2018
New Revision: 473964
URL: https://svnweb.freebsd.org/changeset/ports/473964

Log:
  www/libwww: Update to 5.4.2, Fix security vulnerabilities
  
  This a security release for libwww to take into account security advisories
  CVE-2016-9063 and CVE-2017-9233.
  
  In order to take into account current and future expat security advisories,
  the expat source code was removed from the libwww tree. The makefiles were
  modified so that libwww dynamically links against the system's expat library.
  
  Patches removed were incorporated upstream.
  
  Bump PORTREVISION of dependent ports due shlib change.
  
  Changes:	https://raw.githubusercontent.com/w3c/libwww/5.4.2/ChangeLog
  
  MFH:		2018Q3
  Security:	e375ff3f-7fec-11e8-8088-28d244aee256

Deleted:
  head/www/libwww/files/patch-Library__src__HTMIMImp.c
  head/www/libwww/files/patch-Library_src_HTBound.c
  head/www/libwww/files/patch-libwww-config.in
  head/www/libwww/files/patch-modules_expat_xmlparse_xmlparse.c
  head/www/libwww/files/patch-modules_expat_xmltok_xmltok__impl.c
Modified:
  head/benchmarks/flowgrind/Makefile
  head/devel/liboop/Makefile
  head/net-im/gale/Makefile
  head/net-mgmt/sblim-wbemcli/Makefile
  head/net/ntp-devel/Makefile
  head/net/ntp/Makefile
  head/net/xmlrpc-c/Makefile
  head/www/libwww/Makefile
  head/www/libwww/distinfo
  head/www/libwww/files/patch-Library_src_SSL_HTSSL.c
  head/www/libwww/files/patch-configure
  head/www/libwww/pkg-plist

Modified: head/benchmarks/flowgrind/Makefile
==============================================================================

--- head/benchmarks/flowgrind/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/benchmarks/flowgrind/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -4,7 +4,7 @@
 PORTNAME=	flowgrind
 PORTVERSION=	0.8.0
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	benchmarks
 
 MAINTAINER=	dbaio at FreeBSD.org

Modified: head/devel/liboop/Makefile
==============================================================================
--- head/devel/liboop/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/devel/liboop/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -3,7 +3,7 @@
 
 PORTNAME=	liboop
 PORTVERSION=	1.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	GENTOO \
 		http://download.ofb.net/liboop/

Modified: head/net-im/gale/Makefile
==============================================================================
--- head/net-im/gale/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/net-im/gale/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gale
 PORTVERSION=	0.99f
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.ofb.net/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}ruit

Modified: head/net-mgmt/sblim-wbemcli/Makefile
==============================================================================
--- head/net-mgmt/sblim-wbemcli/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/net-mgmt/sblim-wbemcli/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sblim-wbemcli
 PORTVERSION=	1.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/sblim/${PORTNAME}/${PORTVERSION}
 

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/net/ntp-devel/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.3.93
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		http://archive.ntp.org/ntp4/ntp-dev/

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/net/ntp/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ntp
 PORTVERSION=	4.2.8p11
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \

Modified: head/net/xmlrpc-c/Makefile
==============================================================================
--- head/net/xmlrpc-c/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/net/xmlrpc-c/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmlrpc-c
 PORTVERSION=	1.39.13
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Xmlrpc-c%20Super%20Stable/${PORTVERSION}
 

Modified: head/www/libwww/Makefile
==============================================================================
--- head/www/libwww/Makefile	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/www/libwww/Makefile	Thu Jul  5 11:32:32 2018	(r473964)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libwww
-PORTVERSION=	5.4.0
-PORTREVISION=	6
+PORTVERSION=	5.4.2
 CATEGORIES=	www devel
-MASTER_SITES=	http://www.w3.org/Library/Distribution/old/
+MASTER_SITES=	https://www.w3.org/Library/Distribution/ \
+		https://www.w3.org/Library/Distribution/old/
 DISTNAME=	w3c-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dbaio at FreeBSD.org
@@ -16,17 +16,17 @@ LICENSE_NAME=	W3C IPR SOFTWARE NOTICE
 LICENSE_FILE=	${WRKSRC}/LICENSE.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-zlib --with-ssl=${OPENSSLBASE}
-USES=		gmake libtool perl5 ssl tar:tgz
+BROKEN_SSL=		openssl-devel
+
+LIB_DEPENDS=	libexpat.so:textproc/expat2
+
+USES=		gmake libtool localbase perl5 ssl tar:tgz
 USE_PERL5=	build
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared --with-zlib --with-ssl=${OPENSSLBASE}
 
-BROKEN_SSL=		openssl-devel
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \
-		${STAGEDIR}${PREFIX}/include/w3c-libwww/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>

Modified: head/www/libwww/distinfo
==============================================================================
--- head/www/libwww/distinfo	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/www/libwww/distinfo	Thu Jul  5 11:32:32 2018	(r473964)
@@ -1,2 +1,3 @@
-SHA256 (w3c-libwww-5.4.0.tgz) = 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef
-SIZE (w3c-libwww-5.4.0.tgz) = 1129121
+TIMESTAMP = 1530580809
+SHA256 (w3c-libwww-5.4.2.tgz) = 32b855101f65466c67ae3a3cc0fd18fa982e4b59fc98c9d4691e2da663d05f04
+SIZE (w3c-libwww-5.4.2.tgz) = 2630357

Modified: head/www/libwww/files/patch-Library_src_SSL_HTSSL.c
==============================================================================
--- head/www/libwww/files/patch-Library_src_SSL_HTSSL.c	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/www/libwww/files/patch-Library_src_SSL_HTSSL.c	Thu Jul  5 11:32:32 2018	(r473964)
@@ -1,6 +1,6 @@
---- Library/src/SSL/HTSSL.c.orig	2000-08-03 16:17:20 UTC
+--- Library/src/SSL/HTSSL.c.orig	2018-07-04 23:30:19 UTC
 +++ Library/src/SSL/HTSSL.c
-@@ -187,12 +187,16 @@ PUBLIC BOOL HTSSL_init (void)
+@@ -214,12 +214,16 @@ PUBLIC BOOL HTSSL_init (void)
  
  	/* select the protocol method */
  	switch (ssl_prot_method) {

Modified: head/www/libwww/files/patch-configure
==============================================================================
--- head/www/libwww/files/patch-configure	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/www/libwww/files/patch-configure	Thu Jul  5 11:32:32 2018	(r473964)
@@ -1,6 +1,6 @@
---- configure.orig	2002-06-12 09:31:31 UTC
+--- configure.orig	2018-07-04 23:24:12 UTC
 +++ configure
-@@ -7612,8 +7612,11 @@ if test "${with_ssl+set}" = set; then
+@@ -16416,8 +16416,11 @@ $as_echo "no" >&6; }
      if test "x$withval" = "xyes"; then
        withval=$ssllib
        SSLINC=$sslinc
@@ -10,6 +10,6 @@
 +      LIBS="$LIBS -L$withval/lib -lssl -lcrypto"
      fi
 -    LIBS="$LIBS $withval"
-     cat > conftest.$ac_ext <<EOF
- #line 7619 "configure"
- #include "confdefs.h"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

Modified: head/www/libwww/pkg-plist
==============================================================================
--- head/www/libwww/pkg-plist	Thu Jul  5 11:23:46 2018	(r473963)
+++ head/www/libwww/pkg-plist	Thu Jul  5 11:32:32 2018	(r473964)
@@ -160,7 +160,6 @@ include/w3c-libwww/WWWWAIS.h
 include/w3c-libwww/WWWXML.h
 include/w3c-libwww/WWWZip.h
 include/w3c-libwww/wwwsys.h
-include/w3c-libwww/xmlparse.h
 include/wwwconf.h
 lib/libmd5.a
 lib/libmd5.so
@@ -225,7 +224,7 @@ lib/libwwwnews.so.0.1.0
 lib/libwwwssl.a
 lib/libwwwssl.so
 lib/libwwwssl.so.0
-lib/libwwwssl.so.0.1.0
+lib/libwwwssl.so.0.0.0
 lib/libwwwstream.a
 lib/libwwwstream.so
 lib/libwwwstream.so.0
@@ -245,19 +244,11 @@ lib/libwwwutils.so.0.1.0
 lib/libwwwxml.a
 lib/libwwwxml.so
 lib/libwwwxml.so.0
-lib/libwwwxml.so.0.1.0
+lib/libwwwxml.so.0.0.0
 lib/libwwwzip.a
 lib/libwwwzip.so
 lib/libwwwzip.so.0
-lib/libwwwzip.so.0.1.0
-lib/libxmlparse.a
-lib/libxmlparse.so
-lib/libxmlparse.so.0
-lib/libxmlparse.so.0.1.0
-lib/libxmltok.a
-lib/libxmltok.so
-lib/libxmltok.so.0
-lib/libxmltok.so.0.1.0
+lib/libwwwzip.so.0.0.0
 share/w3c-libwww/back.xbm
 share/w3c-libwww/binary.xbm
 share/w3c-libwww/binhex.xbm
