From 19d351c6616e3f3c4071c6ca7084af89bc72b419 Mon Sep 17 00:00:00 2001 From: Alexander Dahl Date: Wed, 25 May 2016 16:18:01 +0200 Subject: libxml2: security update from 2.9.3 to 2.9.4 see announcement at https://mail.gnome.org/archives/xml/2016-May/msg00023.html for details Signed-off-by: Alexander Dahl Signed-off-by: Michael Olbrich --- .../0200-xml2-config-is-not-SYSROOT-aware.patch | 23 ---------------------- patches/libxml2-2.9.3/series | 6 ------ .../0200-xml2-config-is-not-SYSROOT-aware.patch | 23 ++++++++++++++++++++++ patches/libxml2-2.9.4/series | 6 ++++++ rules/libxml2.make | 4 ++-- 5 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 patches/libxml2-2.9.3/0200-xml2-config-is-not-SYSROOT-aware.patch delete mode 100644 patches/libxml2-2.9.3/series create mode 100644 patches/libxml2-2.9.4/0200-xml2-config-is-not-SYSROOT-aware.patch create mode 100644 patches/libxml2-2.9.4/series diff --git a/patches/libxml2-2.9.3/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.3/0200-xml2-config-is-not-SYSROOT-aware.patch deleted file mode 100644 index 81a76383b..000000000 --- a/patches/libxml2-2.9.3/0200-xml2-config-is-not-SYSROOT-aware.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Marc Kleine-Budde -Date: Sat, 4 Sep 2010 20:14:51 +0200 -Subject: [PATCH] xml2-config is not $SYSROOT aware - -This patch adds $SYSROOT support to xml2-config. - -Signed-off-by: Marc Kleine-Budde ---- - xml2-config.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xml2-config.in b/xml2-config.in -index 19574864cb6a..ee1949ce9542 100644 ---- a/xml2-config.in -+++ b/xml2-config.in -@@ -1,6 +1,6 @@ - #! /bin/sh - --prefix=@prefix@ -+prefix=${SYSROOT}@prefix@ - exec_prefix=@exec_prefix@ - includedir=@includedir@ - libdir=@libdir@ diff --git a/patches/libxml2-2.9.3/series b/patches/libxml2-2.9.3/series deleted file mode 100644 index 05ba5ddea..000000000 --- a/patches/libxml2-2.9.3/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -#tag:upstream --start-number 1 -#tag:ptx --start-number 200 -0200-xml2-config-is-not-SYSROOT-aware.patch -# b6720be956d1b4619bc1c347a0ceb1dd - git-ptx-patches magic diff --git a/patches/libxml2-2.9.4/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.4/0200-xml2-config-is-not-SYSROOT-aware.patch new file mode 100644 index 000000000..81a76383b --- /dev/null +++ b/patches/libxml2-2.9.4/0200-xml2-config-is-not-SYSROOT-aware.patch @@ -0,0 +1,23 @@ +From: Marc Kleine-Budde +Date: Sat, 4 Sep 2010 20:14:51 +0200 +Subject: [PATCH] xml2-config is not $SYSROOT aware + +This patch adds $SYSROOT support to xml2-config. + +Signed-off-by: Marc Kleine-Budde +--- + xml2-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xml2-config.in b/xml2-config.in +index 19574864cb6a..ee1949ce9542 100644 +--- a/xml2-config.in ++++ b/xml2-config.in +@@ -1,6 +1,6 @@ + #! /bin/sh + +-prefix=@prefix@ ++prefix=${SYSROOT}@prefix@ + exec_prefix=@exec_prefix@ + includedir=@includedir@ + libdir=@libdir@ diff --git a/patches/libxml2-2.9.4/series b/patches/libxml2-2.9.4/series new file mode 100644 index 000000000..05ba5ddea --- /dev/null +++ b/patches/libxml2-2.9.4/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:upstream --start-number 1 +#tag:ptx --start-number 200 +0200-xml2-config-is-not-SYSROOT-aware.patch +# b6720be956d1b4619bc1c347a0ceb1dd - git-ptx-patches magic diff --git a/rules/libxml2.make b/rules/libxml2.make index 6d27af589..96dad6737 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 # # Paths and names # -LIBXML2_VERSION := 2.9.3 -LIBXML2_MD5 := daece17e045f1c107610e137ab50c179 +LIBXML2_VERSION := 2.9.4 +LIBXML2_MD5 := ae249165c173b1ff386ee8ad676815f5 LIBXML2 := libxml2-$(LIBXML2_VERSION) LIBXML2_SUFFIX := tar.gz LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) -- cgit v1.2.3