FreeBSD Bugzilla – Attachment 241552 Details for
Bug 270906
textproc/libxml2: SecurityUpdate to 2.10.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
libxml2-2.10.4.patch
libxml2-2.10.4.patch (text/plain), 6.51 KB, created by
takefu
on 2023-04-18 02:43:50 UTC
(
hide
)
Description:
libxml2-2.10.4.patch
Filename:
MIME Type:
Creator:
takefu
Created:
2023-04-18 02:43:50 UTC
Size:
6.51 KB
patch
obsolete
>diff -udprN /usr/ports/textproc/libxml2/Makefile ./Makefile >--- /usr/ports/textproc/libxml2/Makefile 2023-03-23 17:56:40.000000000 +0000 >+++ ./Makefile 2023-04-18 02:04:18.241707000 +0000 >@@ -1,6 +1,5 @@ > PORTNAME= libxml2 >-DISTVERSION= 2.10.3 >-PORTREVISION?= 2 >+DISTVERSION= 2.10.4 > CATEGORIES?= textproc gnome > MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/ > DIST_SUBDIR= gnome >@@ -23,19 +22,18 @@ LICENSE= MIT > # thoroughly may be reverted. > USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz > CPE_VENDOR= xmlsoft >-GNU_CONFIGURE= yes > USE_LDCONFIG= yes >+GNU_CONFIGURE= yes >+# Don't build with Python support unless requested >+CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/ \ >+ --with-lzma=/usr \ >+ --${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U} > > INSTALL_TARGET= install-strip > TEST_TARGET= check > > PLIST_SUB+= LIBVERSION=${DISTVERSION} > >-# Don't build with Python support unless requested >-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/ \ >- --with-lzma=/usr \ >- --${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U} >- > OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE STATIC THREAD_ALLOC > OPTIONS_DEFAULT= READLINE STATIC > OPTIONS_SUB= yes >@@ -54,21 +52,21 @@ STATIC_CONFIGURE_ENABLE= static > THREAD_ALLOC_CONFIGURE_WITH= thread-alloc > > post-patch: >-.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1 > @${REINPLACE_CMD} -e \ > 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ > s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ >- ${WRKSRC}/${f} >-.endfor >+ ${WRKSRC}/doc/xmllint.1 > >-.if !defined(LIBXML2_SLAVE) > post-install: >+.if !defined(LIBXML2_SLAVE) > # Documentation should be in DOCSDIR > @${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \ > ${STAGEDIR}${DOCSDIR}/devhelp > @${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc > # Install remaining documentation that's not connected to autotools > ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} >+.else >+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod${PYTHON_EXT_SUFFIX}.so > .endif > > .include <bsd.port.mk> >diff -udprN /usr/ports/textproc/libxml2/distinfo ./distinfo >--- /usr/ports/textproc/libxml2/distinfo 2022-10-17 06:03:03.000000000 +0000 >+++ ./distinfo 2023-04-17 22:19:25.173781000 +0000 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1665950945 >-SHA256 (gnome/libxml2-2.10.3.tar.xz) = 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c >-SIZE (gnome/libxml2-2.10.3.tar.xz) = 2639908 >+TIMESTAMP = 1681769965 >+SHA256 (gnome/libxml2-2.10.4.tar.xz) = ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 >+SIZE (gnome/libxml2-2.10.4.tar.xz) = 2643600 >diff -udprN /usr/ports/textproc/libxml2/files/patch-Makefile.in ./files/patch-Makefile.in >--- /usr/ports/textproc/libxml2/files/patch-Makefile.in 2022-08-27 14:01:44.000000000 +0000 >+++ ./files/patch-Makefile.in 2023-04-17 23:41:31.613990000 +0000 >@@ -1,6 +1,6 @@ >---- Makefile.in.orig 2022-08-25 18:24:09 UTC >+--- Makefile.in.orig 2023-04-17 23:41:26 UTC > +++ Makefile.in >-@@ -708,7 +708,7 @@ runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) >+@@ -711,7 +711,7 @@ m4datadir = $(datadir)/aclocal > m4data_DATA = libxml.m4 > runtest_SOURCES = runtest.c > runtest_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) >@@ -9,7 +9,7 @@ > runtest_DEPENDENCIES = $(DEPS) > runtest_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS) > testrecurse_SOURCES = testrecurse.c >-@@ -741,7 +741,7 @@ testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) >+@@ -744,7 +744,7 @@ xmlcatalog_DEPENDENCIES = $(DEPS) > xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS) > testThreads_SOURCES = testThreads.c > testThreads_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) >@@ -18,7 +18,7 @@ > testThreads_DEPENDENCIES = $(DEPS) > testThreads_LDADD = $(BASE_THREAD_LIBS) $(THREAD_LIBS) $(LDADDS) > testAutomata_SOURCES = testAutomata.c >-@@ -1146,7 +1146,7 @@ am--depfiles: $(am__depfiles_remade) >+@@ -1149,7 +1149,7 @@ am--depfiles: $(am__depfiles_remade) > @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` > > .c.lo: >@@ -27,7 +27,7 @@ > @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo > @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ > @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ >-@@ -1898,7 +1898,7 @@ check: check-recursive >+@@ -1906,7 +1906,7 @@ check-am: all-am > $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) > $(MAKE) $(AM_MAKEFLAGS) check-local > check: check-recursive >diff -udprN /usr/ports/textproc/libxml2/files/patch-configure ./files/patch-configure >--- /usr/ports/textproc/libxml2/files/patch-configure 2022-08-27 14:01:44.000000000 +0000 >+++ ./files/patch-configure 2023-04-17 23:41:31.625501000 +0000 >@@ -1,6 +1,6 @@ >---- configure.orig 2022-08-25 11:16:02 UTC >+--- configure.orig 2023-04-11 11:28:12 UTC > +++ configure >-@@ -15204,6 +15204,8 @@ fi >+@@ -16008,6 +16008,8 @@ fi > fi > fi > ;; >diff -udprN /usr/ports/textproc/libxml2/files/patch-python_libxml.c ./files/patch-python_libxml.c >--- /usr/ports/textproc/libxml2/files/patch-python_libxml.c 2019-03-08 06:47:53.000000000 +0000 >+++ ./files/patch-python_libxml.c 2023-04-17 23:41:31.631227000 +0000 >@@ -1,9 +1,9 @@ > # Workaround https://bugzilla.gnome.org/show_bug.cgi?id=789714 > # Obtained from openSuse / Fedora > >---- python/libxml.c.orig 2016-06-07 10:04:14 UTC >+--- python/libxml.c.orig 2023-04-11 10:36:35 UTC > +++ python/libxml.c >-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU >+@@ -1621,6 +1621,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, > PyObject *message; > PyObject *result; > char str[1000]; >@@ -11,7 +11,7 @@ > > #ifdef DEBUG_ERROR > printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); >-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU >+@@ -1637,12 +1638,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, > str[999] = 0; > va_end(ap); > >diff -udprN /usr/ports/textproc/libxml2/files/patch-uri.c ./files/patch-uri.c >--- /usr/ports/textproc/libxml2/files/patch-uri.c 2019-11-23 20:09:34.000000000 +0000 >+++ ./files/patch-uri.c 2023-04-17 23:41:31.637011000 +0000 >@@ -12,9 +12,9 @@ bogus values when called with URIs that have rootless > (e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be > correct) > >---- uri.c.orig 2019-10-22 18:46:01 UTC >+--- uri.c.orig 2023-04-11 10:36:35 UTC > +++ uri.c >-@@ -1201,6 +1201,8 @@ xmlSaveUri(xmlURIPtr uri) { >+@@ -1207,6 +1207,8 @@ xmlSaveUri(xmlURIPtr uri) { > if (temp == NULL) goto mem_error; > ret = temp; > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 270906
: 241552 |
241722