From fefe8e1f7920c7ba93427a5fabd5247e439c20b3 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Tue, 28 Aug 2018 22:42:05 +0200 Subject: [PATCH 1/5] lib/expat: Update to 2.2.6 Update (lib)expat to 2.2.6 Signed-off-by: Daniel Engberg --- libs/expat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/expat/Makefile b/libs/expat/Makefile index 9ac94b262..e373a32ac 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=expat -PKG_VERSION:=2.2.5 +PKG_VERSION:=2.2.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/expat -PKG_HASH:=d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 +PKG_HASH:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2 PKG_MAINTAINER:=Steven Barth , \ Ted Hess From fec2709d7899046552c213df6bade440fa407865 Mon Sep 17 00:00:00 2001 From: Andy Walsh Date: Sat, 1 Sep 2018 14:16:16 +0200 Subject: [PATCH 2/5] expat: disable docbook Signed-off-by: Andy Walsh --- libs/expat/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/expat/Makefile b/libs/expat/Makefile index e373a32ac..3f1d71e09 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -41,7 +41,8 @@ TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ --enable-shared \ - --enable-static + --enable-static \ + --without-docbook define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install From deae9b348a166cd869fc91badc7f249a39669c29 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Mon, 3 Sep 2018 13:36:08 +0200 Subject: [PATCH 3/5] expat: fix host build issue with docbook Additionally to the fix issued for #6923, we need to disable the docbook usage also for the host build. This prevents the following error: checking for docbook2man... docbook2man configure: error: Your local docbook2man was found to work with SGML rather than XML. Please install docbook2X and use variable DOCBOOK_TO_MAN to point configure to command docbook2x-man of docbook2X. Or use DOCBOOK_TO_MAN="xmlto man --skip-validation" if you have xmlto around. You can also configure using --without-docbook if you can do without a man page for xmlwf. Signed-off-by: Michael Heimpold --- libs/expat/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/expat/Makefile b/libs/expat/Makefile index 3f1d71e09..52e713336 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -44,6 +44,9 @@ CONFIGURE_ARGS += \ --enable-static \ --without-docbook +HOST_CONFIGURE_ARGS += \ + --without-docbook + define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install endef From c0dea72f92b8ca858866caada33dd9670ac6990d Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Wed, 10 Jul 2019 16:17:52 +0200 Subject: [PATCH 4/5] expat: update to version 2.2.7 (security fix) Fixes: CVE-2018-20843 Changes: add PKG_CPE_ID switch to xz remove maintainer Signed-off-by: Jan Pavlinec --- libs/expat/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/expat/Makefile b/libs/expat/Makefile index 52e713336..ec064986c 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -6,20 +6,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=expat -PKG_VERSION:=2.2.6 +PKG_VERSION:=2.2.7 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/expat -PKG_HASH:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2 -PKG_MAINTAINER:=Steven Barth , \ - Ted Hess +PKG_HASH:=30e3f40acf9a8fdbd5c379bdcc8d1178a1d9af306de29fc8ece922bc4c57bef8 +PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:libexpat:expat PKG_FIXUP:=autoreconf - PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 From f19f9ffc9fe986f2b28172f131cdbbc297bb750c Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 29 Sep 2019 11:03:40 +0200 Subject: [PATCH 5/5] expat: Update to version 2.2.9 Fixes CVE-2019-15903 Signed-off-by: Josef Schlehofer --- libs/expat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/expat/Makefile b/libs/expat/Makefile index ec064986c..52231cdeb 100644 --- a/libs/expat/Makefile +++ b/libs/expat/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=expat -PKG_VERSION:=2.2.7 +PKG_VERSION:=2.2.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/expat -PKG_HASH:=30e3f40acf9a8fdbd5c379bdcc8d1178a1d9af306de29fc8ece922bc4c57bef8 +PKG_HASH:=1ea6965b15c2106b6bbe883397271c80dfa0331cdf821b2c319591b55eadc0a4 PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=MIT