From ad7749a1273ccd2556acd4d24388956d6962a723 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Nov 2020 14:03:05 +0100 Subject: gnu: igt-gpu-tools: Update to 1.25. * gnu/packages/admin.scm (igt-gpu-tools): Update to 1.25. [build-system]: Switch to Meson. [native-inputs]: Remove autoconf, automake, and libtool. Add bison & flex. --- gnu/packages/admin.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 20d5978e6d..a5bff31db5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3108,7 +3108,7 @@ buffers.") (define-public igt-gpu-tools (package (name "igt-gpu-tools") - (version "1.24") + (version "1.25") (source (origin (method git-fetch) @@ -3117,8 +3117,8 @@ buffers.") (commit (string-append "igt-gpu-tools-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gpdjs5aj6vsnzwcjvw5bb120lgffvvshi4202phr0bzw3b92ky8")))) - (build-system gnu-build-system) + (base32 "1lvhkdhilw0fn4nzkpfwvrhiv8d92h811qs2v6ac3p5w7v86a9zm")))) + (build-system meson-build-system) (arguments `(#:tests? #f)) ; many of the tests try to load kernel modules (inputs @@ -3135,9 +3135,8 @@ buffers.") ("procps" ,procps) ("util-macros" ,util-macros))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) + `(("bison" ,bison) + ("flex" ,flex) ("pkg-config" ,pkg-config))) (home-page "https://gitlab.freedesktop.org/drm/igt-gpu-tools") (synopsis "Tools for development and testing of the Intel DRM driver") -- cgit v1.2.3 From 8ae5fde27a828c6c627e1016bffd203632cded09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Nov 2020 14:04:12 +0100 Subject: gnu: igt-gpu-tools: Remove unused inputs. * gnu/packages/admin.scm (igt-gpu-tools)[inputs]: Remove glib, libxrandr, openssl, and util-macros. --- gnu/packages/admin.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a5bff31db5..690e113780 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3125,15 +3125,11 @@ buffers.") `(("cairo" ,cairo) ("elfutils" ,elfutils) ; libdw ("eudev" ,eudev) - ("glib" ,glib) ("kmod" ,kmod) ("libdrm" ,libdrm) ("libpciaccess" ,libpciaccess) ("libunwind" ,libunwind) - ("libxrandr" ,libxrandr) - ("openssl" ,openssl) - ("procps" ,procps) - ("util-macros" ,util-macros))) + ("procps" ,procps))) (native-inputs `(("bison" ,bison) ("flex" ,flex) -- cgit v1.2.3 From 8fe3694990b9d7809cfc1e6832b1a920ea0af164 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Nov 2020 13:34:01 +0100 Subject: gnu: thermald: Update to 2.4. * gnu/packages/admin.scm (thermald): Update to 2.4. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 690e113780..00bb0add47 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3414,7 +3414,7 @@ make it a perfect utility on modern distros.") (define-public thermald (package (name "thermald") - (version "2.3") + (version "2.4") (source (origin (method git-fetch) @@ -3423,11 +3423,11 @@ make it a perfect utility on modern distros.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl")))) + (base32 "08sy6v09drcy3nwv7za543vajn4bm8jvwk9iwwf7i9azmk47jgna")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (let ((out (assoc-ref %outputs "out"))) + (let ((out (assoc-ref %outputs "out"))) (list (string-append "--with-dbus-sys-dir=" out "/etc/dbus-1/system.d") "--localstatedir=/var")) -- cgit v1.2.3 From 739174947ef6b3184e3c012cf41a279a13434b4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Nov 2020 21:04:33 +0100 Subject: gnu: sudo: Update to 1.9.4. * gnu/packages/admin.scm (sudo): Update to 1.9.4. [source]: Add patch. * gnu/packages/patches/sudo-fix-build-without-sendmail.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 5 ++- .../patches/sudo-fix-build-without-sendmail.patch | 45 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/sudo-fix-build-without-sendmail.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 80f87691fe..c4980c8fde 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1443,6 +1443,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/sqlite-hurd.patch \ + %D%/packages/patches/sudo-fix-build-without-sendmail.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 00bb0add47..96e3ff14d1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1397,7 +1397,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.3p1") + (version "1.9.4") (source (origin (method url-fetch) (uri @@ -1407,7 +1407,8 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "17mldsg5d08s23cskmjxfa81ibnqw3slgf3l4023j72ywi9xxffw")) + "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb")) + (patches (search-patches "sudo-fix-build-without-sendmail.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/sudo-fix-build-without-sendmail.patch b/gnu/packages/patches/sudo-fix-build-without-sendmail.patch new file mode 100644 index 0000000000..f40bfe445e --- /dev/null +++ b/gnu/packages/patches/sudo-fix-build-without-sendmail.patch @@ -0,0 +1,45 @@ + +# HG changeset patch +# User Todd C. Miller +# Date 1606767492 25200 +# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9 +# Parent 96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76 +Fix build when configured using --without-sendmail +Bug #947 + +diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c +--- a/lib/eventlog/eventlog.c Sun Nov 29 15:11:34 2020 -0700 ++++ b/lib/eventlog/eventlog.c Mon Nov 30 13:18:12 2020 -0700 +@@ -78,7 +78,7 @@ + static FILE *eventlog_stub_open_log(int type, const char *logfile); + static void eventlog_stub_close_log(int type, FILE *fp); + +-/* Eventlog config settings */ ++/* Eventlog config settings (default values). */ + static struct eventlog_config evl_conf = { + EVLOG_NONE, /* type */ + EVLOG_SUDO, /* format */ +@@ -91,7 +91,11 @@ + false, /* omit_hostname */ + _PATH_SUDO_LOGFILE, /* logpath */ + "%h %e %T", /* time_fmt */ ++#ifdef _PATH_SUDO_SENDMAIL + _PATH_SUDO_SENDMAIL, /* mailerpath */ ++#else ++ NULL, /* mailerpath (disabled) */ ++#endif + "-t", /* mailerflags */ + NULL, /* mailfrom */ + MAILTO, /* mailto */ +@@ -1436,8 +1440,10 @@ + evl_conf.logpath = _PATH_SUDO_LOGFILE; + if (evl_conf.time_fmt == NULL) + evl_conf.time_fmt = "%h %e %T"; ++#ifdef _PATH_SUDO_SENDMAIL + if (evl_conf.mailerpath == NULL) + evl_conf.mailerpath = _PATH_SUDO_SENDMAIL; ++#endif + if (evl_conf.mailerflags == NULL) + evl_conf.mailerflags = "-t"; + if (evl_conf.mailto == NULL) + -- cgit v1.2.3 From a94214f6658b46b4bdf87cddffda75b5d70e8306 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 30 Nov 2020 22:29:57 +0100 Subject: gnu: Add fiano. * gnu/packages/admin.scm (fiano): New variable. --- gnu/packages/admin.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 96e3ff14d1..783089e3ca 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -56,6 +56,7 @@ #:use-module (guix build-system emacs) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -4216,3 +4217,37 @@ to the CPU, memory, swap, disks (including LVM) and network layers, and for every process (and thread) it shows e.g. the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code.") (license license:gpl2+))) + +;; TODO: Unvendor u-root (pkg: forth, golang, testutil). +(define fiano + (package + (name "fiano") + (version "5.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxboot/fiano.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "vendor/golang.org") + (delete-file-recursively "vendor/github.com") + #t)))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/linuxboot/fiano" + #:unpack-path "github.com/linuxboot/fiano")) + (native-inputs + `()) + (inputs + `(("go-golang-org-x-text" ,go-golang-org-x-text) + ("go-github.com-ulikunitz-xz" ,go-github.com-ulikunitz-xz))) + (synopsis "UEFI image editor") + (description "This package provides a command-line UEFI image editor.") + (home-page "https://github.com/linuxboot/fiano") + (license license:bsd-3))) -- cgit v1.2.3 From 4f318f7403ced45be5ae34c3f44c158b480072ea Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 30 Nov 2020 22:30:46 +0100 Subject: gnu: Add fiano-utk. * gnu/packages/admin.scm (fiano-utk): New variable. --- gnu/packages/admin.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 783089e3ca..d8d6dcaead 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4251,3 +4251,11 @@ disk utilization, priority, username, state, and exit code.") (description "This package provides a command-line UEFI image editor.") (home-page "https://github.com/linuxboot/fiano") (license license:bsd-3))) + +(define-public fiano-utk + (package + (inherit fiano) + (name "fiano-utk") + (arguments + `(#:import-path "github.com/linuxboot/fiano/cmds/utk" + #:unpack-path "github.com/linuxboot/fiano")))) -- cgit v1.2.3 From ad01213837a3eeb4c3eb8954dcc35ab9c4c2c3b7 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 30 Nov 2020 22:31:00 +0100 Subject: gnu: Add fiano-fmap. * gnu/packages/admin.scm (fiano-fmap): New variable. --- gnu/packages/admin.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d8d6dcaead..e595ad3702 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4259,3 +4259,11 @@ disk utilization, priority, username, state, and exit code.") (arguments `(#:import-path "github.com/linuxboot/fiano/cmds/utk" #:unpack-path "github.com/linuxboot/fiano")))) + +(define-public fiano-fmap + (package + (inherit fiano) + (name "fiano-fmap") + (arguments + `(#:import-path "github.com/linuxboot/fiano/cmds/fmap" + #:unpack-path "github.com/linuxboot/fiano")))) -- cgit v1.2.3 From 00fb3976b3519373d5f588952b161cf3766a0d1a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 3 Dec 2020 23:52:00 +0100 Subject: gnu: Add novena-eeprom. * gnu/packages/admin.scm (novena-eeprom): New variable. --- gnu/packages/admin.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e595ad3702..d04312c9a1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4267,3 +4267,42 @@ disk utilization, priority, username, state, and exit code.") (arguments `(#:import-path "github.com/linuxboot/fiano/cmds/fmap" #:unpack-path "github.com/linuxboot/fiano")))) + +(define-public novena-eeprom + (package + (name "novena-eeprom") + (version "2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xobs/novena-eeprom.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "00pd71mg0g20v0820ggp3ghf9nyj5s4wavaz9mkmrmsr91hcnf7i")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No tests exist + #:make-flags + (list (string-append "CC=" ,(cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (out-bin (string-append out "/bin")) + (out-share-man (string-append out "/share/man/man8"))) + (install-file "novena-eeprom" out-bin) + (install-file "novena-eeprom.8" out-share-man))))))) + (inputs + `(("i2c-tools" ,i2c-tools))) + (synopsis "Novena EEPROM editor") + (description "This package provides an editor for the Novena EEPROM. +Novena boards contain a device-dependent descriptive EEPROM that defines +various parameters such as serial number, MAC address, and featureset. +This program allows you to view and manipulate this EEPROM list.") + (home-page "https://github.com/xobs/novena-eeprom/") + (supported-systems '("armhf-linux")) + (license license:bsd-3))) -- cgit v1.2.3 From 6a84fddcaa9d949b01afc62f471ef16bfe361e97 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Dec 2020 23:37:59 +0100 Subject: gnu: pam-mount: Update to 2.17. * gnu/packages/admin.scm (pam-mount): Update to 2.17. [source]: Remove upstreamed patch. * gnu/packages/patches/pam-mount-luks2-support.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 11 ++--- gnu/packages/patches/pam-mount-luks2-support.patch | 51 ---------------------- 3 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/pam-mount-luks2-support.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index a390f97693..e9dafc0292 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1432,7 +1432,6 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ - %D%/packages/patches/pam-mount-luks2-support.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d04312c9a1..b855bd15dc 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3934,19 +3934,14 @@ tcpdump and snoop.") (define-public pam-mount (package (name "pam-mount") - (version "2.16") + (version "2.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/" - version "/pam_mount-" version ".tar.xz")) + "pam_mount-" version ".tar.xz")) (sha256 - (base32 - "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf")) - (patches - ;; Patch adding support for encrypted volumes in LUKS2 format. - ;; It comes from the Gentoo package definition for sys-auth/pam_mount. - (search-patches "pam-mount-luks2-support.patch")))) + (base32 "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) diff --git a/gnu/packages/patches/pam-mount-luks2-support.patch b/gnu/packages/patches/pam-mount-luks2-support.patch deleted file mode 100644 index b59daf5ce1..0000000000 --- a/gnu/packages/patches/pam-mount-luks2-support.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d4434c05e7c0cf05d87089404cfa2deedc60811a Mon Sep 17 00:00:00 2001 -From: Ingo Franzki -Date: Mon, 29 Oct 2018 16:47:40 +0100 -Subject: [PATCH] crypto: Add support for LUKS2 - -Cryptsetup version 2.0 added support for LUKS2. -This patch adds support for mounting LUKS2 volumes with -pam_mount. - -Signed-off-by: Ingo Franzki ---- - src/crypto-dmc.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c -index d0ab6ca..abd0358 100644 ---- a/src/crypto-dmc.c -+++ b/src/crypto-dmc.c -@@ -21,6 +21,12 @@ - #include "libcryptmount.h" - #include "pam_mount.h" - -+#ifndef CRYPT_LUKS -+ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will -+ default to LUKS(1) on older -+ libcryptsetup versions. */ -+#endif -+ - /** - * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt) - * @path: path to the crypto container -@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev) - - ret = crypt_init(&cd, device); - if (ret == 0) { -- ret = crypt_load(cd, CRYPT_LUKS1, NULL); -+ ret = crypt_load(cd, CRYPT_LUKS, NULL); - if (ret == -EINVAL) - ret = false; - else if (ret == 0) -@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req, - #endif - } - -- ret = crypt_load(cd, CRYPT_LUKS1, NULL); -+ ret = crypt_load(cd, CRYPT_LUKS, NULL); - if (ret == 0) { - ret = crypt_activate_by_passphrase(cd, mt->crypto_name, - CRYPT_ANY_SLOT, req->key_data, req->key_size, flags); --- -2.21.0 -- cgit v1.2.3 From 88a26bfd52362bad7d2149ef5b63277e327110aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 7 Dec 2020 20:28:03 +0100 Subject: gnu: thermald: Update to 2.4.1. * gnu/packages/admin.scm (thermald): Update to 2.4.1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b855bd15dc..9df14b5ca0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3416,7 +3416,7 @@ make it a perfect utility on modern distros.") (define-public thermald (package (name "thermald") - (version "2.4") + (version "2.4.1") (source (origin (method git-fetch) @@ -3425,7 +3425,7 @@ make it a perfect utility on modern distros.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08sy6v09drcy3nwv7za543vajn4bm8jvwk9iwwf7i9azmk47jgna")))) + (base32 "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From a4cd86ff4b7a9dd4bf1a5320b8121b470e381b67 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 12 Dec 2020 23:24:22 +0100 Subject: gnu: htop: Update to 3.0.3. * gnu/packages/admin.scm (htop): Update to 3.0.3. --- gnu/packages/admin.scm | 4 ++-- gnu/services/security-token.scm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9df14b5ca0..d8083d6f7c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -515,7 +515,7 @@ or via the @code{facter} Ruby library.") (define-public htop (package (name "htop") - (version "3.0.2") + (version "3.0.3") (source (origin (method git-fetch) @@ -523,7 +523,7 @@ or via the @code{facter} Ruby library.") (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7")) + (base32 "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs diff --git a/gnu/services/security-token.scm b/gnu/services/security-token.scm index da5314e7d5..ec26006538 100644 --- a/gnu/services/security-token.scm +++ b/gnu/services/security-token.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From f6afc63dc1f8295968f2b309cddfa34e0f3a8dd7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Dec 2020 16:00:02 +0200 Subject: gnu: pies: Update to 1.5. * gnu/packages/admin.scm (pies): Update to 1.5. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d8083d6f7c..90b09f752d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -565,7 +565,7 @@ memory, disks, network and processes.") (define-public pies (package (name "pies") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) @@ -573,7 +573,7 @@ memory, disks, network and processes.") version ".tar.bz2")) (sha256 (base32 - "14jb4pa4zs26d5j2skxbaypnwhsx2lw8jgj1irrgs03c2dnf7gp6")))) + "11j168qljsinaj5dwmg7nkm2z1aghi6gc3d0wf0pikflnh2q2wqf")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fcf1702196bc7203a15998fb152d7ccadfe3b7ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 17 Dec 2020 23:10:15 +0100 Subject: gnu: sudo: Update to 1.9.4p1. * gnu/packages/admin.scm (sudo): Update to 1.9.4p1. [source]: Remove patch. * gnu/packages/patches/sudo-fix-build-without-sendmail.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 5 +-- .../patches/sudo-fix-build-without-sendmail.patch | 45 ---------------------- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 gnu/packages/patches/sudo-fix-build-without-sendmail.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index aef413abdf..98590ae8eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1449,7 +1449,6 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/sqlite-hurd.patch \ - %D%/packages/patches/sudo-fix-build-without-sendmail.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 90b09f752d..8f377ea72c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1398,7 +1398,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.4") + (version "1.9.4p1") (source (origin (method url-fetch) (uri @@ -1408,8 +1408,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb")) - (patches (search-patches "sudo-fix-build-without-sendmail.patch")) + "0xyn5z4npg6nmjmgglp7db9sn82rkx52fg1sw6bs8byxzjfhjwhi")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/sudo-fix-build-without-sendmail.patch b/gnu/packages/patches/sudo-fix-build-without-sendmail.patch deleted file mode 100644 index f40bfe445e..0000000000 --- a/gnu/packages/patches/sudo-fix-build-without-sendmail.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# HG changeset patch -# User Todd C. Miller -# Date 1606767492 25200 -# Node ID 41db1aad85bbce444b511bcb28b9628a0a22fcd9 -# Parent 96a5cfe3c66b6ee84d7f7b6fb26d932f45a44b76 -Fix build when configured using --without-sendmail -Bug #947 - -diff -r 96a5cfe3c66b -r 41db1aad85bb lib/eventlog/eventlog.c ---- a/lib/eventlog/eventlog.c Sun Nov 29 15:11:34 2020 -0700 -+++ b/lib/eventlog/eventlog.c Mon Nov 30 13:18:12 2020 -0700 -@@ -78,7 +78,7 @@ - static FILE *eventlog_stub_open_log(int type, const char *logfile); - static void eventlog_stub_close_log(int type, FILE *fp); - --/* Eventlog config settings */ -+/* Eventlog config settings (default values). */ - static struct eventlog_config evl_conf = { - EVLOG_NONE, /* type */ - EVLOG_SUDO, /* format */ -@@ -91,7 +91,11 @@ - false, /* omit_hostname */ - _PATH_SUDO_LOGFILE, /* logpath */ - "%h %e %T", /* time_fmt */ -+#ifdef _PATH_SUDO_SENDMAIL - _PATH_SUDO_SENDMAIL, /* mailerpath */ -+#else -+ NULL, /* mailerpath (disabled) */ -+#endif - "-t", /* mailerflags */ - NULL, /* mailfrom */ - MAILTO, /* mailto */ -@@ -1436,8 +1440,10 @@ - evl_conf.logpath = _PATH_SUDO_LOGFILE; - if (evl_conf.time_fmt == NULL) - evl_conf.time_fmt = "%h %e %T"; -+#ifdef _PATH_SUDO_SENDMAIL - if (evl_conf.mailerpath == NULL) - evl_conf.mailerpath = _PATH_SUDO_SENDMAIL; -+#endif - if (evl_conf.mailerflags == NULL) - evl_conf.mailerflags = "-t"; - if (evl_conf.mailto == NULL) - -- cgit v1.2.3 From 04b0636e257dfd416d6f17a942aa43fbd59b9252 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Dec 2020 22:28:22 +0100 Subject: gnu: inxi-minimal: Update to 3.2.01-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.2.01-1. [inputs]: Add lvm2 and mdadm. --- gnu/packages/admin.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f377ea72c..e119ab48e6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3613,7 +3613,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.09-1") + (version "3.2.01-1") (source (origin (method git-fetch) @@ -3622,7 +3622,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5")))) + (base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) @@ -3715,6 +3715,8 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") ("perl-io-socket-ssl" ,perl-io-socket-ssl) ("perl-json-xs" ,perl-json-xs) ("perl-time-hires" ,perl-time-hires) + ("lvm2" ,lvm2) ; lvs + ("mdadm" ,mdadm) ;; TODO: Add more inputs: ;; ipmi-sensors ;; hddtemp -- cgit v1.2.3 From 62fb0680a28d890d5d2c0ba3d89354c8b606c476 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Dec 2020 22:37:39 +0100 Subject: gnu: facter: Update to 4.0.47. * gnu/packages/admin.scm (facter): Update to 4.0.47. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e119ab48e6..07c7b1c243 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -444,7 +444,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.46") + (version "4.0.47") (source (origin (method git-fetch) (uri (git-reference @@ -453,7 +453,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1pi93i1jfpmxxw22b5r4gyx5jzgrammlrjzhjr3q2bpn3kcas91j")))) + "1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5cc109cfaf928ec9bddd40b3d8cf61940add21de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Dec 2020 19:02:57 +0100 Subject: gnu: sudo: Update to 1.9.4p2. * gnu/packages/admin.scm (sudo): Update to 1.9.4p2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 07c7b1c243..dab7a0af7b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1398,7 +1398,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.4p1") + (version "1.9.4p2") (source (origin (method url-fetch) (uri @@ -1408,7 +1408,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0xyn5z4npg6nmjmgglp7db9sn82rkx52fg1sw6bs8byxzjfhjwhi")) + "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 4904d31e8883ed2fcd8912046c176ed9edc8b377 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Dec 2020 00:14:06 +0100 Subject: gnu: acpica: Update to 20201217. * gnu/packages/admin.scm (acpica): Update to 20201217. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index dab7a0af7b..99775ae19a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1858,7 +1858,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20201113") + (version "20201217") (source (origin (method url-fetch) (uri (string-append @@ -1866,7 +1866,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "0fmck3zklc328c8nzvfzm2xyh2i8zszzrd4k8kk8q30y4avnc6z1")))) + "06rdpfjmij5nni1x2wi1gnalhsza5yxq1viskjm9r11wmsjnxm2a")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 3b2cee7fca3be306f4aa28df469937d944331424 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 22 Dec 2020 22:19:40 +0100 Subject: gnu: htop: Update to 3.0.4. * gnu/packages/admin.scm (htop): Update to 3.0.4. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 99775ae19a..ca6eddc64c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -515,7 +515,7 @@ or via the @code{facter} Ruby library.") (define-public htop (package (name "htop") - (version "3.0.3") + (version "3.0.4") (source (origin (method git-fetch) @@ -523,7 +523,7 @@ or via the @code{facter} Ruby library.") (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y")) + (base32 "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From b2b77d8658de677847e4044c2604ea15501b1f7d Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 23 Dec 2020 10:42:56 +0100 Subject: gnu: ansible: Update to 2.9.16. * gnu/packages/admin.scm (ansible): Update to 2.9.16. Signed-off-by: Leo Famulari --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ca6eddc64c..fc4f6675a1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2189,13 +2189,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.9.11") + (version "2.9.16") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "1c9ayh61qwasgncmlw7rjx5r4g5n2cpg1d5blgn53zg7xhrx1yc8")))) + (base32 "0j1icfqff25zm9sq6j41ipl6gcj3i67mb5bqbjf2f2q1yx6rm8sk")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From 72861d8ed4d51eebc831a6645943325c8a5bc44a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 12 Dec 2020 09:46:39 +0100 Subject: gnu: rottlog: Fix mail reporting. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (rottlog)[inputs]: Add MAILUTILS. [phases]: In 'patch-paths', replace "/usr/sbin/sendmail" with 'mail' from Mailutils. Co-authored-by: Ludovic Courtès --- gnu/packages/admin.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index fc4f6675a1..e45e228624 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -107,6 +107,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages mail) #:use-module (gnu packages man) #:use-module (gnu packages mcrypt) #:use-module (gnu packages mpi) @@ -1343,9 +1344,11 @@ at once based on a Perl regular expression.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "rc/rc" - (("/usr/sbin/sendmail") "sendmail")) + (("/usr/sbin/sendmail") + (string-append (assoc-ref inputs "mailutils") + "/bin/mail"))) #t)) (add-after 'unpack 'fix-configure (lambda* (#:key inputs native-inputs #:allow-other-keys) @@ -1384,7 +1387,8 @@ at once based on a Perl regular expression.") (native-inputs `(("texinfo" ,texinfo) ("automake" ,automake) ("util-linux" ,util-linux))) ; for 'cal' - (inputs `(("coreutils*" ,coreutils))) + (inputs `(("coreutils*" ,coreutils) + ("mailutils" ,mailutils))) (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") (description -- cgit v1.2.3 From ef126b97553c8119d9478d368c3fd51fa3471b72 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 2 Jan 2021 19:22:15 +0200 Subject: gnu: alive: Update to 2.0.3. * gnu/packages/admin.scm (alive): Update to 2.0.3. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e45e228624..ed6d2768d3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2020 Leo Famulari ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016, 2017 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 Nikita @@ -929,14 +929,14 @@ recursive runs on the generated subnets. (also IPv6) (define-public alive (package (name "alive") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/alive/alive-" version ".tar.xz")) (sha256 (base32 - "1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j")))) + "053hfp7s66lnilm1ii4jrjmy44wpa2cwwh6f0sl8cyz0mm813x4b")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("alive_cv_nice_ping=yes"))) (inputs `(("guile" ,guile-2.0) -- cgit v1.2.3 From da7fde00b507359570cc846fa30d57bfebf1752c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Jan 2021 17:01:20 +0100 Subject: gnu: smartmontools: Update to 7.2. * gnu/packages/admin.scm (smartmontools): Update to 7.2. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ed6d2768d3..375073363f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones @@ -2110,7 +2110,7 @@ various ways that may be running with too much privilege.") (define-public smartmontools (package (name "smartmontools") - (version "7.1") + (version "7.2") (source (origin (method url-fetch) (uri (string-append @@ -2118,7 +2118,7 @@ various ways that may be running with too much privilege.") version "/smartmontools-" version ".tar.gz")) (sha256 (base32 - "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz")))) + "1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw")))) (build-system gnu-build-system) (inputs `(("libcap-ng" ,libcap-ng))) (home-page "https://www.smartmontools.org/") -- cgit v1.2.3