Re: [update] textproc/libxml
On Tue, Jun 15, 2021 at 05:10:00AM -0700, Nam Nguyen wrote: > Alexander Bluhm writes: > > > ok? > > > > bluhm > > Your diff had mangled whitespace, so a fixed diff is provided here so it > applies cleanly. Can this be put through a bulk? amd64 bulk completed, no fallout
Re: [update] textproc/libxml
Alexander Bluhm writes:
> ok?
>
> bluhm
Your diff had mangled whitespace, so a fixed diff is provided here so it
applies cleanly. Can this be put through a bulk?
ok namn@
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -u -p -r1.188 Makefile
--- Makefile12 May 2021 11:22:35 - 1.188
+++ Makefile15 Jun 2021 10:58:49 -
@@ -3,15 +3,14 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
+VERSION= 2.9.12
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
-SHARED_LIBS += xml2 16.1 # 11.9
+SHARED_LIBS += xml2 17.0 # 11.9
CATEGORIES=textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/
+SUPDISTFILES = ${DISTFILES}.asc
HOMEPAGE= http://xmlsoft.org/
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -u -p -r1.57 distinfo
--- distinfo1 Nov 2019 15:37:45 - 1.57
+++ distinfo15 Jun 2021 10:58:49 -
@@ -1,2 +1,4 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-2.9.12.tar.gz) = yNZoHjjFbxcokshd3AhS4f1LU7Qgnn9Ovxf34urnHZI=
+SHA256 (libxml2-2.9.12.tar.gz.asc) =
RIeC1nGhqdxq52Ew84xYoMmpWeeZQnQSzG+JdEPGoJg=
+SIZE (libxml2-2.9.12.tar.gz) = 5681632
+SIZE (libxml2-2.9.12.tar.gz.asc) = 488
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 1 Nov 2019 15:37:45 - 1.11
+++ patches/patch-Makefile_in 15 Jun 2021 10:58:49 -
@@ -15,7 +15,7 @@ Index: Makefile.in
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
m4datadir = $(datadir)/aclocal
-@@ -880,7 +880,7 @@ cmake_DATA = libxml2-config.cmake
+@@ -881,7 +881,7 @@ cmake_DATA = libxml2-config.cmake
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -24,7 +24,7 @@ Index: Makefile.in
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
#
-@@ -2089,7 +2089,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
+@@ -2090,7 +2090,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
[ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result .
@@ -33,7 +33,7 @@ Index: Makefile.in
$(CHECKER) ./testrecurse$(EXEEXT) && \
ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER)
./testapi$(EXEEXT) && \
$(CHECKER) ./testchar$(EXEEXT) && \
-@@ -2616,6 +2616,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -2618,6 +2618,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
echo Testing $$name ; \
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-configure_ac
--- patches/patch-configure_ac 14 Mar 2018 08:20:49 - 1.4
+++ patches/patch-configure_ac 15 Jun 2021 10:58:49 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2018/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -539,7 +539,7 @@ dnl Checks for library functions.
+@@ -544,7 +544,7 @@ dnl Checks for library functions.
AC_FUNC_STRFTIME
AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)
AC_CHECK_FUNCS(stat signal)
Index: patches/patch-parser_c
===
RCS file: patches/patch-parser_c
diff -N patches/patch-parser_c
--- patches/patch-parser_c 11 May 2021 07:39:24 - 1.21
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-$OpenBSD: patch-parser_c,v 1.21 2021/05/11 07:39:24 bluhm Exp $
-
-https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076
-CVE-2020-7595
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1956522
-https://gitlab.gnome.org/GNOME/libxml2/commit/babe75030c7f64a37826bb3342317134568bef61
-CVE-2021-3537
-
-Index: parser.c
parser.c.orig
-+++ parser.c
-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, cons
- else
- c = 0;
- while ((c != 0) && (c != end) && /* non input consuming loop */
-- (c
Re: [update] textproc/libxml
On Mon, May 31, 2021 at 12:34:54AM -0700, Nam Nguyen wrote:
> > Here is a fresh diff with some additions:
> > - move to gnome's gitlab to avoid using ftp (as suggested by tj@)
> > - CONFIGURE_STYLE autoreconf
> > - translate patches from Makefile.in --> Makefile.am
This is not correct. The gnome gitlab package has different content.
libxml2-v2.9.12.tar.gz is not the official release. E.g. file
customfo.xsl is an addition.
http://www.xmlsoft.org/ provides an official download link to
ftp://xmlsoft.org/libxml2/ . That is where the releases live as
announced by the upstream project. Instead of using some unknown
HTTPS certificate one should verify the PGP signature provided by
the maintainers.
Usually I add it to SUPDISTFILES so it is downloaded when updating.
It reminds me to check it when I update a port.
ok?
bluhm
Index: textproc/libxml/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- textproc/libxml/Makefile12 May 2021 11:22:35 - 1.188
+++ textproc/libxml/Makefile11 Jun 2021 14:30:46 -
@@ -3,15 +3,14 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
+VERSION= 2.9.12
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
-SHARED_LIBS += xml2 16.1 # 11.9
+SHARED_LIBS += xml2 17.0 # 11.9
CATEGORIES=textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/
+SUPDISTFILES = ${DISTFILES}.asc
HOMEPAGE= http://xmlsoft.org/
Index: textproc/libxml/distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- textproc/libxml/distinfo1 Nov 2019 15:37:45 - 1.57
+++ textproc/libxml/distinfo11 Jun 2021 14:31:10 -
@@ -1,2 +1,4 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-2.9.12.tar.gz) = yNZoHjjFbxcokshd3AhS4f1LU7Qgnn9Ovxf34urnHZI=
+SHA256 (libxml2-2.9.12.tar.gz.asc) =
RIeC1nGhqdxq52Ew84xYoMmpWeeZQnQSzG+JdEPGoJg=
+SIZE (libxml2-2.9.12.tar.gz) = 5681632
+SIZE (libxml2-2.9.12.tar.gz.asc) = 488
Index: textproc/libxml/patches/patch-Makefile_in
===
RCS file:
/data/mirror/openbsd/cvs/ports/textproc/libxml/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- textproc/libxml/patches/patch-Makefile_in 1 Nov 2019 15:37:45 -
1.11
+++ textproc/libxml/patches/patch-Makefile_in 11 Jun 2021 14:35:32 -
@@ -15,7 +15,7 @@ Index: Makefile.in
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
m4datadir = $(datadir)/aclocal
-@@ -880,7 +880,7 @@ cmake_DATA = libxml2-config.cmake
+@@ -881,7 +881,7 @@ cmake_DATA = libxml2-config.cmake
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -24,7 +24,7 @@ Index: Makefile.in
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
#
-@@ -2089,7 +2089,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
+@@ -2090,7 +2090,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
[ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result .
@@ -33,7 +33,7 @@ Index: Makefile.in
$(CHECKER) ./testrecurse$(EXEEXT) && \
ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER)
./testapi$(EXEEXT) && \
$(CHECKER) ./testchar$(EXEEXT) && \
-@@ -2616,6 +2616,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -2618,6 +2618,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
echo Testing $$name ; \
Index: textproc/libxml/patches/patch-configure_ac
===
RCS file:
/data/mirror/openbsd/cvs/ports/textproc/libxml/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure_ac
--- textproc/libxml/patches/patch-configure_ac 14 Mar 2018 08:20:49 -
1.4
+++ textproc/libxml/patches/patch-configure_ac 11 Jun 2021 14:35:35 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2018/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -539,7 +539,7 @@ dnl Checks for library functions.
+@@ -544,7 +544,7 @@ dnl Checks for library functions.
AC_FUNC_STRFTIME
Re: [update] textproc/libxml
Ping. Diff is repasted below.
Nam Nguyen writes:
> Moritz Buhl writes:
>
>> Hi ports@,
>>
>> A new libxml release is out (two actally)
>> http://www.xmlsoft.org/news.html
>> https://gitlab.gnome.org/GNOME/libxml2/-/commit/b48e77cf4f6fa0792c5f4b639707a2b0675e461b
>>
>> This fixes CVE-2021-3541.
>>
>> I updated the version and removed previous patches for CVE-2021-3537
>> and CVE-2020-7595.
>>
>> make test passes with no errors.
>>
>> mbuhl
>
> Thanks for this. It is similar to something I have in mystuff. This
> does not incorporate daniel@'s diff for unbreaking python 3.9 yet.
>
> Here is a fresh diff with some additions:
> - major bump
> - move to gnome's gitlab to avoid using ftp (as suggested by tj@)
> - CONFIGURE_STYLE autoreconf
> - translate patches from Makefile.in --> Makefile.am
> - remove parser.c CVE fixes already applied upstream
>
> Questions
> =
> Can I manually edit plist to remove the following?
> +lib/python${MODPY_VERSION}/
> +lib/python${MODPY_VERSION}/site-packages/
>
> explanation for major bump
> ==
> check_sym output: https://namtsui.com/public/libxml_check_sym.txt
>
> check_sym revealed that xmlPopOutputCallbacks is a new function (defined
> in ${WRKSRC}/include/libxml/xmlIO.h) justifying a minor bump.
>
> However, I diffed all headers and found two reasons for a major bump.
>
> Reason 1:
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce00c36e654f0a5291d48bc437e807daecbd8449
> void * *pushTab --> xmlStartTag *pushTab
> "'pushTab' was only used by the push parser... so the change to the
> public headers should be safe."
> Even though upstream states this, because it is in a public header, I
> think this can cause a major bump due to types changing in an
> incompatible way. (50% confidence)
>
> Reason 2:
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/1fe385304f11332ddb232571d54d36a5aeca0398
> upstream claims never part of a public release, but the previous
> distfile has maxDepth and maxParserDepth. Removing this from the struct
> is reason for a major bump. (100% confidence)
>
> Testing
> ===
> I tested SUBPACKAGE=-python using texproc/itstool. `make test'
> passes. If there is positive feedback can this be put through a bulk?
> Feedback and tests are welcome. OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- Makefile12 May 2021 11:22:35 - 1.188
+++ Makefile15 May 2021 11:33:08 -
@@ -3,15 +3,13 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
-DISTNAME= libxml2-${VERSION}
+VERSION= 2.9.12
+DISTNAME= libxml2-v${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
-SHARED_LIBS += xml2 16.1 # 11.9
+SHARED_LIBS += xml2 17.0 # 11.9
CATEGORIES=textproc
-MASTER_SITES= ftp://xmlsoft.org/libxml/
+MASTER_SITES=
https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${VERSION}/
HOMEPAGE= http://xmlsoft.org/
@@ -23,8 +21,9 @@ WANTLIB= iconv lzma m z
LIB_DEPENDS= archivers/xz \
converters/libiconv
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
CONFIGURE_ARGS+= --enable-static \
--with-html-dir="${PREFIX}/share/doc" \
--with-html-subdir="libxml2/html" \
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- distinfo1 Nov 2019 15:37:45 - 1.57
+++ distinfo15 May 2021 11:33:08 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-v2.9.12.tar.gz) = mL+nqaXip1Y4QiBQdARI7p8Cv03CB1yYItd0fV/55hc=
+SIZE (libxml2-v2.9.12.tar.gz) = 5233674
Index: patches/patch-Makefile_am
===
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am 15 May 2021 11:33:08 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+DEPS: Fix parallel build. gmake recognizes libxml2.la and ./libxml2.la
+as equivalent, ours does not.
+
+Index: Makefile.am
+--- Makefile.am.orig
Makefile.am
+@@ -57,7 +57,7 @@ libxml2_la_SOURCES = SAX.c entities.c encoding.c error
+ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
+ xmlmodule.c schematron.c xzlib.c
+
+-DEPS = $(top_builddir)/libxml2.la
++DEPS = libxml2.la
+ LDADDS =
Re: [update] textproc/libxml
Daniel Dickman writes: > libxml 2.9.12 already includes the change for python 3.9, right? > > So if we go to this new version of libxml, I don't think the local diff > would be needed anymore? Yes. I checked and confirmed that your proposed diff is part of this new release. > > I'll hold off on committing my diff and just wait for libxml to be updated > to the new release instead. > > Thanks!
Re: [update] textproc/libxml
On Sat, 15 May 2021, Nam Nguyen wrote: > > Thanks for this. It is similar to something I have in mystuff. This > does not incorporate daniel@'s diff for unbreaking python 3.9 yet. > libxml 2.9.12 already includes the change for python 3.9, right? So if we go to this new version of libxml, I don't think the local diff would be needed anymore? I'll hold off on committing my diff and just wait for libxml to be updated to the new release instead. Thanks!
Re: [update] textproc/libxml
Moritz Buhl writes:
> Hi ports@,
>
> A new libxml release is out (two actally)
> http://www.xmlsoft.org/news.html
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/b48e77cf4f6fa0792c5f4b639707a2b0675e461b
>
> This fixes CVE-2021-3541.
>
> I updated the version and removed previous patches for CVE-2021-3537
> and CVE-2020-7595.
>
> make test passes with no errors.
>
> mbuhl
Thanks for this. It is similar to something I have in mystuff. This
does not incorporate daniel@'s diff for unbreaking python 3.9 yet.
Here is a fresh diff with some additions:
- major bump
- move to gnome's gitlab to avoid using ftp (as suggested by tj@)
- CONFIGURE_STYLE autoreconf
- translate patches from Makefile.in --> Makefile.am
- remove parser.c CVE fixes already applied upstream
Questions
=
Can I manually edit plist to remove the following?
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
explanation for major bump
==
check_sym output: https://namtsui.com/public/libxml_check_sym.txt
check_sym revealed that xmlPopOutputCallbacks is a new function (defined
in ${WRKSRC}/include/libxml/xmlIO.h) justifying a minor bump.
However, I diffed all headers and found two reasons for a major bump.
Reason 1:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce00c36e654f0a5291d48bc437e807daecbd8449
void * *pushTab --> xmlStartTag *pushTab
"'pushTab' was only used by the push parser... so the change to the
public headers should be safe."
Even though upstream states this, because it is in a public header, I
think this can cause a major bump due to types changing in an
incompatible way. (50% confidence)
Reason 2:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/1fe385304f11332ddb232571d54d36a5aeca0398
upstream claims never part of a public release, but the previous
distfile has maxDepth and maxParserDepth. Removing this from the struct
is reason for a major bump. (100% confidence)
Testing
===
I tested SUBPACKAGE=-python using texproc/itstool. `make test'
passes. If there is positive feedback can this be put through a bulk?
Feedback and tests are welcome. OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- Makefile12 May 2021 11:22:35 - 1.188
+++ Makefile15 May 2021 11:33:08 -
@@ -3,15 +3,13 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
-DISTNAME= libxml2-${VERSION}
+VERSION= 2.9.12
+DISTNAME= libxml2-v${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
-SHARED_LIBS += xml2 16.1 # 11.9
+SHARED_LIBS += xml2 17.0 # 11.9
CATEGORIES=textproc
-MASTER_SITES= ftp://xmlsoft.org/libxml/
+MASTER_SITES=
https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${VERSION}/
HOMEPAGE= http://xmlsoft.org/
@@ -23,8 +21,9 @@ WANTLIB= iconv lzma m z
LIB_DEPENDS= archivers/xz \
converters/libiconv
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
CONFIGURE_ARGS+= --enable-static \
--with-html-dir="${PREFIX}/share/doc" \
--with-html-subdir="libxml2/html" \
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- distinfo1 Nov 2019 15:37:45 - 1.57
+++ distinfo15 May 2021 11:33:08 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-v2.9.12.tar.gz) = mL+nqaXip1Y4QiBQdARI7p8Cv03CB1yYItd0fV/55hc=
+SIZE (libxml2-v2.9.12.tar.gz) = 5233674
Index: patches/patch-Makefile_am
===
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am 15 May 2021 11:33:08 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+DEPS: Fix parallel build. gmake recognizes libxml2.la and ./libxml2.la
+as equivalent, ours does not.
+
+Index: Makefile.am
+--- Makefile.am.orig
Makefile.am
+@@ -57,7 +57,7 @@ libxml2_la_SOURCES = SAX.c entities.c encoding.c error
+ xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
+ xmlmodule.c schematron.c xzlib.c
+
+-DEPS = $(top_builddir)/libxml2.la
++DEPS = libxml2.la
+ LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS)
$(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
+
+
+@@ -202,7
Re: [update] textproc/libxml
I forgot to run make update-patches. Sorry for the noise.
mbuhl
Index: textproc/libxml/Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- textproc/libxml/Makefile12 May 2021 11:22:35 - 1.188
+++ textproc/libxml/Makefile14 May 2021 20:43:19 -
@@ -3,9 +3,7 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
+VERSION= 2.9.12
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
Index: textproc/libxml/distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- textproc/libxml/distinfo1 Nov 2019 15:37:45 - 1.57
+++ textproc/libxml/distinfo14 May 2021 20:43:19 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-2.9.12.tar.gz) = yNZoHjjFbxcokshd3AhS4f1LU7Qgnn9Ovxf34urnHZI=
+SIZE (libxml2-2.9.12.tar.gz) = 5681632
Index: textproc/libxml/patches/patch-Makefile_in
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- textproc/libxml/patches/patch-Makefile_in 1 Nov 2019 15:37:45 -
1.11
+++ textproc/libxml/patches/patch-Makefile_in 14 May 2021 20:43:19 -
@@ -15,7 +15,7 @@ Index: Makefile.in
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
m4datadir = $(datadir)/aclocal
-@@ -880,7 +880,7 @@ cmake_DATA = libxml2-config.cmake
+@@ -881,7 +881,7 @@ cmake_DATA = libxml2-config.cmake
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -24,7 +24,7 @@ Index: Makefile.in
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
#
-@@ -2089,7 +2089,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
+@@ -2090,7 +2090,7 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testap
testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
[ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result .
@@ -33,7 +33,7 @@ Index: Makefile.in
$(CHECKER) ./testrecurse$(EXEEXT) && \
ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER)
./testapi$(EXEEXT) && \
$(CHECKER) ./testchar$(EXEEXT) && \
-@@ -2616,6 +2616,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -2618,6 +2618,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
echo Testing $$name ; \
Index: textproc/libxml/patches/patch-configure_ac
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure_ac
--- textproc/libxml/patches/patch-configure_ac 14 Mar 2018 08:20:49 -
1.4
+++ textproc/libxml/patches/patch-configure_ac 14 May 2021 20:43:19 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2018/
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -539,7 +539,7 @@ dnl Checks for library functions.
+@@ -544,7 +544,7 @@ dnl Checks for library functions.
AC_FUNC_STRFTIME
AC_CHECK_FUNCS(strftime localtime gettimeofday ftime)
AC_CHECK_FUNCS(stat signal)
Index: textproc/libxml/patches/patch-parser_c
===
RCS file: textproc/libxml/patches/patch-parser_c
diff -N textproc/libxml/patches/patch-parser_c
--- textproc/libxml/patches/patch-parser_c 11 May 2021 07:39:24 -
1.21
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-$OpenBSD: patch-parser_c,v 1.21 2021/05/11 07:39:24 bluhm Exp $
-
-https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076
-CVE-2020-7595
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1956522
-https://gitlab.gnome.org/GNOME/libxml2/commit/babe75030c7f64a37826bb3342317134568bef61
-CVE-2021-3537
-
-Index: parser.c
parser.c.orig
-+++ parser.c
-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, cons
- else
- c = 0;
- while ((c != 0) && (c != end) && /* non input consuming loop */
-- (c != end2) && (c != end3)) {
-+ (c != end2) && (c != end3) &&
-+ (ctxt->instate != XML_PARSER_EOF)) {
-
- if (c == 0) break;
- if ((c == '&') && (str[1] == '#')) {
-@@ -6194,6 +6195,8 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPt
-
[update] textproc/libxml
Hi ports@,
A new libxml release is out (two actally)
http://www.xmlsoft.org/news.html
https://gitlab.gnome.org/GNOME/libxml2/-/commit/b48e77cf4f6fa0792c5f4b639707a2b0675e461b
This fixes CVE-2021-3541.
I updated the version and removed previous patches for CVE-2021-3537
and CVE-2020-7595.
make test passes with no errors.
mbuhl
Index: textproc/libxml/Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.188
diff -u -p -r1.188 Makefile
--- textproc/libxml/Makefile12 May 2021 11:22:35 - 1.188
+++ textproc/libxml/Makefile14 May 2021 20:17:49 -
@@ -3,9 +3,7 @@
COMMENT-main= XML parsing library
COMMENT-python=Python bindings for libxml
-VERSION= 2.9.10
-REVISION-main= 4
-REVISION-python= 5
+VERSION= 2.9.12
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py3-libxml-${VERSION}
Index: textproc/libxml/distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- textproc/libxml/distinfo1 Nov 2019 15:37:45 - 1.57
+++ textproc/libxml/distinfo14 May 2021 20:17:49 -
@@ -1,2 +1,2 @@
-SHA256 (libxml2-2.9.10.tar.gz) = qv7hk/+4/gyC1K/vbvkZcsuvX+6hAO3C8mJ1BhG0vh8=
-SIZE (libxml2-2.9.10.tar.gz) = 5624761
+SHA256 (libxml2-2.9.12.tar.gz) = yNZoHjjFbxcokshd3AhS4f1LU7Qgnn9Ovxf34urnHZI=
+SIZE (libxml2-2.9.12.tar.gz) = 5681632
Index: textproc/libxml/patches/patch-parser_c
===
RCS file: textproc/libxml/patches/patch-parser_c
diff -N textproc/libxml/patches/patch-parser_c
--- textproc/libxml/patches/patch-parser_c 11 May 2021 07:39:24 -
1.21
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,43 +0,0 @@
-$OpenBSD: patch-parser_c,v 1.21 2021/05/11 07:39:24 bluhm Exp $
-
-https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076
-CVE-2020-7595
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1956522
-https://gitlab.gnome.org/GNOME/libxml2/commit/babe75030c7f64a37826bb3342317134568bef61
-CVE-2021-3537
-
-Index: parser.c
parser.c.orig
-+++ parser.c
-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, cons
- else
- c = 0;
- while ((c != 0) && (c != end) && /* non input consuming loop */
-- (c != end2) && (c != end3)) {
-+ (c != end2) && (c != end3) &&
-+ (ctxt->instate != XML_PARSER_EOF)) {
-
- if (c == 0) break;
- if ((c == '&') && (str[1] == '#')) {
-@@ -6194,6 +6195,8 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPt
- SKIP_BLANKS;
- cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
-depth + 1);
-+if (cur == NULL)
-+return(NULL);
- SKIP_BLANKS;
- GROW;
- } else {
-@@ -6327,6 +6330,11 @@ xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPt
- SKIP_BLANKS;
- last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid,
- depth + 1);
-+if (last == NULL) {
-+ if (ret != NULL)
-+ xmlFreeDocElementContent(ctxt->myDoc, ret);
-+ return(NULL);
-+}
- SKIP_BLANKS;
- } else {
- elem = xmlParseName(ctxt);
Re: Security update textproc/libxml addressing CVE-2012-2807
On Thu, Aug 09, 2012 at 10:55:47AM +0200, Sebastian Trahm wrote: Hello, http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2807 The diff below addresses multiple integer overflows in libxml2 on 64-bit platforms. Any feedback on this or should we consider an update instead? cheers Sebastian Trahm -- gpg:0xba19b59ccdb73113 www:http://basti.schleifi.com/ mail: ba...@schleifi.com
Security update textproc/libxml addressing CVE-2012-2807
Hello,
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2807
The diff below addresses multiple integer overflows in
libxml2 on 64-bit platforms.
Build fine on i386 but i can't get my hands on any
64-bit build machine. So please test, comment, commit.
The patch has been derived from the following Patchset:
http://git.gnome.org/browse/libxml2/commit/?id=459eeb9dc752d5185f57ff6b135027f11981a626
http://git.gnome.org/browse/libxml2/commit/?id=4f9fdc709c4861c390cd84e2ed1fd878b3442e28
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.145
diff -u -p -r1.145 Makefile
--- Makefile5 Aug 2012 00:16:50 - 1.145
+++ Makefile9 Aug 2012 08:14:33 -
@@ -6,7 +6,7 @@ COMMENT-python= Python bindings for lib
VERSION= 2.7.8
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
-REVISION-main =6
+REVISION-main =7
REVISION-python = 3
PKGNAME-python=py-libxml-${VERSION}
SHARED_LIBS= xml213.0
Index: patches/patch-entities_c
===
RCS file: patches/patch-entities_c
diff -N patches/patch-entities_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-entities_c9 Aug 2012 08:14:33 -
@@ -0,0 +1,94 @@
+$OpenBSD$
+
+From 4f9fdc709c4861c390cd84e2ed1fd878b3442e28 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard veill...@redhat.com
+Date: Wed, 18 Jul 2012 03:38:17 +
+Subject: Fix entities local buffers size problems
+
+--- entities.c.origTue Oct 12 08:25:32 2010
entities.c Thu Aug 9 09:19:08 2012
+@@ -528,13 +528,13 @@ xmlGetDocEntity(xmlDocPtr doc, const xmlChar *name) {
+ * Macro used to grow the current buffer.
+ */
+ #define growBufferReentrant() {
\
+-buffer_size *= 2; \
+-buffer = (xmlChar *) \
+- xmlRealloc(buffer, buffer_size * sizeof(xmlChar)); \
+-if (buffer == NULL) { \
+-xmlEntitiesErrMemory(xmlEncodeEntitiesReentrant: realloc failed);\
+- return(NULL); \
+-} \
++xmlChar *tmp; \
++size_t new_size = buffer_size *= 2; \
++if (new_size buffer_size) goto mem_error; \
++tmp = (xmlChar *) xmlRealloc(buffer, new_size); \
++if (tmp == NULL) goto mem_error;\
++buffer = tmp; \
++buffer_size = new_size; \
+ }
+
+
+@@ -555,7 +555,7 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlCha
+ const xmlChar *cur = input;
+ xmlChar *buffer = NULL;
+ xmlChar *out = NULL;
+-int buffer_size = 0;
++size_t buffer_size = 0;
+ int html = 0;
+
+ if (input == NULL) return(NULL);
+@@ -574,8 +574,8 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlCha
+ out = buffer;
+
+ while (*cur != '\0') {
+-if (out - buffer buffer_size - 100) {
+- int indx = out - buffer;
++size_t indx = out - buffer;
++if (indx + 100 buffer_size) {
+
+ growBufferReentrant();
+ out = buffer[indx];
+@@ -692,6 +692,11 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlCha
+ }
+ *out = 0;
+ return(buffer);
++
++mem_error:
++xmlEntitiesErrMemory(xmlEncodeEntitiesReentrant: realloc failed);
++xmlFree(buffer);
++return(NULL);
+ }
+
+ /**
+@@ -709,7 +714,7 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED,
+ const xmlChar *cur = input;
+ xmlChar *buffer = NULL;
+ xmlChar *out = NULL;
+-int buffer_size = 0;
++size_t buffer_size = 0;
+ if (input == NULL) return(NULL);
+
+ /*
+@@ -724,8 +729,8 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED,
+ out = buffer;
+
+ while (*cur != '\0') {
+-if (out - buffer buffer_size - 10) {
+- int indx = out - buffer;
++size_t indx = out - buffer;
++if (indx + 10 buffer_size) {
+
+ growBufferReentrant();
+ out = buffer[indx];
+@@ -774,6 +779,11 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED,
+ }
+ *out = 0;
+ return(buffer);
++
++mem_error:
++xmlEntitiesErrMemory(xmlEncodeSpecialChars: realloc failed);
++xmlFree(buffer);
++return(NULL);
+ }
+
+ /**
Index: patches/patch-parser_c
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-parser_c,v
retrieving revision 1.5
MAINTAINER-UPDATE: textproc/libxml++ (and patch for dependencies)
Hello ports@,
here is an update to textproc/libxml++.
Only port which depens on it is games/wormux (patch for LIB_DEPENDS
below).
Update[s] tested @i386 and @sparc64.
Wormux is broken @sparc64, but also with old lib and I think it is not
worth the effort to debug (and I'm not maintainter of wormux).
Please test and commit if ok.
Regards,
ahb
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml++/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile4 Jan 2008 17:48:37 - 1.3
+++ Makefile16 Apr 2008 11:12:31 -
@@ -2,8 +2,9 @@
COMMENT= C++ wrapper for the libxml XML parser library
-DISTNAME= libxml++-2.17.1
-SHARED_LIBS+= xml++-2.6 0.0 # .2.7
+V= 2.23
+DISTNAME= libxml++-${V}.1
+SHARED_LIBS+= xml++-2.6 1.0 # .2.7
CATEGORIES=textproc
HOMEPAGE= http://libxmlplusplus.sourceforge.net/
@@ -16,7 +17,7 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml++/2.17/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml++/${V}/}
WANTLIB= m z glib-2.0 gmodule-2.0 gobject-2.0 sigc-2.0
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml++/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo5 Apr 2007 17:26:16 - 1.2
+++ distinfo16 Apr 2008 11:12:31 -
@@ -1,5 +1,5 @@
-MD5 (libxml++-2.17.1.tar.gz) = ddbf3aSXKAPC2KrJIPheNQ==
-RMD160 (libxml++-2.17.1.tar.gz) = QMzsmVnGQllA/YO8XdcgexuhxTI=
-SHA1 (libxml++-2.17.1.tar.gz) = /gu1kewidbk+nsQ9tUJwC7OOwSc=
-SHA256 (libxml++-2.17.1.tar.gz) = 0BvLJ1NofE/EG7FVMJtasNepDpMGEttCVpObL0dRk2Y=
-SIZE (libxml++-2.17.1.tar.gz) = 1895189
+MD5 (libxml++-2.23.1.tar.gz) = QMOljZ7VqxBu66m5/rPShg==
+RMD160 (libxml++-2.23.1.tar.gz) = 4+SpKx7MUwYkrYd1GwMgSChhrCI=
+SHA1 (libxml++-2.23.1.tar.gz) = KxHczUXdWVE9l39XSTIAXc8PrYg=
+SHA256 (libxml++-2.23.1.tar.gz) = HU/2HXUSDPjATts7MiyhHB88tMjF9hRlJPeIMHceqHo=
+SIZE (libxml++-2.23.1.tar.gz) = 856685
Index: pkg/PFRAG.shared
===
RCS file: /cvs/ports/textproc/libxml++/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared22 Mar 2007 08:08:47 - 1.1.1.1
+++ pkg/PFRAG.shared16 Apr 2008 11:12:31 -
@@ -1,2 +1,2 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/03/22 08:08:47
ajacoutot Exp $
[EMAIL PROTECTED] $OpenBSD$
@lib lib/libxml++-2.6.so.${LIBxml++-2.6_VERSION}
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/libxml++/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 PLIST
--- pkg/PLIST 22 Mar 2007 08:08:47 - 1.1.1.1
+++ pkg/PLIST 16 Apr 2008 11:12:31 -
@@ -32,8 +32,10 @@
include/libxml++-2.6/libxml++/parsers/parser.h
include/libxml++-2.6/libxml++/parsers/saxparser.h
include/libxml++-2.6/libxml++/parsers/textreader.h
+include/libxml++-2.6/libxml++/schema.h
include/libxml++-2.6/libxml++/validators/
include/libxml++-2.6/libxml++/validators/dtdvalidator.h
+include/libxml++-2.6/libxml++/validators/schemavalidator.h
include/libxml++-2.6/libxml++/validators/validator.h
lib/libxml++-2.6/
lib/libxml++-2.6.a
@@ -48,256 +50,306 @@
share/doc/libxml++-2.6/manual/html/ar01s02.html
share/doc/libxml++-2.6/manual/html/index.html
share/doc/libxml++-2.6/reference/
-share/doc/libxml++-2.6/reference/2.17/
-share/doc/libxml++-2.6/reference/2.17/html/
-share/doc/libxml++-2.6/reference/2.17/html/annotated.html
-share/doc/libxml++-2.6/reference/2.17/html/attribute_8h.html
-share/doc/libxml++-2.6/reference/2.17/html/cdatanode_8h.html
-share/doc/libxml++-2.6/reference/2.17/html/classbool.html
-share/doc/libxml++-2.6/reference/2.17/html/classes.html
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1Attribute-members.html
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1Attribute.html
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1Attribute__inherit__graph.jpg
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1Attribute__inherit__graph.map
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1Attribute__inherit__graph.md5
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CdataNode-members.html
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CdataNode.html
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CdataNode__inherit__graph.jpg
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CdataNode__inherit__graph.map
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CdataNode__inherit__graph.md5
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CommentNode-members.html
-share/doc/libxml++-2.6/reference/2.17/html/classxmlpp_1_1CommentNode.html
Re: UPDATE: textproc/libxml
steven mestdagh [2006-06-01, 22:00:22]:
version 2.6.24 has more bugfixes and improvements. make regress is happy
on i386, amd64, sparc and sparc64. please test/comment. if you are about
to start a bulk build, please put this in.
this should create the new patches in the right place.
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile2006/05/12 16:08:36 1.96
+++ Makefile2006/06/01 15:58:09
@@ -2,10 +2,10 @@
COMMENT= XML parsing library
-VERSION= 2.6.23
+VERSION= 2.6.24
DISTNAME= libxml2-${VERSION}
PKGNAME= libxml-${VERSION}
-SHARED_LIBS= xml29.1
+SHARED_LIBS= xml29.2
CATEGORIES=textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/ \
${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- distinfo2006/03/20 13:36:54 1.35
+++ distinfo2006/06/01 15:58:09
@@ -1,4 +1,4 @@
-MD5 (libxml2-2.6.23.tar.gz) = 0f37385e3ad73cc94db43d6873f4fc3b
-RMD160 (libxml2-2.6.23.tar.gz) = 9fc1640354d5d56b251e40ec06addb494349ac0c
-SHA1 (libxml2-2.6.23.tar.gz) = e0e58856532c49bd16447922ec802c7ac99d497d
-SIZE (libxml2-2.6.23.tar.gz) = 4513068
+MD5 (libxml2-2.6.24.tar.gz) = a0e913c13b5ddbd336fcca7104da6583
+RMD160 (libxml2-2.6.24.tar.gz) = 354791cbecf982adfeeae62cf47a603209e43562
+SHA1 (libxml2-2.6.24.tar.gz) = 12889612c69640360dee6ea8e2b94f40ffdbe825
+SIZE (libxml2-2.6.24.tar.gz) = 4546058
Index: patches/patch-Makefile.in
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 patch-Makefile.in
--- patches/patch-Makefile.in 2006/03/20 13:36:54 1.15
+++ patches/patch-Makefile.in 2006/06/01 15:58:09
@@ -1,6 +1,6 @@
Makefile.in.orig Thu Jan 5 16:39:09 2006
-+++ Makefile.inSun Mar 5 12:00:07 2006
-@@ -524,7 +524,7 @@ testModule_DEPENDENCIES = $(DEPS)
+--- Makefile.in.orig Fri Apr 28 18:32:52 2006
Makefile.inSun May 21 10:21:45 2006
+@@ -522,7 +522,7 @@ testModule_DEPENDENCIES = $(DEPS)
testModule_LDADD = $(LDADDS)
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
@@ -9,7 +9,7 @@
testapi_SOURCES = testapi.c
testapi_LDFLAGS =
testapi_DEPENDENCIES = $(DEPS)
-@@ -553,7 +553,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -551,7 +551,7 @@ pkgconfig_DATA = libxml-2.0.pc
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -18,7 +18,7 @@
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1909,6 +1909,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -1919,6 +1919,7 @@ SVGtests : xmllint$(EXEEXT)
grep MORY ALLO .memdump | grep -v MEMORY ALLOCATED : 0;\
else \
echo Testing $$name ; \
Index: patches/patch-doc_Makefile_in
===
RCS file: patch-doc_Makefile_in
diff -N patch-doc_Makefile_in
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-doc_Makefile_in Thu Jun 1 15:58:09 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.in.orig Sun May 21 10:40:09 2006
doc/Makefile.inSun May 21 10:40:16 2006
+@@ -271,7 +271,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = devhelp examples
++SUBDIRS = examples
+
+ # The top-level SGML file.
+ DOC_MAIN_XML_FILE = gnome-xml.xml
Index: patches/patch-xmlIO_c
===
RCS file: patch-xmlIO_c
diff -N patch-xmlIO_c
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-xmlIO_c Thu Jun 1 15:58:09 2006
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- xmlIO.c.orig Thu Apr 27 10:13:42 2006
xmlIO.cThu Jun 1 19:55:05 2006
+@@ -589,6 +589,7 @@ xmlCleanupOutputCallbacks(void)
+ int
+ xmlCheckFilename (const char *path)
+ {
++struct stat stat_buffer;
+ if (path == NULL)
+ return(0);
+
+@@ -616,7 +617,6 @@ xmlCheckFilename (const char *path)
+ }
+ #else
+ #ifdef HAVE_STAT
+-struct stat stat_buffer;
+
+ if (stat(path, stat_buffer) == -1)
+ return 0;
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
UPDATE: textproc/libxml
version 2.6.24 has more bugfixes and improvements. make regress is happy
on i386, amd64, sparc and sparc64. please test/comment. if you are about
to start a bulk build, please put this in.
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile2006/05/12 16:08:36 1.96
+++ Makefile2006/06/01 15:58:09
@@ -2,10 +2,10 @@
COMMENT= XML parsing library
-VERSION= 2.6.23
+VERSION= 2.6.24
DISTNAME= libxml2-${VERSION}
PKGNAME= libxml-${VERSION}
-SHARED_LIBS= xml29.1
+SHARED_LIBS= xml29.2
CATEGORIES=textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/ \
${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
Index: distinfo
===
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- distinfo2006/03/20 13:36:54 1.35
+++ distinfo2006/06/01 15:58:09
@@ -1,4 +1,4 @@
-MD5 (libxml2-2.6.23.tar.gz) = 0f37385e3ad73cc94db43d6873f4fc3b
-RMD160 (libxml2-2.6.23.tar.gz) = 9fc1640354d5d56b251e40ec06addb494349ac0c
-SHA1 (libxml2-2.6.23.tar.gz) = e0e58856532c49bd16447922ec802c7ac99d497d
-SIZE (libxml2-2.6.23.tar.gz) = 4513068
+MD5 (libxml2-2.6.24.tar.gz) = a0e913c13b5ddbd336fcca7104da6583
+RMD160 (libxml2-2.6.24.tar.gz) = 354791cbecf982adfeeae62cf47a603209e43562
+SHA1 (libxml2-2.6.24.tar.gz) = 12889612c69640360dee6ea8e2b94f40ffdbe825
+SIZE (libxml2-2.6.24.tar.gz) = 4546058
Index: patches/patch-Makefile.in
===
RCS file: /cvs/ports/textproc/libxml/patches/patch-Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 patch-Makefile.in
--- patches/patch-Makefile.in 2006/03/20 13:36:54 1.15
+++ patches/patch-Makefile.in 2006/06/01 15:58:09
@@ -1,6 +1,6 @@
Makefile.in.orig Thu Jan 5 16:39:09 2006
-+++ Makefile.inSun Mar 5 12:00:07 2006
-@@ -524,7 +524,7 @@ testModule_DEPENDENCIES = $(DEPS)
+--- Makefile.in.orig Fri Apr 28 18:32:52 2006
Makefile.inSun May 21 10:21:45 2006
+@@ -522,7 +522,7 @@ testModule_DEPENDENCIES = $(DEPS)
testModule_LDADD = $(LDADDS)
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
@@ -9,7 +9,7 @@
testapi_SOURCES = testapi.c
testapi_LDFLAGS =
testapi_DEPENDENCIES = $(DEPS)
-@@ -553,7 +553,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -551,7 +551,7 @@ pkgconfig_DATA = libxml-2.0.pc
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -18,7 +18,7 @@
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1909,6 +1909,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -1919,6 +1919,7 @@ SVGtests : xmllint$(EXEEXT)
grep MORY ALLO .memdump | grep -v MEMORY ALLOCATED : 0;\
else \
echo Testing $$name ; \
Index: patches/patch-doc_Makefile_in
===
RCS file: patch-doc_Makefile_in
diff -N patch-doc_Makefile_in
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patch-doc_Makefile_in Thu Jun 1 15:58:09 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.in.orig Sun May 21 10:40:09 2006
doc/Makefile.inSun May 21 10:40:16 2006
+@@ -271,7 +271,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = devhelp examples
++SUBDIRS = examples
+
+ # The top-level SGML file.
+ DOC_MAIN_XML_FILE = gnome-xml.xml
Index: patches/patch-xmlIO_c
===
RCS file: patch-xmlIO_c
diff -N patch-xmlIO_c
--- /dev/null Sat Aug 30 18:16:59 1997
+++ patches/patch-xmlIO_c Thu Jun 1 15:58:09 2006
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- xmlIO.c.orig Thu Apr 27 10:13:42 2006
xmlIO.cThu Jun 1 19:55:05 2006
+@@ -589,6 +589,7 @@ xmlCleanupOutputCallbacks(void)
+ int
+ xmlCheckFilename (const char *path)
+ {
++struct stat stat_buffer;
+ if (path == NULL)
+ return(0);
+
+@@ -616,7 +617,6 @@ xmlCheckFilename (const char *path)
+ }
+ #else
+ #ifdef HAVE_STAT
+-struct stat stat_buffer;
+
+ if (stat(path, stat_buffer) == -1)
+ return 0;
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: UPDATE: textproc/libxml
On Mon, 13 Mar 2006 08:45:34 +0100 steven mestdagh [EMAIL PROTECTED] wrote: here is an update for libxml, which includes numerous bugfixes. a bulk build on i386 with this introduced no breakage. please test, including 'make regress'. gcc2 platform reports appreciated. works ok (including regression tests) on alpha. thanks, steven Cheers, Jasper Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm -- Humppa is a serious thing! pgpa2MqynwdZD.pgp Description: PGP signature
