From 84ca88e7563b7034c253b82628344b538ec5a370 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 4 Feb 2022 15:03:07 +0200 Subject: gnu: rcs: Update to 5.10.1. * gnu/packages/version-control.scm (rcs): Update to 5.10.1. [source]: Remove patch. * gnu/packages/patches/rcs-5.10.0-no-stdin.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/rcs-5.10.0-no-stdin.patch | 57 -------------------------- gnu/packages/version-control.scm | 9 ++-- 3 files changed, 4 insertions(+), 63 deletions(-) delete mode 100644 gnu/packages/patches/rcs-5.10.0-no-stdin.patch diff --git a/gnu/local.mk b/gnu/local.mk index c284de9083..f3487637ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1762,7 +1762,6 @@ dist_patch_DATA = \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoints-sturm_and_rp_private.patch \ %D%/packages/patches/ratpoison-shell.patch \ - %D%/packages/patches/rcs-5.10.0-no-stdin.patch \ %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ diff --git a/gnu/packages/patches/rcs-5.10.0-no-stdin.patch b/gnu/packages/patches/rcs-5.10.0-no-stdin.patch deleted file mode 100644 index 56edfe7b65..0000000000 --- a/gnu/packages/patches/rcs-5.10.0-no-stdin.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://git.savannah.gnu.org/cgit/rcs.git/patch/?id=8883c4f5a29be18e9ea09bd27a7b660830de45bb - - -From 8883c4f5a29be18e9ea09bd27a7b660830de45bb Mon Sep 17 00:00:00 2001 -From: Thien-Thi Nguyen -Date: Fri, 23 Oct 2020 09:23:49 -0400 -Subject: [v] Don't test signal handling if stdin not ok. - - - -* tests/t632: If stdin is not open and connected to -a tty, skip the signal handling portion of the test. ---- - tests/ChangeLog | 9 +++++++++ - tests/t632 | 9 +++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/tests/ChangeLog b/tests/ChangeLog -index c3715c0..0565058 100644 ---- a/tests/ChangeLog -+++ b/tests/ChangeLog -@@ -1,3 +1,12 @@ -+2020-10-23 Thien-Thi Nguyen -+ -+ [v] Don't test signal handling if stdin not ok. -+ -+ -+ -+ * t632: If stdin is not open and connected to -+ a tty, skip the signal handling portion of the test. -+ - 2020-10-20 Thien-Thi Nguyen - - Release: 5.10.0 -diff --git a/tests/t632 b/tests/t632 -index df6acc9..677ec8c 100644 ---- a/tests/t632 -+++ b/tests/t632 -@@ -40,6 +40,15 @@ echo | co -l -I $w \ - # (This is skipped if GNU coreutils timeout(1) is not available.) - ## - -+# -+# The timeout test needs co(1) to block on input. -+# If stdin is not open and connected to a tty, skip out. -+if test -t 0 ; then -+ echo STDIN OK -+else -+ exit 0 -+fi -+ - # TODO: Don't be lame! Pick one: - # (a) Mimic timeout(1) w/ sh commands. - # (b) Incorporate heart of timeout(1) into ./btdt and use that. --- -cgit v1.2.1 - diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c29de9cf2a..aa7076b02d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2011,15 +2011,14 @@ projects, from individuals to large-scale enterprise operations.") (define-public rcs (package (name "rcs") - (version "5.10.0") + (version "5.10.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/rcs/rcs-" - version ".tar.xz")) + version ".tar.lz")) (sha256 (base32 - "1if5pa4iip2p70gljm54nggfdnsfjxa4cqz8fpj07lvsijary39s")) - (patches (search-patches "rcs-5.10.0-no-stdin.patch")))) + "1iac4d1dhsfy5zb0n3p605pihdq702v06r4g8vi8b2saf88gxpa3")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -2031,7 +2030,7 @@ projects, from individuals to large-scale enterprise operations.") (chmod "src/rcsfreeze" #o755) (install-file "src/rcsfreeze" bin) (install-file "man/rcsfreeze.1" man1))))))) - (native-inputs (list ed)) + (native-inputs (list ed lzip)) (home-page "https://www.gnu.org/software/rcs/") (synopsis "Per-file local revision control system") (description -- cgit v1.2.3