From 80b64ee2d86b179cb92c2c66ea3a67c9d3b4cdab Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Jan 2016 14:51:25 -0500 Subject: gnu: isc-dhcp: Update bundled bind to 9.9.8-P3 [fixes CVE-2015-8704]. * gnu/packages/admin.scm (isc-dhcp): Update bundled bind to 9.9.8-P3. --- 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 1f2d0fbf95..6e783502e6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -392,7 +392,7 @@ connection alive.") (bind-minor-version "9") (bind-patch-version "8") (bind-release-type "-P") - (bind-release-version "2") + (bind-release-version "3") (bind-version (string-append bind-major-version "." bind-minor-version @@ -508,7 +508,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "0agkpmpna7s67la13krn4xlhwhdjpazmljxlq0zbjdwnw4k1k17m")))) + "01qa17479jghy90lb2j8b1bpg3ay6k6aaajpigyirwzsvyc9yj3a")))) ;; When cross-compiling, we need the cross Coreutils and sed. ;; Otherwise just use those from %FINAL-INPUTS. -- cgit v1.2.3 From 45da8c6dd10c93280277d17463d09fce6a25afe9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 Jan 2016 02:12:40 -0500 Subject: gnu: Add iftop. * gnu/packages/admin.scm (iftop): New variable. --- gnu/packages/admin.scm | 23 +++++++++++++++++++++ gnu/packages/zsh.scm | 56 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 57 insertions(+), 22 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6e783502e6..953c5b4cf8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen ;;; Copyright © 2015 Eric Dvorsak +;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -1377,3 +1378,25 @@ command that learns\". It works by maintaining a database of the directories you use the most from the command line and allows you to \"jump\" to frequently used directories by typing only a small pattern.") (license license:gpl3+))) + +(define-public iftop + (package + (name "iftop") + (version "1.0pre4") + (source (origin + (method url-fetch) + (uri (string-append "http://www.ex-parrot.com/~pdw/iftop/download" + "/iftop-" version ".tar.gz")) + (sha256 + (base32 + "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp")))) + (build-system gnu-build-system) + (inputs + `(("libpcap" ,libpcap) + ("ncurses" ,ncurses))) + (synopsis "Monitor network usage") + (description "Iftop does for network usage what @command{top} does +for CPU usage. It listens to network traffic on a named interface and +displays a table of current bandwidth usage by pairs of hosts.") + (home-page "http://www.ex-parrot.com/~pdw/iftop/") + (license license:gpl3))) diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm index 6d25fd4671..2ce36d066b 100644 --- a/gnu/packages/zsh.scm +++ b/gnu/packages/zsh.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages autotools) #:use-module (guix packages) #:use-module (guix download) +; #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix licenses)) @@ -42,28 +43,39 @@ (base32 "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") - #:phases (alist-cons-before - 'configure 'fix-sh - (lambda _ - ;; Some of the files are ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - (substitute* - '("configure" - "configure.ac" - "Src/exec.c" - "Src/mkmakemod.sh" - "Config/installfns.sh" - "Config/defs.mk.in" - "Test/E01options.ztst" - "Test/A05execution.ztst" - "Test/A01grammar.ztst" - "Test/A06assign.ztst" - "Test/B02typeset.ztst" - "Completion/Unix/Command/_init_d" - "Util/preconfig") - (("/bin/sh") (which "sh"))))) - %standard-phases))) + (arguments `(#:parallel-build? #f + #:configure-flags '("--with-tcsetpgrp" "--enable-pcre") + #:make-flags '("ZTST_verbose=2") + #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-sh + (lambda _ + ;; Some of the files are ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + (substitute* + '("configure" + "configure.ac" + "Src/exec.c" + "Src/mkmakemod.sh" + "Config/installfns.sh" + "Config/defs.mk.in" + "Test/E01options.ztst" + "Test/A05execution.ztst" + "Test/A01grammar.ztst" + "Test/A06assign.ztst" + "Test/B02typeset.ztst" + "Completion/Unix/Command/_init_d" + "Util/preconfig") + (("/bin/sh") (which "sh")))))) +; (add-before 'check 'provide-zsh-interpreter +; (lambda _ +; (substitute* "Test/runtests.zsh" +; (("#!/bin/zsh -f") +; (string-append "#!" (getcwd) "/Src/zsh -f"))) +; (substitute* "Test/ztst.zsh" +; (("#!/bin/zsh -f") +; (string-append "#!" (getcwd) "/Src/zsh -f"))) +; )) + ))) (native-inputs `(("autoconf", autoconf))) (inputs `(("ncurses", ncurses) ("pcre", pcre) -- cgit v1.2.3 From c2af02602ab19deca27db776406b35860cf47d97 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 Jan 2016 20:11:21 -0500 Subject: Revert "gnu: Add iftop." This reverts commit 45da8c6dd10c93280277d17463d09fce6a25afe9. --- gnu/packages/admin.scm | 23 --------------------- gnu/packages/zsh.scm | 56 ++++++++++++++++++++------------------------------ 2 files changed, 22 insertions(+), 57 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 953c5b4cf8..6e783502e6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6,7 +6,6 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -1378,25 +1377,3 @@ command that learns\". It works by maintaining a database of the directories you use the most from the command line and allows you to \"jump\" to frequently used directories by typing only a small pattern.") (license license:gpl3+))) - -(define-public iftop - (package - (name "iftop") - (version "1.0pre4") - (source (origin - (method url-fetch) - (uri (string-append "http://www.ex-parrot.com/~pdw/iftop/download" - "/iftop-" version ".tar.gz")) - (sha256 - (base32 - "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp")))) - (build-system gnu-build-system) - (inputs - `(("libpcap" ,libpcap) - ("ncurses" ,ncurses))) - (synopsis "Monitor network usage") - (description "Iftop does for network usage what @command{top} does -for CPU usage. It listens to network traffic on a named interface and -displays a table of current bandwidth usage by pairs of hosts.") - (home-page "http://www.ex-parrot.com/~pdw/iftop/") - (license license:gpl3))) diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm index 2ce36d066b..6d25fd4671 100644 --- a/gnu/packages/zsh.scm +++ b/gnu/packages/zsh.scm @@ -23,7 +23,6 @@ #:use-module (gnu packages autotools) #:use-module (guix packages) #:use-module (guix download) -; #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix licenses)) @@ -43,39 +42,28 @@ (base32 "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl")))) (build-system gnu-build-system) - (arguments `(#:parallel-build? #f - #:configure-flags '("--with-tcsetpgrp" "--enable-pcre") - #:make-flags '("ZTST_verbose=2") - #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-sh - (lambda _ - ;; Some of the files are ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - (substitute* - '("configure" - "configure.ac" - "Src/exec.c" - "Src/mkmakemod.sh" - "Config/installfns.sh" - "Config/defs.mk.in" - "Test/E01options.ztst" - "Test/A05execution.ztst" - "Test/A01grammar.ztst" - "Test/A06assign.ztst" - "Test/B02typeset.ztst" - "Completion/Unix/Command/_init_d" - "Util/preconfig") - (("/bin/sh") (which "sh")))))) -; (add-before 'check 'provide-zsh-interpreter -; (lambda _ -; (substitute* "Test/runtests.zsh" -; (("#!/bin/zsh -f") -; (string-append "#!" (getcwd) "/Src/zsh -f"))) -; (substitute* "Test/ztst.zsh" -; (("#!/bin/zsh -f") -; (string-append "#!" (getcwd) "/Src/zsh -f"))) -; )) - ))) + (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") + #:phases (alist-cons-before + 'configure 'fix-sh + (lambda _ + ;; Some of the files are ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + (substitute* + '("configure" + "configure.ac" + "Src/exec.c" + "Src/mkmakemod.sh" + "Config/installfns.sh" + "Config/defs.mk.in" + "Test/E01options.ztst" + "Test/A05execution.ztst" + "Test/A01grammar.ztst" + "Test/A06assign.ztst" + "Test/B02typeset.ztst" + "Completion/Unix/Command/_init_d" + "Util/preconfig") + (("/bin/sh") (which "sh"))))) + %standard-phases))) (native-inputs `(("autoconf", autoconf))) (inputs `(("ncurses", ncurses) ("pcre", pcre) -- cgit v1.2.3 From 765973cd651d597bf9cd42ea05b50c5a8ebee2f3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 21 Jan 2016 20:21:19 -0500 Subject: gnu: Add iftop. * gnu/packages/admin.scm (iftop): New variable. --- gnu/packages/admin.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6e783502e6..953c5b4cf8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Alex Sassmannshausen ;;; Copyright © 2015 Eric Dvorsak +;;; Copyright © 2016 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -1377,3 +1378,25 @@ command that learns\". It works by maintaining a database of the directories you use the most from the command line and allows you to \"jump\" to frequently used directories by typing only a small pattern.") (license license:gpl3+))) + +(define-public iftop + (package + (name "iftop") + (version "1.0pre4") + (source (origin + (method url-fetch) + (uri (string-append "http://www.ex-parrot.com/~pdw/iftop/download" + "/iftop-" version ".tar.gz")) + (sha256 + (base32 + "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp")))) + (build-system gnu-build-system) + (inputs + `(("libpcap" ,libpcap) + ("ncurses" ,ncurses))) + (synopsis "Monitor network usage") + (description "Iftop does for network usage what @command{top} does +for CPU usage. It listens to network traffic on a named interface and +displays a table of current bandwidth usage by pairs of hosts.") + (home-page "http://www.ex-parrot.com/~pdw/iftop/") + (license license:gpl3))) -- cgit v1.2.3