pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc {py-,}libxslt: update to 1.1.37



details:   https://anonhg.NetBSD.org/pkgsrc/rev/98b64090584b
branches:  trunk
changeset: 386690:98b64090584b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Oct 13 11:22:24 2022 +0000

description:
{py-,}libxslt: update to 1.1.37

v1.1.37: Aug 29 2022

### Improvements

- Don't use deprecated libxml2 macros
- Don't mess with xmlDefaultSAXHandler

### Build system

- Require automake-1.16.3 or later
- Remove generated files from distribution
- Add missing compile definition for static builds to Autotools (Mike Dalessio)


v1.1.36: Aug 17 2022

### Removals and deprecations

- Remove SVN keyword anchors
- Remove CVS and SVN-related code
- Remove README.cvs-commits
- Remove ChangeLog
- Remove xsltwin32config.h

### Improvements

- Simplify xsltexports.h and exsltexports.h
- Don't overlink executables with gcrypt
- Fix quadratic behavior with variables and parameters
- Remove case labels with XPointer location types
- Add configure~ to .gitignore
- Stop calling deprecated libxml2 functions

### Portability

- Use portable python shebangs (David Seifert)
- Remove useless __CYGWIN__ checks
- Remove cruft from win32config.h
- crypto.c: Silence a compiler warning on Windows (Chun-wei Fan)

### Build system

- Add missing compile definition for static builds to CMake
- Avoid obsolescent `test -a` constructs (David Seifert)
- Only link libxml2 statically in purely static build
- Set AC_CONFIG_MACRO_DIR
- Allow AM_MAINTAINER_MODE to be disabled
- Streamline and fix documentation installation
- Don't try to recreate COPYING symlink
- Remove special configuration for certain maintainers
- configure.ac: produce tar.xz only (GNOME policy) (David Seifert)
- Detect libm using libtool's macros (David Seifert)
- configure.ac: disable static libraries by default (David Seifert)
- python/Makefile.am: nest python docs in $(docdir) (David Seifert)
- python/Makefile.am: rely on global AM_INIT_AUTOMAKE (David Seifert)
- configure.ac: remove useless AC_SUBST (David Seifert)
- Use AM_PATH_PYTHON/PKG_CHECK_MODULES for python bindings (David Seifert)
- Change libxml2 Python config
- Don't check for standard C89 library functions
- Don't check for standard C89 headers
- Remove --with-html-dir option
- Also check for glibtoolize in autogen.sh
- Rework documentation build system
- Remove old website
- CMake: Relax check for enabling crypto support on Windows (Chun-wei Fan)
- Remove obsolete AC_HEADER_STDC autoconf macro (Vadim Zeitlin)
- Remove special configuration for old maintainers

### Test suite, CI

- Remove test involving XPointer range-to function
- Test recursion in EXSLT dynamic functions
- Add CI job for static build

### Documentation

- Move tutorial images


