From 6493d0eec43f4e2950c3d19f26b278fbbc6e3192 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Sep 2020 14:08:16 +0200 Subject: gnu: htop: Update to 3.0.2. * gnu/packages/admin.scm (htop): Update to 3.0.2. [native-inputs]: Remove python-wrapper. --- gnu/packages/admin.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4e470abd8a..5ab6cdb3e1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -514,7 +514,7 @@ or via the @code{facter} Ruby library.") (define-public htop (package (name "htop") - (version "3.0.1") + (version "3.0.2") (source (origin (method git-fetch) @@ -522,15 +522,14 @@ or via the @code{facter} Ruby library.") (url "https://github.com/htop-dev/htop") (commit version))) (sha256 - (base32 "0kjlphdvwwbj91kk91s4ksc954d3c2bznddzx2223jmb1bn9rcsa")) + (base32 "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("python" ,python-wrapper))) ; for scripts/MakeHeader.py + ("automake" ,automake))) (home-page "https://htop.dev") (synopsis "Interactive process viewer") (description -- cgit v1.2.3 From 635bf73d2f1b5e8bd913de4e673273a39830a7c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 21 Sep 2020 20:28:35 +0200 Subject: gnu: sudo: Update to 1.9.3. * gnu/packages/admin.scm (sudo): Update to 1.9.3. --- 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 5ab6cdb3e1..c73e4843eb 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.2") + (version "1.9.3") (source (origin (method url-fetch) (uri @@ -1407,7 +1407,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "05432672iilb7s52j9l9xzrlambb1wg3k7qvf5973i41y40x563w")) + "0dsq7xf55060cx88286h71l74fia76mf6gbw5j6fs59v7g68k60x")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From dd492cb8536c81aa7b9702f2dca3a3d387b3e7f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 22 Sep 2020 00:31:34 +0200 Subject: gnu: facter: Update to 4.0.38. * gnu/packages/admin.scm (facter): Update to 4.0.38. --- 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 c73e4843eb..36793c5947 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.35") + (version "4.0.38") (source (origin (method git-fetch) (uri (git-reference @@ -452,7 +452,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1f203g2hp96cp8w4x1myhqdj5j09z9s23kylwkrxr69fjhn0vhnb")))) + "0jrpzkhnz5lv129rkfy68bdsq53n4wsk1vpmhsvykqi5mrkdffck")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5c9ea15daa6e7cdc08b9aadb2cad063d994858e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2020 09:16:30 +0200 Subject: gnu: sudo: Update to 1.9.3p1. * gnu/packages/admin.scm (sudo): Update to 1.9.3p1. --- 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 36793c5947..e16b69a903 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.3") + (version "1.9.3p1") (source (origin (method url-fetch) (uri @@ -1407,7 +1407,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0dsq7xf55060cx88286h71l74fia76mf6gbw5j6fs59v7g68k60x")) + "17mldsg5d08s23cskmjxfa81ibnqw3slgf3l4023j72ywi9xxffw")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From aea2a0f967e644a98baff1bbe10f85b08b7e1fc6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 24 Sep 2020 17:20:41 +0300 Subject: gnu: netcat-openbsd: Use cc-for-target. * gnu/packages/admin.scm (netcat-openbsd)[arguments]: Replace hard-coded gcc with cc-for-target in make-flags. --- 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 e16b69a903..db68a15d8f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016, 2017 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Peter Feigl ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016, 2017 Nikita @@ -841,7 +841,7 @@ would need and has several interesting built-in capabilities.") (arguments `(#:tests? #f ; no test suite #:make-flags - (list "CC=gcc") + (list (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 8bfe8b36416116faa4caf0d7993065b40df713c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Oct 2020 21:44:05 +0200 Subject: gnu: inxi-minimal: Update to 3.1.07-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.07-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 db68a15d8f..f2e653d409 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3588,7 +3588,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.06-1") + (version "3.1.07-1") (source (origin (method git-fetch) @@ -3597,7 +3597,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0h65n03q9kdsv0i1q5f88i11iv79ca7fqq97rdkzkmiqb4whhnm2")))) + (base32 "0hs4m2vmfc6srscaz72r6zpkn6n7msgzlps376ks38gj1l103xfn")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 40fa331c81351e82240c7cd2203281501eadf77f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Oct 2020 21:41:47 +0200 Subject: gnu: nmap: Update to 7.90. * gnu/packages/admin.scm (nmap): Update to 7.90. --- 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 f2e653d409..9fca27c9c8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2606,14 +2606,14 @@ done with the @code{auditctl} utility.") (define-public nmap (package (name "nmap") - (version "7.80") + (version "7.90") (source (origin (method url-fetch) (uri (string-append "https://nmap.org/dist/nmap-" version ".tar.bz2")) (sha256 (base32 - "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw")) + "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 05c29040599069057a923bbbecb333f15fbd87ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Oct 2020 21:45:28 +0200 Subject: gnu: netcat-openbsd: Update to 1.217-2. * gnu/packages/admin.scm (netcat-openbsd): Update to 1.217-2. --- 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 9fca27c9c8..d154904964 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -827,7 +827,7 @@ would need and has several interesting built-in capabilities.") (define-public netcat-openbsd (package (name "netcat-openbsd") - (version "1.217-1") + (version "1.217-2") (source (origin (method git-fetch) (uri (git-reference @@ -836,7 +836,7 @@ would need and has several interesting built-in capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "0kcvi3pav2fdx5c22psjv5dggk4cmrqiaq2cklhqngsk4a7vrjan")))) + "19sr52ix14w344pv13ppb0c1wyg5dxhic1fw2q0s3qfmx57b9hhp")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From 2a372bedbfe0cc5beff52eb3fc22e4786831abb6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Oct 2020 21:46:58 +0200 Subject: gnu: facter: Update to 4.0.41. * gnu/packages/admin.scm (facter): Update to 4.0.41. --- 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 d154904964..e62a145614 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.38") + (version "4.0.41") (source (origin (method git-fetch) (uri (git-reference @@ -452,7 +452,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "0jrpzkhnz5lv129rkfy68bdsq53n4wsk1vpmhsvykqi5mrkdffck")))) + "09i3kv91g2y5hgl75ccd59gjjvkkri4cj80m7smlx6p14hmbgdif")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4e880695e0248a237fe7de27b212f4fa4d6a24fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 8 Oct 2020 13:49:42 +0200 Subject: gnu: facter: Update to 4.0.42. * gnu/packages/admin.scm (facter): Update to 4.0.42. --- 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 e62a145614..40db55e73c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.41") + (version "4.0.42") (source (origin (method git-fetch) (uri (git-reference @@ -452,7 +452,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "09i3kv91g2y5hgl75ccd59gjjvkkri4cj80m7smlx6p14hmbgdif")))) + "1y1aisfy6m7syvw84035mqspgyml1qb8d8v5rl1pl6pd695y6si8")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7e917283d71fee1a29363e113f29c8c21f7c4739 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 8 Oct 2020 23:11:55 +0200 Subject: gnu: sunxi-tools: Fix build. * gnu/packages/patches/sunxi-tools-remove-sys-io.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (sunxi-tools-source): Add it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 2 + .../patches/sunxi-tools-remove-sys-io.patch | 52 ++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 gnu/packages/patches/sunxi-tools-remove-sys-io.patch (limited to 'gnu/packages/admin.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 83d2d72ab1..b59b122e86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1420,6 +1420,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/sunxi-tools-remove-sys-io.patch \ %D%/packages/patches/patchutils-test-perms.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 40db55e73c..275432cb96 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2945,6 +2945,8 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") (commit (string-append "v" version)))) (sha256 (base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd")) + (patches + (search-patches "sunxi-tools-remove-sys-io.patch")) (modules '((guix build utils))) (snippet ;; Remove binaries contained in the tarball which are only for the diff --git a/gnu/packages/patches/sunxi-tools-remove-sys-io.patch b/gnu/packages/patches/sunxi-tools-remove-sys-io.patch new file mode 100644 index 0000000000..fc1e5ea28d --- /dev/null +++ b/gnu/packages/patches/sunxi-tools-remove-sys-io.patch @@ -0,0 +1,52 @@ +From 783cbd59fcf086a9aaf603271823fb4ca71f0c55 Mon Sep 17 00:00:00 2001 +From: Danny Milosavljevic +Date: Thu, 8 Oct 2020 23:01:05 +0200 +Subject: [PATCH] meminfo: Replace sys/io.h by direct register accesses. +See: https://github.com/linux-sunxi/sunxi-tools/pull/144 + +Signed-off-by: Danny Milosavljevic +--- + meminfo.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/meminfo.c b/meminfo.c +index 0b0ff23..3b3a5df 100644 +--- a/meminfo.c ++++ b/meminfo.c +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + + #include "common.h" +@@ -74,24 +73,24 @@ static enum sunxi_soc_version soc_version; + unsigned int + sunxi_io_read(void *base, int offset) + { +- return inl((unsigned long) (base + offset)); ++ return *(volatile unsigned int*) (base + offset); + } + + void + sunxi_io_write(void *base, int offset, unsigned int value) + { +- outl(value, (unsigned long) (base + offset)); ++ *(volatile unsigned int*) (base + offset) = value; + } + + void + sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask) + { +- unsigned int tmp = inl((unsigned long) (base + offset)); ++ unsigned int tmp = sunxi_io_read(base, offset); + + tmp &= ~mask; + tmp |= value & mask; + +- outl(tmp, (unsigned long) (base + offset)); ++ sunxi_io_write(base, offset, tmp); + } + + -- cgit v1.2.3 From 165e0918da54643bfaf9a6cb6b866f8692e9f8f9 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 7 Oct 2020 18:49:29 +0200 Subject: gnu: sudo: Remove support for Python plug-ins. * gnu/packages/admin.scm (sudo)[inputs], [outputs]: Remove python. [arguments]: Remove --enable-python/--disable-python configure flags. Remove 'separate-python-output phase. --- gnu/packages/admin.scm | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 275432cb96..d20becda3b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1414,18 +1414,12 @@ system administrator.") (delete-file-recursively "lib/zlib") #t)))) (build-system gnu-build-system) - (outputs (list "out" "python")) + (outputs (list "out")) (arguments `(#:configure-flags (list (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) - ;; XXX: Disable Python support when cross-compiling because - ;; 'configure' tries to run 'python', which fails. - ,(if (%current-target-system) - "--disable-python" - "--enable-python") ; for plug-ins written in ~ - "--with-logpath=/var/log/sudo.log" "--with-rundir=/var/run/sudo" ; must be cleaned up at boot time "--with-vardir=/var/db/sudo" @@ -1472,22 +1466,7 @@ system administrator.") (substitute* "plugins/sudoers/Makefile.in" (("^pre-install:" match) (string-append match "\ndisabled-" match))) - #t)) - (add-after 'install 'separate-python-output - (lambda* (#:key target outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (out:python (assoc-ref outputs "python"))) - (if target - (mkdir-p (string-append out:python "/empty")) - (for-each - (lambda (file) - (let ((old (string-append out "/" file)) - (new (string-append out:python "/" file))) - (mkdir-p (dirname new)) - (rename-file old new))) - (list "libexec/sudo/python_plugin.so" - "libexec/sudo/python_plugin.la"))) - #t)))) + #t))) ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off the tests. @@ -1497,9 +1476,6 @@ system administrator.") (inputs `(("coreutils" ,coreutils) ("linux-pam" ,linux-pam) - ,@(if (%current-target-system) - '() - `(("python" ,python))) ("zlib" ,zlib))) (home-page "https://www.sudo.ws/") (synopsis "Run commands as root") -- cgit v1.2.3 From 93d3cfec32bbbe1dfbe0be686b371973545b35b8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 10 Oct 2020 18:13:51 +0200 Subject: gnu: Add nmrpflash. * gnu/packages/admin.scm (nmrpflash): New variable. --- gnu/packages/admin.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d20becda3b..ce505f08a3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4076,3 +4076,44 @@ the system configuration; hosts only works when using the Guix package manager on a foreign distro. @command{hosts} works with existing hosts files and entries, providing commands to add, remove, comment, and search.") (license license:expat))) + +(define-public nmrpflash + (package + (name "nmrpflash") + (version "0.9.14") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/jclehner/nmrpflash.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1fdjrxhjs96rdclbkld57xarf592slhkp79h46z833npxpn12ck1")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libnl" ,libnl) + ("libpcap" ,libpcap))) + (arguments + `(#:tests? #f ; None exist + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'prepare-install + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/bin")) + #t))))) + (home-page "https://github.com/jclehner/nmrpflash") + (synopsis "Netgear unbrick utility") + (description "This package provides a utility to flash a new firmware +image to a Netgear device. It has been tested on Netgear EX2700, EX6120, +EX6150v2, DNG3700v2, R6100, R6220, R7000, D7000, WNR3500, R6400, R6800, +R8000, R8500, WNDR3800, but is likely to be compatible with many other +Netgear devices.") + (license license:gpl3+))) -- cgit v1.2.3 From e42765b675d5f3fced0720c1a66350c635fd8643 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 10 Oct 2020 18:22:22 +0200 Subject: gnu; sudo: Remove 'groff' input when building for the Hurd. * gnu/packages/admin.scm (sudo)[native-inputs]: Remove 'groff' when building for the Hurd. --- gnu/packages/admin.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ce505f08a3..f0ae1209eb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1472,7 +1472,10 @@ system administrator.") ;; the chroot's /etc/passwd doesn't have it. Turn off the tests. #:tests? #f)) (native-inputs - `(("groff" ,groff))) + ;; XXX TODO: Remove on next rebuild cycle. + (if (hurd-target?) + '() + `(("groff" ,groff)))) (inputs `(("coreutils" ,coreutils) ("linux-pam" ,linux-pam) -- cgit v1.2.3 From 3c452a35ef6e34ec9221114713c11fe912adebd5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 13 Oct 2020 14:53:04 +0200 Subject: gnu: nmap: Update to 7.91. * gnu/packages/admin.scm (nmap): Update to 7.91. --- 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 f0ae1209eb..e3db9a2fd7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2585,14 +2585,14 @@ done with the @code{auditctl} utility.") (define-public nmap (package (name "nmap") - (version "7.90") + (version "7.91") (source (origin (method url-fetch) (uri (string-append "https://nmap.org/dist/nmap-" version ".tar.bz2")) (sha256 (base32 - "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm")) + "001kb5xadqswyw966k2lqi6jr6zz605jpp9w4kmm272if184pk0q")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 199dfe916b01c11a22eb5bf26c20e64f452ad49d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 13 Oct 2020 15:00:09 +0200 Subject: gnu: facter: Update to 4.0.43. * gnu/packages/admin.scm (facter): Update to 4.0.43. --- 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 e3db9a2fd7..27caa193d7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -443,7 +443,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.42") + (version "4.0.43") (source (origin (method git-fetch) (uri (git-reference @@ -452,7 +452,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1y1aisfy6m7syvw84035mqspgyml1qb8d8v5rl1pl6pd695y6si8")))) + "0ppzr7vsl6iw8x82c4g60mx1vz06nzwcy8byablhg0n0g6qa3pb0")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2323a7120a0f3ed96fedfff42e86c0aee97995c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 13 Oct 2020 22:16:57 +0200 Subject: gnu: nmap: Update license. * guix/licenses.scm (nmap): Rename to ... (npsl): ... this. Adjust name and URL, and remove outdated Fedora wiki entry in favor of nmap's own annotated version. * gnu/packages/admin.scm (nmap)[license]: Adjust accordingly. --- gnu/packages/admin.scm | 2 +- guix/licenses.scm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 27caa193d7..1b80eb8ab7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2670,7 +2670,7 @@ advanced netcat implementation (ncat), a utility for comparing scan results (ndiff), and a packet generation and response analysis tool (nping).") ;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; both use a 3-clause BSD license. - (license (list license:nmap license:bsd-3)))) + (license (list license:npsl license:bsd-3)))) (define-public dstat (package diff --git a/guix/licenses.scm b/guix/licenses.scm index 5038f75638..cd43386102 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -76,7 +76,7 @@ mpl1.0 mpl1.1 mpl2.0 ms-pl ncsa - nmap + npsl ogl-psi1.0 openldap2.8 openssl perl-license @@ -521,10 +521,10 @@ at URI, which may be a file:// URI pointing the package's tree." "http://directory.fsf.org/wiki/License:IllinoisNCSA" "https://www.gnu.org/licenses/license-list#NCSA")) -(define nmap - (license "Nmap license" - "https://svn.nmap.org/nmap/COPYING" - "https://fedoraproject.org/wiki/Licensing/Nmap")) +(define npsl + (license "Nmap Public Source License" + "https://svn.nmap.org/nmap/LICENSE" + "https://nmap.org/npsl/")) (define ogl-psi1.0 (license "Open Government Licence for Public Sector Information" -- cgit v1.2.3 From 6f19c32b0eeeb6b6647ef75c4c8b9e390d41fcd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 15 Oct 2020 23:37:28 +0200 Subject: gnu: dmidecode: Update to 3.3. * gnu/packages/admin.scm (dmidecode): Update to 3.3. [arguments]: Restructure. Add CC to #:make-flags. --- gnu/packages/admin.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1b80eb8ab7..93430dceb7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1809,21 +1809,24 @@ network, which causes enabled computers to power on.") (define-public dmidecode (package (name "dmidecode") - (version "3.2") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://savannah/dmidecode/dmidecode-" - version ".tar.xz")) - (sha256 - (base32 - "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07")))) + (version "3.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/dmidecode/dmidecode-" + version ".tar.xz")) + (sha256 + (base32 "0m8lzg9rf1qssasiix672bxk5qwms90561g8hfkkhk31h2kkgiw2")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases (delete 'configure)) - #:tests? #f ; no 'check' target - #:make-flags (list (string-append "prefix=" - (assoc-ref %outputs "out"))))) + `(#:tests? #f ; no 'check' target + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "prefix=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script (home-page "https://www.nongnu.org/dmidecode/") (synopsis "Read hardware information from the BIOS") (description -- cgit v1.2.3 From 5c8e8bc556c32c1b6ead1638e4e7886f87acf255 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 16:56:58 +0200 Subject: gnu: dstat: Fix bogus use of DESTDIR. * gnu/packages/admin.scm (dstat)[arguments]: Set the standard prefix variable. --- gnu/packages/admin.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 93430dceb7..2cfa4a05e3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2693,9 +2693,8 @@ results (ndiff), and a packet generation and response analysis tool (nping).") (build-system gnu-build-system) (arguments `(#:tests? #f ; no make check - #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "DESTDIR=" out) - "prefix=/")) + #:make-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-python3-DeprecationWarning -- cgit v1.2.3