mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
package/libyaml: bump version to 0.1.7
Removed patch after upstream committed a similar patch:
946596172d (diff-35a172a9ca8faa1683fc747ca94681b3)
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
08ac3e134f
commit
e1501e2d1f
@ -1,33 +0,0 @@
|
|||||||
From e6aa721cc0e5a48f408c52355559fd36780ba32a Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= <ingy@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@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
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 yaml-0.1.6.tar.gz
|
sha256 8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729 yaml-0.1.7.tar.gz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBYAML_VERSION = 0.1.6
|
LIBYAML_VERSION = 0.1.7
|
||||||
LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
|
LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
|
||||||
LIBYAML_SITE = http://pyyaml.org/download/libyaml
|
LIBYAML_SITE = http://pyyaml.org/download/libyaml
|
||||||
LIBYAML_INSTALL_STAGING = YES
|
LIBYAML_INSTALL_STAGING = YES
|
||||||
|
Loading…
x
Reference in New Issue
Block a user