diff options
| author | Nicolas Graves <[email protected]> | 2024-10-28 12:27:37 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2024-11-12 17:41:38 +0900 |
| commit | 44b06b030dcd78b108fa3869255644e4db792d6b (patch) | |
| tree | 678bc9594a62b6bdc0272cda550a733b51ccaeb1 /gnu | |
| parent | 09bbdc3eadeeec4ffd8ff24a6fb2a07471d2f361 (diff) | |
gnu: Remove allegro-5.0. [security fixes]
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.
Signed-off-by: Maxim Cournoyer <[email protected]>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/game-development.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/patches/allegro-mesa-18.2.5-and-later.patch | 41 |
3 files changed, 0 insertions, 60 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1792ed8c78..f0eb14c925 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -957,7 +957,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 @@ etc.") (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 |