[Python-modules-commits] [pyyaml] 04/08: change version to 3.12-1 New upstream release
Scott Kitterman
kitterman at moszumanska.debian.org
Sun Sep 4 05:50:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch master
in repository pyyaml.
commit d1ee90124e1d966714ed2152e7b7b77774f56633
Merge: c4bf8a0 3ab78f1
Author: Scott Kitterman <scott at kitterman.com>
Date: Sun Sep 4 01:22:15 2016 -0400
change version to 3.12-1
New upstream release
PKG-INFO | 11 +-
README | 2 +-
debian/.git-dpm | 6 +-
debian/changelog | 5 +-
.../patches/CVE-2014-9130-invalid-key-assert.diff | 43 -
debian/patches/series | 2 -
debian/patches/size_t_not_int.diff | 84 -
debian/patches/support-high-codepoints.patch | 2 +-
ext/_yaml.c | 12277 ++++++++++++-------
ext/_yaml.pxd | 8 +-
lib/yaml/__init__.py | 2 +-
lib/yaml/representer.py | 4 +-
lib/yaml/resolver.py | 5 +-
lib/yaml/scanner.py | 4 +-
lib3/yaml/__init__.py | 2 +-
lib3/yaml/representer.py | 17 +-
lib3/yaml/resolver.py | 5 +-
lib3/yaml/scanner.py | 4 +-
setup.py | 72 +-
.../data/invalid-python-name-module-2.loader-error | 1 -
tests/lib/test_all.py | 2 +-
tests/lib/test_appliance.py | 4 +-
tests/lib3/test_all.py | 2 +-
tests/lib3/test_appliance.py | 4 +-
24 files changed, 8031 insertions(+), 4537 deletions(-)
diff --cc debian/.git-dpm
index 7499ece,0000000..1a61578
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- ce6f328b074bee1e81c1f7caaf05815330a24e1e
- ce6f328b074bee1e81c1f7caaf05815330a24e1e
- b2559d98f7c8e416b74a8c84bc93bf7b7fa4f6b4
++3ab78f1d6df268e4ed1d9c10de2cbf7ec19decb3
++3ab78f1d6df268e4ed1d9c10de2cbf7ec19decb3
++93dbe92fd26c4698920a40c884ea6230b008ab82
+93dbe92fd26c4698920a40c884ea6230b008ab82
+pyyaml_3.12.orig.tar.gz
+cb7fd3e58c129494ee86e41baedfec69eb7dafbe
+253011
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 24a6afd,0000000..8cd94b5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,230 -1,0 +1,231 @@@
- pyyaml (3.11-4) UNRELEASED; urgency=medium
++pyyaml (3.12-1) UNRELEASED; urgency=medium
+
+ [ Scott Kitterman ]
+ * Update Homepage field in debian/control
++ * New upstream release
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
- -- Scott Kitterman <scott at kitterman.com> Sat, 16 Jan 2016 02:57:27 -0500
++ -- Scott Kitterman <scott at kitterman.com> Sun, 04 Sep 2016 01:22:15 -0400
+
+pyyaml (3.11-3) unstable; urgency=medium
+
+ * Team upload.
+ * d/control: Bump Standards-Version with no other changes necessary.
+ * d/patches/support-high-codepoints.patch: Added to fix support for
+ codepoints above 0xffff. Given by John R. Lenton. (Closes: #806826)
+ * d/tests/{control,python2.sh,python3.sh}: Added to test the above patch
+ since a unittest is problematic.
+
+ -- Barry Warsaw <barry at debian.org> Wed, 02 Dec 2015 16:29:22 -0500
+
+pyyaml (3.11-2) unstable; urgency=medium
+
+ * Backport security fix for Reachable Assertion security issue (potential
+ remote DoS) - CVE-2014-9130 (Closes: #772815)
+ - Add debian/patches/CVE-2014-9130-invalid-key-assert.diff
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 12 Dec 2014 08:35:37 -0500
+
+pyyaml (3.11-1) unstable; urgency=medium
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Scott Kitterman ]
+ * New upstream release
+ * Remove empty directory usr/lib/python3/dist-packages/yaml from python3-
+ yaml-dbg
+ * Bump standards version to 3.9.5 without further change
+ * Remove unneeded X-Python-Version/X-Python3-Version from debian/control
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 18 Apr 2014 22:37:37 -0400
+
+pyyaml (3.10-4) unstable; urgency=low
+
+ * Bump debian/compat and minimum debhelper version to 9 for dpkg-buildflags
+ and hardening support
+ * Drop unneeded XB-Python-Version from python-yaml
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 26 Jun 2012 11:19:50 -0400
+
+pyyaml (3.10-3) unstable; urgency=low
+
+ * Regenerate ext_yaml.c during build
+ - Update debian/rules to move the upstream file aside during build
+ - Add cython and cython-dbg to build-depends
+ * Add quilt patch system
+ - Add quilt to build-depends
+ - Add --with quilt to debian/rules
+ - Add README.source
+ * Add debian/patches/size_t_not_int.diff to fix FTBFS on S390x
+ (Closes: #676536)
+ - Thanks to Julien Cristau for the patch
+ * Rework debian/rules to support DEB_BUILD_OPTIONS nocheck
+ * Bump standards version to 3.9.3 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 08 Jun 2012 16:36:33 -0400
+
+pyyaml (3.10-2) unstable; urgency=low
+
+ * Remove python3-yaml-dbg find rule in debian/rules so python3 debug package
+ is built correctly (Closes: #650950)
+ * Remove similar rule for python-yaml-dbg since it is not needed
+ * Fix short descriptions for debug packages so they are not the same as
+ non-debug packages
+ * Also ship upstream changelog in python-yaml
+ * Add python3-yaml.docs to README/CHANGES are shipped in python3-yaml
+ * Bump standards version to 3.9.2 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 04 Dec 2011 13:48:42 -0500
+
+pyyaml (3.10-1) unstable; urgency=low
+
+ * New upstream release (LP: #770895)
+ * Override dh_auto_test to run tests in the right part of the build
+ * Protect for loops in debian/rules with set -e
+ * Use install-layout=deb to avoid files landing in /usr/local
+ * Drop XB-Python-Version from python-yaml (obsolete)
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 31 May 2011 16:18:44 -0400
+
+pyyaml (3.09-5) unstable; urgency=low
+
+ * Team upload.
+ * Bump minimum required python3-all-dev version to 3.1.2-10
+ (and rebuild for /usr/lib/python3/dist-packages transtion)
+
+ -- Piotr Ożarowski <piotr at debian.org> Sun, 26 Sep 2010 22:15:21 +0200
+
+pyyaml (3.09-4) unstable; urgency=low
+
+ * Switch from incorrect use of XS-Python-Version to X-Python-Version and
+ X-Python3-Version to work with current pyversions/py3versions
+ * Use ${python3:Depends} instead of ${python:Depends} for python3-yaml
+ (Closes: #591957)
+ * Rebuild with recent dh_python3 to fix pre-removal script (Closes: #591652)
+ * Drop XB-Python-Version from python3 packages (only relates to Python)
+ * Bump standards version to 3.9.1 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 13 Aug 2010 23:48:51 -0400
+
+pyyaml (3.09-3) unstable; urgency=low
+
+ * Convert from CDBS to Debhelper
+ - Port rules from cdbs to debhelper
+ - Drop cdbs from build-depends
+ * Convert from python-support to dh_python2
+ - Drop python-central from build-depends
+ - Switch to --with python2 in debian/rules
+ - Bump python-all-dev build-depend version to 2.6.5-2~
+ * Add support for Python3
+ - Add python3-yaml and python3-yaml-dbg to debian/control
+ - Add python3-all-dev and python3-all-dbg to build-depends
+ - Add >= 3.0 to XS-Python-Version
+ - Adjust debian rules to build --with python3
+ * Change priority to optional to match override
+ * Bump standards version to 3.8.4 without further change
+ * Remove DM-Upload-Allowed
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 20 Jun 2010 20:50:44 -0400
+
+pyyaml (3.09-2) unstable; urgency=low
+
+ * Update XB-Python-Version for Python 2.6 transition (closes: #556160)
+ * Move python-yaml-dbg to section debug
+ * Use correct © symbol in debian/copyright
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 13 Nov 2009 18:22:57 -0500
+
+pyyaml (3.09-1) unstable; urgency=low
+
+ * New upstream release
+ * Update standards version to 3.8.3 without further change
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 31 Aug 2009 10:02:36 -0400
+
+pyyaml (3.08-1) unstable; urgency=low
+
+ * New upstream release
+ - Change debian/rules to run new upstream test suite during build
+ - Version libyaml-dev build dep to 0.1.2~ due to test failures with 0.1.1
+ * Change priority to extra due to libyaml being extra
+ * Add ${misc:Depends} to python-yaml and python-yaml-dbg
+ * Update package description to mention being built against libyaml
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 02 Jan 2009 23:57:37 -0500
+
+pyyaml (3.06-1) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Scott Kitterman ]
+ * New upstream release
+ - Dropped build-dep on python-pyrex (no longer used)
+ - Update debian/rules to build with the new libyaml integration scheme
+ * Comment out simple-patchsys.mk in debian/rules since it's not currently
+ needed
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 03 Nov 2008 21:17:42 -0500
+
+pyyaml (3.05-2) unstable; urgency=low
+
+ [ Piotr Ożarowski ]
+ * Vcs-Browser and Homepage fields added
+ * XS-Vcs-Svn field renamed to Vcs-Svn
+ * DM-Upload-Allowed set to "yes"
+
+ [ Sandro Tosi ]
+ * debian/control
+ - uniforming Vcs-Browser field
+
+ [ Scott Kitterman ]
+ * Build with lib-yaml now that it is in the archive (Closes: #435410)
+ - Add build-dep on libyaml-dev and python-pyrex
+ - Add depends for ${shlibs:Depends} (Package falls back to pure Python
+ if libyaml is not present, but it's not worth splitting a small package)
+ - Install with setup_with_libyaml.py for all Python versions
+ - Switch from arch all to arch any
+ * Add debug package
+ - Add python-all-dbg to build-dep
+ - Add python-yaml-dbg to debian/control
+ - Update debian/rules
+ * Switch from python-support to python-central
+ - Update depends
+ - Remove pyversions
+ - Add XS/XB-python-versions to debian/control
+ - Update debian/rules
+ * Update package description
+ * Update standards version to 3.8.0.1
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 24 Jun 2008 21:32:45 -0400
+
+pyyaml (3.05-1) unstable; urgency=low
+
+ [ Scott Kitterman ]
+ * New upstream version
+ * Removed obsolete patch and debian/patches
+ * debian/control:
+ - Added XS-Vcs-Svn field
+ - Remove build-dep on pacht-utils
+ * debian/rules:
+ - Comment out simple-patchsys
+
+ [ Piotr Ożarowski ]
+ * Added debian/watch file
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 13 May 2007 22:38:17 -0400
+
+pyyaml (3.04-1) unstable; urgency=low
+
+ * Initial Debian package (Closes: #413720)
+ * Include upstream recommended patches from the development tree:
+ - fix loading an empty stream: changeset 233
+ - fix the !timestamp constructor: changeset 234
+ - fix an obscure issue with yaml_path_resolver: changeset 246
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 4 Apr 2007 15:50:36 -0400
+
diff --cc debian/patches/series
index 6350b70,0000000..b44ddb2
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
- size_t_not_int.diff
- CVE-2014-9130-invalid-key-assert.diff
+support-high-codepoints.patch
diff --cc debian/patches/support-high-codepoints.patch
index 9f8cb3d,0000000..4c5619e
mode 100644,000000..100644
--- a/debian/patches/support-high-codepoints.patch
+++ b/debian/patches/support-high-codepoints.patch
@@@ -1,97 -1,0 +1,97 @@@
- From ce6f328b074bee1e81c1f7caaf05815330a24e1e Mon Sep 17 00:00:00 2001
++From 3ab78f1d6df268e4ed1d9c10de2cbf7ec19decb3 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at python.org>
+Date: Tue, 1 Dec 2015 18:15:20 -0500
+Subject: =?UTF-8?q?Fix=20support=20for=20codepoints=20over=200xffff=20acco?=
+ =?UTF-8?q?rding=20to=20the=20spec.=20=20Given=20by=20John=0AR.=20Lenton.?=
+ =?UTF-8?q?=20=20Closes:=20#806826.?=
+
+Patch-Name: support-high-codepoints.patch
+---
+ lib/yaml/emitter.py | 7 ++++++-
+ lib/yaml/reader.py | 9 +++++++--
+ lib3/yaml/emitter.py | 3 ++-
+ lib3/yaml/reader.py | 2 +-
+ 4 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/lib/yaml/emitter.py b/lib/yaml/emitter.py
+index e5bcdcc..9b4d5f0 100644
+--- a/lib/yaml/emitter.py
++++ b/lib/yaml/emitter.py
+@@ -8,9 +8,13 @@
+
+ __all__ = ['Emitter', 'EmitterError']
+
++import sys
++
+ from error import YAMLError
+ from events import *
+
++has_ucs4 = sys.maxunicode > 0xffff
++
+ class EmitterError(YAMLError):
+ pass
+
+@@ -701,7 +705,8 @@ class Emitter(object):
+ line_breaks = True
+ if not (ch == u'\n' or u'\x20' <= ch <= u'\x7E'):
+ if (ch == u'\x85' or u'\xA0' <= ch <= u'\uD7FF'
+- or u'\uE000' <= ch <= u'\uFFFD') and ch != u'\uFEFF':
++ or u'\uE000' <= ch <= u'\uFFFD'
++ or ((not has_ucs4) or (u'\U00010000' <= ch < u'\U0010ffff'))) and ch != u'\uFEFF':
+ unicode_characters = True
+ if not self.allow_unicode:
+ special_characters = True
+diff --git a/lib/yaml/reader.py b/lib/yaml/reader.py
+index 3249e6b..0b95f47 100644
+--- a/lib/yaml/reader.py
++++ b/lib/yaml/reader.py
+@@ -19,7 +19,9 @@ __all__ = ['Reader', 'ReaderError']
+
+ from error import YAMLError, Mark
+
+-import codecs, re
++import codecs, re, sys
++
++has_ucs4 = sys.maxunicode > 0xffff
+
+ class ReaderError(YAMLError):
+
+@@ -134,7 +136,10 @@ class Reader(object):
+ self.encoding = 'utf-8'
+ self.update(1)
+
+- NON_PRINTABLE = re.compile(u'[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uD7FF\uE000-\uFFFD]')
++ if has_ucs4:
++ NON_PRINTABLE = re.compile(u'[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uD7FF\uE000-\uFFFD\U00010000-\U0010ffff]')
++ else:
++ NON_PRINTABLE = re.compile(u'[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uD7FF\uE000-\uFFFD]')
+ def check_printable(self, data):
+ match = self.NON_PRINTABLE.search(data)
+ if match:
+diff --git a/lib3/yaml/emitter.py b/lib3/yaml/emitter.py
+index 34cb145..1f8ed92 100644
+--- a/lib3/yaml/emitter.py
++++ b/lib3/yaml/emitter.py
+@@ -698,7 +698,8 @@ class Emitter:
+ line_breaks = True
+ if not (ch == '\n' or '\x20' <= ch <= '\x7E'):
+ if (ch == '\x85' or '\xA0' <= ch <= '\uD7FF'
+- or '\uE000' <= ch <= '\uFFFD') and ch != '\uFEFF':
++ or '\uE000' <= ch <= '\uFFFD'
++ or '\U00010000' <= ch < '\U0010ffff') and ch != '\uFEFF':
+ unicode_characters = True
+ if not self.allow_unicode:
+ special_characters = True
+diff --git a/lib3/yaml/reader.py b/lib3/yaml/reader.py
+index f70e920..5764f2d 100644
+--- a/lib3/yaml/reader.py
++++ b/lib3/yaml/reader.py
+@@ -134,7 +134,7 @@ class Reader(object):
+ self.encoding = 'utf-8'
+ self.update(1)
+
+- NON_PRINTABLE = re.compile('[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uD7FF\uE000-\uFFFD]')
++ NON_PRINTABLE = re.compile('[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uD7FF\uE000-\uFFFD\U00010000-\U0010ffff]')
+ def check_printable(self, data):
+ match = self.NON_PRINTABLE.search(data)
+ if match:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyyaml.git
More information about the Python-modules-commits
mailing list