From ecb232bdfcb2718de5944bcf4d9c4e288ec41519 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 30 Jun 2017 11:51:08 -0400 Subject: gnu: isc-dhcp: Update bundled bind to 9.9.10-P2 [fixes CVE-2017-{3142,3143}]. * gnu/packages/admin.scm (isc-dhcp): Update bundled bind to 9.9.10-P2. --- 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 7012eb6d4c..ab3ae9f911 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -483,7 +483,7 @@ connection alive.") (bind-minor-version "9") (bind-patch-version "10") (bind-release-type "-P") ; for patch release, use "-P" - (bind-release-version "1") ; for patch release, e.g. "6" + (bind-release-version "2") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version "." bind-minor-version @@ -599,7 +599,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "1ibbparr9k52rbs0qf0ar8jwvhhx6lja7ylxzpf32swklmhz629c")))) + "19yl7axphmpm4n2ggb7j5irw4c655yifa1bnlckg6qiyv8dr8n7b")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit v1.2.3 From e9e3a69d36f375d36bd25a211b1a173638007494 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Jul 2017 21:27:25 +0200 Subject: gnu: nnn: Update to 1.2. * gnu/packages/admin.scm (nnn): Update to 1.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 ab3ae9f911..ef95fe2cb2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2168,7 +2168,7 @@ you are running, what theme or icon set you are using, etc.") (define-public nnn (package (name "nnn") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/" @@ -2176,7 +2176,7 @@ you are running, what theme or icon set you are using, etc.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1hww4385f81lyy30fx2rb4wchfi79dpgl7yylnfxvf27a4h2mkhm")))) + "08l0wcwwsl5kix9kg3h51s2afzg97y1rjjfi0ijs294kz57g1cfq")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("readline" ,readline))) -- cgit v1.2.3 From 425ab478ac99452dff6a71b16caa46ae06d5b550 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Jul 2017 23:11:07 +0200 Subject: gnu: shepherd: Allow cross-compilation. * gnu/packages/admin.scm (shepherd)[native-inputs]: Add GUILE-2.0. --- gnu/packages/admin.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index ef95fe2cb2..f056cc51c6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -163,8 +163,14 @@ and provides a \"top-like\" mode (monitoring).") (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0))) + (native-inputs + `(("pkg-config" ,pkg-config) + + ;; This is the Guile we use as a cross-compiler... + ("guile" ,guile-2.0))) + (inputs + ;; ... and this is the one that appears in shebangs when cross-compiling. + `(("guile" ,guile-2.0))) (synopsis "System service manager") (description "The GNU Shepherd is a daemon-managing daemon, meaning that it supervises -- cgit v1.2.3 From e048de60983da83ee67fdecf689babfc15a4fe41 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 5 Jul 2017 00:32:53 -0400 Subject: gnu: inet-utils: Mention `hostname` in description. * gnu/packages/admin.scm (inetutils)[description]: Update description. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f056cc51c6..75fba24796 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -282,7 +282,8 @@ re-executing them as necessary.") (synopsis "Basic networking utilities") (description "Inetutils is a collection of common network programs, such as an ftp -client and server, a telnet client and server, and an rsh client and server.") +client and server, a telnet client and server, an rsh client and server, and +hostname.") (license license:gpl3+))) (define-public shadow -- cgit v1.2.3 From 5dfbd7697104ec217f8ed39d711990e27591c1d1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Jul 2017 00:43:03 +0200 Subject: gnu: shadow: Correctly match the system type. * gnu/packages/admin.scm (shadow)[inputs]: Use 'string-contains' instead of 'string-prefix?' when matching the system type. --- 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 75fba24796..ac8f155fcf 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -324,11 +324,11 @@ hostname.") (for-each delete-file (find-files man "^groups\\.")) #t)))))) - (inputs (if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) - `(("linux-pam" ,linux-pam)) - '())) + (inputs (if (string-contains (or (%current-target-system) + (%current-system)) + "-linux") + `(("linux-pam" ,linux-pam)) + '())) (home-page "http://pkg-shadow.alioth.debian.org/") (synopsis "Authentication-related tools such as passwd, su, and login") (description -- cgit v1.2.3