Bug#854833: unblock: django-cors-headers/1.1.0-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package django-cors-headers
The latest version fixes a RC bug #854716.
It also updates the Vcs-* headers which were wrong.
diff -Nru django-cors-headers-1.1.0/debian/changelog django-cors-headers-1.1.0/debian/changelog
--- django-cors-headers-1.1.0/debian/changelog 2015-08-07 12:22:31.000000000 +1000
+++ django-cors-headers-1.1.0/debian/changelog 2017-02-11 08:34:43.000000000 +1100
@@ -1,3 +1,11 @@
+django-cors-headers (1.1.0-2) unstable; urgency=medium
+
+ * Add patch to fix Django 1.10 support. Closes: #854716.
+ * Update Vcs-* headers for git repository.
+ * disable_broken_tests.patch regenerated from git-dpm but unchanged.
+
+ -- Brian May <bam@debian.org> Sat, 11 Feb 2017 08:34:43 +1100
+
django-cors-headers (1.1.0-1) unstable; urgency=low
* Initial upload. Closes: #794829.
diff -Nru django-cors-headers-1.1.0/debian/control django-cors-headers-1.1.0/debian/control
--- django-cors-headers-1.1.0/debian/control 2015-08-07 12:30:44.000000000 +1000
+++ django-cors-headers-1.1.0/debian/control 2017-02-10 20:17:00.000000000 +1100
@@ -8,8 +8,8 @@
python3-setuptools (>= 0.6b3), python3-mock, python3-django, python3-all
Standards-Version: 3.9.6
Homepage: https://github.com/ottoyiu/django-cors-headers
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-cors-headers/trunk/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-cors-headers/trunk/
+Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/django-cors-headers.git
+Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/django-cors-headers.git
Package: python-django-cors-headers
Architecture: all
diff -Nru django-cors-headers-1.1.0/debian/.git-dpm django-cors-headers-1.1.0/debian/.git-dpm
--- django-cors-headers-1.1.0/debian/.git-dpm 1970-01-01 10:00:00.000000000 +1000
+++ django-cors-headers-1.1.0/debian/.git-dpm 2017-02-10 20:17:00.000000000 +1100
@@ -0,0 +1,11 @@
+# see git-dpm(1) from git-dpm package
+09adb1de0a7b0d99121d135e0a0019f11145fb31
+09adb1de0a7b0d99121d135e0a0019f11145fb31
+1f50c6e016dd93030cfe96fdb5ea87157ec3f018
+1f50c6e016dd93030cfe96fdb5ea87157ec3f018
+django-cors-headers_1.1.0.orig.tar.gz
+72b55a3728819f4efc2cd8623499eecae8871e50
+4633
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff -Nru django-cors-headers-1.1.0/debian/patches/0002-Fix-Django-1.0-support.patch django-cors-headers-1.1.0/debian/patches/0002-Fix-Django-1.0-support.patch
--- django-cors-headers-1.1.0/debian/patches/0002-Fix-Django-1.0-support.patch 1970-01-01 10:00:00.000000000 +1000
+++ django-cors-headers-1.1.0/debian/patches/0002-Fix-Django-1.0-support.patch 2017-02-10 20:17:00.000000000 +1100
@@ -0,0 +1,45 @@
+From 09adb1de0a7b0d99121d135e0a0019f11145fb31 Mon Sep 17 00:00:00 2001
+From: Brian May <bam@debian.org>
+Date: Fri, 10 Feb 2017 17:14:03 +1100
+Subject: Fix Django 1.0 support
+
+Patch downloaded from upstream
+https://github.com/ottoyiu/django-cors-headers/commit/870b1d9deb54ff4c1fefedc39dff02519abb32c5
+---
+ corsheaders/middleware.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/corsheaders/middleware.py b/corsheaders/middleware.py
+index f22ee58..c6c1af8 100755
+--- a/corsheaders/middleware.py
++++ b/corsheaders/middleware.py
+@@ -12,6 +12,11 @@ try:
+ except ImportError:
+ from django.db.models.loading import get_model
+
++try:
++ from django.utils.deprecation import MiddlewareMixin
++except ImportError:
++ MiddlewareMixin = object
++
+ from corsheaders import defaults as settings
+
+
+@@ -23,7 +28,7 @@ ACCESS_CONTROL_ALLOW_METHODS = 'Access-Control-Allow-Methods'
+ ACCESS_CONTROL_MAX_AGE = 'Access-Control-Max-Age'
+
+
+-class CorsPostCsrfMiddleware(object):
++class CorsPostCsrfMiddleware(MiddlewareMixin):
+
+ def _https_referer_replace_reverse(self, request):
+ """
+@@ -45,7 +50,7 @@ class CorsPostCsrfMiddleware(object):
+ return None
+
+
+-class CorsMiddleware(object):
++class CorsMiddleware(MiddlewareMixin):
+
+ def _https_referer_replace(self, request):
+ """
diff -Nru django-cors-headers-1.1.0/debian/patches/disable_broken_tests.patch django-cors-headers-1.1.0/debian/patches/disable_broken_tests.patch
--- django-cors-headers-1.1.0/debian/patches/disable_broken_tests.patch 2015-08-07 12:12:50.000000000 +1000
+++ django-cors-headers-1.1.0/debian/patches/disable_broken_tests.patch 2017-02-10 20:17:00.000000000 +1100
@@ -1,8 +1,18 @@
-Index: django-cors-headers-1.1.0/corsheaders/tests.py
-===================================================================
---- django-cors-headers-1.1.0.orig/corsheaders/tests.py
-+++ django-cors-headers-1.1.0/corsheaders/tests.py
-@@ -10,6 +10,7 @@ from corsheaders.middleware import ACCES
+From c070b3aa4cb30c9c49c5f5d4498b5d847eb06c35 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 08:51:17 -0700
+Subject: disable_broken_tests
+
+Patch-Name: disable_broken_tests.patch
+---
+ corsheaders/tests.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/corsheaders/tests.py b/corsheaders/tests.py
+index 6ebf2ac..6e40b27 100644
+--- a/corsheaders/tests.py
++++ b/corsheaders/tests.py
+@@ -10,6 +10,7 @@ from corsheaders.middleware import ACCESS_CONTROL_MAX_AGE
from corsheaders import defaults as settings
from mock import Mock
from mock import patch
@@ -10,7 +20,7 @@
class settings_override(object):
-@@ -322,6 +323,7 @@ class TestCorsMiddlewareProcessResponse(
+@@ -322,6 +323,7 @@ class TestCorsMiddlewareProcessResponse(TestCase):
processed = self.middleware.process_response(request, response)
self.assertEqual(processed.get(ACCESS_CONTROL_ALLOW_ORIGIN, None), None)
diff -Nru django-cors-headers-1.1.0/debian/patches/series django-cors-headers-1.1.0/debian/patches/series
--- django-cors-headers-1.1.0/debian/patches/series 2015-08-07 12:11:45.000000000 +1000
+++ django-cors-headers-1.1.0/debian/patches/series 2017-02-10 20:17:00.000000000 +1100
@@ -1 +1,2 @@
disable_broken_tests.patch
+0002-Fix-Django-1.0-support.patch
unblock django-cors-headers/1.1.0-2
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (100, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: