Skip to content

Commit

Permalink
Pullup ticket #6737 - requested by taca
Browse files Browse the repository at this point in the history
textproc/libxml2: security update

Revisions pulled up:
- textproc/libxml2/Makefile                                     1.166-1.167
- textproc/libxml2/Makefile.common                              1.17-1.19
- textproc/libxml2/PLIST                                        1.48
- textproc/libxml2/distinfo                                     1.142-1.143
- textproc/libxml2/patches/patch-Makefile.in                    deleted
- textproc/libxml2/patches/patch-catalog.c                      deleted
- textproc/libxml2/patches/patch-configure                      1.5
- textproc/libxml2/patches/patch-doc_examples_Makefile.in       deleted
- textproc/libxml2/patches/patch-encoding.c                     1.4
- textproc/libxml2/patches/patch-error.c                        1.1
- textproc/libxml2/patches/patch-python_libxml.c                deleted
- textproc/libxml2/patches/patch-python_libxml.py               deleted
- textproc/libxml2/patches/patch-python_libxml2.py              deleted
- textproc/libxml2/patches/patch-python_setup.py                deleted
- textproc/libxml2/patches/patch-xmlcatalog.c                   deleted

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sun Jan 22 10:30:09 UTC 2023

   Modified Files:
   	pkgsrc/textproc/libxml2: Makefile Makefile.common PLIST distinfo
   	pkgsrc/textproc/libxml2/patches: patch-configure patch-encoding.c
   Removed Files:
   	pkgsrc/textproc/libxml2/patches: patch-Makefile.in patch-catalog.c
   	    patch-doc_examples_Makefile.in patch-python_libxml.c
   	    patch-python_libxml.py patch-python_libxml2.py
   	    patch-python_setup.py patch-xmlcatalog.c

   Log Message:
   libxml2: update to 2.10.3.

   NEWS file for libxml2

   v2.10.3: Oct 14 2022

   ### Security

   - [CVE-2022-40304] Fix dict corruption caused by entity reference cycles
   - [CVE-2022-40303] Fix integer overflows with XML_PARSE_HUGE
   - Fix overflow check in SAX2.c

   ### Portability

   - win32: Fix build with VS2013

   ### Build system

   - cmake: Set SOVERSION

   v2.10.2: Aug 29 2022

   ### Improvements

   - Remove set-but-unused variable in xmlXPathScanName
   - Silence -Warray-bounds warning

   ### Build system

   - build: require automake-1.16.3 or later (Xi Ruoyao)
   - Remove generated files from distribution

   ### Test suite

   - Don't create missing.xml when running testapi

   v2.10.1: Aug 25 2022

   ### Regressions

   - Fix xmlCtxtReadDoc with encoding

   ### Bug fixes

   - Fix HTML parser with threads and --without-legacy

   ### Build system

   - Fix build with Python 3.10
   - cmake: Disable version script on macOS
   - Remove Makefile rule to build testapi.c

   ### Documentation

   - Switch back to HTML output for API documentation
   - Port doc/examples/index.py to Python 3
   - Fix order of exports in libxml2-api.xml
   - Remove libxml2-refs.xml

   v2.10.0: Aug 17 2022

   ### Security

   - [CVE-2022-2309] Reset nsNr in xmlCtxtReset
   - Reserve byte for NUL terminator and report errors consistently in xmlBuf and
     xmlBuffer (David Kilzer)
   - Fix missing NUL terminators in xmlBuf and xmlBuffer functions (David Kilzer)
   - Fix integer overflow in xmlBufferDump() (David Kilzer)
   - xmlBufAvail() should return length without including a byte for NUL
     terminator (David Kilzer)
   - Fix ownership of xmlNodePtr & xmlAttrPtr fields in xmlSetTreeDoc() (David
     Kilzer)
   - Use xmlNewDocText in xmlXIncludeCopyRange
   - Fix use-after-free bugs when calling xmlTextReaderClose() before
     xmlFreeTextReader() on post-validating parser (David Kilzer)
   - Use UPDATE_COMPAT() consistently in buf.c (David Kilzer)
   - fix: xmlXPathParserContext could be double-delete in  OOM case. (jinsub ahn)

   ### Removals and deprecations

   - Disable XPointer location support by default
   - Remove outdated xml2Conf.sh
   - Deprecate module init and cleanup functions
   - Remove obsolete XML Software Autoupdate (XSA) file
   - Remove DOCBparser
   - Remove obsolete Python test framework
   - Remove broken VxWorks support
   - Remove broken Mac OS 9 support
   - Remove broken bakefile support
   - Remove broken Visual Studio 2010 support
   - Remove broken Windows CE support
   - Deprecate IDREF-related functions in valid.h
   - Deprecate legacy functions
   - Disable legacy support by default
   - Deprecate all functions in nanoftp.h
   - Disable FTP support by default
   - Add XML_DEPRECATED macro
   - Remove elfgcchack.h

   ### Regressions

   - Skip incorrectly opened HTML comments
   - Restore behavior of htmlDocContentDumpFormatOutput() (David Kilzer)

   ### Bug fixes

   - Fix memory leak with invalid XSD
   - Make XPath depth check work with recursive invocations
   - Fix memory leak in xmlLoadEntityContent error path
   - Avoid double-free if malloc fails in inputPush
   - Properly fold whitespace around the QName value when validating an XSD
     schema. (Damjan Jovanovic)
   - Add whitespace folding for some atomic data types that it's missing on.
     (Damjan Jovanovic)
   - Don't add IDs containing unexpanded entity references

   ### Improvements

   - Avoid calling xmlSetTreeDoc
   - Simplify xmlFreeNode
   - Don't reset nsDef when changing node content
   - Fix unintended fall-through in xmlNodeAddContentLen
   - Remove unused xmlBuf functions (David Kilzer)
   - Implement xpath1() XPointer scheme
   - Add configuration flag for XPointer locations support
   - Fix compiler warnings in Python code
   - Mark more static data as `const` (David Kilzer)
   - Make xmlStaticCopyNode non-recursive
   - Clean up encoding switching code
   - Simplify recursive pthread mutex
   - Use non-recursive mutex in dict.c
   - Fix parser progress checks
   - Avoid arithmetic on freed pointers
   - Improve buffer allocation scheme
   - Remove unneeded #includes
   - Add support for some non-standard escapes in regular expressions. (Damjan
     Jovanovic)
   - htmlParseComment: handle abruptly-closed comments (Mike Dalessio)
   - Add let variable tag support (Oliver Diehl)
   - Add value-of tag support (Oliver Diehl)
   - Remove useless call to xmlRelaxNGCleanupTypes
   - Don't include ICU headers in public headers
   - Update `xmlStrlen()` to use POSIX / ISO C `strlen()` (Mike Dalessio)
   - Fix unused variable warnings with disabled features
   - Only warn on invalid redeclarations of predefined entities
   - Remove unneeded code in xmlreader.c
   - Rework validation context flags

   ### Portability

   - Use NAN/INFINITY if available to init XPath NaN/Inf (Sergey Kosukhin)
   - Fix Python tests on macOS
   - Fix xmlCleanupThreads on Windows
   - Fix reinitialization of library on Windows
   - Don't mix declarations and code in runtest.c
   - Use portable python shebangs (David Seifert)
   - Use critical sections as mutex on Windows
   - Don't set HAVE_WIN32_THREADS in win32config.h
   - Use stdint.h with newer MSVC
   - Remove cruft from win32config.h
   - Remove isinf/isnan emulation in win32config.h
   - Always fopen files with "rb"
   - Remove __DJGPP__ checks
   - Remove useless __CYGWIN__ checks

   ### Build system

   - Don't autogenerate doc/examples/Makefile.am
   - cmake: Install libxml.m4 on UNIX-like platforms (Daniel E)
   - cmake: Use symbol versioning on UNIX-like platforms (Daniel E)
   - Port genUnicode.py to Python 3
   - Port gentest.py to Python 3
   - cmake: Fix build without thread support
   - cmake: Install documentation in CMAKE_INSTALL_DOCDIR
   - cmake: Remove non needed files in docs dir (Daniel E)
   - configure: move XML_PRIVATE_LIBS after WIN32_EXTRA_LIBADD is set
     (Christopher Degawa)
   - Move local Autoconf macros into m4 directory
   - Use XML_PRIVATE_LIBS in libxml2_la_LIBADD
   - Update libxml-2.0-uninstalled.pc.in
   - Remove LIBS from XML_PRIVATE_LIBS
   - Add WIN32_EXTRA_LIBADD to XML_PRIVATE_LIBS
   - Don't overlink executables
   - cmake: Adjust paths for UNIX or UNIX-like target systems (Daniel Engberg)
   - build: Make use of variables in libxml's pkg-config file (Daniel Engberg)
   - Avoid obsolescent `test -a` constructs (David Seifert)
   - Move AM_MAINTAINER_MODE to AM section
   - configure.ac: make AM_SILENT_RULES([yes]) unconditional (David Seifert)
   - Streamline documentation installation
   - Don't try to recreate COPYING symlink
   - 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)
   - Makefile.am: install examples more idiomatically (David Seifert)
   - configure.ac: remove useless AC_SUBST (David Seifert)
   - Respect `--sysconfdir` in source files (David Seifert)
   - Ignore configure backup file created by recent autoreconf too (Vadim Zeitlin)
   - Only install *.html and *.c example files
   - Remove --with-html-dir option
   - Rework documentation build system
   - Remove old website
   - Use AM_PATH_PYTHON/PKG_CHECK_MODULES for python bindings (David Seifert)
   - Update genChRanges.py
   - Update build_glob.py
   - Remove ICONV_CONST test
   - Remove obsolete AC_HEADER checks
   - Don't check for standard C89 library functions
   - Don't check for standard C89 headers
   - Remove special configuration for certain maintainers

   ### Test suite, CI

   - Disable network in API tests
   - testapi: remove leading slash from "/missing.xml" (Mike Gilbert)
   - Build Autotools CI tests out of source tree (VPATH)
   - Add --with-minimum build to CI tests
   - Fix warnings when testing --with-minimum build
   - cmake: Run all tests when threads are disabled
   - Also build CI tests with -Werror
   - Move doc/examples tests to new test suite
   - Simplify 'make check' targets
   - Fix schemas and relaxng tests
   - Remove unused result files
   - Allow missing result files in runtest
   - Move regexp tests to runtest
   - Move SVG tests to runtest.c
   - Move testModule to new test suite
   - Move testThreads to new test suite
   - Remove major parts of old test suite
   - Make testchar return an error on failure (Tony Tascioglu)
   - Add CI job for static build
   - python/tests: open() relative to test scripts (David Seifert)
   - Port some test scripts to Python 3

   ### Documentation

   - Improve documentation of tree manipulation API
   - Update xml2-config man page
   - Consolidate man pages
   - Rename xmlcatalog_man.xml
   - Make examples a standalone HTML page
   - Fix documentation in entities.c
   - Add note about optimization flags


   To generate a diff of this commit:
   cvs rdiff -u -r1.165 -r1.166 pkgsrc/textproc/libxml2/Makefile
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/libxml2/Makefile.common
   cvs rdiff -u -r1.47 -r1.48 pkgsrc/textproc/libxml2/PLIST
   cvs rdiff -u -r1.141 -r1.142 pkgsrc/textproc/libxml2/distinfo
   cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/libxml2/patches/patch-Makefile.in \
       pkgsrc/textproc/libxml2/patches/patch-doc_examples_Makefile.in \
       pkgsrc/textproc/libxml2/patches/patch-python_setup.py
   cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/libxml2/patches/patch-catalog.c \
       pkgsrc/textproc/libxml2/patches/patch-python_libxml.py \
       pkgsrc/textproc/libxml2/patches/patch-python_libxml2.py \
       pkgsrc/textproc/libxml2/patches/patch-xmlcatalog.c
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/libxml2/patches/patch-configure
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libxml2/patches/patch-encoding.c
   cvs rdiff -u -r1.4 -r0 pkgsrc/textproc/libxml2/patches/patch-python_libxml.c

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	gutteridge
   Date:		Thu Jan 26 01:49:16 UTC 2023

   Modified Files:
   	pkgsrc/textproc/libxml2: Makefile.common distinfo
   Added Files:
   	pkgsrc/textproc/libxml2/patches: patch-error.c

   Log Message:
   libxml2: Make sure that error messages are valid UTF-8

   Fixes segfaults with itstool, which were breaking various MATE package
   builds. (This is the third time a variant of a patch to fix this same
   issue has been applied here.)


   To generate a diff of this commit:
   cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/libxml2/Makefile.common
   cvs rdiff -u -r1.142 -r1.143 pkgsrc/textproc/libxml2/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libxml2/patches/patch-error.c

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	jperkin
   Date:		Fri Jan 27 14:49:37 UTC 2023

   Modified Files:
   	pkgsrc/textproc/libxml2: Makefile Makefile.common

   Log Message:
   libxml2: Ensure --sysconfdir is passed.

   Fixes widespread breakage of recent update on systems where PKG_SYSCONFDIR
   is not PREFIX/etc so the catalog files could not be found.

   Move PKGREVISION out of Makefile.common and bump.


   To generate a diff of this commit:
   cvs rdiff -u -r1.166 -r1.167 pkgsrc/textproc/libxml2/Makefile
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/libxml2/Makefile.common
  • Loading branch information
