Added security patches from Debian (bug #162818). Added bash-completion and examples USE-flag. Corrected psycopg dependency. Added src_test with test USE-flag. Some Cleanups.

Package-Manager: portage-2.1.2-r1

7 files changed, 142 insertions, 12 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index d42d699a7607..be50cd4659f4 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/django
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.9 2006/12/30 01:49:34 dev-zero Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.10 2007/01/21 13:35:03 dev-zero Exp $
+
+*django-0.95-r1 (21 Jan 2007)
+
+  21 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/django-0.95-auth_fix.patch,
+  +files/django-0.95-compile_messages_fix.patch, +django-0.95-r1.ebuild:
+  Added security patches from Debian (bug #162818). Added bash-completion and
+  examples USE-flag. Corrected psycopg dependency. Added src_test with test
+  USE-flag. Some Cleanups.
 
   30 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> -django-0.91.ebuild,
   django-0.95.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 69ab3579ebfb..c5b22db7648a 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,12 +1,24 @@
+AUX django-0.95-auth_fix.patch 716 RMD160 0fdfdd233d15ad663f80f286870f6b8fb990b326 SHA1 f2f60dda0508f3076653248650e1123cc18c15d4 SHA256 ac074bbcc8d0085d8c8cf38b62fa04d3805cf4508a0c652ebe0b5ceebc7429c5
+MD5 33682e5c484f00ba29e8a0da9d1cec86 files/django-0.95-auth_fix.patch 716
+RMD160 0fdfdd233d15ad663f80f286870f6b8fb990b326 files/django-0.95-auth_fix.patch 716
+SHA256 ac074bbcc8d0085d8c8cf38b62fa04d3805cf4508a0c652ebe0b5ceebc7429c5 files/django-0.95-auth_fix.patch 716
+AUX django-0.95-compile_messages_fix.patch 1048 RMD160 47b94590b594e43880c7d96108bbc90665d602c8 SHA1 266bbf12baccad74bc25d4f617c4432c3ac55a5e SHA256 d0187a6810c1d7b0abd8d6bacbb95cb259dc63921f71d61716cf163415c88ad8
+MD5 66df908be357fa0cc7beb7f905b3e8a1 files/django-0.95-compile_messages_fix.patch 1048
+RMD160 47b94590b594e43880c7d96108bbc90665d602c8 files/django-0.95-compile_messages_fix.patch 1048
+SHA256 d0187a6810c1d7b0abd8d6bacbb95cb259dc63921f71d61716cf163415c88ad8 files/django-0.95-compile_messages_fix.patch 1048
 DIST Django-0.95.tar.gz 1287781 RMD160 95c405fff77e4a0cf51654e9d089a47b629dd875 SHA1 2ea50ec96bf4b3f0b4821ce33ff422150c9c4f15 SHA256 2185514d642f35d61d7c5c0a59545f2e18e41ee5abdb2912eafd64c1fa07c388
-EBUILD django-0.95.ebuild 1213 RMD160 432ae62fa5cefa21989320add3e72fa8fd433ae3 SHA1 5f0b95a40c745c08261a53f61d27362934a2ff9e SHA256 b8ad64864360009b5a78afd1debed30226fea3128f77a322f8e499bfe37364cc
-MD5 a9ba65bda2f73e8b7bee9caa318418cf django-0.95.ebuild 1213
-RMD160 432ae62fa5cefa21989320add3e72fa8fd433ae3 django-0.95.ebuild 1213
-SHA256 b8ad64864360009b5a78afd1debed30226fea3128f77a322f8e499bfe37364cc django-0.95.ebuild 1213
-MISC ChangeLog 1358 RMD160 f885ed6969c53ad65c8346704d999afa69272a42 SHA1 bafef6c301ccfe4705d7211cc70755e3358a87d8 SHA256 6c056d00001246e2b6ad10cd5a170710f4d7eb0ab52bcaf3ae2e200b7bb82795
-MD5 9146d83e2a29d1653d10afc614805f00 ChangeLog 1358
-RMD160 f885ed6969c53ad65c8346704d999afa69272a42 ChangeLog 1358
-SHA256 6c056d00001246e2b6ad10cd5a170710f4d7eb0ab52bcaf3ae2e200b7bb82795 ChangeLog 1358
+EBUILD django-0.95-r1.ebuild 1687 RMD160 9446acfc9868c22ceabb9918f6f611bf4b6cfb3b SHA1 2b8ccf6ef35b46697113d346cdd6080e07619f2a SHA256 997971f28ea3555a1ddeae0c512f633352fedb689ea31c75d5a3268de4c0ff10
+MD5 8eb25bcc5959ce079dce5b781a9a1d31 django-0.95-r1.ebuild 1687
+RMD160 9446acfc9868c22ceabb9918f6f611bf4b6cfb3b django-0.95-r1.ebuild 1687
+SHA256 997971f28ea3555a1ddeae0c512f633352fedb689ea31c75d5a3268de4c0ff10 django-0.95-r1.ebuild 1687
+EBUILD django-0.95.ebuild 1213 RMD160 7312c45168f5c26c2b75e25c1d7007222c7fc801 SHA1 e0f2fbb96d1e6c3c2987a43a73f6bba89b03faf4 SHA256 7481a64fa15abe8d945132b64b60238c66ad9ccf6c3e916d31d19ecfd98247fe
+MD5 4b7cac8b3a3ce89cfe0aadd5034a0ddb django-0.95.ebuild 1213
+RMD160 7312c45168f5c26c2b75e25c1d7007222c7fc801 django-0.95.ebuild 1213
+SHA256 7481a64fa15abe8d945132b64b60238c66ad9ccf6c3e916d31d19ecfd98247fe django-0.95.ebuild 1213
+MISC ChangeLog 1735 RMD160 da51468afa21b76780c8b9d3bac867e7b22780d4 SHA1 8f0c822cd76b9e0fce537eda24804bbdba91065f SHA256 148f3cecdf55efa180290bf8778ea3af5cec9406e76f279c13ddeba20ac7fc99
+MD5 5462550e72ee6521681e8a27f8f1a519 ChangeLog 1735
+RMD160 da51468afa21b76780c8b9d3bac867e7b22780d4 ChangeLog 1735
+SHA256 148f3cecdf55efa180290bf8778ea3af5cec9406e76f279c13ddeba20ac7fc99 ChangeLog 1735
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -14,3 +26,6 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 f3f1a6ef235840e1ab04b210ed8ae4ad files/digest-django-0.95 238
 RMD160 b1425ae1ceb8186c790dcffde27d4b3094154e00 files/digest-django-0.95 238
 SHA256 e631d3deb73e7a5ce3fc942830556e08a5d85567ed0f892dd2322c5ac920b05e files/digest-django-0.95 238
+MD5 f3f1a6ef235840e1ab04b210ed8ae4ad files/digest-django-0.95-r1 238
+RMD160 b1425ae1ceb8186c790dcffde27d4b3094154e00 files/digest-django-0.95-r1 238
+SHA256 e631d3deb73e7a5ce3fc942830556e08a5d85567ed0f892dd2322c5ac920b05e files/digest-django-0.95-r1 238
diff --git a/dev-python/django/django-0.95-r1.ebuild b/dev-python/django/django-0.95-r1.ebuild
new file mode 100644
index 000000000000..37132f7851b9
--- /dev/null
+++ b/dev-python/django/django-0.95-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95-r1.ebuild,v 1.1 2007/01/21 13:35:03 dev-zero Exp $
+
+inherit bash-completion distutils eutils
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="high-level python web framework"
+HOMEPAGE="http://www.djangoproject.com/"
+SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="examples mysql postgres sqlite test"
+
+RDEPEND="dev-python/imaging
+	sqlite? ( || (
+		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5 ) )
+	test? ( || (
+		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5 ) )
+	postgres? ( dev-python/psycopg )
+	mysql? ( dev-python/mysql-python )"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-0.6_rc3"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="docs/* AUTHORS"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/ez_setup/d' \
+		setup.py || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-compile_messages_fix.patch"
+	epatch "${FILESDIR}/${P}-auth_fix.patch"
+}
+
+src_install() {
+	distutils_python_version
+
+	site_pkgs="/usr/$(get_libdir)/python${PYVER}/site-packages/"
+	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
+	dodir ${site_pkgs}
+
+	distutils_src_install --single-version-externally-managed
+
+	dobashcompletion extras/django_bash_completion
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+src_test() {
+	cat >> tests/settings.py << __EOF__
+DATABASE_ENGINE='sqlite3'
+__EOF__
+	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
+}
diff --git a/dev-python/django/django-0.95.ebuild b/dev-python/django/django-0.95.ebuild
index 7f18b6e11ed7..c118cff32df7 100644
--- a/dev-python/django/django-0.95.ebuild
+++ b/dev-python/django/django-0.95.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.ebuild,v 1.3 2006/12/30 01:49:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.ebuild,v 1.4 2007/01/21 13:35:03 dev-zero Exp $
 
 inherit distutils
 
diff --git a/dev-python/django/files/digest-django-0.95-r1 b/dev-python/django/files/digest-django-0.95-r1
new file mode 100644
index 000000000000..8d758bb9b360
--- /dev/null
+++ b/dev-python/django/files/digest-django-0.95-r1
@@ -0,0 +1,3 @@
+MD5 9ed7d6a0daa147c012e31d0894802951 Django-0.95.tar.gz 1287781
+RMD160 95c405fff77e4a0cf51654e9d089a47b629dd875 Django-0.95.tar.gz 1287781
+SHA256 2185514d642f35d61d7c5c0a59545f2e18e41ee5abdb2912eafd64c1fa07c388 Django-0.95.tar.gz 1287781
diff --git a/dev-python/django/files/django-0.95-auth_fix.patch b/dev-python/django/files/django-0.95-auth_fix.patch
new file mode 100644
index 000000000000..5e2672e036f2
--- /dev/null
+++ b/dev-python/django/files/django-0.95-auth_fix.patch
@@ -0,0 +1,19 @@
+Index: /django/trunk/django/contrib/auth/middleware.py
+===================================================================
+--- django/contrib/auth/middleware.py (revision 3226)
++++ django/contrib/auth/middleware.py (revision 3754)
+@@ -1,11 +1,8 @@
+ class LazyUser(object):
+-    def __init__(self):
+-        self._user = None
+-
+     def __get__(self, request, obj_type=None):
+-        if self._user is None:
++        if not hasattr(request, '_cached_user'):
+             from django.contrib.auth import get_user
+-            self._user = get_user(request)
+-        return self._user
++            request._cached_user = get_user(request)
++        return request._cached_user
+ 
+ class AuthenticationMiddleware(object):
diff --git a/dev-python/django/files/django-0.95-compile_messages_fix.patch b/dev-python/django/files/django-0.95-compile_messages_fix.patch
new file mode 100644
index 000000000000..8e7de6a09190
--- /dev/null
+++ b/dev-python/django/files/django-0.95-compile_messages_fix.patch
@@ -0,0 +1,18 @@
+Index: /django/trunk/django/bin/compile-messages.py
+===================================================================
+--- django/bin/compile-messages.py (revision 3590)
++++ django/bin/compile-messages.py (revision 3592)
+@@ -20,5 +20,12 @@
+                 sys.stderr.write('processing file %s in %s\n' % (f, dirpath))
+                 pf = os.path.splitext(os.path.join(dirpath, f))[0]
+-                cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf)
++                # Store the names of the .mo and .po files in an environment
++                # variable, rather than doing a string replacement into the
++                # command, so that we can take advantage of shell quoting, to
++                # quote any malicious characters/escaping.
++                # See http://cyberelk.net/tim/articles/cmdline/ar01s02.html
++                os.environ['djangocompilemo'] = pf + '.mo'
++                os.environ['djangocompilepo'] = pf + '.po'
++                cmd = 'msgfmt -o "$djangocompilemo" "$djangocompilepo"'
+                 os.system(cmd)
+