diff options
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cf9524eb5f..ad31bc498f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> @@ -75,6 +75,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) #:use-module (gnu packages pciutils) @@ -610,14 +611,14 @@ connection alive.") bind-release-version))) (package (name "isc-dhcp") - (version "4.3.6") + (version "4.3.6-P1") (source (origin (method url-fetch) (uri (string-append "http://ftp.isc.org/isc/dhcp/" version "/dhcp-" version ".tar.gz")) (sha256 (base32 - "06vgxhm6agzkp6r1jy10467vrfw2rzcp2mnkcph7ydziciisy7m4")))) + "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f @@ -1855,7 +1856,7 @@ throughput (in the same interval).") (define-public thefuck (package (name "thefuck") - (version "3.19") + (version "3.25") (source (origin (method url-fetch) (uri (string-append "https://github.com/nvbn/thefuck/archive/" @@ -1863,7 +1864,7 @@ throughput (in the same interval).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "191zbvkyc02h0wwd46xwj4zzg7jhlr8xv0ji6knqkgjnk0nvqq01")) + "088bn2l1376qlndbpnjya4q1x3913nj3yj3wc7s2w3bz66d23skk")) (patches (search-patches "thefuck-test-environ.patch")))) (build-system python-build-system) (arguments @@ -1881,14 +1882,12 @@ throughput (in the same interval).") `(("python-colorama" ,python-colorama) ("python-decorator" ,python-decorator) ("python-psutil" ,python-psutil) + ("python-pyte" ,python-pyte) ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) - ("python-pytest-mock" ,python-pytest-mock) - ;; Requires setuptools >= 17.1 due to some features used, while our - ;; python currently only includes 12.0. TODO: Remove this input. - ("python-setuptools" ,python-setuptools))) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://github.com/nvbn/thefuck") (synopsis "Correct mistyped console command") (description @@ -1993,12 +1992,10 @@ shortcut syntax and completion options.") (home-page "https://github.com/TrilbyWhite/interrobang") (license license:gpl3+)))) - - (define-public pam-krb5 (package (name "pam-krb5") - (version "4.7") + (version "4.8") (source (origin (method url-fetch) (uri (string-append @@ -2006,7 +2003,7 @@ shortcut syntax and completion options.") version ".tar.xz")) (sha256 (base32 - "0abf8cfpkprmhw5ca8iyqgrggh65lgqvmfllc1y6qz7zw1gas894")))) + "1qjp8i1s9bz7g6kiqrkzzkxn5pfspa4sy53b6z40fqmdf9przdfb")))) (build-system gnu-build-system) (arguments `(#:phases @@ -2032,8 +2029,8 @@ It supports ticket refreshing by screen savers, configurable authorization handling, authentication of non-local accounts for network services, password changing, and password expiration, as well as all the standard expected PAM features. It works correctly with OpenSSH, even -with ChallengeResponseAuthentication and PrivilegeSeparation enabled, -and supports extensive configuration either by PAM options or in +with @code{ChallengeResponseAuthentication} and @code{PrivilegeSeparation} +enabled, and supports extensive configuration either by PAM options or in krb5.conf or both. PKINIT is supported with recent versions of both MIT Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") (home-page "http://www.eyrie.org/~eagle/software/pam-krb5") @@ -2043,8 +2040,6 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") ;; clause requiring us to give all recipients a copy. (license license:gpl1+))) -;;http://archives.eyrie.org/software/kerberos/pam-krb5-4.7.tar.xz - (define-public sunxi-tools (package (name "sunxi-tools") @@ -2067,7 +2062,8 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") ("cross-gcc" ,(cross-gcc "arm-linux-gnueabihf" #:xbinutils (cross-binutils "arm-linux-gnueabihf") #:libc (cross-libc "arm-linux-gnueabihf"))) - ("cross-libc" ,(cross-libc "arm-linux-gnueabihf")))) + ("cross-libc" ,(cross-libc "arm-linux-gnueabihf")) ; header files + ("cross-libc-static" ,(cross-libc "arm-linux-gnueabihf") "static"))) (inputs `(("libusb" ,libusb))) (build-system gnu-build-system) @@ -2085,25 +2081,34 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") (lambda* (#:key make-flags #:allow-other-keys) (define (cross? x) (string-contains x "cross-arm-linux")) + (define (filter-environment! filter-predicate + environment-variable-names) + (for-each + (lambda (env-name) + (let* ((env-value (getenv env-name)) + (search-path (search-path-as-string->list env-value)) + (new-search-path (filter filter-predicate + search-path)) + (new-env-value (list->search-path-as-string + new-search-path ":"))) + (setenv env-name new-env-value))) + environment-variable-names)) (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (for-each - (lambda (env-name) - (let* ((env-value (getenv env-name)) - (search-path (search-path-as-string->list env-value)) - (new-search-path (filter (lambda (e) (not (cross? e))) - search-path)) - (new-env-value (list->search-path-as-string - new-search-path ":"))) - (setenv env-name new-env-value))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) + (filter-environment! cross? + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + "CROSS_LIBRARY_PATH")) + (filter-environment! (lambda (e) (not (cross? e))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + "LIBRARY_PATH")) #t)) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) (zero? (apply system* "make" "tools" "misc" make-flags)))) (add-after 'build 'build-armhf (lambda* (#:key make-flags #:allow-other-keys) + (setenv "LIBRARY_PATH" #f) (zero? (apply system* "make" "target-tools" make-flags)))) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) @@ -2373,7 +2378,7 @@ make it a perfect utility on modern distros.") (define-public thermald (package (name "thermald") - (version "1.6") + (version "1.7.1") (source (origin (method url-fetch) @@ -2381,7 +2386,7 @@ make it a perfect utility on modern distros.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "14klz9fnvi9jdlaqwrp61xa5nh051n8ykrs1fh1wxd7j66qf2fn6")))) + "0isgmav3z3nb5bsdya8m3haqhzj1lyfjx7i812cqfjrh2a9msin4")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -2389,6 +2394,7 @@ make it a perfect utility on modern distros.") 'unpack 'autogen.sh-and-fix-paths (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + ;; XXX this can probably be removed after version 1.7.1. ;; upstartconfir is hardcoded to /etc/init and the build ;; system tries to mkdir that. We don't even need upstart ;; files at all; this is a fast and kludgy workaround @@ -2397,7 +2403,8 @@ make it a perfect utility on modern distros.") (string-append "upstartconfdir = " out "/etc/init"))) ;; Now run autogen - (zero? (system* "sh" "autogen.sh")))))) + (invoke "sh" "autogen.sh") + #t)))) #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "--sysconfdir=" @@ -2426,23 +2433,26 @@ on systems running the Linux kernel.") (define-public masscan (package (name "masscan") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/robertdavidgraham/masscan" "/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y9af345g00z83rliv6bmlqg37xwc7xpnx5xqdgmjikzcxgk9pji")))) + "0wxddsgyx27z45906icdhdbfsvfj8ij805208qpqjx46i0lnjs50")))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap))) (arguments '(#:test-target "regress" - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) ; There is no ./configure script + (delete 'configure) ; no ./configure script (add-after 'unpack 'patch-path (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2455,8 +2465,8 @@ on systems running the Linux kernel.") open ports, and also complete the TCP connection and interact with the remote application, collecting the information received.") (home-page "https://github.com/robertdavidgraham/masscan") - ;; 'src/siphash24.c' is the SipHash reference implementation, which - ;; bears a CC0 Public Domain Dedication. + ;; 'src/siphash24.c' is the SipHash reference implementation, which + ;; bears a CC0 Public Domain Dedication. (license license:agpl3+))) (define-public hungrycat |