diff options
author | Aron Xu <aron@debian.org> | 2015-09-21 22:55:08 +0800 |
---|---|---|
committer | Aron Xu <aron@debian.org> | 2015-09-21 22:55:08 +0800 |
commit | d548c999ade382febb424b26743b3c4d63159ae0 (patch) | |
tree | 232c9c894b45099f211728742569111738b17e16 /debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch | |
parent | d837811e969fac31afdf39c00ba579b33f6adeb6 (diff) | |
download | libxml2-d548c999ade382febb424b26743b3c4d63159ae0.tar.gz |
Revert "Restore all patches available in 2.9.1+dfsg1-5 in stretch, ensuring CVE-2014-3660 is fixed too."
This reverts commit 37f590756a23e167808f76f1389c36f0a2d39f11.
Diffstat (limited to 'debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch')
-rw-r--r-- | debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch index 6b16e59..d5d3622 100644 --- a/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch +++ b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch @@ -1,20 +1,19 @@ From: Aron Xu <aron@debian.org> -Date: Fri, 21 Sep 2012 00:19:41 +0800 +Date: Sun, 26 Oct 2014 06:02:29 +0800 Subject: modify xml2-config and pkgconfig behaviour --- - configure.in | 2 +- + configure.ac | 2 +- libxml-2.0-uninstalled.pc.in | 3 ++- - libxml-2.0.pc.in | 2 +- xml2-config.1 | 4 ++++ xml2-config.in | 22 ++++++++++------------ - 5 files changed, 18 insertions(+), 15 deletions(-) + 4 files changed, 17 insertions(+), 14 deletions(-) -diff --git a/configure.in b/configure.in -index d449b11..668f233 100644 ---- a/configure.in -+++ b/configure.in -@@ -1380,7 +1380,7 @@ case "$host" in +diff --git a/configure.ac b/configure.ac +index 14ac0a8..21d90ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1476,7 +1476,7 @@ case "$host" in *) M_LIBS="-lm" ;; esac @@ -24,28 +23,17 @@ index d449b11..668f233 100644 AC_SUBST(WITH_ICONV) diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in -index cab6834..af16ebc 100644 +index 60b886b..0d5d6cb 100644 --- a/libxml-2.0-uninstalled.pc.in +++ b/libxml-2.0-uninstalled.pc.in @@ -8,5 +8,6 @@ Name: libXML Version: @VERSION@ Description: libXML library version2. Requires: --Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ +-Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ +Libs: -L${libdir} -lxml2 -+Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ ++Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index f5f5f03..0de667b 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -9,5 +9,5 @@ Version: @VERSION@ - Description: libXML library version2. - Requires: - Libs: -L${libdir} -lxml2 --Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ -+Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ @LZMA_LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/xml2-config.1 b/xml2-config.1 index 8cf9858..7b4195d 100644 --- a/xml2-config.1 |