diff options
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/Manifest | 7 | ||||
| -rw-r--r-- | dev-python/django/django-4.2.15.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/django/django-5.0.8.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/django/django-5.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/django/files/django-5.1-more-pypy3.patch | 51 |
5 files changed, 61 insertions, 3 deletions
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index c42e318bb6dd..785acfe594b5 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,5 +1,6 @@ AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e AUX django-5.0.6-py313.patch 2474 BLAKE2B cf47f32ec1989b50a3e2a3cdce950f33c9f1ca9b6b367397710f9b2a4fed96c78200f4ec8ad8c274a8cea57183be0c873ebbaacd2e4de86543311229cd2b76d1 SHA512 be59bc3bea66b446a0b145b447032b5a5dca9e6e7580830ca2c58170b7fa58ce0cf01b5daf864f44843f490ccac8192befc8c010b23e04fd9ed39616716717ad +AUX django-5.1-more-pypy3.patch 1975 BLAKE2B 7b3c0820ec6b27c7ddc8c95db3eaf444831bae4ec546c5600a9f79475cbdd5671b7ad119482f9d4959088f5f923d810ff79e87149af8ca5d22d0260c84088d3e SHA512 02e945420bf1a911f930099aa00816191e5cece9520eb3373f83187b5dae70986db766d806f7c2e9fe92bc65a2e24cea6a52c22ecc7eb9ff883e813ac4d17258 DIST Django-4.2.15.checksum.txt 2418 BLAKE2B 06338f990952736d1368c11bc0a14df4fcb756c7e33b0a843d692c1ca23a9bf5073c552513cf2846c16da24da475ff122f59122f90da528c2cb8875072fa7748 SHA512 b4e8eb163a889c2aa556217b2ba6280916c891b2f8af862d66e09b5ec643dee9281e58e2382fdfdee1d0e1a9a80267c93993374ae3e0f33f3ec5051bae69f145 DIST Django-4.2.15.tar.gz 10418066 BLAKE2B 4abf7205995fbc8dd90ca43aadfdd6737c5f731fea4054f987ae851e0b6f0a5f0f799441f94ca322e31c07c2a810903a00b4432b71a7517b2a261c4844ddba90 SHA512 8f334dcaa36b3bce5184ddf1a1508bf42614be6ab486c9e0d87e9bfd212511c43081ad5fb02d2dd7b54f8236fc1f7ee9cd7b7f6f94ac8edc1cb52d1c0c698880 DIST Django-5.0.8.checksum.txt 2408 BLAKE2B 18751733d7abaa4e98039bf0cfa3773a999df4351371939803ec77850c25d75392abc7e4136e8c4a79620017c224bafcd8552c2446ee0817249abebcc3b0e1bb SHA512 c05027bdec0928dd51239ba5c72b97b737ad73dbbdbdc1c4bef2b9faf8afc188cd854e1dcd3b5ffbdc9c3a30dea5a27e4b899f9d257bcee6f80fbfdfd30e7a20 @@ -8,7 +9,7 @@ DIST Django-5.1.checksum.txt 2551 BLAKE2B bec3fb2608b4152667420951ea7ba34cdbf416 DIST Django-5.1.tar.gz 10681050 BLAKE2B 1cded54e573d7a75ff246523235a1e17b6900000ef428f02ddf1f17fb0146449cef28da9207cfb3a0a888def86620a755cb62dba033c15501dc9125d6164f462 SHA512 4c34df7adf2a151488d8595551fe6e8eb90fdef9d7592ce1d8c8b0663fe4d876614f5dde4df1dd648153d4df6246ae39dbb33a66b1c3d2f60bd46595e0efb396 DIST django-4.2.8-pypy3.patch.xz 5900 BLAKE2B b7dc5c5fc162817a218ee6d025ed8a65559b80e4506e49ac393428c26e2621f9e7c5010b36f2412dea8194a9f1086ab21f97286eabd696c6a786285eb07393cf SHA512 f953b5adbd1364f1d84dde55087ccb493256b1327701275fd2fe99f3cd41751d18e002b6e21afc96892e1671428a6b8f3c2e4b88252c3c278f1a79e286bb73e3 DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b -EBUILD django-4.2.15.ebuild 2849 BLAKE2B ebb89a44dbf2a91ec144dc6ba9b8ef72698236a43297f3f8db6c11fe397f37cd424d3b3d62e6013b066070f38cb8dc2a9ee48661f088cddd7f599fd7fa0b3a58 SHA512 bd6e5c046a15413ddafd8b48853b180ad3c250b9ee3db908c1da7b033a684502d58551088e697d7b3ac15d5db3818041aa45a7d6f30bf2aff4a6a268073eca9b -EBUILD django-5.0.8.ebuild 3008 BLAKE2B 872f5c3267d05c96529e9a28453c9082d40c4803dee3a353d8d92e9a59edf979f4cfc6492edb71651e84e40241bab1de0830e77f1ab33801f13014aaf376f698 SHA512 bdc513ba6dd040088c3c6484be18bc1657dd08af16ecdae23a0d139a31f5de47f654cf299144af0b0c07be4b5d81c47d3f22baaeac12c976448299b7a90a0b8a -EBUILD django-5.1.ebuild 2851 BLAKE2B 34d5ee39eebd55a8c2254d7cae0de19e6814cf63f598c5f493eaa1eab004a3db3a66c7b73ea19c93fec87b9ec7bbb6fde0064709e8414be9e523dc0928b7e85d SHA512 0767e301f37315279dae44150f5acca43b0aeeb81f0ca160db79b4e6e4a1339f5237792a1b2d6623cad360cb5e18bf53f4ce67e87f6827d51956ffd8c93bf7e2 +EBUILD django-4.2.15.ebuild 2939 BLAKE2B 87cbd243792e973094c330efbbc1cceb7a485445b7b1664ba68e095c987057b59bd2c3d554541da7c35ff6abc10bba3794d0a20b3fe952a6038f1be922a39e11 SHA512 1deb4002df1d0b11173ec30d58038fc2a0a95043aa7bc3607e7c682be50ffb92f1047c28151c8217540b77be92d87c132c06b7e82437995d648aee3908bdcec3 +EBUILD django-5.0.8.ebuild 3098 BLAKE2B c53ed861ad0b4ed6f9651f0a8243580bcf1673f6ba427f176cbfb4e0246fa6df6f3fc8ef5f58c98ba65f8c354fc94007791b14442849a7a32c990e77f5db5256 SHA512 60899c4715597dfc731940f451f5d7c259121f6f9deacbebaab101debd03f34dffb027c8310a74b01bcedef47fbf7f287a68f633f2b810d9ea5bfbdd072278a1 +EBUILD django-5.1.ebuild 2941 BLAKE2B 0bfb27f7be94f405e0d301c021343f37c98adf043597f9c82af9adffec958a3b990ec9f1b83f2b4fa9f1e1b37e5fc3ae8e1046c6e5fa65fcee8ed02aef3b0ec0 SHA512 c649a09d1755b75fa543c072b0845fcdddf9fb17c7e857afcb3d1fab7a4c5a0b4911e615d4b37ba40217f08ba76f89e1fbfa41b03fb7c0e8d43063c5ea159270 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7 diff --git a/dev-python/django/django-4.2.15.ebuild b/dev-python/django/django-4.2.15.ebuild index c05445503ec7..bd2335231db9 100644 --- a/dev-python/django/django-4.2.15.ebuild +++ b/dev-python/django/django-4.2.15.ebuild @@ -57,6 +57,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/django-4.0-bashcomp.patch "${WORKDIR}"/django-4.2.8-pypy3.patch + # https://code.djangoproject.com/ticket/35661 + "${FILESDIR}"/django-5.1-more-pypy3.patch ) distutils_enable_sphinx docs --no-autodoc diff --git a/dev-python/django/django-5.0.8.ebuild b/dev-python/django/django-5.0.8.ebuild index 80dc188258c8..2357d8dbed8b 100644 --- a/dev-python/django/django-5.0.8.ebuild +++ b/dev-python/django/django-5.0.8.ebuild @@ -59,6 +59,8 @@ PATCHES=( "${WORKDIR}"/django-5.0-pypy3.patch # https://github.com/django/django/commit/3426a5c33c36266af42128ee9eca4921e68ea876 "${FILESDIR}"/django-5.0.6-py313.patch + # https://code.djangoproject.com/ticket/35661 + "${FILESDIR}"/django-5.1-more-pypy3.patch ) distutils_enable_sphinx docs --no-autodoc diff --git a/dev-python/django/django-5.1.ebuild b/dev-python/django/django-5.1.ebuild index bd9babed87a6..1a52c318f46b 100644 --- a/dev-python/django/django-5.1.ebuild +++ b/dev-python/django/django-5.1.ebuild @@ -56,6 +56,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/django-4.0-bashcomp.patch + # https://code.djangoproject.com/ticket/35661 + "${FILESDIR}"/django-5.1-more-pypy3.patch ) distutils_enable_sphinx docs --no-autodoc diff --git a/dev-python/django/files/django-5.1-more-pypy3.patch b/dev-python/django/files/django-5.1-more-pypy3.patch new file mode 100644 index 000000000000..27663898cc55 --- /dev/null +++ b/dev-python/django/files/django-5.1-more-pypy3.patch @@ -0,0 +1,51 @@ +From d9aeb23edb6cc861360ffbb59a45beccafe55dcb Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak <felisiak.mariusz@gmail.com> +Date: Thu, 8 Aug 2024 08:13:29 +0200 +Subject: [PATCH] [5.1.x] Fixed #35661 -- Fixed + test_too_many_digits_to_rander() test crash on PyPy. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks Michał Górny for the report. + +Backport of 7fb15ad5bcae05324ee8913e4b2c6c982e8f2de0 from main. +--- + .../template_tests/filter_tests/test_floatformat.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/tests/template_tests/filter_tests/test_floatformat.py b/tests/template_tests/filter_tests/test_floatformat.py +index 3d6c34a55232..6183f6a0691d 100644 +--- a/tests/template_tests/filter_tests/test_floatformat.py ++++ b/tests/template_tests/filter_tests/test_floatformat.py +@@ -4,6 +4,7 @@ + from django.test import SimpleTestCase + from django.utils import translation + from django.utils.safestring import mark_safe ++from django.utils.version import PYPY + + from ..utils import setup + +@@ -181,12 +182,21 @@ def test_too_many_digits_to_render(self): + "-1E10000000000000000", + "1e10000000000000000", + "-1e10000000000000000", +- "1" + "0" * 1_000_000, + ] + for value in cases: + with self.subTest(value=value): + self.assertEqual(floatformat(value), value) + ++ def test_too_many_digits_to_render_very_long(self): ++ value = "1" + "0" * 1_000_000 ++ if PYPY: ++ # PyPy casts decimal parts to int, which reaches the integer string ++ # conversion length limit (default 4300 digits, CVE-2020-10735). ++ with self.assertRaises(ValueError): ++ floatformat(value) ++ else: ++ self.assertEqual(floatformat(value), value) ++ + def test_float_dunder_method(self): + class FloatWrapper: + def __init__(self, value): |