v1.1.35: Feb 16 2022:
   - Security:
  [CVE-2021-30560] Fix use-after-free in xsltApplyTemplates
  Fix memory leak in xsltDocumentElem (David King)
  Fix memory leak in xsltCompileIdKeyPattern (David King)
  Fix double-free with stylesheets containing entity nodes

   - Fixed regressions:
  Fix performance regression with predicates in patterns
  Fix regression in xsltComputeSortResult

   - Bug fixes:
  Fix conflict resolution for templates with same priority
  Fix xsl:number generating invalid UTF-8
  Support attribute value templates in xsl:sort lang attributes
  Don't pass first <xsl:sort> in <xsl:apply-templates> twice
  Fix quadratic runtime with text and <xsl:message>
  Don't allow empty EXSLT durations

   - Improvements:
  Add xsltproc --huge Argument via libxml XML_PARSE_HUGE (William N. Braswell, Jr.)

   - Tests, code quality, fuzzing:
  Remove .travis.yml
  Fix some misleading indentation (David King)
  Use actual types for templates in struct _xsltStylesheet
  Add CI for CMake on MSVC (Markus Rickert)
  Check for null pointer before calling freelocale
  Add CI test for Python 3
  Don't set maxDepth in XPath contexts
  Transfer XPath limits to XPtr context
  Stop using maxParserDepth XPath limit
  Make long-to-double cast explicit in date.c
  Disable LeakSanitizer
  Run clang CI tests with -Wimplicit-int-conversion
  Fix implicit-int-conversion warning in exslt/crypto.c
  Fix clang -Wimplicit-int-conversion warning (David Kilzer)
  Fix clang -Wconditional-uninitialized warning in libxslt/numbers.c (David Kilzer)
  Fix -Wshadow warnings in libexslt/dynamic.c (David Kilzer)
  Also search parent dir for source XML when fuzzing

   - Build system, portability:
  Add CMake build files (Markus Rickert)
  Initial support for Python 3 (Suleyman Poyraz)
  Call ANSI versions of WinAPI functions explicitly
  Remove redundant flags from pkg-config files
  Suppress automake warning in tests/XSLTMark
  Fix linking libexslt dynamic library when using MinGW (Vadim Zeitlin)
  Added platform specific path separators (Dmitriy Korovkin)
  win32: allow passing *FLAGS on command line
  Fix export of xsltExtMarker on Windows (David Kilzer)
  Fix redundant includes already in libexslt.h (David Kilzer)
  Minor fixes to configure.js
  Fix variable syntax in Python configuration
  Add new EXSLT string tests to EXTRA_DIST
  Fix xml2-config check in configure script
  win32: Add configuration for profiler (Chun-wei Fan)
  Check whether 'xml2-config --dynamic' is supported

   - Documentation:
  Add Makefile rule to regenerate xsltproc.html
  Update links
  Remove MAINTAINERS
  Upload documentation to GitLab Pages
  Add documentation in devhelp format
  Add --enable-rebuild-docs configure option
  Fix libexslt header summaries
  Fix validity of tutorial XML (David King)
  Use DocBook URL for tutorial DTD (David King)
  Update libxslt.doap
  Add missing options to xsltproc man page

diffstat:

 textproc/libxslt/Makefile                          |   20 +--
 textproc/libxslt/Makefile.common                   |   12 +-
 textproc/libxslt/PLIST                             |  136 ++++++-----------
 textproc/libxslt/distinfo                          |   11 +-
 textproc/libxslt/patches/patch-configure           |   17 --
 textproc/libxslt/patches/patch-libexslt_date.c     |   12 -
 textproc/libxslt/patches/patch-libxslt_transform.c |  159 ---------------------
 textproc/py-libxslt/Makefile                       |    7 +-
 textproc/py-libxslt/PLIST                          |    8 +-
 9 files changed, 70 insertions(+), 312 deletions(-)

diffs (truncated from 493 to 300 lines):

diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/Makefile
--- a/textproc/libxslt/Makefile Thu Oct 13 11:08:54 2022 +0000
+++ b/textproc/libxslt/Makefile Thu Oct 13 11:22:24 2022 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2022/09/13 21:34:00 gutteridge Exp $
+# $NetBSD: Makefile,v 1.121 2022/10/13 11:22:24 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   10
-
 BUILD_DEPENDS+=        docbook-xml-[0-9]*:../../textproc/docbook-xml
 BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
@@ -18,23 +16,9 @@
 PKGCONFIG_OVERRIDE+=   libexslt.pc.in
 TEST_TARGET=           check
 
-# fix PR 55123 - leading whitespace breaks manpage
-SUBST_CLASSES+=                man
-SUBST_FILES.man=       doc/xsltproc.1
-SUBST_STAGE.man=       post-build
-SUBST_MESSAGE.man=     Clean up manpages.
-SUBST_SED.man+=                -e 's,^[         ]*,,'
-SUBST_SED.man+=                -e '/^$$/d'
-
 BUILDLINK_TRANSFORM.SunOS+=    opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms
 
-.include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MIRIX-5.*)
-CPPFLAGS+=     -Dsocklen_t=int
-.endif
-
+.include "../../security/libgcrypt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxml2+=        libxml2>=2.6.27
-
-.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/Makefile.common
--- a/textproc/libxslt/Makefile.common  Thu Oct 13 11:08:54 2022 +0000
+++ b/textproc/libxslt/Makefile.common  Thu Oct 13 11:22:24 2022 +0000
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.6 2019/11/06 13:23:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2022/10/13 11:22:24 wiz Exp $
 #
 # used by textproc/libxslt/Makefile
 # used by textproc/py-libxslt/Makefile
 