spzeidler authored and jperkin committed Mar 7, 2023
1 parent 8dcdeb3 commit 2be2dfb
Show file tree
Hide file tree
Showing 15 changed files with 109 additions and 397 deletions.
27 changes: 4 additions & 23 deletions textproc/libxml2/Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# $NetBSD: Makefile,v 1.165 2022/11/23 16:19:03 adam Exp $
# $NetBSD: Makefile,v 1.165.2.1 2023/03/04 12:54:51 spz Exp $

PKGREVISION= 1
.include "../../textproc/libxml2/Makefile.common"

PKGREVISION= 2
COMMENT= XML parser library from the GNOME project
LICENSE= modified-bsd

USE_FEATURES= glob
USE_LIBTOOL= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/libxml2
CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
Expand All @@ -20,29 +21,9 @@ PKGCONFIG_OVERRIDE= libxml-2.0.pc.in

USE_LANGUAGES+= c99

.include "options.mk"

# allow thread-awareness, but make sure the library is not
# linked against libpthread
#CONFIGURE_ARGS+= --without-threads

MAKE_ENV+= PAX=${PAX:Q}

TEST_TARGET= check

SUBST_CLASSES+= cat
SUBST_STAGE.cat= pre-configure
SUBST_FILES.cat= catalog.c xmlcatalog.c
SUBST_SED.cat= -e "s,@@SGML_DEFAULT_CATALOG@@,${SGML_DEFAULT_CATALOG},g"
SUBST_SED.cat+= -e "s,@@XML_DEFAULT_CATALOG@@,${XML_DEFAULT_CATALOG},g"

