diff options
| author | James Bennett <james@b-list.org> | 2014-04-21 17:51:51 -0500 |
|---|---|---|
| committer | James Bennett <james@b-list.org> | 2014-04-21 17:51:51 -0500 |
| commit | 486b6f398bba109ba68b2f29c604e2cf13099aab (patch) | |
| tree | 724d2b4190fe2105a75f555abd56e720016fa39b | |
| parent | cebfbcdb862c7800e84d7413afc80de992486c4a (diff) | |
[1.5.x] Update for 1.5.6 security release.1.5.6
| -rw-r--r-- | django/__init__.py | 2 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/releases/security.txt | 17 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/django/__init__.py b/django/__init__.py index f7f270002c..10e683e780 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 5, 6, 'alpha', 0) +VERSION = (1, 5, 6, 'final', 0) def get_version(*args, **kwargs): # Don't litter django/__init__.py with all the get_version stuff. diff --git a/docs/conf.py b/docs/conf.py index 01e660aef4..1ca303a42a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ copyright = 'Django Software Foundation and contributors' # built documents. # # The short X.Y version. -version = '1.5.5' +version = '1.5.6' # The full version, including alpha/beta/rc tags. release = version # The next version to be released diff --git a/docs/releases/security.txt b/docs/releases/security.txt index 474eeee26d..3cc7e82628 100644 --- a/docs/releases/security.txt +++ b/docs/releases/security.txt @@ -448,3 +448,20 @@ Versions affected * Django 1.4 `(patch <https://github.com/django/django/commit/3f3d887a6844ec2db743fee64c9e53e04d39a368>`__ and `Python compatibility fix) <https://github.com/django/django/commit/6903d1690a92aa040adfb0c8eb37cf62e4206714>`__ * Django 1.5 `(patch) <https://github.com/django/django/commit/22b74fa09d7ccbc8c52270d648a0da7f3f0fa2bc>`__ + + +April 21, 2014 - CVE-2014-2014-0472 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`CVE-2014-0472 <http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-0472&cid=2>`_: Unexpected code execution using ``reverse()``. `Full description <https://www.djangoproject.com/weblog/2014/apr/21/security/>`_ + +Versions affected +----------------- + +* Django 1.4 `(patch <https://github.com/django/django/commit/c1a8c420fe4b27fb2caf5e46d23b5712fc0ac535>`_) + +* Django 1.5 `(patch <https://github.com/django/django/commit/2a5bcb69f42b84464b24b5c835dca6467b6aa7f1>`_) + +* Django 1.6 `(patch <https://github.com/django/django/commit/4352a50871e239ebcdf64eee6f0b88e714015c1b>`_) + +* Django 1.7 `(patch <https://github.com/django/django/commit/546740544d7f69254a67b06a3fc7fa0c43512958>`_) @@ -85,7 +85,7 @@ setup( author_email='foundation@djangoproject.com', description=('A high-level Python Web framework that encourages ' 'rapid development and clean, pragmatic design.'), - download_url='https://www.djangoproject.com/m/releases/1.5/Django-1.5.5.tar.gz', + download_url='https://www.djangoproject.com/m/releases/1.5/Django-1.5.6.tar.gz', license='BSD', packages=packages, package_data=package_data, |