Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Oct 2014 12:55:55 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371120 - in head/textproc: libxml2 libxml2/files py-libxml2 py3-libxml2
Message-ID:  <201410181255.s9ICttqm027640@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Sat Oct 18 12:55:55 2014
New Revision: 371120
URL: https://svnweb.freebsd.org/changeset/ports/371120
QAT: https://qat.redports.org/buildarchive/r371120/

Log:
  Update to 2.9.2.
  
  This release fixes CVE-2014-3660 (DoS).
  
  MFH:		2014Q4
  Security:	0642b064-56c4-11e4-8b87-bcaec565249c

Deleted:
  head/textproc/libxml2/files/patch-python_drv-libxml2.py
  head/textproc/libxml2/files/patch-python_setup.py.in
Modified:
  head/textproc/libxml2/Makefile
  head/textproc/libxml2/distinfo
  head/textproc/libxml2/files/patch-Makefile.in
  head/textproc/libxml2/pkg-plist
  head/textproc/py-libxml2/Makefile
  head/textproc/py3-libxml2/Makefile

Modified: head/textproc/libxml2/Makefile
==============================================================================
--- head/textproc/libxml2/Makefile	Sat Oct 18 12:52:26 2014	(r371119)
+++ head/textproc/libxml2/Makefile	Sat Oct 18 12:55:55 2014	(r371120)
@@ -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: head/textproc/libxml2/distinfo
==============================================================================
--- head/textproc/libxml2/distinfo	Sat Oct 18 12:52:26 2014	(r371119)
+++ head/textproc/libxml2/distinfo	Sat Oct 18 12:55:55 2014	(r371120)
@@ -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: head/textproc/libxml2/files/patch-Makefile.in
==============================================================================
--- head/textproc/libxml2/files/patch-Makefile.in	Sat Oct 18 12:52:26 2014	(r371119)
+++ head/textproc/libxml2/files/patch-Makefile.in	Sat Oct 18 12:55:55 2014	(r371120)
@@ -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: head/textproc/libxml2/pkg-plist
==============================================================================
--- head/textproc/libxml2/pkg-plist	Sat Oct 18 12:52:26 2014	(r371119)
+++ head/textproc/libxml2/pkg-plist	Sat Oct 18 12:55:55 2014	(r371120)
@@ -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: head/textproc/py-libxml2/Makefile
==============================================================================
--- head/textproc/py-libxml2/Makefile	Sat Oct 18 12:52:26 2014	(r371119)
+++ head/textproc/py-libxml2/Makefile	Sat Oct 18 12:55:55 2014	(r371120)
@@ -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: head/textproc/py3-libxml2/Makefile
==============================================================================
--- head/textproc/py3-libxml2/Makefile	Sat Oct 18 12:52:26 2014	(r371119)
+++ head/textproc/py3-libxml2/Makefile	Sat Oct 18 12:55:55 2014	(r371120)
@@ -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/.//}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410181255.s9ICttqm027640>