BUILDLINK_TRANSFORM.Darwin+= rm:-Wno-array-bounds
BUILDLINK_TRANSFORM.SunOS+= rm:-Werror=format=2

LDFLAGS.SCO_SV+= -lm

post-install:
${RM} -f ${DESTDIR}${PREFIX}/share/examples/libxml2/README
.include "options.mk"

.include "../../archivers/xz/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
Expand Down
4 changes: 2 additions & 2 deletions textproc/libxml2/Makefile.common
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.16 2022/05/06 00:55:54 gutteridge Exp $
# $NetBSD: Makefile.common,v 1.16.6.1 2023/03/04 12:54:51 spz Exp $
#
# used by textproc/libxml2/Makefile
# used by textproc/py-libxml2/Makefile

DISTNAME= libxml2-2.9.14
DISTNAME= libxml2-2.10.3
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml2/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
Expand Down
126 changes: 20 additions & 106 deletions textproc/libxml2/PLIST
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@comment $NetBSD: PLIST,v 1.47 2022/03/12 07:33:22 kim Exp $
@comment $NetBSD: PLIST,v 1.47.8.1 2023/03/04 12:54:51 spz Exp $
bin/xml2-config
bin/xmlcatalog
bin/xmllint
include/libxml2/libxml/DOCBparser.h
include/libxml2/libxml/HTMLparser.h
include/libxml2/libxml/HTMLtree.h
include/libxml2/libxml/SAX.h
Expand Down Expand Up @@ -52,102 +51,27 @@ include/libxml2/libxml/xpointer.h
lib/cmake/libxml2/libxml2-config.cmake
lib/libxml2.la
lib/pkgconfig/libxml-2.0.pc
lib/xml2Conf.sh
man/man1/xml2-config.1
man/man1/xmlcatalog.1
man/man1/xmllint.1
man/man3/libxml.3
share/aclocal/libxml.m4
share/doc/libxml2/Copyright
share/doc/libxml2/DOM.gif
share/doc/libxml2/FAQ.html
share/doc/libxml2/Libxml2-Logo-180x168.gif
share/doc/libxml2/Libxml2-Logo-90x34.gif
share/doc/libxml2/encoding.html
share/doc/libxml2/examples.xml
share/doc/libxml2/examples.xsl
share/doc/libxml2/html/book1.html
share/doc/libxml2/html/home.png
share/doc/libxml2/html/index.html
share/doc/libxml2/html/left.png
share/doc/libxml2/html/libxml-DOCBparser.html
share/doc/libxml2/html/libxml-HTMLparser.html
share/doc/libxml2/html/libxml-HTMLtree.html
share/doc/libxml2/html/libxml-SAX.html
share/doc/libxml2/html/libxml-SAX2.html
share/doc/libxml2/html/libxml-c14n.html
share/doc/libxml2/html/libxml-catalog.html
share/doc/libxml2/html/libxml-chvalid.html
share/doc/libxml2/html/libxml-debugXML.html
share/doc/libxml2/html/libxml-dict.html
share/doc/libxml2/html/libxml-encoding.html
share/doc/libxml2/html/libxml-entities.html
share/doc/libxml2/html/libxml-globals.html
share/doc/libxml2/html/libxml-hash.html
share/doc/libxml2/html/libxml-lib.html
share/doc/libxml2/html/libxml-list.html
share/doc/libxml2/html/libxml-nanoftp.html
share/doc/libxml2/html/libxml-nanohttp.html
share/doc/libxml2/html/libxml-parser.html
share/doc/libxml2/html/libxml-parserInternals.html
share/doc/libxml2/html/libxml-pattern.html
share/doc/libxml2/html/libxml-relaxng.html
share/doc/libxml2/html/libxml-schemasInternals.html
share/doc/libxml2/html/libxml-schematron.html
share/doc/libxml2/html/libxml-threads.html
share/doc/libxml2/html/libxml-tree.html
share/doc/libxml2/html/libxml-uri.html
share/doc/libxml2/html/libxml-valid.html
share/doc/libxml2/html/libxml-xinclude.html
share/doc/libxml2/html/libxml-xlink.html
share/doc/libxml2/html/libxml-xmlIO.html
share/doc/libxml2/html/libxml-xmlautomata.html
share/doc/libxml2/html/libxml-xmlerror.html
share/doc/libxml2/html/libxml-xmlexports.html
share/doc/libxml2/html/libxml-xmlmemory.html
share/doc/libxml2/html/libxml-xmlmodule.html
share/doc/libxml2/html/libxml-xmlreader.html
share/doc/libxml2/html/libxml-xmlregexp.html
share/doc/libxml2/html/libxml-xmlsave.html
share/doc/libxml2/html/libxml-xmlschemas.html
share/doc/libxml2/html/libxml-xmlschemastypes.html
share/doc/libxml2/html/libxml-xmlstring.html
share/doc/libxml2/html/libxml-xmlunicode.html
share/doc/libxml2/html/libxml-xmlversion.html
share/doc/libxml2/html/libxml-xmlwriter.html
share/doc/libxml2/html/libxml-xpath.html
share/doc/libxml2/html/libxml-xpathInternals.html
share/doc/libxml2/html/libxml-xpointer.html
share/doc/libxml2/html/right.png
share/doc/libxml2/html/up.png
share/doc/libxml2/io1.c
share/doc/libxml2/io1.res
share/doc/libxml2/io2.c
share/doc/libxml2/io2.res
share/doc/libxml2/libxml.gif
share/doc/libxml2/parse1.c
share/doc/libxml2/parse2.c
share/doc/libxml2/parse3.c
share/doc/libxml2/parse4.c
share/doc/libxml2/reader1.c
share/doc/libxml2/reader1.res
share/doc/libxml2/reader2.c
share/doc/libxml2/reader3.c
share/doc/libxml2/reader3.res
share/doc/libxml2/reader4.c
share/doc/libxml2/reader4.res
share/doc/libxml2/redhat.gif
share/doc/libxml2/smallfootonly.gif
share/doc/libxml2/structure.gif
share/doc/libxml2/test1.xml
share/doc/libxml2/test2.xml
share/doc/libxml2/test3.xml
share/doc/libxml2/testWriter.c
share/doc/libxml2/tree1.c
share/doc/libxml2/tree1.res
share/doc/libxml2/tree2.c
share/doc/libxml2/tree2.res
share/doc/libxml2/tst.xml
share/doc/libxml2/examples/index.html
share/doc/libxml2/examples/io1.c
share/doc/libxml2/examples/io2.c
share/doc/libxml2/examples/parse1.c
share/doc/libxml2/examples/parse2.c
share/doc/libxml2/examples/parse3.c
share/doc/libxml2/examples/parse4.c
share/doc/libxml2/examples/reader1.c
share/doc/libxml2/examples/reader2.c
share/doc/libxml2/examples/reader3.c
share/doc/libxml2/examples/reader4.c
share/doc/libxml2/examples/testWriter.c
share/doc/libxml2/examples/tree1.c
share/doc/libxml2/examples/tree2.c
share/doc/libxml2/examples/xmllint.c
share/doc/libxml2/examples/xpath1.c
share/doc/libxml2/examples/xpath2.c
share/doc/libxml2/tutorial/apa.html
share/doc/libxml2/tutorial/apb.html
share/doc/libxml2/tutorial/apc.html
Expand Down Expand Up @@ -197,22 +121,12 @@ share/doc/libxml2/tutorial/includekeyword.c
share/doc/libxml2/tutorial/includexpath.c
share/doc/libxml2/tutorial/index.html
share/doc/libxml2/tutorial/ix01.html
share/doc/libxml2/w3c.png
share/doc/libxml2/writer.xml
share/doc/libxml2/xml.html
share/doc/libxml2/xpath1.c
share/doc/libxml2/xpath1.res
share/doc/libxml2/xpath2.c
share/doc/libxml2/xpath2.res
share/examples/libxml2/testHTML.c
share/examples/libxml2/testSAX.c
share/examples/libxml2/testXPath.c
share/examples/libxml2/xmllint.c
share/doc/libxml2/xmlcatalog.html
share/doc/libxml2/xmllint.html
share/gtk-doc/html/libxml2/general.html
share/gtk-doc/html/libxml2/home.png
share/gtk-doc/html/libxml2/index.html
share/gtk-doc/html/libxml2/left.png
share/gtk-doc/html/libxml2/libxml2-DOCBparser.html
share/gtk-doc/html/libxml2/libxml2-HTMLparser.html
share/gtk-doc/html/libxml2/libxml2-HTMLtree.html
share/gtk-doc/html/libxml2/libxml2-SAX.html
Expand Down
21 changes: 7 additions & 14 deletions textproc/libxml2/distinfo
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
$NetBSD: distinfo,v 1.141 2022/05/06 00:55:54 gutteridge Exp $
$NetBSD: distinfo,v 1.141.6.1 2023/03/04 12:54:51 spz Exp $

