On Sun, Nov 13, 2016 at 04:33:18PM +1100, Jonathan Gray wrote:
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/py-yaml/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 9 Dec 2015 18:26:47 -0000 1.14
> +++ Makefile 13 Nov 2016 05:15:05 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT= YAML parser and emitter in Python
>
> -MODPY_EGG_VERSION=3.11
> +MODPY_EGG_VERSION=3.12
> DISTNAME= PyYAML-${MODPY_EGG_VERSION}
> PKGNAME= py-yaml-${MODPY_EGG_VERSION}
> -REVISION= 1
> CATEGORIES= textproc
>
> HOMEPAGE= http://pyyaml.org/wiki/PyYAML
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/textproc/py-yaml/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 19 Aug 2014 14:25:11 -0000 1.4
> +++ distinfo 13 Nov 2016 05:15:12 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (PyYAML-3.11.tar.gz) = w2yTiocuX/SUk4szsUqqFWy0OexnVI/Ks1Nbt4sIRug=
> -SIZE (PyYAML-3.11.tar.gz) = 248685
> +SHA256 (PyYAML-3.12.tar.gz) = WSdmxjAyB6IO/ERVh3eDItf3OxYb2ZTyJ62qNBuiEqs=
> +SIZE (PyYAML-3.12.tar.gz) = 253011
> Index: patches/patch-lib3_yaml_scanner_py
> ===================================================================
> RCS file: patches/patch-lib3_yaml_scanner_py
> diff -N patches/patch-lib3_yaml_scanner_py
> --- patches/patch-lib3_yaml_scanner_py 1 Dec 2014 09:24:46 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-lib3_yaml_scanner_py,v 1.1 2014/12/01 09:24:46 jasper Exp $
> -
> -Security fix for CVE-2014-9130
> -http://marc.info/?l=oss-security&m=141720508007010&w=2
> -
> ---- lib3/yaml/scanner.py.orig Mon Dec 1 10:14:54 2014
> -+++ lib3/yaml/scanner.py Mon Dec 1 10:15:21 2014
> -@@ -299,7 +299,8 @@ class Scanner:
> -
> - # A simple key is required only if it is the first token in the
> current
> - # line. Therefore it is always allowed.
> -- assert self.allow_simple_key or not required
> -+ # http://marc.info/?l=oss-security&m=141720508007010&w=2
> -+ #assert self.allow_simple_key or not required
> -
> - # The next token might be a simple key. Let's save it's number and
> - # position.
> Index: patches/patch-lib_yaml_scanner_py
> ===================================================================
> RCS file: patches/patch-lib_yaml_scanner_py
> diff -N patches/patch-lib_yaml_scanner_py
> --- patches/patch-lib_yaml_scanner_py 1 Dec 2014 09:24:46 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-lib_yaml_scanner_py,v 1.1 2014/12/01 09:24:46 jasper Exp $
> -
> -Security fix for CVE-2014-9130
> -http://marc.info/?l=oss-security&m=141720508007010&w=2
> -
> ---- lib/yaml/scanner.py.orig Wed Mar 26 19:54:13 2014
> -+++ lib/yaml/scanner.py Mon Dec 1 10:15:36 2014
> -@@ -299,7 +299,8 @@ class Scanner(object):
> -
> - # A simple key is required only if it is the first token in the
> current
> - # line. Therefore it is always allowed.
> -- assert self.allow_simple_key or not required
> -+ # http://marc.info/?l=oss-security&m=141720508007010&w=2
> -+ #assert self.allow_simple_key or not required
> -
> - # The next token might be a simple key. Let's save it's number and
> - # position.
ok pea@
Thanks.
