Version bump to fix security bug, see bug #222029.

Package-Manager: portage-2.1.5.2

3 files changed, 42 insertions, 7 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 127a846c8752..59b56d80b4bd 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.21 2007/12/25 14:50:09 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.22 2008/05/26 18:15:28 nelchael Exp $
+
+*django-0.96.2 (26 May 2008)
+
+  26 May 2008; Krzysiek Pawlik <nelchael@gentoo.org> -django-0.96.1.ebuild,
+  +django-0.96.2.ebuild:
+  Version bump to fix security bug, see bug #222029.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing seemant from metadata.xml as per #202469.
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8eb8fad136c7..ae5d1a8619d0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Django-0.96.1.tar.gz 1746455 RMD160 1bd8fcceab101f80560bb4aa8a4851c204f3918b SHA1 85270f857ff405983cae9a1ef76dfb3303ca6eec SHA256 4874134e9fc6bd08eb7e451e42038394668895c26b7cc867d4c3fdaf9d711085
-EBUILD django-0.96.1.ebuild 1527 RMD160 be1ad882beed371c9f0ecd78e1e6dab5095ece76 SHA1 49b041679f6225db0ede3cd0c6f924530f97bec7 SHA256 64818e21f5c1ff5f65ca7f8a33d3fa54436bc41bf86365cc52ce45d4e4b83019
-MISC ChangeLog 3544 RMD160 6370fd5fd31ee749a13e2f659704c7cd46fa255b SHA1 e384c92a6b8dd385e16b96fc8bdfdeb3d9ac9af7 SHA256 b230a8ad404a81a1f69109e2846ed477f69565e36f4fbff00d87a0ed6daa82d3
+DIST Django-0.96.2.tar.gz 1637044 RMD160 29488b09cc6d8013716c8a7d190fe6bc9625e568 SHA1 2766d858b15d5d76da61e096fa6ffeb55b0469fb SHA256 8964023587331412aed118549c83cf0dcc106850833cc75573e8671b68ecf29c
+EBUILD django-0.96.2.ebuild 2241 RMD160 ac81e46f172e3d9b876b98112947c06f96acd07b SHA1 abaaf737a7e7fc41bace19484b811cf0f87f381c SHA256 832b615ae205819c56fbccc510aec29e341942a70d8846503049018ad6d57e47
+MISC ChangeLog 3731 RMD160 a9ff46d983f3662c524ab71a6cd38f6e7ac42ec4 SHA1 7ef43001f9f347cc36176015c97283aa9d07a5c6 SHA256 55920a82284fbaf62f9fc8eb0a20a30ff0d7ef83c7f79a1e034025fba9f39b3c
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkg6/kUACgkQgo/w9rxVVVEbVACgkkrwxwVg1TYpwj++hVuuGPpQ
+E6wAn0z0wZNbYgsJhvFmdBXc7Z23Ph6W
+=eVtp
+-----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-0.96.1.ebuild b/dev-python/django/django-0.96.2.ebuild
index 48fd2fcb84dc..2c650593f78c 100644
--- a/dev-python/django/django-0.96.1.ebuild
+++ b/dev-python/django/django-0.96.2.ebuild
@@ -1,16 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.96.1.ebuild,v 1.1 2007/10/27 12:10:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.96.2.ebuild,v 1.1 2008/05/26 18:15:28 nelchael Exp $
 
 inherit bash-completion distutils eutils versionator
 
 RPV=$(get_version_component_range 1-2)
+EXTRAS_VERSION="0.96.1"
 
 MY_P="Django-${PV}"
 
 DESCRIPTION="high-level python web framework"
 HOMEPAGE="http://www.djangoproject.com/"
-SRC_URI="http://media.djangoproject.com/releases/${RPV}/${MY_P}.tar.gz"
+SRC_URI="http://media.djangoproject.com/releases/${RPV}/${MY_P}.tar.gz
+		http://media.djangoproject.com/releases/${RPV}/Django-${EXTRAS_VERSION}.tar.gz"
+		# We need ${EXTRAS_VERSION} in SRC_URI, because it's the last release that
+		# contains extras, tests and examples, see also src_unpack
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
@@ -31,6 +35,20 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="docs/* AUTHORS"
 
+src_unpack() {
+
+	distutils_src_unpack
+
+	# Those directories are missing from 0.96.2, so we copy them over from
+	# Django-${EXTRAS_VERSION}:
+	cp -a "${WORKDIR}/Django-${EXTRAS_VERSION}/examples" "${S}/" || die
+	cp -a "${WORKDIR}/Django-${EXTRAS_VERSION}/extras" "${S}/" || die
+	cp -a "${WORKDIR}/Django-${EXTRAS_VERSION}/tests" "${S}/" || die
+	cp -a "${WORKDIR}/Django-${EXTRAS_VERSION}/django/contrib/formtools/templates" \
+		"${S}/django/contrib/formtools/" || die
+
+}
+
 src_test() {
 	cat >> tests/settings.py << __EOF__
 DATABASE_ENGINE='sqlite3'