From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 42A631382C5 for ; Fri, 2 Mar 2018 17:07:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 735EAE0AE4; Fri, 2 Mar 2018 17:07:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 430E8E0AE4 for ; Fri, 2 Mar 2018 17:07:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29A4A335C36 for ; Fri, 2 Mar 2018 17:07:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76E7D231 for ; Fri, 2 Mar 2018 17:07:11 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1520010422.6b84cea1d4bcf7efd30689dda626e31117dbca60.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/, dev-libs/libxslt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxslt/Manifest dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch dev-libs/libxslt/libxslt-1.1.29-r1.ebuild X-VCS-Directories: dev-libs/libxslt/files/ dev-libs/libxslt/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 6b84cea1d4bcf7efd30689dda626e31117dbca60 X-VCS-Branch: master Date: Fri, 2 Mar 2018 17:07:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8afa10cf-8473-4ad2-8a26-21241c8c3927 X-Archives-Hash: 72673873363265fe392c07fc34e7efb1 commit: 6b84cea1d4bcf7efd30689dda626e31117dbca60 Author: Mart Raudsepp gentoo org> AuthorDate: Fri Mar 2 17:05:21 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Fri Mar 2 17:07:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b84cea1 dev-libs/libxslt: security cleanup Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-libs/libxslt/Manifest | 1 - .../files/libxslt-1.1.28-simplify-python.patch | 250 --------------------- dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch | 29 --- dev-libs/libxslt/libxslt-1.1.29-r1.ebuild | 130 ----------- 4 files changed, 410 deletions(-) diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 7c4fd3bf5ed..12817c52ce2 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,2 +1 @@ -DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch deleted file mode 100644 index 7cbaaf69e09..00000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch +++ /dev/null @@ -1,250 +0,0 @@ -From f8aeca1dca05c7053532c576add6ab4a472c5e4e Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Wed, 11 Nov 2015 17:49:07 +0100 -Subject: [PATCH] Simplify python setup in autoconf - -AM_PATH_PYTHON does most of the job without using pkg-config as expected -from the rest of the autoconf script. ---- - Makefile.am | 14 +++++-- - configure.in | 119 ++++++++++++++--------------------------------------- - python/Makefile.am | 28 ++++--------- - 3 files changed, 49 insertions(+), 112 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e357f19..c396913 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,13 @@ SUBDIRS = \ - libxslt \ - libexslt \ - xsltproc \ -- doc \ -- $(PYTHON_SUBDIR) \ -- tests -+ doc -+ -+if WITH_PYTHON -+SUBDIRS += python -+endif -+ -+SUBDIRS += tests - - DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests - -@@ -51,7 +55,9 @@ tests: dummy - @echo '## Running the regression test suite' - @(cd tests ; $(MAKE) tests) - @(cd xsltproc ; $(MAKE) tests) -- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) tests ; fi) -+if WITH_PYTHON -+ @(cd python ; $(MAKE) tests) -+endif - - valgrind: - @echo '## Running the regression tests under Valgrind' -diff --git a/configure.in b/configure.in -index e84ad4f..102c733 100644 ---- a/configure.in -+++ b/configure.in -@@ -291,90 +291,37 @@ dnl - dnl check for python - dnl - --PYTHON_VERSION= --PYTHON_INCLUDES= --PYTHON_SITE_PACKAGES= --pythondir= --AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) --if test "$with_python" != "no" ; then -- if test -x "$with_python/bin/python" -- then -- echo Found python in $with_python/bin/python -- PYTHON="$with_python/bin/python" -- else -- if test -x "$with_python" -- then -- echo Found python in $with_python -- PYTHON="$with_python" -- else -- if test -x "$PYTHON" -- then -- echo Found python in environment PYTHON=$PYTHON -- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` -- else -- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) -- fi -- fi -- fi -- if test "$PYTHON" != "" -- then -- echo "PYTHON is pointing at $PYTHON" -- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` -- echo Found Python version $PYTHON_VERSION -- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 --except: print 0"` -- if test "$LIBXML2_PYTHON" = "1" -- then -- echo Found libxml2-python module -- else -- echo Warning: Missing libxml2-python -- fi -- fi -- if test "$PYTHON_VERSION" != "" -- then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ -- -d $with_python/lib/python$PYTHON_VERSION/site-packages -- then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else -- if test -r $prefix/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else -- if test -r /usr/include/python$PYTHON_VERSION/Python.h -- then -- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else -- echo could not find python$PYTHON_VERSION/Python.h -- fi -- fi -- if test ! -d "$PYTHON_SITE_PACKAGES" -- then -- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` -- fi -- fi -- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` -- fi -- if test "$with_python" != "" -- then -- pythondir='$(PYTHON_SITE_PACKAGES)' -- else -- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- fi --fi --AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") --if test "$PYTHON_INCLUDES" != "" --then -- PYTHON_SUBDIR=python --else -- PYTHON_SUBDIR= --fi --AC_SUBST(pythondir) --AC_SUBST(PYTHON_SUBDIR) --AC_SUBST(PYTHON_LIBS) -+AC_ARG_WITH([python], -+ AS_HELP_STRING([--with-python], [Build Python bindings if found]) -+) -+ -+AS_IF([test "$with_python" = "yes"], -+ [AM_PATH_PYTHON -+ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no]) -+ AS_IF([test "$PYTHON_CONFIG" = "no"], -+ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])]) -+ AS_IF([test "$PYTHON_CONFIG" != "no"], -+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags` -+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags` -+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`], -+ [AC_MSG_ERROR([Missing python development files.])]) -+ AC_MSG_CHECKING([libxml2 module in $PYTHON]) -+ LIBXML2_PYTHON=`$PYTHON -c "import sys; -+try: -+ import libxml2 -+ sys.stdout.write('1') -+except: -+ sys.stdout.write('0')"` -+ AS_IF([test "$LIBXML2_PYTHON" = "1"], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_RESULT([no]) -+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) -+ ]) -+ -+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) -+AC_SUBST([PYTHON_CFLAGS]) -+AC_SUBST([PYTHON_LDFLAGS]) -+AC_SUBST([PYTHON_LIBS]) - - AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)]) - WITH_CRYPTO=0 -@@ -644,10 +591,6 @@ AC_SUBST(PYTHONSODV) - AC_SUBST(XML_CONFIG) - AC_SUBST(LIBXML_LIBS) - AC_SUBST(LIBXML_CFLAGS) --AC_SUBST(PYTHON) --AC_SUBST(PYTHON_VERSION) --AC_SUBST(PYTHON_INCLUDES) --AC_SUBST(PYTHON_SITE_PACKAGES) - - XSLT_LIBDIR='-L${libdir}' - XSLT_INCLUDEDIR='-I${includedir}' -diff --git a/python/Makefile.am b/python/Makefile.am -index fa58b78..3a5ecd6 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -5,9 +5,9 @@ SUBDIRS= . tests - - AM_CFLAGS = $(LIBXML_CFLAGS) - --DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) -+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) - # libxsltclass.txt is generated --DOCS = TODO -+dist_docs_DATA = TODO - - EXTRA_DIST = \ - libxslt.c \ -@@ -16,10 +16,7 @@ EXTRA_DIST = \ - libxml_wrap.h \ - libxslt_wrap.h \ - libxsl.py \ -- libxslt-python-api.xml \ -- $(DOCS) -- --libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -+ libxslt-python-api.xml - - if WITH_PYTHON - mylibs = \ -@@ -28,31 +25,22 @@ mylibs = \ - - all-local: libxslt.py - --python_LTLIBRARIES = libxsltmod.la -+python_PYTHON = libxslt.py -+pyexec_LTLIBRARIES = libxsltmod.la - - libxsltmod_la_CPPFLAGS = \ -- -I$(PYTHON_INCLUDES) \ - -I$(top_srcdir)/libxslt \ - -I$(top_srcdir) \ -- -I../libexslt -+ -I$(top_srcdir)/libexslt \ -+ $(PYTHON_CFLAGS) - libxsltmod_la_SOURCES = libxslt.c types.c - nodist_libxsltmod_la_SOURCES = libxslt-py.c - libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) -+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version - - libxslt.py: $(srcdir)/libxsl.py libxsltclass.py - cat $(srcdir)/libxsl.py libxsltclass.py > $@ - --install-data-local: -- $(MKDIR_P) $(DESTDIR)$(pythondir) -- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir) -- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR) -- @(for doc in $(DOCS) ; \ -- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done) -- --uninstall-local: -- rm -f $(DESTDIR)$(pythondir)/libxslt.py -- rm -rf $(DESTDIR)$(DOCS_DIR) -- - GENERATE = generator.py - API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml - GENERATED= libxsltclass.py \ --- -2.6.3 - diff --git a/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch b/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch deleted file mode 100644 index 221da9a55da..00000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2fbf5b1f440534a46b7b440a487768620cfb039c Mon Sep 17 00:00:00 2001 -From: Michael Haubenwallner -Date: Wed, 13 Jul 2016 13:31:05 +0200 -Subject: Add WIN32_EXTRA_LDFLAGS to tests/plugins/Makefile.am - -Fixes a compilation problem with Cygwin. - -Fixes bug #766669: -https://bugzilla.gnome.org/show_bug.cgi?id=766669 ---- - tests/plugins/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am -index e0736ab..0f8c378 100644 ---- a/tests/plugins/Makefile.am -+++ b/tests/plugins/Makefile.am -@@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs - xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) - xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c - xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) --xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir) -+xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir) - - test-logall: - @echo '## Running plugin tests' --- -cgit v0.12 - diff --git a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild deleted file mode 100644 index 75eb8487331..00000000000 --- a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal - -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="arm64 m68k s390 sh" - -IUSE="crypt debug examples python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xslt-config -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libxslt/xsltconfig.h -) - -src_prepare() { - default - - DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - - # https://bugzilla.gnome.org/show_bug.cgi?id=684621 - eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch - # https://bugzilla.gnome.org/show_bug.cgi?id=766669 - eapply "${FILESDIR}"/${PN}-1.1.29-cygwin.patch - - # Simplify python setup - eapply "${FILESDIR}"/${PN}-1.1.28-simplify-python.patch - eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch - - mv configure.{in,ac} || die - - eautoreconf - # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary - # and it is propably otherwise too if upstream generated with new - # autoconf -# epunt_cxx - # But Prefix always needs elibtoolize if not eautoreconf'd. -# elibtoolize -} - -multilib_src_configure() { - libxslt_configure() { - ECONF_SOURCE="${S}" econf \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ - $(use_with crypt crypto) \ - $(use_with debug) \ - $(use_with debug mem-debug) \ - $(use_enable static-libs static) \ - "$@" - } - - libxslt_py_configure() { - mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist - run_in_build_dir libxslt_configure --with-python - } - - libxslt_configure --without-python # build python bindings separately - - if multilib_is_native_abi && use python; then - python_foreach_impl libxslt_py_configure - fi -} - -multilib_src_compile() { - default - multilib_is_native_abi && use python && libxslt_foreach_py_emake all -} - -multilib_src_test() { - default - multilib_is_native_abi && use python && libxslt_foreach_py_emake test -} - -multilib_src_install() { - # "default" does not work here - docs are installed by multilib_src_install_all - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - libxslt_foreach_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - prune_libtool_files --modules -} - -libxslt_foreach_py_emake() { - libxslt_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake "$@" - popd > /dev/null - } - local native_builddir=${BUILD_DIR} - python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" -}