Attachment 187118 Details for Bug 222580 – updated patch file

[patch] updated patch file

textproc_libxml2.patch (text/plain), 10.05 KB, created by Yasuhiro Kimura on 2017-10-12 20:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2017-10-12 20:20:09 UTC

Size: 10.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 451797)
>+++ Makefile	(working copy)
>@@ -13,6 +13,13 @@
> MAINTAINER?=	gnome@FreeBSD.org
> COMMENT?=	XML parser library for GNOME
> 
>+LICENSE=	MIT TRIO
>+LICENSE_COMB=	multi
>+LICENSE_NAME_TRIO=	Trio License
>+LICENSE_FILE_MIT=	${WRKSRC}/COPYING
>+LICENSE_FILE_TRIO=	${FILESDIR}/LICENSE.TRIO
>+LICENSE_PERMS_TRIO=	${_LICENSE_PERMS_DEFAULT}
>+
> .if !defined(REFERENCE_PORT)
> 
> GNU_CONFIGURE=	yes
>@@ -32,7 +39,7 @@
> 
> .if !defined(MASTERDIR)
> 
>-OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
>+OPTIONS_DEFINE=	SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
> OPTIONS_DEFAULT=SCHEMA VALID THREADS
> SCHEMA_DESC=	XML schema support
> SCHEMA_CONFIGURE_WITH=	schemas
>@@ -40,11 +47,11 @@
> VALID_CONFIGURE_OFF=	--without-valid
> THREADS_DESC=	Threads support
> THREADS_CONFIGURE_WITH=	threads
>-MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
>+MEM_DEBUG_DESC=	Memory debugging (DEVELOPERS ONLY!)
> MEM_DEBUG_CONFIGURE_WITH=	mem-debug
>-XMLLINT_HIST_DESC= History for xmllint
>+XMLLINT_HIST_DESC=	History for xmllint
> XMLLINT_HIST_CONFIGURE_WITH=	history
>-THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
>+THREAD_ALLOC_DESC=	Per-thread memory (DEVELOPERS ONLY!)
> THREAD_ALLOC_CONFIGURE_WITH=	thread-alloc
> 
> .endif # !defined(MASTERDIR)
>Index: files/LICENSE.TRIO
>===================================================================
>--- files/LICENSE.TRIO	(nonexistent)
>+++ files/LICENSE.TRIO	(working copy)
>@@ -0,0 +1,12 @@
>+(Following sentences are from trio.c of libxml2-2.9.4.tar.gz.)
>+
>+Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
>+
>+Permission to use, copy, modify, and distribute this software for any
>+purpose with or without fee is hereby granted, provided that the above
>+copyright notice and this permission notice appear in all copies.
>+
>+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
>+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
>+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
>+CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 451797)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,7 +1,7 @@
>---- Makefile.in.orig	2014-10-17 20:26:52.547793054 +0200
>-+++ Makefile.in	2014-10-17 20:27:34.868791352 +0200
>-@@ -1234,7 +1234,7 @@
>- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
>+--- Makefile.in.orig	2017-09-20 18:23:56 UTC
>++++ Makefile.in
>+@@ -1245,7 +1245,7 @@ distclean-compile:
>+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
>  
>  .c.lo:
> -@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>@@ -9,7 +9,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@
>-@@ -1712,7 +1712,7 @@
>+@@ -1730,7 +1730,7 @@ distcleancheck: distclean
>  check-am: all-am
>  check: $(BUILT_SOURCES)
>  	$(MAKE) $(AM_MAKEFLAGS) check-recursive
>@@ -18,7 +18,7 @@
>  		config.h
>  install-binPROGRAMS: install-libLTLIBRARIES
>  
>-@@ -1780,7 +1780,7 @@
>+@@ -1798,7 +1798,7 @@ info: info-recursive
>  
>  info-am:
>  
>Index: files/patch-config.h.in
>===================================================================
>--- files/patch-config.h.in	(revision 451797)
>+++ files/patch-config.h.in	(working copy)
>@@ -1,7 +1,8 @@
>---- config.h.in.orig	2012-05-23 10:56:31.000000000 +0200
>-+++ config.h.in	2012-07-23 09:34:22.000000000 +0200
>-@@ -1,5 +1,8 @@
>- /* config.h.in.  Generated from configure.in by autoheader.  */
>+--- config.h.in.orig	2016-05-23 08:00:35 UTC
>++++ config.h.in
>+@@ -3,6 +3,9 @@
>+ /* Type cast for the gethostbyname() argument */
>+ #undef GETHOSTBYNAME_ARG_CAST
>  
> +/* XXX */
> +#define HAVE_VFSCANF
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 451797)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2013-11-24 09:41:13.000000000 +0100
>-+++ configure	2013-11-24 09:41:55.000000000 +0100
>-@@ -14499,6 +14499,8 @@
>+--- configure.orig	2016-05-23 08:00:35 UTC
>++++ configure
>+@@ -15639,6 +15639,8 @@ fi
>  	       fi
>  	   fi
>         ;;
>Index: files/patch-d8083bf
>===================================================================
>--- files/patch-d8083bf	(revision 451797)
>+++ files/patch-d8083bf	(working copy)
>@@ -7,7 +7,13 @@
> - Add sanity check for empty stack.
> 
> Found with afl-fuzz.
>----
>+--- result/XPath/xptr/viderror.orig	2017-09-20 18:23:56 UTC
>++++ result/XPath/xptr/viderror
>+@@ -0,0 +1,4 @@
>++
>++========================
>++Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
>++Object is empty (NULL)
>  result/XPath/xptr/viderror | 4 ++++
>  test/XPath/xptr/viderror   | 1 +
>  xpath.c                    | 7 ++++++-
>@@ -15,28 +21,14 @@
>  create mode 100644 result/XPath/xptr/viderror
>  create mode 100644 test/XPath/xptr/viderror
> 
>-diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror
> new file mode 100644
>-index 0000000..d589882
>---- /dev/null
>-+++ result/XPath/xptr/viderror
>-@@ -0,0 +1,4 @@
>-+
>-+========================
>-+Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
>-+Object is empty (NULL)
>-diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror
>-new file mode 100644
>-index 0000000..da8c53b
>---- /dev/null
>+--- test/XPath/xptr/viderror.orig	2017-09-20 18:23:56 UTC
> +++ test/XPath/xptr/viderror
> @@ -0,0 +1 @@
> +xpointer(non-existing-fn()/range-to(id('chapter2')))
>-diff --git a/xpath.c b/xpath.c
>-index 113bce6..751665b 100644
>---- xpath.c
>+--- xpath.c.orig	2016-05-23 07:25:25 UTC
> +++ xpath.c
>-@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
>+@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContext
>                  xmlNodeSetPtr oldset;
>                  int i, j;
>  
>@@ -52,6 +44,3 @@
>                  if (op->ch2 == -1)
>                      return (total);
>  
>--- 
>-cgit v0.12
>-
>Index: files/patch-libxml-2.0-uninstalled.pc.in
>===================================================================
>--- files/patch-libxml-2.0-uninstalled.pc.in	(revision 451797)
>+++ files/patch-libxml-2.0-uninstalled.pc.in	(working copy)
>@@ -1,6 +1,6 @@
>---- libxml-2.0-uninstalled.pc.in.orig	2014-10-03 11:00:53.000000000 +0200
>-+++ libxml-2.0-uninstalled.pc.in	2015-07-31 13:26:13.641069000 +0200
>-@@ -8,5 +8,5 @@
>+--- libxml-2.0-uninstalled.pc.in.orig	2016-02-09 10:17:32 UTC
>++++ libxml-2.0-uninstalled.pc.in
>+@@ -8,5 +8,5 @@ Name: libXML
>  Version: @VERSION@
>  Description: libXML library version2.
>  Requires:
>Index: files/patch-libxml-2.0.pc.in
>===================================================================
>--- files/patch-libxml-2.0.pc.in	(revision 451797)
>+++ files/patch-libxml-2.0.pc.in	(working copy)
>@@ -1,6 +1,6 @@
>---- libxml-2.0.pc.in.orig	2014-10-03 11:00:53.000000000 +0200
>-+++ libxml-2.0.pc.in	2015-07-31 13:26:13.647320000 +0200
>-@@ -9,5 +9,5 @@
>+--- libxml-2.0.pc.in.orig	2016-02-09 10:17:32 UTC
>++++ libxml-2.0.pc.in
>+@@ -9,5 +9,5 @@ Version: @VERSION@
>  Description: libXML library version2.
>  Requires:
>  Libs: -L${libdir} -lxml2
>Index: files/patch-python_Makefile.in
>===================================================================
>--- files/patch-python_Makefile.in	(revision 451797)
>+++ files/patch-python_Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- python/Makefile.in.orig	2013-11-24 08:47:04.000000000 +0100
>-+++ python/Makefile.in	2013-11-24 08:51:02.000000000 +0100
>-@@ -415,7 +415,7 @@
>+--- python/Makefile.in.orig	2017-09-20 18:23:56 UTC
>++++ python/Makefile.in
>+@@ -489,7 +489,7 @@ top_srcdir = @top_srcdir@
>  
>  # Makefile for libxml2 python library
>  AUTOMAKE_OPTIONS = 1.4 foreign
>@@ -9,7 +9,7 @@
>  docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
>  dist_docs_DATA = TODO
>  EXTRA_DIST = \
>-@@ -435,7 +435,7 @@
>+@@ -509,7 +509,7 @@ EXTRA_DIST = \
>  @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
>  @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
>  @WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
>Index: files/patch-python_tests_Makefile.in
>===================================================================
>--- files/patch-python_tests_Makefile.in	(revision 451797)
>+++ files/patch-python_tests_Makefile.in	(working copy)
>@@ -1,7 +1,7 @@
>---- python/tests/Makefile.in.orig	2008-05-23 22:41:49.000000000 -0500
>-+++ python/tests/Makefile.in	2008-05-23 22:42:12.000000000 -0500
>-@@ -270,7 +270,7 @@
>- target_alias = @target_alias@
>+--- python/tests/Makefile.in.orig	2017-09-20 18:23:56 UTC
>++++ python/tests/Makefile.in
>+@@ -385,7 +385,7 @@ target_alias = @target_alias@
>+ top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
> -exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
>Index: files/patch-uri.c
>===================================================================
>--- files/patch-uri.c	(revision 451797)
>+++ files/patch-uri.c	(working copy)
>@@ -12,9 +12,9 @@
> (e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
> correct)
> 
>---- uri.c.orig	2014-10-03 13:28:06.000000000 +0200
>-+++ uri.c	2014-10-20 14:22:57.677231158 +0200
>-@@ -1198,6 +1198,8 @@
>+--- uri.c.orig	2016-05-22 01:49:02 UTC
>++++ uri.c
>+@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) {
>                  if (temp == NULL) goto mem_error;
>                  ret = temp;
>  	    }
>Index: files/patch-xml2Conf.sh.in
>===================================================================
>--- files/patch-xml2Conf.sh.in	(revision 451797)
>+++ files/patch-xml2Conf.sh.in	(working copy)
>@@ -1,5 +1,5 @@
>---- xml2Conf.sh.in	2001/05/19 19:57:43	1.1
>-+++ xml2Conf.sh.in	2001/05/19 19:59:40
>+--- xml2Conf.sh.in.orig	2009-07-30 15:24:35 UTC
>++++ xml2Conf.sh.in
> @@ -1,6 +1,12 @@
>  #
>  # Configuration file for using the XML library in GNOME applications

Actions: View | Diff

Attachments on bug 222580: 186687 | 187118 | 191511