lp://staging/ubuntu/precise-proposed/python-django

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

42. By Andres Rodriguez on 2013-03-07

[ Julian Edwards ]
* debian/patches:
  - prefetch_related.diff: Backport prefetch_related from 1.4 (LP: #1081388)
  - bug15496-base64-multipart-fix.diff: Include fix for upstream bug #15496
    which makes 'Content-Transfer-Encoding: base64: work for multipart
    messages. (LP: #1081392)

41. By Andres Rodriguez on 2012-11-20

[ Julian Edwards ]
* debian/patches:
  - genericipaddressfield.diff: Backport GenericIPAddressField
    from 1.4 (LP: #1081391)
  - prefetch_related.diff: Backport prefetch_related from 1.4 (LP: #1081388)
  - bug15496-base64-multipart-fix.diff: Include fix for upstream bug #15496
    which makes 'Content-Transfer-Encoding: base64: work for multipart
    messages. (LP: #1081392)

40. By Jamie Strandboge on 2012-11-19

* Add additional tests for CVE-2012-4520
  - debian/patches/CVE-2012-4520-additional-tests.diff: add various poisoned
    host header test material
* Don't fail self-tests if MANAGERS or ADMINS is defined in settings.py
  - debian/patches/lp1080204.diff: Isolate poisoned_http_host tests from 500
  - https://code.djangoproject.com/ticket/19172
  - LP: #1080204

39. By Jamie Strandboge on 2012-11-09

* SECURITY UPDATE: fix Host header poisoning
  - debian/patches/CVE-2012-4520.diff: adjust HttpRequest.get_host() to
    raise django.core.exceptions.SuspiciousOperation if Host headers contain
    potentially dangerous content. Patch thanks to Mackenzie Morgan.
  - CVE-2012-4520
  - LP: #1068486

38. By Marc Deslauriers on 2012-09-06

[ Scott Kitterman ]
* SECURITY UPDATE: multiple issues (LP: #1031733)
* References CVE-2012-3442 CVE-2012-3443 CVE-2012-3444
  https://www.djangoproject.com/weblog/2012/jul/30/security-releases-issued/
* New upstream release to address three security issues:
  - Cross-site scripting in authentication views
  - Denial-of-service in image validation
  - Denial-of-service via get_image_dimensions()
* Added debian/patches/security_http_redirects,
  security_image_uploading_two, and security_image_uploading cherry picked
  from upstream git

[ Marc Deslauriers ]
* debian/patches/security_http_redirects: remove unrelated changes, add
  python 2.4 regression fix.

37. By Dave Walker on 2012-02-17

* Merge with Debian. Remaining changes:
  - 09_test_view_decorator_sleep.diff increases the sleep time to
    reduce race condition effects on build machines.
    https://code.djangoproject.com/ticket/16686 (LP: #829487)
* debian/patches/{psycopg2_creation.diff,compat-psycopg2-plus2.4.2.diff}:
  - New patches, resolve compatibility with psycopg2 > 2.4.1, patches
    based on upstream submissions, rebasing courtesy of Dave Pifke.
  - LP: #905837

36. By Barry Warsaw on 2011-10-19

* Merge with Debian. Remaining changes:
  - 09_test_view_decorator_sleep.diff increases the sleep time to
    reduce race condition effects on build machines.
    https://code.djangoproject.com/ticket/16686 (LP: #829487)

35. By Raphaël Hertzog on 2011-09-15

* New upstream release. It includes security updates described here:
  https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
  Closes: #641405
* Update 01_disable_url_verify_regression_tests.diff and merge
  07_disable_url_verify_model_tests.diff into it.
* Update patch headers to conform to DEP-3.
* Apply patch from Steve Langasek to dynamically build the UTF-8
  locale required by the test-suite instead of build-depending on
  locales-all. Closes: #630421
* Use "dh --with sphinxdoc" to clean up the Sphinx generated documentation
  and avoid the embedded-javascript-library lintian warning. Build-Depends
  on python-sphinx >= 1.0.7+dfsg-1 for this and also add
  ${sphinxdoc:Depends} to python-django-doc Depends field.
* Cleanup build-dependencies now that even oldstable has python 2.5.
* Switch to dh_python2 as python helper tool. Drop legacy files
  debian/pyversions and debian/pycompat.
* New patch 02_disable-sources-in-sphinxdoc.diff to not generate
  the _sources directory that we used to remove manually within the rules
  file. But must be kept disabled until #641710 is fixed.
* Properly support DEB_BUILD_OPTIONS=nocheck despite the override
  of dh_auto_test.

34. By Barry Warsaw on 2011-08-23

* 09_test_view_decorator_sleep.diff increases the sleep time to
  reduce race condition effects on build machines.
  https://code.djangoproject.com/ticket/16686 (LP: #829487)
* Remove build-dep on locales-all which isn't in the Ubuntu archive.

33. By Piotr Ożarowski on 2011-05-02

* Team upload.

[ Chris Lamb ]
* Don't remove "backup~" test file - upstream did ship it; we were just
  removing it with dh_clean.

[ Piotr Ożarowski ]
* Fix builds with non-default Python versions installed
* Bump Standards-Version to 3.9.2 (no changes needed)