From 20af303231f2046c3ec650e452b6b07b3b0cfec41ce77e8eeacb0ccd31c6d49a Mon Sep 17 00:00:00 2001 From: Alexandre Rogoski Date: Fri, 12 Apr 2013 17:59:12 +0000 Subject: [PATCH] - Update to 2.5.10: Kombu 3 consumers will no longer accept pickle/yaml or msgpack by default, and you will have to explicitly enable untrusted deserializers either globally using kombu.enable_insecure_serializers, or using the accept argument to kombu.Consumer. - New utility function to disable/enable untrusted serializers. - kombu.disable_insecure_serializers - kombu.enable_insecure_serializers - Consumer: `accept` can now be used to specify a whitelist of content types to accept. If the accept whitelist is set and a message is received with a content type that is not in the whitelist then a :exc:`~kombu.exceptions.ContentDisallowed` exception is raised. Note that this error can be handled by the already existing `on_decode_error` callback Examples: Consumer(accept=['application/json']) Consumer(accept=['pickle', 'json']) - Now depends on amqp 1.0.11 - pidbox: Mailbox now supports the `accept` argument. - Redis: More friendly error for when keys are missing. - Connection URLs: The parser did not work well when there were multiple '+' tokens. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=76 --- accept-newer-amqp-versions.diff | 31 ------------------------------- kombu-2.5.10.tar.gz | 3 +++ kombu-2.5.9.tar.gz | 3 --- python-kombu.changes | 27 +++++++++++++++++++++++++++ python-kombu.spec | 6 ++---- python3-kombu.spec | 6 ++---- 6 files changed, 34 insertions(+), 42 deletions(-) delete mode 100644 accept-newer-amqp-versions.diff create mode 100644 kombu-2.5.10.tar.gz delete mode 100644 kombu-2.5.9.tar.gz diff --git a/accept-newer-amqp-versions.diff b/accept-newer-amqp-versions.diff deleted file mode 100644 index cc46fa3..0000000 --- a/accept-newer-amqp-versions.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: kombu.egg-info/requires.txt -=================================================================== ---- kombu.egg-info/requires.txt.orig -+++ kombu.egg-info/requires.txt -@@ -1,2 +1,2 @@ - anyjson>=0.3.3 --amqp>=1.0.10,<1.1.0 -\ No newline at end of file -+amqp>=1.0.10 -\ No newline at end of file -Index: requirements/default.txt -=================================================================== ---- requirements/default.txt.orig -+++ requirements/default.txt -@@ -1,2 +1,2 @@ - anyjson>=0.3.3 --amqp>=1.0.10,<1.1.0 -+amqp>=1.0.10 -Index: setup.cfg -=================================================================== ---- setup.cfg.orig -+++ setup.cfg -@@ -28,7 +28,7 @@ upload-dir = docs/.build/html - - [bdist_rpm] - requires = anyjson >= 0.3.3 -- amqp < 1.1.0 -+ amqp >= 1.0.9 - importlib - ordereddict - diff --git a/kombu-2.5.10.tar.gz b/kombu-2.5.10.tar.gz new file mode 100644 index 0000000..bc1798f --- /dev/null +++ b/kombu-2.5.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01c1e56fe88053b6e7801682277c4cc8318c485d8bd47c830c08567bfac680e2 +size 304810 diff --git a/kombu-2.5.9.tar.gz b/kombu-2.5.9.tar.gz deleted file mode 100644 index 9d33b93..0000000 --- a/kombu-2.5.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0f9b7a412964af67e8ac013b5dbe2299eb8f1bd68b09a6d3d85717bdf1ea459 -size 303193 diff --git a/python-kombu.changes b/python-kombu.changes index 0440fc5..c08875a 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br + +- Update to 2.5.10: + Kombu 3 consumers will no longer accept pickle/yaml or msgpack + by default, and you will have to explicitly enable untrusted deserializers + either globally using kombu.enable_insecure_serializers, or + using the accept argument to kombu.Consumer. + - New utility function to disable/enable untrusted serializers. + - kombu.disable_insecure_serializers + - kombu.enable_insecure_serializers + - Consumer: `accept` can now be used to specify a whitelist + of content types to accept. + If the accept whitelist is set and a message is received + with a content type that is not in the whitelist then a + :exc:`~kombu.exceptions.ContentDisallowed` exception + is raised. Note that this error can be handled by the already + existing `on_decode_error` callback + Examples: + Consumer(accept=['application/json']) + Consumer(accept=['pickle', 'json']) + - Now depends on amqp 1.0.11 + - pidbox: Mailbox now supports the `accept` argument. + - Redis: More friendly error for when keys are missing. + - Connection URLs: The parser did not work well when there were + multiple '+' tokens. + ------------------------------------------------------------------- Thu Apr 11 16:51:37 UTC 2013 - alexandre@exatati.com.br diff --git a/python-kombu.spec b/python-kombu.spec index ab3b13f..6593eaf 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -17,14 +17,13 @@ Name: python-kombu -Version: 2.5.9 +Version: 2.5.10 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause Group: Development/Languages/Python Url: http://github.com/ask/kombu/ Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz -Patch0: accept-newer-amqp-versions.diff BuildRequires: python-PyYAML BuildRequires: python-amqplib BuildRequires: python-anyjson @@ -35,7 +34,7 @@ BuildRequires: python-msgpack-python BuildRequires: python-nose-cover3 BuildRequires: python-simplejson BuildRequires: python-unittest2 >= 0.5.0 -Requires: python-amqp >= 1.0.8 +Requires: python-amqp >= 1.0.11 Requires: python-anyjson >= 0.3.3 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-importlib @@ -65,7 +64,6 @@ provide proven and tested solutions to common messaging problems. %prep %setup -q -n kombu-%{version} -%patch0 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py # NOTE(saschpe): We have a newer python-amqp, but this shouldn't be an issue: diff --git a/python3-kombu.spec b/python3-kombu.spec index 5cb899a..8e03433 100644 --- a/python3-kombu.spec +++ b/python3-kombu.spec @@ -17,14 +17,13 @@ Name: python3-kombu -Version: 2.5.9 +Version: 2.5.10 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-2-Clause Group: Development/Languages/Python Url: http://github.com/ask/kombu/ Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz -Patch0: accept-newer-amqp-versions.diff BuildRequires: python3 BuildRequires: python3-PyYAML BuildRequires: python3-amqplib @@ -36,7 +35,7 @@ BuildRequires: python3-msgpack-python BuildRequires: python3-nose-cover3 BuildRequires: python3-simplejson BuildRequires: python3-unittest2 -Requires: python3-amqp >= 1.0.8 +Requires: python3-amqp >= 1.0.11 Requires: python3-anyjson Suggests: couchdb Suggests: mongodb @@ -57,7 +56,6 @@ providing an idiomatic high-level interface for the AMQP protocol, and also provide proven and tested solutions to common messaging problems. %prep -%setup -q -n kombu-%{version} %patch0 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py