Update to Django 1.0.3:

- various bugfix
- correctly validate file names for the admin media when using the
development server

5 files changed, 21 insertions, 35 deletions

diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 6b705e7e85e..381d49987af 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/07/14 11:17:11 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/29 11:02:08 joerg Exp $
 
-DJANGOVERS=	1.0.2
-DISTNAME=	Django-${DJANGOVERS}-final
+DJANGOVERS=	1.0.3
+DISTNAME=	Django-${DJANGOVERS}
 PKGNAME=	${PYPKGPREFIX}-django-${DJANGOVERS}
-PKGREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://media.djangoproject.com/releases/${DJANGOVERS}/
 
diff --git a/www/py-django/PLIST b/www/py-django/PLIST
index cf913591424..744d2effedf 100644
--- a/www/py-django/PLIST
+++ b/www/py-django/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 22:00:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/07/29 11:02:08 joerg Exp $
 bin/django-admin.py
 ${PYSITELIB}/django/__init__.py
 ${PYSITELIB}/django/__init__.pyc
@@ -779,6 +779,9 @@ ${PYSITELIB}/django/contrib/gis/db/models/sql/__init__.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/sql/query.py
 ${PYSITELIB}/django/contrib/gis/db/models/sql/query.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/sql/query.pyo
+${PYSITELIB}/django/contrib/gis/db/models/sql/subqueries.py
+${PYSITELIB}/django/contrib/gis/db/models/sql/subqueries.pyc
+${PYSITELIB}/django/contrib/gis/db/models/sql/subqueries.pyo
 ${PYSITELIB}/django/contrib/gis/db/models/sql/where.py
 ${PYSITELIB}/django/contrib/gis/db/models/sql/where.pyc
 ${PYSITELIB}/django/contrib/gis/db/models/sql/where.pyo
@@ -1000,6 +1003,9 @@ ${PYSITELIB}/django/contrib/gis/tests/geoapp/sql/tx.wkt
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_feeds.py
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_feeds.pyc
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_feeds.pyo
+${PYSITELIB}/django/contrib/gis/tests/geoapp/test_regress.py
+${PYSITELIB}/django/contrib/gis/tests/geoapp/test_regress.pyc
+${PYSITELIB}/django/contrib/gis/tests/geoapp/test_regress.pyo
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_sitemaps.py
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_sitemaps.pyc
 ${PYSITELIB}/django/contrib/gis/tests/geoapp/test_sitemaps.pyo
@@ -1035,6 +1041,9 @@ ${PYSITELIB}/django/contrib/gis/tests/layermap/models.pyo
 ${PYSITELIB}/django/contrib/gis/tests/layermap/tests.py
 ${PYSITELIB}/django/contrib/gis/tests/layermap/tests.pyc
 ${PYSITELIB}/django/contrib/gis/tests/layermap/tests.pyo
+${PYSITELIB}/django/contrib/gis/tests/layermap/tests_mysql.py
+${PYSITELIB}/django/contrib/gis/tests/layermap/tests_mysql.pyc
+${PYSITELIB}/django/contrib/gis/tests/layermap/tests_mysql.pyo
 ${PYSITELIB}/django/contrib/gis/tests/relatedapp/__init__.py
 ${PYSITELIB}/django/contrib/gis/tests/relatedapp/__init__.pyc
 ${PYSITELIB}/django/contrib/gis/tests/relatedapp/__init__.pyo
diff --git a/www/py-django/distinfo b/www/py-django/distinfo
index 42db961c7da..98f004ebce2 100644
--- a/www/py-django/distinfo
+++ b/www/py-django/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/04/14 09:14:24 joerg Exp $
+$NetBSD: distinfo,v 1.10 2009/07/29 11:02:08 joerg Exp $
 
-SHA1 (Django-1.0.2-final.tar.gz) = f2d9088f17aff47ea17e5767740cab67b2a73b6b
-RMD160 (Django-1.0.2-final.tar.gz) = 0cfea620df0831310da4ef51ef6ee4ef1b65974e
-Size (Django-1.0.2-final.tar.gz) = 4649433 bytes
-SHA1 (patch-aa) = 54a532d9c6761f80a10c633bb6192faccb5ab64b
-SHA1 (patch-ab) = 620e958ab3b4c3cf7ceb507b52ac64b522a6e4a8
+SHA1 (Django-1.0.3.tar.gz) = d7efafe20de8cd97ee417f6538a7ff1e86bfcd4a
+RMD160 (Django-1.0.3.tar.gz) = 21983d9722f12299a08010507be96b8a9640a565
+Size (Django-1.0.3.tar.gz) = 5086964 bytes
+SHA1 (patch-ab) = dc7f9f0d5f66148c495534d96f7131a67b4b0ecc
diff --git a/www/py-django/patches/patch-aa b/www/py-django/patches/patch-aa
deleted file mode 100644
index 0c71c5a702a..00000000000
--- a/www/py-django/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/09/04 22:04:17 tonnerre Exp $
-
---- django/contrib/admin/views/decorators.py.orig	2008-09-02 23:10:00.000000000 +0200
-+++ django/contrib/admin/views/decorators.py
-@@ -9,6 +9,7 @@ from django.conf import settings
- from django.contrib.auth.models import User
- from django.contrib.auth import authenticate, login
- from django.shortcuts import render_to_response
-+from django.utils.html import escape
- from django.utils.translation import ugettext_lazy, ugettext as _
- 
- ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
-@@ -18,7 +19,7 @@ def _display_login_form(request, error_m
-     request.session.set_test_cookie()
-     return render_to_response('admin/login.html', {
-         'title': _('Log in'),
--        'app_path': request.get_full_path(),
-+        'app_path': escape(request.get_full_path()),
-         'error_message': error_message
-     }, context_instance=template.RequestContext(request))
- 
diff --git a/www/py-django/patches/patch-ab b/www/py-django/patches/patch-ab
index 840dd09497a..90ee114ae17 100644
--- a/www/py-django/patches/patch-ab
+++ b/www/py-django/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2009/04/14 09:14:25 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2009/07/29 11:02:08 joerg Exp $
 
 --- django/db/backends/sqlite3/base.py.orig	2009-04-11 22:01:24.000000000 +0200
 +++ django/db/backends/sqlite3/base.py
-@@ -12,18 +12,11 @@ from django.db.backends.sqlite3.creation
- from django.db.backends.sqlite3.introspection import DatabaseIntrospection
+@@ -13,18 +13,11 @@ from django.db.backends.sqlite3.introspe
+ from django.utils.safestring import SafeString                                                           
  
  try:
 -    try: