svn commit: r376978 - in head/textproc/libyaml: . files

[Josh Paetzel]

Author: jpaetzel
Date: Tue Jan 13 17:58:00 2015
New Revision: 376978
URL: https://svnweb.freebsd.org/changeset/ports/376978
QAT: https://qat.redports.org/buildarchive/r376978/

Log:
  Patch port for CVE
  
  PR:	195956
  Submitted by:	yasu at utahime.org

Added:
  head/textproc/libyaml/files/patch-src__scanner.c   (contents, props changed)
Modified:
  head/textproc/libyaml/Makefile

Modified: head/textproc/libyaml/Makefile
==============================================================================
--- head/textproc/libyaml/Makefile	Tue Jan 13 17:56:31 2015	(r376977)
+++ head/textproc/libyaml/Makefile	Tue Jan 13 17:58:00 2015	(r376978)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libyaml
 PORTVERSION=	0.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://pyyaml.org/download/libyaml/
 DISTNAME=	yaml-${PORTVERSION}
@@ -12,6 +12,8 @@ DIST_SUBDIR=	repacked
 MAINTAINER=	jpaetzel at FreeBSD.org
 COMMENT=	YAML 1.1 parser and emitter written in C
 
+LICENSE=	MIT
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool pathfix

Added: head/textproc/libyaml/files/patch-src__scanner.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/libyaml/files/patch-src__scanner.c	Tue Jan 13 17:58:00 2015	(r376978)
@@ -0,0 +1,16 @@
+--- src/scanner.c.orig	2014-03-27 03:54:02.000000000 +0900
++++ src/scanner.c	2014-12-14 10:07:35.636167929 +0900
+@@ -1106,13 +1106,6 @@
+             && 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.
+      */
+