diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 4 | ||||
| -rw-r--r-- | gnu/packages/electronics.scm | 36 | ||||
| -rw-r--r-- | gnu/packages/patches/kvmfr-linux-module-fix-build.patch | 41 | ||||
| -rw-r--r-- | gnu/packages/patches/opusfile-CVE-2022-47021.patch | 40 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/xiph.scm | 3 |
6 files changed, 82 insertions, 47 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ab53474192..6ea7ca806c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -17,7 +17,7 @@ # Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> -# Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov <go.wigust@gmail.com> +# Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> # Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim@guixotic.coop> # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net> @@ -1706,7 +1706,6 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \ %D%/packages/patches/krita-xsimd-13-compat.patch \ - %D%/packages/patches/kvmfr-linux-module-fix-build.patch \ %D%/packages/patches/kwayland-5-fix-build.patch \ %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\ %D%/packages/patches/laby-make-install.patch \ @@ -1995,6 +1994,7 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-hurd64.patch \ %D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ + %D%/packages/patches/opusfile-CVE-2022-47021.patch \ %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \ %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index cf49c267f7..49ff1ce67f 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -248,6 +248,42 @@ individual low-level driver modules.") (home-page "https://www.comedi.org/") (license license:lgpl2.1))) +(define-public ieee-p1076 + (package + (name "ieee-p1076") + (version "2019") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://opensource.ieee.org/vasg/Packages/") + (commit (string-append "1076-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1va626i5ww2ziw3dghw0d2mq7mrj5dwcn0h019h77866yw2pq9xn")))) + (build-system copy-build-system) + (native-inputs (list python-minimal-wrapper nvc python-vunit)) + (arguments + (list + ;; Not all 2019 features are supported by nvc compiler. + ;; pass 1055 of 1648 + #:tests? #f + #:install-plan + #~'(("ieee" "share/ieee/p1076/ieee" #:include ("vhdl")) + ("std" "share/ieee/p1076/std" #:include ("vhdl"))))) + (native-search-paths + (list (search-path-specification + (variable "IEEE-1076") + (separator #f) + (files (list "share/ieee/p1076"))))) + (home-page "https://IEEE-P1076.gitlab.io") + (synopsis "VHDL libraries corresponding to the IEEE 1076 standard") + (description + "Open source materials intended for reference by the IEEE standard 1076, +as approved and published by the @acronym{VHDL, Very High Speed Hardware +Description Language} Analysis and Standardization Group.") + (license license:asl2.0))) + (define-public fftgen (let ((commit "3378b77d83a98b06184656a5cb9b54e50dfe4485") ;no releases (revision "1")) diff --git a/gnu/packages/patches/kvmfr-linux-module-fix-build.patch b/gnu/packages/patches/kvmfr-linux-module-fix-build.patch deleted file mode 100644 index 49c1a713a5..0000000000 --- a/gnu/packages/patches/kvmfr-linux-module-fix-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -Copied from -https://github.com/gnif/LookingGlass/issues/1075#issuecomment-1546422678 and -https://github.com/gnif/LookingGlass/issues/1134 with adjustments for current -kvmfr source version. - -From c4950a830fbe2ca27337793aa227c86f5c044f46 Mon Sep 17 00:00:00 2001 -From: Oleg Pykhalov <go.wigust@gmail.com> -Date: Sat, 5 Oct 2024 16:11:45 +0300 -Subject: [PATCH] Fix build - ---- - module/kvmfr.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/module/kvmfr.c b/module/kvmfr.c -index 121aae5..4c386f9 100644 ---- a/module/kvmfr.c -+++ b/module/kvmfr.c -@@ -30,6 +30,7 @@ - #include <linux/highmem.h> - #include <linux/memremap.h> - #include <linux/version.h> -+#include <linux/vmalloc.h> - - #include <asm/io.h> - -@@ -539,7 +540,11 @@ static int __init kvmfr_module_init(void) - if (kvmfr->major < 0) - goto out_free; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) - kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME); -+#else -+ kvmfr->pClass = class_create(KVMFR_DEV_NAME); -+#endif - if (IS_ERR(kvmfr->pClass)) - goto out_unreg; - --- -2.41.0 - diff --git a/gnu/packages/patches/opusfile-CVE-2022-47021.patch b/gnu/packages/patches/opusfile-CVE-2022-47021.patch new file mode 100644 index 0000000000..b41ef35eb0 --- /dev/null +++ b/gnu/packages/patches/opusfile-CVE-2022-47021.patch @@ -0,0 +1,40 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles <giles@thaumas.net> +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry <tterribe@xiph.org> +Signed-off-by: Mark Harris <mark.hsj@gmail.com> +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 761ad02db2..467904e5dc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4392,7 +4392,7 @@ your host privately.") (define-public kvmfr-linux-module (package (name "kvmfr-linux-module") - (version "B6") + (version "B7") (source (origin (method url-fetch) (uri (string-append "https://looking-glass.io/artifact/" version @@ -4400,8 +4400,7 @@ your host privately.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")) - (patches (search-patches "kvmfr-linux-module-fix-build.patch")))) + "11crsvy783ig7kzmr2cr68wv9zsjkcbp1akcs28rc6yc1ik0dr89")))) (build-system linux-module-build-system) (inputs (list bash-minimal)) (arguments diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index d58665f6c3..ffe1266f42 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -438,7 +438,8 @@ decoding .opus files.") ".tar.gz")) (sha256 (base32 - "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i")))) + "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i")) + (patches (search-patches "opusfile-CVE-2022-47021.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static") |