From patchwork Mon Oct 28 11:27:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69591 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F3E027BBEA; Mon, 28 Oct 2024 11:28:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 341A027BBE2 for ; Mon, 28 Oct 2024 11:28:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5NvF-0004C5-2I; Mon, 28 Oct 2024 07:28:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5Nv8-0004BT-5X for guix-patches@gnu.org; Mon, 28 Oct 2024 07:28:27 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5Nv7-0005Qf-T5 for guix-patches@gnu.org; Mon, 28 Oct 2024 07:28:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=foZIk14jMfrvIqeaDa/VcUFtsB/CGnMHxeAuC0S6Fug=; b=FcZ0MPbZXJe4JeQPql6X6jYV+m/HpJKgQDY+MZDcB9ucEWoRsoa+VFTLJn1SwViL6KthD3Y/xA/vlPIRH+Upx2VyBo3xh/h3kQujo2gGxC6r9m8sCFX7Zmk4d9uJHhCaT2NLStTHAlXHzD8js03s2AQUdNgyyySJ5/EiUsDOs4+fDudnHBpNYGohqOuA17OglLqQ6osIUB9anaJkXVCwyzcdi1meeoZTp/KIROBQ+nwTHwKliYf4S8GEgcS+ggIYjBBv26qYHZ/ldt38zlKDM7Ce3pYzXTF+B6M15sRuNEF7UWOE2Ys199FnmnGs5YEAt4K+uRXrK9fYDEK/5r3fGA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5Nvh-00030N-Ry for guix-patches@gnu.org; Mon, 28 Oct 2024 07:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74060] [PATCH] gnu: Remove allegro-5.0. [security fixes] Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 11:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74060@debbugs.gnu.org Cc: Nicolas Graves X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173011491411506 (code B ref -1); Mon, 28 Oct 2024 11:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Oct 2024 11:28:34 +0000 Received: from localhost ([127.0.0.1]:52760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5NvG-0002zW-0g for submit@debbugs.gnu.org; Mon, 28 Oct 2024 07:28:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:60392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5NvD-0002zO-T0 for submit@debbugs.gnu.org; Mon, 28 Oct 2024 07:28:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5Nud-00048U-Cj for guix-patches@gnu.org; Mon, 28 Oct 2024 07:27:55 -0400 Received: from 5.mo582.mail-out.ovh.net ([46.105.54.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t5Nub-0005Ns-9V for guix-patches@gnu.org; Mon, 28 Oct 2024 07:27:55 -0400 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.148.87]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4XcWMn6h0rz1C8W for ; Mon, 28 Oct 2024 11:27:49 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-lnnqv (unknown [10.108.54.171]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 67A831FED3; Mon, 28 Oct 2024 11:27:41 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-5b5ff79f4f-lnnqv with ESMTPSA id zRQRGC11H2dgbAAAtWJFhg (envelope-from ); Mon, 28 Oct 2024 11:27:41 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S0033d705a8d-de2e-40e0-9f17-8063706975a0, 2EBFFEBE9A2CEA4974D3D0C7E73B7B071B2C9EDA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 89.85.243.20 Date: Mon, 28 Oct 2024 12:27:37 +0100 Message-ID: <20241028112739.21615-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 8445656679823172322 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejledgtdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptdfgleefgfdujefftdeigeehkeehhfelveejiefhleekjedvteevffdujeejvdegnecuffhomhgrihhnpehlihgsrghllhgvghdrohhrghdpghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdekledrkeehrddvgeefrddvtddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=foZIk14jMfrvIqeaDa/VcUFtsB/CGnMHxeAuC0S6Fug=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1730114870; v=1; b=DGlUGGusHtBVF9dLREz0VDL9TuKmUKNpLNB1h7RskG6BamPhrbBN92LzdwxxkwML1tXbHsPo /rEncd5qA9xWIAhhsjhFRhHj6MQHOXNJpcq4lQWesnAI6XrPmrOLQyZrROCwOXsWua8myG+JnII acA5RH/BkD86+/1/zxEiJfGzVQoHM576uF5W9Of0Q/Qa5GPDbH7FRJLODSEFY7y1eVVHrNOEWZA 8rHaXW6V7MwX37/0psIDX1OXCtBYKHPkpP7PrNhw81GDOGI/uuECRUSGX7USoj7FuMqDBEnWSVU eLhYkZxS5n2l7cuc4X2Sa5DkBpcb3G3yaSAHWH87Pj/6w== Received-SPF: pass client-ip=46.105.54.31; envelope-from=ngraves@ngraves.fr; helo=5.mo582.mail-out.ovh.net X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This package has no dependencies in Guix, is unsupported (see https://liballeg.org/old.html) and is vulnerable to CVE-2021-36489. * gnu/packages/game-development.scm (allegro-5.0): Delete variable. * gnu/local.mk: Deregister patch. * gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch: Delete file. --- gnu/local.mk | 1 - gnu/packages/game-development.scm | 18 -------- .../allegro-mesa-18.2.5-and-later.patch | 41 ------------------- 3 files changed, 60 deletions(-) delete mode 100644 gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch diff --git a/gnu/local.mk b/gnu/local.mk index c432685775..113d8ed68d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -954,7 +954,6 @@ dist_patch_DATA = \ %D%/packages/patches/akonadi-paths.patch \ %D%/packages/patches/akonadi-not-relocatable.patch \ %D%/packages/patches/akonadi-timestamps.patch \ - %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/alure-dumb-2.patch \ %D%/packages/patches/ibus-anthy-fix-tests.patch \ %D%/packages/patches/ibus-table-paths.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee869c9cc5..6100e4e94e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1132,24 +1132,6 @@ (define-public allegro (home-page "https://liballeg.org") (license license:bsd-3))) -(define-public allegro-5.0 - (package (inherit allegro) - (name "allegro") - (version "5.0.11") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/liballeg/allegro5/releases" - "/download/" version "/allegro-" - (if (equal? "0" (string-take-right version 1)) - (string-drop-right version 2) - version) - ".tar.gz")) - (patches (search-patches - "allegro-mesa-18.2.5-and-later.patch")) - (sha256 - (base32 - "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9")))))) - (define-public aseprite (package (name "aseprite") diff --git a/gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch b/gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch deleted file mode 100644 index fa273a5dfa..0000000000 --- a/gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fixes compilation with Mesa >= 18.2.5. - -Taken from upstream: - -https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47 - -diff --git a/include/allegro5/allegro_opengl.h b/include/allegro5/allegro_opengl.h -index 0f86a6768..652dd024e 100644 ---- a/include/allegro5/allegro_opengl.h -+++ b/include/allegro5/allegro_opengl.h -@@ -103,10 +103,14 @@ - - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glext_h_ -+#define __gl_glext_h_ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glext_h_ -+#undef __gl_glext_h_ - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - -diff --git a/include/allegro5/opengl/GLext/glx_ext_defs.h b/include/allegro5/opengl/GLext/glx_ext_defs.h -index 49c502091..fba8aea5d 100644 ---- a/include/allegro5/opengl/GLext/glx_ext_defs.h -+++ b/include/allegro5/opengl/GLext/glx_ext_defs.h -@@ -1,7 +1,9 @@ - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define _ALLEGRO_GLX_VERSION_1_3 --- -2.20.0