Skip to content

Commit 486b6f3

Browse files
committed
[1.5.x] Update for 1.5.6 security release.
1 parent cebfbcd commit 486b6f3

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

django/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = (1, 5, 6, 'alpha', 0)
1+
VERSION = (1, 5, 6, 'final', 0)
22

33
def get_version(*args, **kwargs):
44
# Don't litter django/__init__.py with all the get_version stuff.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# built documents.
5353
#
5454
# The short X.Y version.
55-
version = '1.5.5'
55+
version = '1.5.6'
5656
# The full version, including alpha/beta/rc tags.
5757
release = version
5858
# The next version to be released

docs/releases/security.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,3 +448,20 @@ Versions affected
448448
* Django 1.4 `(patch <https://github.com/django/django/commit/3f3d887a6844ec2db743fee64c9e53e04d39a368>`__ and `Python compatibility fix) <https://github.com/django/django/commit/6903d1690a92aa040adfb0c8eb37cf62e4206714>`__
449449

450450
* Django 1.5 `(patch) <https://github.com/django/django/commit/22b74fa09d7ccbc8c52270d648a0da7f3f0fa2bc>`__
451+
452+
453+
April 21, 2014 - CVE-2014-2014-0472
454+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
455+
456+
`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/>`_
457+
458+
Versions affected
459+
-----------------
460+
461+
* Django 1.4 `(patch <https://github.com/django/django/commit/c1a8c420fe4b27fb2caf5e46d23b5712fc0ac535>`_)
462+
463+
* Django 1.5 `(patch <https://github.com/django/django/commit/2a5bcb69f42b84464b24b5c835dca6467b6aa7f1>`_)
464+
465+
* Django 1.6 `(patch <https://github.com/django/django/commit/4352a50871e239ebcdf64eee6f0b88e714015c1b>`_)
466+
467+
* Django 1.7 `(patch <https://github.com/django/django/commit/546740544d7f69254a67b06a3fc7fa0c43512958>`_)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def is_package(package_name):
8585
author_email='[email protected]',
8686
description=('A high-level Python Web framework that encourages '
8787
'rapid development and clean, pragmatic design.'),
88-
download_url='https://www.djangoproject.com/m/releases/1.5/Django-1.5.5.tar.gz',
88+
download_url='https://www.djangoproject.com/m/releases/1.5/Django-1.5.6.tar.gz',
8989
license='BSD',
9090
packages=packages,
9191
package_data=package_data,

0 commit comments

Comments
 (0)