BLAKE2s (libxml2-2.9.14.tar.xz) = 0d3a2a64a9f0253171fd0adfa1eb3c28997f92c306aa3668e787e0b71b4ca654
SHA512 (libxml2-2.9.14.tar.xz) = d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
Size (libxml2-2.9.14.tar.xz) = 3129968 bytes
SHA1 (patch-Makefile.in) = 4e3a3c20ce388de040b865dab73b0190ed6bdf0a
SHA1 (patch-catalog.c) = 34afe787f6012b460a85be993048e133907a1621
SHA1 (patch-configure) = 3b4cbb36602c11fe73ba1a6e327fd4810b835380
SHA1 (patch-doc_examples_Makefile.in) = d81b7b9285e207fc53acc6981c67768b686ff5fb
SHA1 (patch-encoding.c) = 62b3343f0a0ea51e3fb8eb693e495520eefb6ffd
SHA1 (patch-python_libxml.c) = a8d89922589f51db99c2b8960b32d37ddda8a7a9
SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34
SHA1 (patch-python_setup.py) = 2e712778a35cad9a167eeec7884748cf3f2090a9
SHA1 (patch-xmlcatalog.c) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
BLAKE2s (libxml2-2.10.3.tar.xz) = e46e6337acb5ff88e6206d1d61ee8b27d66c5f716c98e830c3504a01dc178ad6
SHA512 (libxml2-2.10.3.tar.xz) = 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
Size (libxml2-2.10.3.tar.xz) = 2639908 bytes
SHA1 (patch-configure) = 3d73d05780562dccd5f9621d9e9f15f2d62cfa87
SHA1 (patch-encoding.c) = 7fe0f67db061a2f46abe1c4b6b4d8a0402f82830
SHA1 (patch-error.c) = 77561e820e0da96acb572378c2f2a0b9b84112e1
15 changes: 0 additions & 15 deletions textproc/libxml2/patches/patch-Makefile.in

