From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 74060@debbugs.gnu.org
Cc: Nicolas Graves <ngraves@ngraves.fr>
Subject: [bug#74060] [PATCH] gnu: Remove allegro-5.0. [security fixes]
Date: Mon, 28 Oct 2024 12:27:37 +0100 [thread overview]
Message-ID: <20241028112739.21615-1-ngraves@ngraves.fr> (raw)
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 <GL/gl.h>
- #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 <GL/glx.h>
- #undef __glxext_h_
-+#undef __glx_glxext_h_
-
- #ifndef GLX_VERSION_1_3
- #define _ALLEGRO_GLX_VERSION_1_3
---
-2.20.0
--
2.46.0
next reply other threads:[~2024-10-28 11:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 11:27 Nicolas Graves via Guix-patches via [this message]
2024-11-11 12:37 ` [bug#74060] [PATCH] gnu: Remove allegro-5.0. [security fixes] Maxim Cournoyer
2024-11-11 14:17 ` Nicolas Graves via Guix-patches via
2024-11-12 10:58 ` Nicolas Graves via Guix-patches via
2024-11-12 12:30 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241028112739.21615-1-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=74060@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).