-DISTNAME=      libxslt-1.1.34
+DISTNAME=      libxslt-1.1.37
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://xmlsoft.org/libxslt/
-MASTER_SITES+= http://xmlsoft.org/sources/
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libxslt/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://xmlsoft.org/XSLT/
-COMMENT=       XSLT parser library from the GNOME project
+HOMEPAGE=      https://gitlab.gnome.org/GNOME/libxslt
+COMMENT=       XSLT parser library
 LICENSE=       mit # with advertisement clause
 
 PATCHDIR=      ${.CURDIR}/../../textproc/libxslt/patches
diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/PLIST
--- a/textproc/libxslt/PLIST    Thu Oct 13 11:08:54 2022 +0000
+++ b/textproc/libxslt/PLIST    Thu Oct 13 11:22:24 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2019/11/06 13:23:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.42 2022/10/13 11:22:24 wiz Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -25,6 +25,8 @@
 include/libxslt/xsltexports.h
 include/libxslt/xsltlocale.h
 include/libxslt/xsltutils.h
+lib/cmake/libxslt/FindGcrypt.cmake
+lib/cmake/libxslt/libxslt-config.cmake
 lib/libexslt.la
 lib/libxslt.la
 lib/pkgconfig/libexslt.pc
@@ -34,93 +36,57 @@
 man/man3/libexslt.3
 man/man3/libxslt.3
 share/aclocal/libxslt.m4
-share/doc/libxslt/API.html
-share/doc/libxslt/APIchunk0.html
-share/doc/libxslt/APIchunk1.html
-share/doc/libxslt/APIchunk10.html
-share/doc/libxslt/APIchunk11.html
-share/doc/libxslt/APIchunk12.html
-share/doc/libxslt/APIchunk2.html
-share/doc/libxslt/APIchunk3.html
-share/doc/libxslt/APIchunk4.html
-share/doc/libxslt/APIchunk5.html
-share/doc/libxslt/APIchunk6.html
-share/doc/libxslt/APIchunk7.html
-share/doc/libxslt/APIchunk8.html
-share/doc/libxslt/APIchunk9.html
-share/doc/libxslt/APIconstructors.html
-share/doc/libxslt/APIfiles.html
-share/doc/libxslt/APIfunctions.html
-share/doc/libxslt/APIsymbols.html
-share/doc/libxslt/EXSLT/APIchunk0.html
-share/doc/libxslt/EXSLT/APIconstructors.html
-share/doc/libxslt/EXSLT/APIfiles.html
-share/doc/libxslt/EXSLT/APIfunctions.html
-share/doc/libxslt/EXSLT/APIsymbols.html
-share/doc/libxslt/EXSLT/bugs.html
-share/doc/libxslt/EXSLT/docs.html
-share/doc/libxslt/EXSLT/downloads.html
-share/doc/libxslt/EXSLT/exslt.html
-share/doc/libxslt/EXSLT/help.html
-share/doc/libxslt/EXSLT/index.html
-share/doc/libxslt/EXSLT/intro.html
-share/doc/libxslt/FAQ.html
-share/doc/libxslt/Libxslt-Logo-180x168.gif
-share/doc/libxslt/Libxslt-Logo-90x34.gif
-share/doc/libxslt/bugs.html
-share/doc/libxslt/contexts.gif
-share/doc/libxslt/contribs.html
-share/doc/libxslt/docbook.html
-share/doc/libxslt/docs.html
-share/doc/libxslt/downloads.html
-share/doc/libxslt/extensions.html
-share/doc/libxslt/help.html
-share/doc/libxslt/html/book1.html
-share/doc/libxslt/html/home.png
-share/doc/libxslt/html/index.html
-share/doc/libxslt/html/left.png
-share/doc/libxslt/html/libxslt-attributes.html
-share/doc/libxslt/html/libxslt-documents.html
-share/doc/libxslt/html/libxslt-extensions.html
-share/doc/libxslt/html/libxslt-extra.html
-share/doc/libxslt/html/libxslt-functions.html
-share/doc/libxslt/html/libxslt-imports.html
-share/doc/libxslt/html/libxslt-keys.html
-share/doc/libxslt/html/libxslt-lib.html
-share/doc/libxslt/html/libxslt-namespaces.html
-share/doc/libxslt/html/libxslt-numbersInternals.html
-share/doc/libxslt/html/libxslt-pattern.html
-share/doc/libxslt/html/libxslt-preproc.html
-share/doc/libxslt/html/libxslt-security.html
-share/doc/libxslt/html/libxslt-templates.html
-share/doc/libxslt/html/libxslt-transform.html
-share/doc/libxslt/html/libxslt-variables.html
-share/doc/libxslt/html/libxslt-xslt.html
-share/doc/libxslt/html/libxslt-xsltInternals.html
-share/doc/libxslt/html/libxslt-xsltexports.html
-share/doc/libxslt/html/libxslt-xsltlocale.html
-share/doc/libxslt/html/libxslt-xsltutils.html
-share/doc/libxslt/html/right.png
-share/doc/libxslt/html/up.png
-share/doc/libxslt/index.html
-share/doc/libxslt/internals.html
-share/doc/libxslt/intro.html
-share/doc/libxslt/news.html
-share/doc/libxslt/node.gif
-share/doc/libxslt/object.gif
-share/doc/libxslt/processing.gif
-share/doc/libxslt/python.html
-share/doc/libxslt/redhat.gif
-share/doc/libxslt/smallfootonly.gif
-share/doc/libxslt/stylesheet.gif
-share/doc/libxslt/templates.gif
+share/doc/libxslt/tutorial/images/callouts/1.png
+share/doc/libxslt/tutorial/images/callouts/10.png
+share/doc/libxslt/tutorial/images/callouts/2.png
+share/doc/libxslt/tutorial/images/callouts/3.png
+share/doc/libxslt/tutorial/images/callouts/4.png
+share/doc/libxslt/tutorial/images/callouts/5.png
+share/doc/libxslt/tutorial/images/callouts/6.png
+share/doc/libxslt/tutorial/images/callouts/7.png
+share/doc/libxslt/tutorial/images/callouts/8.png
+share/doc/libxslt/tutorial/images/callouts/9.png
 share/doc/libxslt/tutorial/libxslt_tutorial.c
 share/doc/libxslt/tutorial/libxslttutorial.html
