- 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 2e0a3dfb2a3cafba19310aee2360e696683acba8..8749786df058fcf6386de87ab08e4a27934b61aa 100644 (file)
--- a/libxml2-amfix.patch
+++ b/libxml2-amfix.patch
@@ -1,60 +1,62 @@
---- ibxml2-2.4.6/include/libxml/Makefile.am~   Thu Oct  4 04:35:06 2001
-+++ ibxml2-2.4.6/include/libxml/Makefile.am    Thu Oct 11 03:32:22 2001
-@@ -31,7 +31,4 @@
-               DOCBparser.h \
-               catalog.h
+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 @@
  
--install-exec-hook:
--      $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
--
- EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in
---- libxml2-2.4.6/Makefile.am~ Thu Sep 20 04:35:06 2001
-+++ libxml2-2.4.6/Makefile.am  Thu Oct 11 03:39:25 2001
-@@ -5,7 +5,7 @@
- 
- SUBDIRS = include . doc example
- 
--INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @Z_CFLAGS@ 
-+INCLUDES = -I$(srcdir)/include -I$(top_builddir)/include $(Z_CFLAGS)
+ DIST_SUBDIRS = include . doc example python xstc
  
- noinst_PROGRAMS=testSAX testHTML testXPath testURI testDocbook
+-INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
++INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
  
-@@ -14,9 +14,9 @@
+ 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 = @Z_LIBS@ $(ICONV_LIBS) -lm
-+libxml2_la_LIBADD = $(Z_LIBS) $(ICONV_LIBS) -lm
+-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 = -version-info @LIBXML_VERSION_INFO@
-+libxml2_la_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  \
-@@ -35,7 +35,7 @@
+@@ -41,7 +41,7 @@
  endif
  
  DEPS = $(top_builddir)/libxml2.la
--LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ $(ICONV_LIBS) -lm
-+LDADDS = $(top_builddir)/libxml2.la $(Z_LIBS) $(ICONV_LIBS) -lm
+-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 = xmllint.1 xml2-config.1 libxml.4
  
-@@ -45,7 +45,7 @@
+ 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) $(LDADDS)
++xmllint_LDADD=  $(RDL_LIBS) libxml2.la
  
  testSAX_SOURCES=testSAX.c
  testSAX_LDFLAGS = 
-@@ -502,8 +502,6 @@
+@@ -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