From 008649604296307682955d4c0da2525b606b7134 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 25 Jan 2017 12:57:42 -0500 Subject: gnu: tcsh: Incorporate grafted patch. * gnu/packages/shells.scm (tcsh)[replacement]: Remove field. [source]: Add patch 'tcsh-fix-out-of-bounds-read.patch'. (tcsh/fixed): Remove variable. --- gnu/packages/shells.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 4ed1f4696b..d4a7d8090f 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -217,7 +217,6 @@ written by Paul Haahr and Byron Rakitzis.") (define-public tcsh (package (name "tcsh") - (replacement tcsh/fixed) (version "6.18.01") (source (origin (method url-fetch) @@ -230,7 +229,8 @@ written by Paul Haahr and Byron Rakitzis.") (base32 "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q")) (patches (search-patches "tcsh-fix-autotest.patch" - "tcsh-do-not-define-BSDWAIT.patch")) + "tcsh-do-not-define-BSDWAIT.patch" + "tcsh-fix-out-of-bounds-read.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (inputs @@ -275,15 +275,6 @@ command-line editor, programmable word completion, spelling correction, a history mechanism, job control and a C-like syntax.") (license bsd-4))) -(define tcsh/fixed - (package - (inherit tcsh) - (name "tcsh") - (source (origin - (inherit (package-source tcsh)) - (patches (cons (search-patch "tcsh-fix-out-of-bounds-read.patch") - (origin-patches (package-source tcsh)))))))) - (define-public zsh (package (name "zsh") -- cgit v1.2.3 From 816417f5a48cbdf8e551b47d36bb56be17dd4b9e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 24 Feb 2017 00:13:02 -0500 Subject: gnu: tcsh: Update to 6.20.00. * gnu/packages/shells.scm (tcsh): Update to 6.20.00. [source]: Remove 'tcsh-do-not-define-BSDWAIT.patch'. [inputs]: Remove coreutils. Move autoconf to ... [native-inputs]: ... here. Add perl. * gnu/packages/patches/tcsh-fix-autotest.patch: Adjust patch to upstream changes. * gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/shells.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index cc3968f9bf..d9e0f93a1a 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -218,7 +218,7 @@ written by Paul Haahr and Byron Rakitzis.") (define-public tcsh (package (name "tcsh") - (version "6.18.01") + (version "6.20.00") (source (origin (method url-fetch) ;; Old tarballs are moved to old/. @@ -228,16 +228,16 @@ written by Paul Haahr and Byron Rakitzis.") "old/tcsh-" version ".tar.gz"))) (sha256 (base32 - "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q")) + "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq")) (patches (search-patches "tcsh-fix-autotest.patch" - "tcsh-do-not-define-BSDWAIT.patch" "tcsh-fix-out-of-bounds-read.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) - (inputs + (native-inputs `(("autoconf" ,autoconf) - ("coreutils" ,coreutils) - ("ncurses" ,ncurses))) + ("perl" ,perl))) + (inputs + `(("ncurses" ,ncurses))) (arguments `(#:phases (alist-cons-before -- cgit v1.2.3 From c71011f80f17a7160d067a6b83e444b75f8bc527 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 24 Feb 2017 03:05:13 -0500 Subject: gnu: tcsh: Use modify-phases. * gnu/packages/shells.scm (tcsh)[arguments]: Use modify-phases. --- gnu/packages/shells.scm | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index d9e0f93a1a..eb3e69bb86 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -240,32 +240,32 @@ written by Paul Haahr and Byron Rakitzis.") `(("ncurses" ,ncurses))) (arguments `(#:phases - (alist-cons-before - 'check 'patch-test-scripts - (lambda _ - ;; Take care of pwd - (substitute* '("tests/commands.at" "tests/variables.at") - (("/bin/pwd") (which "pwd"))) - ;; The .at files create shell scripts without shebangs. Erk. - (substitute* "tests/commands.at" - (("./output.sh") "/bin/sh output.sh")) - (substitute* "tests/syntax.at" - (("; other_script.csh") "; /bin/sh other_script.csh")) - ;; Now, let's generate the test suite and patch it - (system* "make" "tests/testsuite") + (modify-phases %standard-phases + (add-before 'check 'patch-test-scripts + (lambda _ + ;; Take care of pwd + (substitute* '("tests/commands.at" "tests/variables.at") + (("/bin/pwd") (which "pwd"))) + ;; The .at files create shell scripts without shebangs. Erk. + (substitute* "tests/commands.at" + (("./output.sh") "/bin/sh output.sh")) + (substitute* "tests/syntax.at" + (("; other_script.csh") "; /bin/sh other_script.csh")) + ;; Now, let's generate the test suite and patch it + (system* "make" "tests/testsuite") - ;; This file is ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - (substitute* "tests/testsuite" - (("/bin/sh") (which "sh"))))) - (alist-cons-after - 'install 'post-install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin"))) - (with-directory-excursion bin - (symlink "tcsh" "csh")))) - %standard-phases)))) + ;; This file is ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + (substitute* "tests/testsuite" + (("/bin/sh") (which "sh")))) + #t)) + (add-after 'install 'post-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (with-directory-excursion bin + (symlink "tcsh" "csh")) + #t)))))) (home-page "http://www.tcsh.org/") (synopsis "Unix shell based on csh") (description -- cgit v1.2.3 From 06e8d0c8e5179d79bd04afed197b9365d85f1cf7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 30 Mar 2017 03:30:26 -0400 Subject: gnu: dash: Update to 0.5.9.1. * gnu/packages/shells.scm (dash): Update to 0.5.9.1. [source]: Use git-fetch. [native-inputs]: Add autoconf and automake. [arguments]: Add 'bootstrap' phase. --- gnu/packages/shells.scm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0cbd3a53e1..ca51b3ad5d 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,15 +49,20 @@ (define-public dash (package (name "dash") - (version "0.5.9") + (version "0.5.9.1") (source (origin - (method url-fetch) - (uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/" - name "-" version ".tar.gz")) + ;; The canonical source is offline, so we fetch the source code + ;; from the Git repository. See: + ;; https://www.mail-archive.com/dash@vger.kernel.org/msg01323.html + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/utils/dash/dash.git/") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "17328wd9n5krr5wd37smrk0y7fdf8aa3hmhm02br5mqpq0a3nycj")) + "0p01vx7rbyf5hyyaff7h8cbhq81bm5fmq1m933484lncl9rafcai")) (modules '((guix build utils))) (snippet '(begin @@ -67,10 +73,17 @@ "a command interpreter based on the original Bourne shell")) #t)))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) (inputs `(("libedit" ,libedit))) (arguments - `(#:configure-flags '("--with-libedit"))) + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vfi"))))) + #:configure-flags '("--with-libedit"))) (home-page "http://gondor.apana.org.au/~herbert/dash") (synopsis "POSIX-compliant shell optimised for size") (description -- cgit v1.2.3