-share/doc/libxslt/tutorial/libxslttutorial.xml
 share/doc/libxslt/tutorial2/libxslt_pipes.c
 share/doc/libxslt/tutorial2/libxslt_pipes.html
-share/doc/libxslt/tutorial2/libxslt_pipes.xml
-share/doc/libxslt/xslt.html
 share/doc/libxslt/xsltproc.html
-share/doc/libxslt/xsltproc2.html
+share/gtk-doc/html/libexslt/general.html
+share/gtk-doc/html/libexslt/home.png
+share/gtk-doc/html/libexslt/index.html
+share/gtk-doc/html/libexslt/left.png
+share/gtk-doc/html/libexslt/libexslt-exslt.html
+share/gtk-doc/html/libexslt/libexslt-exsltexports.html
+share/gtk-doc/html/libexslt/libexslt.devhelp2
+share/gtk-doc/html/libexslt/right.png
+share/gtk-doc/html/libexslt/style.css
+share/gtk-doc/html/libexslt/up.png
+share/gtk-doc/html/libxslt/general.html
+share/gtk-doc/html/libxslt/home.png
+share/gtk-doc/html/libxslt/index.html
+share/gtk-doc/html/libxslt/left.png
+share/gtk-doc/html/libxslt/libxslt-attributes.html
+share/gtk-doc/html/libxslt/libxslt-documents.html
+share/gtk-doc/html/libxslt/libxslt-extensions.html
+share/gtk-doc/html/libxslt/libxslt-extra.html
+share/gtk-doc/html/libxslt/libxslt-functions.html
+share/gtk-doc/html/libxslt/libxslt-imports.html
+share/gtk-doc/html/libxslt/libxslt-keys.html
+share/gtk-doc/html/libxslt/libxslt-namespaces.html
+share/gtk-doc/html/libxslt/libxslt-numbersInternals.html
+share/gtk-doc/html/libxslt/libxslt-pattern.html
+share/gtk-doc/html/libxslt/libxslt-preproc.html
+share/gtk-doc/html/libxslt/libxslt-security.html
+share/gtk-doc/html/libxslt/libxslt-templates.html
+share/gtk-doc/html/libxslt/libxslt-transform.html
+share/gtk-doc/html/libxslt/libxslt-variables.html
+share/gtk-doc/html/libxslt/libxslt-xslt.html
+share/gtk-doc/html/libxslt/libxslt-xsltInternals.html
+share/gtk-doc/html/libxslt/libxslt-xsltexports.html
+share/gtk-doc/html/libxslt/libxslt-xsltlocale.html
+share/gtk-doc/html/libxslt/libxslt-xsltutils.html
+share/gtk-doc/html/libxslt/libxslt.devhelp2
+share/gtk-doc/html/libxslt/right.png
+share/gtk-doc/html/libxslt/style.css
+share/gtk-doc/html/libxslt/up.png
 @pkgdir lib/libxslt-plugins
diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/distinfo
--- a/textproc/libxslt/distinfo Thu Oct 13 11:08:54 2022 +0000
+++ b/textproc/libxslt/distinfo Thu Oct 13 11:22:24 2022 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.69 2022/09/13 21:34:00 gutteridge Exp $
+$NetBSD: distinfo,v 1.70 2022/10/13 11:22:24 wiz Exp $
 
-BLAKE2s (libxslt-1.1.34.tar.gz) = e17d720708ac550a120ee49856cf3c4ea92663fc42e5011bbae1d3e660519183
-SHA512 (libxslt-1.1.34.tar.gz) = 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
-Size (libxslt-1.1.34.tar.gz) = 3552258 bytes
-SHA1 (patch-configure) = a63c214c7f5e4c4f89307c18519240372382c2fa
-SHA1 (patch-libexslt_date.c) = 40ce3940a93b6a2dc804f62676909d3313e0ea52
-SHA1 (patch-libxslt_transform.c) = 6d76f6fd91a8729bb6a3b61f4866453c0fd08c62
+BLAKE2s (libxslt-1.1.37.tar.xz) = 43105aa9f0956bede37f422d6c7ac2dabf454b82c7292ddb898b3545081b54c2
+SHA512 (libxslt-1.1.37.tar.xz) = a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca
+Size (libxslt-1.1.37.tar.xz) = 1588572 bytes
diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/patches/patch-configure
--- a/textproc/libxslt/patches/patch-configure  Thu Oct 13 11:08:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2021/05/24 04:18:19 mcf Exp $
-
-Fix incorrect xml2-config usage.
-
-Upstream: https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc
-
---- configure.orig     Mon May 24 04:04:05 2021
-+++ configure
-@@ -14860,7 +14860,7 @@ PKG_CONFIG=$_save_PKG_CONFIG
- fi
- 
- 
--if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1
-+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1
- then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml libraries >= $LIBXML_REQUIRED_VERSION" >&5
- $as_echo_n "checking for libxml libraries >= $LIBXML_REQUIRED_VERSION... " >&6; }
diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/patches/patch-libexslt_date.c
--- a/textproc/libxslt/patches/patch-libexslt_date.c    Thu Oct 13 11:08:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-libexslt_date.c,v 1.1 2019/01/09 19:12:14 adam Exp $
-
---- libexslt/date.c.orig       2012-09-12 05:58:38.000000000 +0000
-+++ libexslt/date.c
-@@ -31,6 +31,7 @@
- #if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__)   /* _POSIX_SOURCE required by gnu libc */
- #ifndef _AIX51                /* but on AIX we're not using gnu libc */
- #define _POSIX_SOURCE
-+#define _POSIX_C_SOURCE 199506L /* POSIX.1c */
- #endif
- #endif
- 
diff -r 031503a41ff7 -r 98b64090584b textproc/libxslt/patches/patch-libxslt_transform.c
--- a/textproc/libxslt/patches/patch-libxslt_transform.c        Thu Oct 13 11:08:54 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-$NetBSD: patch-libxslt_transform.c,v 1.1 2022/09/13 21:34:00 gutteridge Exp $
-
-Address CVE-2021-30560
-https://gitlab.gnome.org/GNOME/libxslt/-/commit/50f9c9cd3b7dfe9b3c8c795247752d1fdcadcac8
-
---- libxslt/transform.c.orig   2019-10-23 17:36:39.000000000 +0000
-+++ libxslt/transform.c
-@@ -1895,7 +1895,7 @@ static void
- xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node,
-                         xsltStackElemPtr params) {
-     xmlNodePtr copy;
--    xmlNodePtr delete = NULL, cur;
-+    xmlNodePtr cur;
-     int nbchild = 0, oldSize;
-     int childno = 0, oldPos;
-     xsltTemplatePtr template;
-@@ -1968,54 +1968,13 @@ xsltDefaultProcessOneNode(xsltTransformC
-           return;



Home | Main Index | Thread Index | Old Index