From owner-svn-ports-branches@FreeBSD.ORG Mon Oct 20 15:12:22 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCB66D3A; Mon, 20 Oct 2014 15:12:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DC7C97C; Mon, 20 Oct 2014 15:12:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9KFCMr4011422; Mon, 20 Oct 2014 15:12:22 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9KFCLO0011416; Mon, 20 Oct 2014 15:12:21 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201410201512.s9KFCLO0011416@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 20 Oct 2014 15:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r371275 - in branches/2014Q4/textproc: libxml2 libxml2/files py-libxml2 py3-libxml2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Oct 2014 15:12:22 -0000 Author: kwm Date: Mon Oct 20 15:12:20 2014 New Revision: 371275 URL: https://svnweb.freebsd.org/changeset/ports/371275 QAT: https://qat.redports.org/buildarchive/r371275/ Log: MFH: r371120 Update to 2.9.2. This release fixes CVE-2014-3660 (DoS). Security: 0642b064-56c4-11e4-8b87-bcaec565249c Approved by: portmgr (bapt@) Deleted: branches/2014Q4/textproc/libxml2/files/patch-python_drv-libxml2.py branches/2014Q4/textproc/libxml2/files/patch-python_setup.py.in Modified: branches/2014Q4/textproc/libxml2/Makefile branches/2014Q4/textproc/libxml2/distinfo branches/2014Q4/textproc/libxml2/files/patch-Makefile.in branches/2014Q4/textproc/libxml2/pkg-plist branches/2014Q4/textproc/py-libxml2/Makefile branches/2014Q4/textproc/py3-libxml2/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/textproc/libxml2/Makefile ============================================================================== --- branches/2014Q4/textproc/libxml2/Makefile Mon Oct 20 15:07:54 2014 (r371274) +++ branches/2014Q4/textproc/libxml2/Makefile Mon Oct 20 15:12:20 2014 (r371275) @@ -3,8 +3,8 @@ # $MCom: ports/trunk/textproc/libxml2/Makefile 19578 2014-04-25 21:50:30Z kwm $ PORTNAME= libxml2 -PORTVERSION= 2.9.1 -PORTREVISION?= 1 +PORTVERSION= 2.9.2 +PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ @@ -17,7 +17,7 @@ COMMENT?= XML parser library for GNOME .if !defined(REFERENCE_PORT) GNU_CONFIGURE= yes -USES= gmake iconv libtool:keepla pathfix pkgconfig shebangfix +USES+= gmake iconv libtool pathfix pkgconfig shebangfix USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \ --with-html-dir=${PREFIX}/share/doc \ Modified: branches/2014Q4/textproc/libxml2/distinfo ============================================================================== --- branches/2014Q4/textproc/libxml2/distinfo Mon Oct 20 15:07:54 2014 (r371274) +++ branches/2014Q4/textproc/libxml2/distinfo Mon Oct 20 15:12:20 2014 (r371275) @@ -1,2 +1,2 @@ -SHA256 (gnome2/libxml2-2.9.1.tar.gz) = fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb -SIZE (gnome2/libxml2-2.9.1.tar.gz) = 5172503 +SHA256 (gnome2/libxml2-2.9.2.tar.gz) = 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc +SIZE (gnome2/libxml2-2.9.2.tar.gz) = 5444991 Modified: branches/2014Q4/textproc/libxml2/files/patch-Makefile.in ============================================================================== --- branches/2014Q4/textproc/libxml2/files/patch-Makefile.in Mon Oct 20 15:07:54 2014 (r371274) +++ branches/2014Q4/textproc/libxml2/files/patch-Makefile.in Mon Oct 20 15:12:20 2014 (r371275) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2013-11-24 09:26:25.000000000 +0100 -+++ Makefile.in 2013-11-24 09:26:37.000000000 +0100 -@@ -1130,7 +1130,7 @@ +--- Makefile.in.orig 2014-10-17 20:26:52.547793054 +0200 ++++ Makefile.in 2014-10-17 20:27:34.868791352 +0200 +@@ -1234,7 +1234,7 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @@ -9,7 +9,7 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@@ -1635,7 +1635,7 @@ +@@ -1712,7 +1712,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive @@ -18,12 +18,12 @@ config.h install-binPROGRAMS: install-libLTLIBRARIES -@@ -1703,7 +1703,7 @@ +@@ -1780,7 +1780,7 @@ info-am: --install-data-am: install-data-local install-m4dataDATA install-man \ -+install-data-am: install-m4dataDATA install-man \ - install-pkgconfigDATA +-install-data-am: install-cmakeDATA install-data-local \ ++install-data-am: install-cmakeDATA \ + install-m4dataDATA install-man install-pkgconfigDATA install-dvi: install-dvi-recursive Modified: branches/2014Q4/textproc/libxml2/pkg-plist ============================================================================== --- branches/2014Q4/textproc/libxml2/pkg-plist Mon Oct 20 15:07:54 2014 (r371274) +++ branches/2014Q4/textproc/libxml2/pkg-plist Mon Oct 20 15:12:20 2014 (r371275) @@ -48,8 +48,8 @@ include/libxml2/libxml/xmlwriter.h include/libxml2/libxml/xpath.h include/libxml2/libxml/xpathInternals.h include/libxml2/libxml/xpointer.h +lib/cmake/libxml2/libxml2-config.cmake lib/libxml2.a -lib/libxml2.la lib/libxml2.so lib/libxml2.so.2 lib/libxml2.so.%%LIBVERSION%% @@ -60,5 +60,3 @@ man/man1/xml2-config.1.gz man/man1/xmlcatalog.1.gz man/man1/xmllint.1.gz man/man3/libxml.3.gz -@dirrm include/libxml2/libxml -@dirrm include/libxml2 Modified: branches/2014Q4/textproc/py-libxml2/Makefile ============================================================================== --- branches/2014Q4/textproc/py-libxml2/Makefile Mon Oct 20 15:07:54 2014 (r371274) +++ branches/2014Q4/textproc/py-libxml2/Makefile Mon Oct 20 15:12:20 2014 (r371275) @@ -16,7 +16,7 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USE_PYTHON= 2 +USES+= python:2 USE_PYDISTUTILS=yes PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info Modified: branches/2014Q4/textproc/py3-libxml2/Makefile ============================================================================== --- branches/2014Q4/textproc/py3-libxml2/Makefile Mon Oct 20 15:07:54 2014 (r371274) +++ branches/2014Q4/textproc/py3-libxml2/Makefile Mon Oct 20 15:12:20 2014 (r371275) @@ -16,8 +16,9 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist USE_GNOME+= libxml2 -USE_PYTHON= 3 +USES= python:3 USE_PYDISTUTILS=yes +#USE_PYTHON= distutils:3 PYDISTUTILS_EGGINFO= libxml2_python-${PORTVERSION}-py${PYTHON_VER}.egg-info PLIST_SUB+= PYTVER=${PYTHON_VER:S/.//}