This file was deleted.

19 changes: 0 additions & 19 deletions textproc/libxml2/patches/patch-catalog.c

This file was deleted.

85 changes: 4 additions & 81 deletions textproc/libxml2/patches/patch-configure
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
$NetBSD: patch-configure,v 1.4 2022/03/12 07:33:22 kim Exp $
$NetBSD: patch-configure,v 1.4.8.1 2023/03/04 12:54:51 spz Exp $

Various configure fixes:
* Don't leak non-existent include directories to xml2-config.
Important for CMake on Darwin.
* Add run-path to XML_LIBDIR
* Fix handling of pthreads
* Add portability to OpenBSD, MirBSD, FreeBSD, NetBSD and DragonFly
* Fix test for SAX
Submitted as https://bugzilla.gnome.org/show_bug.cgi?id=766859

--- configure.orig 2022-02-20 12:11:10.000000000 +0000
+++ configure 2022-03-12 06:29:48.961424860 +0000
@@ -14898,7 +14898,7 @@
--- configure.orig 2022-10-14 12:41:28.000000000 +0000
+++ configure
@@ -15171,7 +15171,7 @@ printf "%s\n" "#define HAVE_GETADDRINFO
fi


Expand All @@ -20,73 +13,3 @@ Various configure fixes:
XML_INCLUDEDIR='-I${includedir}/libxml2'

