summaryrefslogtreecommitdiff
path: root/textproc/libyaml
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-09-01 16:22:02 +0000
committerwiz <wiz@pkgsrc.org>2016-09-01 16:22:02 +0000
commit285c706eb9ffe9b7a319ff1893926a164b7044dd (patch)
tree484a47737c8d4656349f9b78122115f997bc8c17 /textproc/libyaml
parent24ea333614794687171f1db0698ffd0206de1a39 (diff)
downloadpkgsrc-285c706eb9ffe9b7a319ff1893926a164b7044dd.tar.gz
Updated libyaml to 0.1.7.
Changes not found.
Diffstat (limited to 'textproc/libyaml')
-rw-r--r--textproc/libyaml/Makefile5
-rw-r--r--textproc/libyaml/distinfo11
-rw-r--r--textproc/libyaml/patches/patch-src_scanner.c21
3 files changed, 7 insertions, 30 deletions
diff --git a/textproc/libyaml/Makefile b/textproc/libyaml/Makefile
index ccd6f423f9e..2b714bdea5b 100644
--- a/textproc/libyaml/Makefile
+++ b/textproc/libyaml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/12/20 21:04:32 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/09/01 16:22:02 wiz Exp $
-DISTNAME= yaml-0.1.6
+DISTNAME= yaml-0.1.7
PKGNAME= lib${DISTNAME}
-PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://pyyaml.org/download/libyaml/
diff --git a/textproc/libyaml/distinfo b/textproc/libyaml/distinfo
index a0c48c302f5..11c36c82565 100644
--- a/textproc/libyaml/distinfo
+++ b/textproc/libyaml/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:59:39 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/09/01 16:22:02 wiz Exp $
-SHA1 (yaml-0.1.6.tar.gz) = f3d404e11bec3c4efcddfd14c42d46f1aabe0b5d
-RMD160 (yaml-0.1.6.tar.gz) = c37f04eb6d8c3c587bf241c2f3daf74b6d24f513
-SHA512 (yaml-0.1.6.tar.gz) = eef1f26fec0a305836b8c6a65def4e2864fe2415618e7490717d4e42f0fc51048727ab0e7e4a6c3a2783ae762fddd6b78091a76a6cd3a2710ae18e3dfb27cd44
-Size (yaml-0.1.6.tar.gz) = 503012 bytes
-SHA1 (patch-src_scanner.c) = a273f2b3bdf499a76270ee82aa851b772e207ed9
+SHA1 (yaml-0.1.7.tar.gz) = 3590cbf092ef4c71bc0a9b404c00a626b1e04dee
+RMD160 (yaml-0.1.7.tar.gz) = e41df050417f2640f7ba0ee905c0b4cc3eb603f3
+SHA512 (yaml-0.1.7.tar.gz) = 1ee5007dd10db137b5ee80f8117f07390ec04af98d087a5f5475dd2b38d87c699b79ab1676e6c7bfa263323fcdf8edd69fada2b0b7f9c57bef4e46cd65f1e975
+Size (yaml-0.1.7.tar.gz) = 527518 bytes
diff --git a/textproc/libyaml/patches/patch-src_scanner.c b/textproc/libyaml/patches/patch-src_scanner.c
deleted file mode 100644
index d9e15c12d3d..00000000000
--- a/textproc/libyaml/patches/patch-src_scanner.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_scanner.c,v 1.1 2014/12/20 21:04:32 wiz Exp $
-
-Fix CVE-2014-9130:
-https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
-
---- src/scanner.c.orig 2014-03-26 18:54:02.000000000 +0000
-+++ src/scanner.c
-@@ -1106,13 +1106,6 @@ yaml_parser_save_simple_key(yaml_parser_
- && parser->indent == (ptrdiff_t)parser->mark.column);
-
- /*
-- * A simple key is required only when it is the first token in the current
-- * line. Therefore it is always allowed. But we add a check anyway.
-- */
--
-- assert(parser->simple_key_allowed || !required); /* Impossible. */
--
-- /*
- * If the current position may start a simple key, save it.
- */
-