From patchwork Mon Mar 4 18:18:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Hoffmann X-Patchwork-Id: 1907837 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpRlz1KGJz23l2 for ; Tue, 5 Mar 2024 05:18:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BBF6E40967; Mon, 4 Mar 2024 18:18:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v7urb7naibiH; Mon, 4 Mar 2024 18:18:48 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4B0834109E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4B0834109E; Mon, 4 Mar 2024 18:18:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 03BF21BF29C for ; Mon, 4 Mar 2024 18:18:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id F0AC2414C4 for ; Mon, 4 Mar 2024 18:18:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BOqFOkWoex3O for ; Mon, 4 Mar 2024 18:18:45 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=176.9.145.28; helo=smtp.bubu1.eu; envelope-from=buildroot@bubu1.eu; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 587F1414D8 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 587F1414D8 Received: from smtp.bubu1.eu (smtp.bubu1.eu [176.9.145.28]) by smtp2.osuosl.org (Postfix) with ESMTPS id 587F1414D8 for ; Mon, 4 Mar 2024 18:18:45 +0000 (UTC) Received: from tuxedoOT.fritz.box (unknown [212.37.174.96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.bubu1.eu (Postfix) with ESMTPSA id 8CA632C80CC2; Mon, 4 Mar 2024 19:18:42 +0100 (CET) To: buildroot@buildroot.org Date: Mon, 4 Mar 2024 19:18:41 +0100 Message-Id: <20240304181841.954880-1-buildroot@bubu1.eu> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bubu1.eu; s=bubu; t=1709576323; bh=IWFVMUMRYtT5f95EMqLNA17wuXWTCrgj5J4fYRPfAW0=; h=From:To:Cc:Subject:Date; b=ryi37KaiddUiTphz5AOpPFPF2ydnH/PgywPhbikPpg5RSe8bmBwCI9l8QpuOy2J0h WxFfoG5+Kaq8/lVlzgaXhaS/GR486dgHqVx/FqWS4fBTd9KxbhNAOmGKNEQcjFeQoX 0f8Mi8ALTZoZYBGM5U66YVo1lGijvER/D0wypgDSwnCl+6jQqeyC9BDIRK+uoTVaNr j43MTVA49s8cdS+v+cnmX7wXIRfrOG6BiYb9TBKvcDsFSW4KtdxqhGnQJtk4pKhLBA CYgdVKQJqHHVvubScoY8EFvHaM/6mun/2mSAqc3Y+Uo5B1rXIzJ0tx+8us2hy3CqxJ 0tbCH9vlT70Mg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=reject dis=none) header.from=bubu1.eu X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bubu1.eu header.i=@bubu1.eu header.a=rsa-sha256 header.s=bubu header.b=ryi37Kai Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Marcus Hoffmann via buildroot From: Marcus Hoffmann Reply-To: Marcus Hoffmann Cc: James Hilliard , Oli Vogt , Asaf Kahlon Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Fixes: CVE-2024-27351: Potential regular expression denial-of-service in django.utils.text.Truncator.words() [1] Remove patch that is included in this release. [1] https://docs.djangoproject.com/en/dev/releases/5.0.3/ Signed-off-by: Marcus Hoffmann --- ...d-sensitive_variables-sensitive_post.patch | 45 ------------------- package/python-django/python-django.hash | 4 +- package/python-django/python-django.mk | 4 +- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch deleted file mode 100644 index 90dc9c7dd0..0000000000 --- a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Sat, 17 Feb 2024 08:15:59 +0100 -Subject: [PATCH] Fixed #35187 -- Fixed - @sensitive_variables/sensitive_post_parameters decorators crash with - .pyc-only builds. - -Thanks Jon Janzen for the implementation idea. - -Thanks Marcus Hoffmann for the report. - -Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. -Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main - -Signed-off-by: Marcus Hoffmann -Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 ---- - django/views/decorators/debug.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py -index 7ea8a540de..6540fc0651 100644 ---- a/django/views/decorators/debug.py -+++ b/django/views/decorators/debug.py -@@ -47,7 +47,6 @@ def sensitive_variables(*variables): - - try: - file_path = inspect.getfile(wrapped_func) -- _, first_file_line = inspect.getsourcelines(wrapped_func) - except TypeError: # Raises for builtins or native functions. - raise ValueError( - f"{func.__name__} cannot safely be wrapped by " -@@ -55,7 +54,8 @@ def sensitive_variables(*variables): - "Python file (not a builtin or from a native extension)." - ) - else: -- key = hash(f"{file_path}:{first_file_line}") -+ first_line_number = wrapped_func.__code__.co_firstlineno -+ key = hash(f"{file_path}:{first_line_number}") - - if variables: - coroutine_functions_to_sensitive_variables[key] = variables --- -2.34.1 - diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 20b66a4106..d5684a083c 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz -sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz +md5 1009c48d70060cadb40000cc15a8058a Django-5.0.3.tar.gz +sha256 5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df Django-5.0.3.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 231de0b833..258ff9e0c1 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.2 +PYTHON_DJANGO_VERSION = 5.0.3 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/e1/b1/ac6a16aaf0049637b50afbcf06b8ec2fa5c6ce42d4ae6ba66bbaf4c3609a PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject