From 9e632a55546e9b6bb8098e5743678daf86a2c855 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 29 May 2021 16:05:00 +0200 Subject: gnu: isc-dhcp: Update to 4.4.2-P1 [fixes CVE-2021-25217]. * gnu/packages/admin.scm (isc-dhcp): Update to 4.4.2-P1. --- 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 001c6db414..a3d260818e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1147,14 +1147,14 @@ (define-public isc-dhcp bind-release-version))) (package (name "isc-dhcp") - (version "4.4.2") + (version "4.4.2-P1") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/dhcp/" version "/dhcp-" version ".tar.gz")) (sha256 (base32 - "08a5003zdxgl41b29zjkxa92h2i40zyjgxg0npvnhpkfl5jcsz0s")))) + "06jsr0cg5rsmyibshrpcb9za0qgwvqccashdma7mlm1rflrh8pmh")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f -- cgit v1.2.3 From ee206133de2100bd872e493710a0b28995744b21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 29 May 2021 16:05:31 +0200 Subject: gnu: isc-dhcp: Update home page. * gnu/packages/admin.scm (isc-dhcp)[home-page]: Update. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a3d260818e..8bc02f5ee3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1277,7 +1277,7 @@ (define-public isc-dhcp ("coreutils*" ,coreutils) ("sed*" ,sed))) - (home-page "https://www.isc.org/products/DHCP/") + (home-page "https://www.isc.org/dhcp/") (synopsis "Dynamic Host Configuration Protocol (DHCP) tools") (description "ISC's Dynamic Host Configuration Protocol (DHCP) distribution provides a -- cgit v1.2.3 From 9412762f9b092a89bf63054540909f84a577c1dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 13:38:32 +0200 Subject: gnu: thermald: Update to 2.4.5. * gnu/packages/admin.scm (thermald): Update to 2.4.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 8bc02f5ee3..551cd3666c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3637,7 +3637,7 @@ (define-public nnn (define-public thermald (package (name "thermald") - (version "2.4.4") + (version "2.4.5") (source (origin (method git-fetch) @@ -3646,7 +3646,7 @@ (define-public thermald (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1k0r2c13fihjndwfh0byw0i8ni4lzsjgwz874pvpj1l1nvjj0ajx")))) + (base32 "1y8s0cpjm01bz4isp3ksvnrbhpp3phivdhsb0w2kxhv09sfxkc5g")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ddd871c18ab2d853503c167fd306fa8d84e99421 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 13:39:15 +0200 Subject: gnu: thermald: Compile with -Werror again. * gnu/packages/admin.scm (thermald)[arguments]: Remove substitution, and a #t whilst we're here. --- gnu/packages/admin.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 551cd3666c..9bade4a850 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3660,13 +3660,7 @@ (define-public thermald (modify-phases %standard-phases (add-before 'bootstrap 'no-early-./configure (lambda _ - (setenv "NO_CONFIGURE" "yet") - ;; XXX thd_trip_point.h redefines "__STDC_LIMIT_MACROS" after - ;; /include/lzma.h. ./configure forcibly appends -Werror - ;; to CXXFLAGS, overriding any -Wno-error we'd add. - (substitute* "configure.ac" - (("-Werror") "")) - #t))))) + (setenv "NO_CONFIGURE" "yet")))))) (native-inputs `(("autoconf" ,autoconf) ("autoconf-archive" ,autoconf-archive) -- cgit v1.2.3 From 1e1a274ffd5fdeb41b4c65a99cb333712c95b3f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 13:49:43 +0200 Subject: gnu: nnn: Update to 4.1.1. * gnu/packages/admin.scm (nnn): Update to 4.1.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 9bade4a850..83e52963f1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3596,14 +3596,14 @@ (define-public pfetch (define-public nnn (package (name "nnn") - (version "4.0") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "0m07nh1cdfikn4bkpni29j61hr9jdwbl0n5fmlm53l1xmn7yq6d2")))) + (base32 "1fnf35s3b2nfp18s712n5vhg6idx4rfgwdfv74nc2933v9l2dq7h")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From 49dd606f574b3e7aadea8d93818bfdc6f3de71cc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 13:51:37 +0200 Subject: gnu: nnn: Use #:make-flags over Makefile patching. * gnu/packages/admin.scm (nnn)[arguments]: Remove 'patch-pkg-config phase. Set PKG_CONFIG in #:make-flags instead. --- gnu/packages/admin.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 83e52963f1..a2e013ed03 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3614,17 +3614,13 @@ (define-public nnn `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'unpack 'patch-pkg-config - (lambda _ - (substitute* "Makefile" - (("pkg-config") - ,(pkg-config-for-target)))))) + (delete 'configure)) ; no configure script #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "CC=" ,(cc-for-target))))) + (string-append "CC=" ,(cc-for-target)) + (string-append "PKG_CONFIG=" ,(pkg-config-for-target))))) (home-page "https://github.com/jarun/nnn") (synopsis "Terminal file browser") (description "@command{nnn} is a fork of @command{noice}, a blazing-fast -- cgit v1.2.3 From 605a40b3857ffb705649aa0857a0ef0d065aa7a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 5 Jun 2021 13:52:43 +0200 Subject: gnu: nnn: Remove marketing hyperbole. * gnu/packages/admin.scm (nnn)[description]: Gush less. --- gnu/packages/admin.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a2e013ed03..661e5e131d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3623,11 +3623,11 @@ (define-public nnn (string-append "PKG_CONFIG=" ,(pkg-config-for-target))))) (home-page "https://github.com/jarun/nnn") (synopsis "Terminal file browser") - (description "@command{nnn} is a fork of @command{noice}, a blazing-fast -lightweight terminal file browser with easy keyboard shortcuts for -navigation, opening files and running tasks. There is no config file and -mime associations are hard-coded. The incredible user-friendliness and speed -make it a perfect utility on modern distros.") + (description + "@command{nnn} is a fork of @command{noice}, a fast and minimal text +terminal file browser with keyboard shortcuts for navigation, opening files and +running tasks. There is no configuration file and MIME associations are +hard-coded.") (license license:bsd-2))) (define-public thermald -- cgit v1.2.3