From 0b5e128750ed40d4348f2eb49d328b81dba9181a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Oct 2021 19:23:30 +0200 Subject: gnu: QEMU: Update to 6.1.0. * gnu/packages/virtualization.scm (qemu): Update to 6.1.0. [source](patches): Remove obsolete patch. [arguments]: Adjust substitutions for upstream changes. [native-inputs]: Add PYTHON-SPHINX-RTD-THEME. * gnu/packages/patches/qemu-meson-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 34218ec8ce..1b7e7f4d43 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1689,7 +1689,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ - %D%/packages/patches/qemu-meson-compat.patch \ %D%/packages/patches/qemu-sphinx-compat.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ -- cgit 1.4.1 From 702bc2b89939165a3dc61096c21bb8b670a94713 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Oct 2021 19:24:50 +0200 Subject: gnu: QEMU: Remove obsolete patch. * gnu/packages/virtualization.scm (qemu)[source](patches): Remove Sphinx compatibility patch, which worked around a bug in Sphinx that has since been fixed. * gnu/packages/patches/qemu-sphinx-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/patches/qemu-sphinx-compat.patch | 18 ------------------ gnu/packages/virtualization.scm | 1 - 3 files changed, 20 deletions(-) delete mode 100644 gnu/packages/patches/qemu-sphinx-compat.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 1b7e7f4d43..ea27741a77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1689,7 +1689,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ - %D%/packages/patches/qemu-sphinx-compat.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ diff --git a/gnu/packages/patches/qemu-sphinx-compat.patch b/gnu/packages/patches/qemu-sphinx-compat.patch deleted file mode 100644 index 7342ebee4e..0000000000 --- a/gnu/packages/patches/qemu-sphinx-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Prevent Sphinx 4 and later from creating subdirectories, which -the build scripts are not equipped to deal with. - -Taken from upstream: -https://gitlab.com/qemu-project/qemu/-/issues/256 -https://gitlab.com/qemu-project/qemu/-/commit/269a7e97865cb863c9ca19e5f2e6a40ac9eddf82 - -diff --git a/docs/conf.py b/docs/conf.py ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -279,6 +279,7 @@ - ['Stefan Hajnoczi ', - 'Masayoshi Mizuma '], 1), - ] -+man_make_section_directory = False - - # -- Options for Texinfo output ------------------------------------------- - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 504f199296..772a0ac430 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -159,7 +159,6 @@ (base32 "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f")) (patches (search-patches "qemu-CVE-2021-20203.patch" - "qemu-sphinx-compat.patch" "qemu-build-info-manual.patch")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From 848581ae9b900f0237fc7ab3ab77aa84cd6b2aad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Oct 2021 13:25:46 +0200 Subject: gnu: cpufrequtils: Update to 008. * gnu/packages/linux.scm (cpufrequtils): Update to 008. [source]: Remove patch. [arguments]: Add many #:configure-flags to mitigate downgrade from Autotools. Don't ./configure. [native-inputs]: Remove unused sysfsutils-1. Add gettext-minimal. [home-page]: Change to a working mirror. * gnu/packages/patches/cpufrequtils-fix-aclocal.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 31 +++++++++++---- .../patches/cpufrequtils-fix-aclocal.patch | 46 ---------------------- 3 files changed, 23 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/patches/cpufrequtils-fix-aclocal.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index ea27741a77..c0734c3889 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -954,7 +954,6 @@ dist_patch_DATA = \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/coreutils-ls.patch \ - %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3f31d24fa2..aa5fbb5bc9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4780,22 +4780,37 @@ also contains the libsysfs library.") (define-public cpufrequtils (package (name "cpufrequtils") - (version "0.3") + (version "008") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/kernel/cpufreq/" "cpufrequtils-" version ".tar.gz")) (sha256 - (base32 "0qfqv7nqmjfr3p0bwrdlxkiqwqr7vmx053cadaa548ybqbghxmvm")) - (patches (search-patches "cpufrequtils-fix-aclocal.patch")))) + (base32 "0xjs8j44hh0cz6qpig1n0iw8xjpr6s5qmcmwh965ngapxgarr7af")))) (build-system gnu-build-system) - (native-inputs - `(("sysfsutils" ,sysfsutils-1))) (arguments - '(#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")))) - (home-page "https://www.kernel.org/pub/linux/utils/kernel/cpufreq/") + `(#:tests? #f ; no test suite + #:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list "PROC=false" ; obsoleted by sysfs in Linux 2.6(!) + (string-append "CC=" ,(cc-for-target)) + (string-append "LDFLAGS=-Wl,-rpath=" out "/lib") + "INSTALL=install" + (string-append "bindir=" out "/bin") + (string-append "sbindir=" out "/sbin") + (string-append "mandir=" out "/share/man") + (string-append "includedir=" out "/include") + (string-append "libdir=" out "/lib") + (string-append "localedir=" out "/share/locale") + (string-append "docdir=" out "/share/doc/" ,name))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (native-inputs + `(("gettext" ,gettext-minimal))) + (home-page + "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html") (synopsis "Utilities to get and set CPU frequency on Linux") (description "The cpufrequtils suite contains utilities to retrieve CPU frequency diff --git a/gnu/packages/patches/cpufrequtils-fix-aclocal.patch b/gnu/packages/patches/cpufrequtils-fix-aclocal.patch deleted file mode 100644 index be5767f462..0000000000 --- a/gnu/packages/patches/cpufrequtils-fix-aclocal.patch +++ /dev/null @@ -1,46 +0,0 @@ -Add an extra layer of quoting to ltmain.sh sanity check. - ---- a/configure 2005-05-07 14:19:31.000000000 +0200 -+++ b/configure 2015-02-10 11:16:32.456146934 +0100 -@@ -6266,7 +6266,7 @@ - exit 1 - fi - gentoo_lt_version="1.5.16" --gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'` -+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` - if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 ---- a/aclocal.m4 2005-05-07 14:19:25.000000000 +0200 -+++ b/aclocal.m4 2015-02-10 11:16:15.352030318 +0100 -@@ -246,7 +246,7 @@ - exit 1 - fi - gentoo_lt_version="1.5.16" --gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` -+gentoo_ltmain_version=`[grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||']` - if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then - AC_MSG_RESULT(no) - echo ---- a/libcpufreq/configure 2005-05-07 14:19:31.000000000 +0200 -+++ b/libcpufreq/configure 2015-02-10 11:16:32.456146934 +0100 -@@ -6266,7 +6266,7 @@ - exit 1 - fi - gentoo_lt_version="1.5.16" --gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'` -+gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` - if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 ---- a/libcpufreq/aclocal.m4 2005-05-07 14:19:25.000000000 +0200 -+++ b/libcpufreq/aclocal.m4 2015-02-10 11:16:15.352030318 +0100 -@@ -246,7 +246,7 @@ - exit 1 - fi - gentoo_lt_version="1.5.16" --gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` -+gentoo_ltmain_version=`[grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||']` - if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then - AC_MSG_RESULT(no) - echo -- cgit 1.4.1 From c1ea1a94c33035a5aec413617d502884647af628 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 12 Oct 2021 16:43:40 +0200 Subject: gnu: libhx: Fix runtime bug. There is a bug in libhx causing pam-mount to crash when trying to mount user directories at login. Upstream has a patch to fix this issue. * gnu/packages/patches/libhx-fix-double-free-bug.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/c.scm (libhx)[source]: Use it. --- gnu/local.mk | 3 +- gnu/packages/c.scm | 5 +- .../patches/libhx-fix-double-free-bug.patch | 80 ++++++++++++++++++++++ 3 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libhx-fix-double-free-bug.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index c0734c3889..6f037937ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -20,7 +20,7 @@ # Copyright © 2018, 2019, 2020, 2021 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović # Copyright © 2018, 2020, 2021 Maxim Cournoyer -# Copyright © 2019, 2020 Guillaume Le Vaillant +# Copyright © 2019, 2020, 2021 Guillaume Le Vaillant # Copyright © 2019, 2020 John Soo # Copyright © 2019 Jonathan Brielmaier # Copyright © 2019 Evan Straw @@ -1379,6 +1379,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgrss-CVE-2016-2001.patch \ + %D%/packages/patches/libhx-fix-double-free-bug.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libofa-ftbfs-1.diff \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 7fdac40a97..9f30295067 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2019, 2020 Efraim Flashner -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Marius Bakke @@ -259,7 +259,8 @@ whose behaviour is inconsistent across *NIX flavours.") (uri (string-append "https://inai.de/files/libhx/" "libHX-" version ".tar.xz")) (sha256 - (base32 "1f4rmarym1j368cbxhqzyvdn5dk4bh8951s19ffqwql16anqsgfr")))) + (base32 "1f4rmarym1j368cbxhqzyvdn5dk4bh8951s19ffqwql16anqsgfr")) + (patches (search-patches "libhx-fix-double-free-bug.patch")))) (build-system gnu-build-system) (home-page "https://inai.de/projects/libhx/") (synopsis "C library with common data structures and functions") diff --git a/gnu/packages/patches/libhx-fix-double-free-bug.patch b/gnu/packages/patches/libhx-fix-double-free-bug.patch new file mode 100644 index 0000000000..80c2c6ca84 --- /dev/null +++ b/gnu/packages/patches/libhx-fix-double-free-bug.patch @@ -0,0 +1,80 @@ +From a08eabc6e5a3e0a9c7a15ca15ff7d450ecb6db88 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 12 Oct 2021 17:32:43 +0200 +Subject: [PATCH] io: fix a use-after-free in conjunction with HX_realpath + +HX_readlink(&x, ...) forgot to set x to nullptr upon error, which +trips up subsequent calls to HX_readlink with the very same x. + +Fixes: v3.26-1-g97f4be2 +--- + src/io.c | 8 ++++++-- + src/tc-realpath.c | 10 ++++++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/src/io.c b/src/io.c +index 95d6fd6..14078fc 100644 +--- a/src/io.c ++++ b/src/io.c +@@ -316,8 +316,10 @@ EXPORT_SYMBOL int HX_readlink(hxmc_t **target, const char *path) + ssize_t ret = readlink(path, *target, linkbuf_size); + if (ret < 0) { + int saved_errno = errno; +- if (allocate) ++ if (allocate) { + HXmc_free(*target); ++ *target = nullptr; ++ } + return -(errno = saved_errno); + } + if (static_cast(size_t, ret) < linkbuf_size) { +@@ -327,8 +329,10 @@ EXPORT_SYMBOL int HX_readlink(hxmc_t **target, const char *path) + linkbuf_size *= 2; + if (HXmc_setlen(target, linkbuf_size) == NULL) { + int saved_errno = errno; +- if (allocate) ++ if (allocate) { + HXmc_free(*target); ++ *target = nullptr; ++ } + return -(errno = saved_errno); + } + } +diff --git a/src/tc-realpath.c b/src/tc-realpath.c +index 5dd9aa2..c2ef15a 100644 +--- a/src/tc-realpath.c ++++ b/src/tc-realpath.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + static unsigned int rp_flags; + static unsigned int rp_absolute; +@@ -42,6 +43,14 @@ static bool rp_get_options(int *argc, const char ***argv) + return true; + } + ++static void t_1(void) ++{ ++ hxmc_t *tmp = HXmc_strinit(""); ++ /* two components, so that HX_readlink gets called twice */ ++ HX_realpath(&tmp, "/dev/tty", HX_REALPATH_DEFAULT); ++ HXmc_free(tmp); ++} ++ + int main(int argc, const char **argv) + { + hxmc_t *res; +@@ -49,6 +58,7 @@ int main(int argc, const char **argv) + + if (!rp_get_options(&argc, &argv)) + return EXIT_FAILURE; ++ t_1(); + + res = NULL; + while (--argc > 0) { +-- +2.33.0 + -- cgit 1.4.1 From 711ee48f81d62785b6e1fedcba20ed3078b8ab01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Oct 2021 22:23:14 +0200 Subject: gnu: ganeti: Prepare for Sphinx 4.0. * gnu/packages/patches/ganeti-sphinx-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/virtualization.scm (ganeti)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/patches/ganeti-sphinx-compat.patch | 24 ++++++++++++++++++++++++ gnu/packages/virtualization.scm | 1 + 3 files changed, 26 insertions(+) create mode 100644 gnu/packages/patches/ganeti-sphinx-compat.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 6f037937ad..8c30eaafba 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1068,6 +1068,7 @@ dist_patch_DATA = \ %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch \ %D%/packages/patches/ganeti-shepherd-master-failover.patch \ %D%/packages/patches/ganeti-shepherd-support.patch \ + %D%/packages/patches/ganeti-sphinx-compat.patch \ %D%/packages/patches/gash-utils-ls-test.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ diff --git a/gnu/packages/patches/ganeti-sphinx-compat.patch b/gnu/packages/patches/ganeti-sphinx-compat.patch new file mode 100644 index 0000000000..4e84abbf37 --- /dev/null +++ b/gnu/packages/patches/ganeti-sphinx-compat.patch @@ -0,0 +1,24 @@ +Adjust documentation for Sphinx 4.0. + +Discussed upstream at . + +diff --git a/doc/index.rst b/doc/index.rst +--- a/doc/index.rst ++++ b/doc/index.rst +@@ -119,7 +119,6 @@ Draft designs + design-hotplug.rst + design-internal-shutdown.rst + design-kvmd.rst +- design-location.rst + design-linuxha.rst + design-location.rst + design-lu-generated-jobs.rst +diff --git a/lib/build/shell_example_lexer.py b/lib/build/shell_example_lexer.py +--- a/lib/build/shell_example_lexer.py ++++ b/lib/build/shell_example_lexer.py +@@ -79,4 +79,4 @@ class ShellExampleLexer(RegexLexer): + + + def setup(app): +- app.add_lexer("shell-example", ShellExampleLexer()) ++ app.add_lexer("shell-example", ShellExampleLexer) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 772a0ac430..0dd05a65c9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -519,6 +519,7 @@ firmware blobs. You can (file-name (git-file-name name version)) (patches (search-patches "ganeti-shepherd-support.patch" "ganeti-shepherd-master-failover.patch" + "ganeti-sphinx-compat.patch" "ganeti-haskell-compat.patch" "ganeti-haskell-pythondir.patch" "ganeti-disable-version-symlinks.patch" -- cgit 1.4.1