nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to libxml2-2.9.14.

This commit is contained in:
Jonas 'Sortie' Termansen 2022-06-14 19:43:00 +02:00
parent 51677c38b3
commit 4c8799fa73
3 changed files with 47 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

193
ports/libxml2/libxml2.patch
View File

@ -1,19 +1,7 @@
diff -Paur --no-dereference -- libxml2.upstream/config.sub libxml2/config.sub
--- libxml2.upstream/config.sub
+++ libxml2/config.sub
@@ -1342,7 +1342,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff -Paur --no-dereference -- libxml2.upstream/dict.c libxml2/dict.c
--- libxml2.upstream/dict.c
+++ libxml2/dict.c
@@ -138,15 +138,6 @@
@@ -139,15 +139,6 @@
*/
static int xmlDictInitialized = 0;
@ -29,7 +17,7 @@ diff -Paur --no-dereference -- libxml2.upstream/dict.c libxml2/dict.c
/**
* xmlInitializeDict:
*
@@ -180,14 +171,6 @@
@@ -181,14 +172,6 @@
return(0);
xmlRMutexLock(xmlDictMutex);
@ -44,7 +32,7 @@ diff -Paur --no-dereference -- libxml2.upstream/dict.c libxml2/dict.c
xmlDictInitialized = 1;
xmlRMutexUnlock(xmlDictMutex);
return(1);
@@ -195,19 +178,7 @@
@@ -196,19 +179,7 @@
#ifdef DICT_RANDOMIZATION
int __xmlRandom(void) {
@ -65,86 +53,28 @@ diff -Paur --no-dereference -- libxml2.upstream/dict.c libxml2/dict.c
}
#endif
diff -Paur --no-dereference -- libxml2.upstream/Makefile.am libxml2/Makefile.am
--- libxml2.upstream/Makefile.am
+++ libxml2/Makefile.am
@@ -17,7 +17,7 @@
bin_PROGRAMS = xmllint xmlcatalog
-bin_SCRIPTS=xml2-config
+bin_SCRIPTS=
lib_LTLIBRARIES = libxml2.la
libxml2_la_LIBADD = $(ICU_LIBS) $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
@@ -61,7 +61,7 @@
LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
-man_MANS = xml2-config.1 libxml.3
+man_MANS = libxml.3
m4datadir = $(datadir)/aclocal
m4data_DATA = libxml.m4
@@ -1176,32 +1176,18 @@
@(rm -rf $(distdir)/xstc/Test)
cleantar:
- @(rm -f libxml*.tar.gz COPYING.LIB)
+ @(rm -f libxml*.tar.gz)
rpm: cleanup cleantar
@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)
-## We create xml2Conf.sh here and not from configure because we want
-## to get the paths expanded correctly. Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-
-xml2Conf.sh: xml2Conf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
- sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
- -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
- -e 's?\@VERSION\@?$(VERSION)?g' \
- -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
- < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
- && mv xml2Conf.tmp xml2Conf.sh
-
CLEANFILES = runxmlconf.log test.out xml2Conf.sh *.gcda *.gcno *.res
-DISTCLEANFILES = COPYING missing.lst
+DISTCLEANFILES = missing.lst
confexecdir=$(libdir)
-confexec_DATA = xml2Conf.sh
+confexec_DATA =
CVS_EXTRA_DIST=
-EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
+EXTRA_DIST = libxml.spec.in libxml2.spec \
libxml.m4 Copyright check-xml-test-suite.py gentest.py \
check-relaxng-test-suite.py check-relaxng-test-suite2.py \
check-xsddata-test-suite.py check-xinclude-test-suite.py \
diff -Paur --no-dereference -- libxml2.upstream/Makefile.in libxml2/Makefile.in
--- libxml2.upstream/Makefile.in
+++ libxml2/Makefile.in
@@ -67,7 +67,7 @@
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -444,7 +444,7 @@
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libxml-2.0-uninstalled.pc.in \
$(srcdir)/libxml-2.0.pc.in $(srcdir)/libxml.spec.in \
- $(srcdir)/xml2-config.in $(top_srcdir)/configure AUTHORS \
+ $(top_srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -615,7 +615,7 @@
DIST_SUBDIRS = include . doc example python xstc
- $(srcdir)/libxml2-config.cmake.in $(srcdir)/xml2-config.in \
+ $(srcdir)/libxml2-config.cmake.in \
COPYING NEWS TODO compile config.guess config.sub depcomp \
install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -728,7 +728,7 @@
DIST_SUBDIRS = include . doc example fuzz python xstc
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
AM_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
-bin_SCRIPTS = xml2-config
+bin_SCRIPTS =
lib_LTLIBRARIES = libxml2.la
libxml2_la_LIBADD = $(ICU_LIBS) $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
@USE_VERSION_SCRIPT_FALSE@LIBXML2_VERSION_SCRIPT =
@@ -643,7 +643,7 @@
@@ -756,7 +756,7 @@
DEPS = $(top_builddir)/libxml2.la
LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
@ -153,37 +83,31 @@ diff -Paur --no-dereference -- libxml2.upstream/Makefile.in libxml2/Makefile.in
m4datadir = $(datadir)/aclocal
m4data_DATA = libxml.m4
runtest_SOURCES = runtest.c
@@ -740,11 +740,11 @@
@@ -851,11 +851,11 @@
runxmlconf_LDFLAGS =
runxmlconf_DEPENDENCIES = $(DEPS)
runxmlconf_LDADD = $(LDADDS)
CLEANFILES = runxmlconf.log test.out xml2Conf.sh *.gcda *.gcno *.res
-DISTCLEANFILES = COPYING missing.lst
+DISTCLEANFILES = missing.lst
-CLEANFILES = runxmlconf.log test.out xml2Conf.sh *.gcda *.gcno *.res
+CLEANFILES = runxmlconf.log test.out *.gcda *.gcno *.res
DISTCLEANFILES = COPYING missing.lst
confexecdir = $(libdir)
-confexec_DATA = xml2Conf.sh
+confexec_DATA =
CVS_EXTRA_DIST =
-EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
+confexec_DATA =
+EXTRA_DIST = libxml.spec.in libxml2.spec \
libxml.m4 Copyright check-xml-test-suite.py gentest.py \
check-relaxng-test-suite.py check-relaxng-test-suite2.py \
check-xsddata-test-suite.py check-xinclude-test-suite.py \
@@ -829,8 +829,6 @@
-rm -f config.h stamp-h1
libxml2.spec: $(top_builddir)/config.status $(srcdir)/libxml.spec.in
@@ -947,8 +947,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
libxml2-config.cmake: $(top_builddir)/config.status $(srcdir)/libxml2-config.cmake.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-xml2-config: $(top_builddir)/config.status $(srcdir)/xml2-config.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
libxml-2.0.pc: $(top_builddir)/config.status $(srcdir)/libxml-2.0.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
libxml-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libxml-2.0-uninstalled.pc.in
@@ -2781,19 +2779,11 @@
@(rm -rf $(distdir)/xstc/Test)
cleantar:
- @(rm -f libxml*.tar.gz COPYING.LIB)
+ @(rm -f libxml*.tar.gz)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -3109,15 +3107,6 @@
rpm: cleanup cleantar
@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)
@ -192,16 +116,17 @@ diff -Paur --no-dereference -- libxml2.upstream/Makefile.in libxml2/Makefile.in
- -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
- -e 's?\@VERSION\@?$(VERSION)?g' \
- -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
- -e 's?\@XML_PRIVATE_LIBS\@?$(XML_PRIVATE_LIBS)?g' \
- < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
- && mv xml2Conf.tmp xml2Conf.sh
-
install-data-local:
$(MKDIR_P) $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
-$(INSTALL) -m 0644 $(srcdir)/Copyright $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
$(MKDIR_P) $(DESTDIR)$(docdir)
-$(INSTALL) -m 0644 $(srcdir)/Copyright $(DESTDIR)$(docdir)
diff -Paur --no-dereference -- libxml2.upstream/nanoftp.c libxml2/nanoftp.c
--- libxml2.upstream/nanoftp.c
+++ libxml2/nanoftp.c
@@ -62,6 +62,18 @@
@@ -60,6 +60,18 @@
#include <strings.h>
#endif
@ -223,19 +148,19 @@ diff -Paur --no-dereference -- libxml2.upstream/nanoftp.c libxml2/nanoftp.c
diff -Paur --no-dereference -- libxml2.upstream/nanohttp.c libxml2/nanohttp.c
--- libxml2.upstream/nanohttp.c
+++ libxml2/nanohttp.c
@@ -1119,7 +1119,7 @@
@@ -1124,7 +1124,7 @@
#if defined(HAVE_GETADDRINFO) && defined(SUPPORT_IP6) && !defined(_WIN32)
else
#endif
-#if !defined(HAVE_GETADDRINFO) || !defined(_WIN32)
+#if !defined(HAVE_GETADDRINFO) || (!defined(_WIN32) && !defined(__sortix__))
{
h = gethostbyname (host);
if (h == NULL) {
struct hostent *h;
struct in_addr ia;
diff -Paur --no-dereference -- libxml2.upstream/runtest.c libxml2/runtest.c
--- libxml2.upstream/runtest.c
+++ libxml2/runtest.c
@@ -192,6 +192,33 @@
@@ -198,6 +198,33 @@
}
}
@ -269,42 +194,6 @@ diff -Paur --no-dereference -- libxml2.upstream/runtest.c libxml2/runtest.c
#else
#include <glob.h>
#endif
diff -Paur --no-dereference -- libxml2.upstream/testlimits.c libxml2/testlimits.c
--- libxml2.upstream/testlimits.c
+++ libxml2/testlimits.c
@@ -1287,12 +1287,12 @@
if (fail)
res = 0;
else {
- fprintf(stderr, "Failed to parse '%s' %lu\n", filename, limit);
+ fprintf(stderr, "Failed to parse '%s' %zu\n", filename, limit);
res = 1;
}
} else {
if (fail) {
- fprintf(stderr, "Failed to get failure for '%s' %lu\n",
+ fprintf(stderr, "Failed to get failure for '%s' %zu\n",
filename, limit);
res = 1;
} else
@@ -1341,7 +1341,7 @@
fprintf(stderr, "Failed to parse '%s' %u\n",
filename, crazy_indx);
else
- fprintf(stderr, "Failed to parse '%s' %lu\n",
+ fprintf(stderr, "Failed to parse '%s' %zu\n",
filename, limit);
res = 1;
}
@@ -1351,7 +1351,7 @@
fprintf(stderr, "Failed to get failure for '%s' %u\n",
filename, crazy_indx);
else
- fprintf(stderr, "Failed to get failure for '%s' %lu\n",
+ fprintf(stderr, "Failed to get failure for '%s' %zu\n",
filename, limit);
res = 1;
} else
diff -Paur --no-dereference -- libxml2.upstream/testrecurse.c libxml2/testrecurse.c
--- libxml2.upstream/testrecurse.c
+++ libxml2/testrecurse.c
@ -342,15 +231,3 @@ diff -Paur --no-dereference -- libxml2.upstream/testrecurse.c libxml2/testrecurs
#else
#include <glob.h>
#endif
diff -Paur --no-dereference -- libxml2.upstream/timsort.h libxml2/timsort.h
--- libxml2.upstream/timsort.h
+++ libxml2/timsort.h
@@ -323,7 +323,7 @@
SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
if (tempstore == NULL)
{
- fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
+ fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
exit(1);
}
store->storage = tempstore;

17
ports/libxml2/libxml2.port
View File

@ -1,14 +1,19 @@
NAME=libxml2
BUILD_LIBRARIES='libiconv?'
VERSION=2.9.1
BUILD_LIBRARIES='libiconv? libicu? liblzma? libz?'
VERSION_MAJOR=2
VERSION_MINOR=9
VERSION_PATCH=14
VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.gz
COMPRESSION=tar.xz
ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb
UPSTREAM_SITE=ftp://xmlsoft.org/libxml2
SHA256SUM=60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee
UPSTREAM_SITE=https://download.gnome.org/sources/libxml2/$VERSION_MAJOR.$VERSION_MINOR
UPSTREAM_ARCHIVE=$ARCHIVE
RELEASE_SEARCH_PAGE=https://download.gnome.org/sources/libxml2/cache.json
LICENSE=MIT
BUILD_SYSTEM=configure
# libxml2 looks for python in a non-cross-compile compatible manner and tries a python2.7-config script.
# libxml2 looks for python in a non-cross-compile compatible manner and tries a python*-config script.
CONFIGURE_ARGS=--without-python
MAKE_VARS='V=1'
POST_INSTALL=tix-eradicate-libtool-la

1
ports/libxml2/libxml2.rmpatch
View File

@ -1,3 +1,4 @@
rm -rf -- 'COPYING'
rm -rf -- 'include/libxml/xmlversion.h'
rm -rf -- 'libxml2.spec'
rm -rf -- 'python/setup.py'