- updated to 2.7.1 (fixes CVE-2008-3281)

[packages/libxml2.git] / libxml2-amfix.patch

diff --git a/libxml2-amfix.patch b/libxml2-amfix.patch
index 7445f0cd98f4b4474ca49fcb3fd9e86dd84dc1b9..8749786df058fcf6386de87ab08e4a27934b61aa 100644 (file)
--- a/libxml2-amfix.patch
+++ b/libxml2-amfix.patch
@@ -1,11 +1,62 @@
---- libxml2-2.4.3/Makefile.am.orig     Fri Aug 24 01:21:28 2001
-+++ libxml2-2.4.3/Makefile.am  Sun Sep  9 02:12:50 2001
-@@ -502,8 +502,6 @@
+diff -Nur libxml2-2.6.17.orig/Makefile.am libxml2-2.6.17/Makefile.am
+--- libxml2-2.6.17.orig/Makefile.am    2005-01-11 10:17:08.000000000 +0100
++++ libxml2-2.6.17/Makefile.am 2005-01-18 12:10:48.763861240 +0100
+@@ -4,7 +4,7 @@
+ 
+ DIST_SUBDIRS = include . doc example python xstc
+ 
+-INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
++INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
+ 
+ noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+                 testThreads testC14N testAutomata testRegexp \
+@@ -15,9 +15,9 @@
+ bin_SCRIPTS=xml2-config
+ 
+ lib_LTLIBRARIES = libxml2.la
+-libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
++libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
+ 
+-libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@ @MODULE_PLATFORM_LIBS@
++libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBXML_VERSION_INFO) $(MODULE_PLATFORM_LIBS)
+ 
+ if WITH_TRIO_SOURCES
+ libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
+@@ -41,7 +41,7 @@
+ endif
+ 
+ DEPS = $(top_builddir)/libxml2.la
+-LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
++LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
+ 
+ 
+ man_MANS = xml2-config.1 libxml.3
+@@ -52,7 +52,7 @@
+ xmllint_SOURCES=xmllint.c
+ xmllint_LDFLAGS = 
+ xmllint_DEPENDENCIES = $(DEPS)
+-xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
++xmllint_LDADD=  $(RDL_LIBS) libxml2.la
+ 
+ testSAX_SOURCES=testSAX.c
+ testSAX_LDFLAGS = 
+@@ -1031,8 +1031,6 @@
  
  CLEANFILES=xml2Conf.sh
  
 -confexecdir=$(libdir)
 -confexec_DATA = xml2Conf.sh
- EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \
-              libxml.m4 \
-              example/Makefile.am example/gjobread.c example/gjobs.xml \
+ CVS_EXTRA_DIST=
+ EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
+              libxml.m4 Copyright check-xml-test-suite.py gentest.py \
+diff -Nur libxml2-2.6.17.orig/include/libxml/Makefile.am libxml2-2.6.17/include/libxml/Makefile.am
+--- libxml2-2.6.17.orig/include/libxml/Makefile.am     2005-01-04 15:55:45.000000000 +0100
++++ libxml2-2.6.17/include/libxml/Makefile.am  2005-01-18 12:08:45.978527448 +0100
+@@ -50,7 +50,4 @@
+               pattern.h \
+               xmlsave.h
+ 
+-install-exec-hook:
+-      $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
+-
+ EXTRA_DIST = xmlversion.h.in