- 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 0d658f75ce8e66f8dfe02a24ca58d16d33eb3daf..8749786df058fcf6386de87ab08e4a27934b61aa 100644 (file)
--- a/libxml2-amfix.patch
+++ b/libxml2-amfix.patch
@@ -1,28 +1,28 @@
-diff -urN libxml2-2.5.10.orig/Makefile.am libxml2-2.5.10/Makefile.am
---- libxml2-2.5.10.orig/Makefile.am    Fri Aug 15 15:03:34 2003
-+++ libxml2-2.5.10/Makefile.am Fri Aug 15 15:06:34 2003
-@@ -5,7 +5,7 @@
+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
+ 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 \
-                 testDocbook testThreads testC14N testAutomata testRegexp \
-@@ -16,9 +16,9 @@
+                 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@
-+libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBXML_VERSION_INFO)
+-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  \
-@@ -39,7 +39,7 @@
+@@ -41,7 +41,7 @@
  endif
  
  DEPS = $(top_builddir)/libxml2.la
@@ -31,7 +31,7 @@ diff -urN libxml2-2.5.10.orig/Makefile.am libxml2-2.5.10/Makefile.am
  
  
  man_MANS = xml2-config.1 libxml.3
-@@ -50,7 +50,7 @@
+@@ -52,7 +52,7 @@
  xmllint_SOURCES=xmllint.c
  xmllint_LDFLAGS = 
  xmllint_DEPENDENCIES = $(DEPS)
@@ -40,21 +40,21 @@ diff -urN libxml2-2.5.10.orig/Makefile.am libxml2-2.5.10/Makefile.am
  
  testSAX_SOURCES=testSAX.c
  testSAX_LDFLAGS = 
-@@ -789,8 +789,6 @@
+@@ -1031,8 +1031,6 @@
  
  CLEANFILES=xml2Conf.sh
  
 -confexecdir=$(libdir)
 -confexec_DATA = xml2Conf.sh
+ CVS_EXTRA_DIST=
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-              libxml.m4 Copyright check-xml-test-suite.py \
-            check-relaxng-test-suite.py check-xinclude-test-suite.py \
-diff -urN libxml2-2.5.10.orig/include/libxml/Makefile.am libxml2-2.5.10/include/libxml/Makefile.am
---- libxml2-2.5.10.orig/include/libxml/Makefile.am     Fri Aug 15 15:03:34 2003
-+++ libxml2-2.5.10/include/libxml/Makefile.am  Fri Aug 15 15:04:18 2003
-@@ -41,7 +41,4 @@
-               xmlreader.h \
-               relaxng.h
+              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)