XML_CFLAGS=""
@@ -15371,13 +15371,13 @@
if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
if test "x$ac_cv_header_pthread_h" = xyes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in -lpthread" >&5
-$as_echo_n "checking for pthread_join in -lpthread... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+$as_echo_n "checking for pthread_join in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
if ${ac_cv_lib_pthread_pthread_join+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

@@ -15409,7 +15409,7 @@
$as_echo "$ac_cv_lib_pthread_pthread_join" >&6; }
if test "x$ac_cv_lib_pthread_pthread_join" = xyes; then :

- THREAD_LIBS="-lpthread"
+ THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"

$as_echo "#define HAVE_PTHREAD_H /**/" >>confdefs.h

@@ -15428,12 +15428,12 @@
*beos*) WITH_THREADS="1"
THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS"
;;
- *linux*)
+ *linux* | *openbsd* | *mirbsd*)
if test "${GCC}" = "yes" ; then
GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
GCC_MAJOR=`echo ${GCC_VERSION} | sed 's+\..*++'`
GCC_MEDIUM=`echo ${GCC_VERSION} | sed 's+[0-9]*\.++' | sed 's+\..*++'`
- if test "${THREAD_LIBS}" = "-lpthread" ; then
+ if test "${THREAD_LIBS}" = "${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" ; then
if expr ${GCC_MEDIUM} \> 2 \& ${GCC_MAJOR} = 3 > /dev/null
then
THREAD_LIBS=""
@@ -15450,6 +15450,10 @@
fi
fi
;;
+ *freebsd* | *netbsd* | *dragonfly*)
+ THREAD_LIBS=""
+ BASE_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ ;;
esac
if test "$WITH_THREADS" = "1" ; then
THREAD_CFLAGS="$THREAD_CFLAGS -D_REENTRANT"
@@ -15720,7 +15724,7 @@
TEST_SAX=SAXtests
fi

- if test "${WITH_TRIO}" = "1"; then
+ if test "${WITH_SAX1}" = "1"; then
WITH_SAX1_SOURCES_TRUE=
WITH_SAX1_SOURCES_FALSE='#'
else
@@ -15905,7 +15909,7 @@
if test "$with_iconv" = "no" ; then
echo Disabling ICONV support
else
- if test "$with_iconv" != "yes" -a "$with_iconv" != "" ; then
+ if test -e "$with_iconv/include" ; then
CPPFLAGS="${CPPFLAGS} -I$with_iconv/include"
# Export this since our headers include iconv.h
XML_INCLUDEDIR="${XML_INCLUDEDIR} -I$with_iconv/include"
17 changes: 0 additions & 17 deletions textproc/libxml2/patches/patch-doc_examples_Makefile.in

This file was deleted.

Loading

0 comments on commit 2be2dfb

Please sign in to comment.