From owner-svn-ports-head@FreeBSD.ORG Tue Jan 13 17:58:01 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F57D7C1; Tue, 13 Jan 2015 17:58:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 514A7211; Tue, 13 Jan 2015 17:58:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0DHw1Or033454; Tue, 13 Jan 2015 17:58:01 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0DHw0ID033449; Tue, 13 Jan 2015 17:58:00 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201501131758.t0DHw0ID033449@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Tue, 13 Jan 2015 17:58:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376978 - in head/textproc/libyaml: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2015 17:58:01 -0000 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@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@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. + */ +