[Buildroot] [PATCH 1/2] package/libyaml: bump version to 0.1.7
Bernd Kuhls
bernd.kuhls at t-online.de
Sun Sep 17 09:36:48 UTC 2017
Switched _SITE to github.com because pyyaml.org is down, added
_AUTORECONF = YES because the upstream tarball does not contain a
configure script.
Removed patch after upstream committed a similar patch:
https://github.com/yaml/libyaml/commit/946596172d140497b560e016e581accb0a92cca4#diff-35a172a9ca8faa1683fc747ca94681b3
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
---
package/libyaml/0001-fix-CVE-2014-9130.patch | 33 ----------------------------
package/libyaml/Config.in | 2 +-
package/libyaml/libyaml.hash | 2 +-
package/libyaml/libyaml.mk | 6 ++---
4 files changed, 5 insertions(+), 38 deletions(-)
delete mode 100644 package/libyaml/0001-fix-CVE-2014-9130.patch
diff --git a/package/libyaml/0001-fix-CVE-2014-9130.patch b/package/libyaml/0001-fix-CVE-2014-9130.patch
deleted file mode 100644
index a267e4084c..0000000000
--- a/package/libyaml/0001-fix-CVE-2014-9130.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e6aa721cc0e5a48f408c52355559fd36780ba32a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= <ingy at ingy.net>
-Date: Fri, 28 Nov 2014 09:21:49 -0800
-Subject: [PATCH] Fix for https://bitbucket.org/xi/libyaml/issue/10/
-
-https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-
-Commenting out the assert makes the scanner do the right thing and
-results in just a simple parse failure.
-
-Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
----
- src/scanner.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/scanner.c b/src/scanner.c
-index 88d4fa5..c5f3d2f 100644
---- a/src/scanner.c
-+++ b/src/scanner.c
-@@ -1110,7 +1110,9 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
- * line. Therefore it is always allowed. But we add a check anyway.
- */
-
-- assert(parser->simple_key_allowed || !required); /* Impossible. */
-+ /* XXX This caused:
-+ * https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-+ assert(parser->simple_key_allowed || !required); */ /* Impossible. */
-
- /*
- * If the current position may start a simple key, save it.
---
-2.0.4
-
diff --git a/package/libyaml/Config.in b/package/libyaml/Config.in
index 00a48b2016..b1165b5f85 100644
--- a/package/libyaml/Config.in
+++ b/package/libyaml/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_LIBYAML
help
LibYAML is a YAML 1.1 parser and emitter written in C.
- http://pyyaml.org/wiki/LibYAML
+ https://github.com/yaml/libyaml
diff --git a/package/libyaml/libyaml.hash b/package/libyaml/libyaml.hash
index fd039fa6e4..4b998dae54 100644
--- a/package/libyaml/libyaml.hash
+++ b/package/libyaml/libyaml.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 yaml-0.1.6.tar.gz
+sha256 e1884d0fa1eec8cf869ac6bebbf25391e81956aa2970267f974a9fa5e0b968e2 libyaml-0.1.7.tar.gz
diff --git a/package/libyaml/libyaml.mk b/package/libyaml/libyaml.mk
index 52d475066e..001d7a761b 100644
--- a/package/libyaml/libyaml.mk
+++ b/package/libyaml/libyaml.mk
@@ -4,11 +4,11 @@
#
################################################################################
-LIBYAML_VERSION = 0.1.6
-LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
-LIBYAML_SITE = http://pyyaml.org/download/libyaml
+LIBYAML_VERSION = 0.1.7
+LIBYAML_SITE = $(call github,yaml,libyaml,$(LIBYAML_VERSION))
LIBYAML_INSTALL_STAGING = YES
LIBYAML_LICENSE = MIT
LIBYAML_LICENSE_FILES = LICENSE
+LIBYAML_AUTORECONF = YES
$(eval $(autotools-package))
--
2.11.0
More information about the buildroot
mailing list