Open Build Service

Changes of Revision 16

_service:tar_scm_kernel_repo:coreutils.spec Changed

@@ -1,6 +1,6 @@
 Name:       coreutils
 Version:    9.0
-Release:    9
+Release:    10
 License:    GPLv3+
 Summary:    A set of basic GNU tools commonly used in shell scripts
 Url:        https://www.gnu.org/software/coreutils/
@@ -31,6 +31,8 @@
 Patch17:   backport-copy-copy_file_range-handle-ENOENT-for-CIFS.patch
 Patch18:   backport-tail-fix-support-for-F-with-non-seekable-files.patch
 Patch19:   backport-fts-fail-gracefully-when-out-of-memory.patch
+Patch20:   backport-pr-fix-infinite-loop-when-double-spacing.patch
+Patch21:   backport-wc-ensure-we-update-file-offset.patch
 
 %ifarch sw_64
 Patch13:   coreutils-9.0-sw.patch
@@ -159,6 +161,11 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jun 15 2023 jiangchuangang<jiangchuangang@huawei.com> - 9.0-10
+- sync patches from community
+- add backport-pr-fix-infinite-loop-when-double-spacing.patch
+  backport-wc-ensure-we-update-file-offset.patch
+
 * Fri Mar 17 2023 jiangchuangang<jiangchuangang@huawei.com> - 9.0-9
 - add backport-fts-fail-gracefully-when-out-of-memory.patch for malloc failed

_service:tar_scm_kernel_repo:backport-pr-fix-infinite-loop-when-double-spacing.patch Added

@@ -0,0 +1,66 @@
+From 3fb0cc80fa5e1cede9ec05303a70c26d0d23ca1d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Tue, 25 Apr 2023 14:07:03 +0100
+Subject: [PATCH] pr: fix infinite loop when double spacing
+
+* src/pr.c (init_parameters): Ensure we avoid a 0 lines_per_body
+which was possible when adjusting for double spacing.
+That caused print_page() to always return true,
+causing an infinite loop.
+* tests/pr/pr-tests.pl: Add a test case.
+* NEWS: Mention the fix.
+Fixes https://bugs.debian.org/1034808
+
+Conflict:NEWS context adaption
+Reference:https://github.com/coreutils/coreutils/commit/3fb0cc80fa5e1cede9ec05303a70c26d0d23ca1d
+
+---
+ NEWS                 | 3 +++
+ src/pr.c             | 2 +-
+ tests/pr/pr-tests.pl | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index f65eb95..5320b9c 100644
+--- a/NEWS
++++ b/NEWS
+@@ -3,6 +3,9 @@ GNU coreutils NEWS                                    -*- outline -*-
+ * Noteworthy changes in release 9.0 (2021-09-24) [stable]
+
+ ** Bug fixes
++  'pr --length=1 --double-space' no longer enters an infinite loop.
++  [This bug was present in "the beginning".]
++
+   tail --follow=name works again with non seekable files.  Previously it
+   exited with an "Illegal seek" error when such a file was replaced.
+   [bug introduced in fileutils-4.1.6]
+diff --git a/src/pr.c b/src/pr.c
+index 2c5cdceb1..14a368b6c 100644
+--- a/src/pr.c
++++ b/src/pr.c
+@@ -1209,7 +1209,7 @@ init_parameters (int number_of_files)
+     lines_per_body = lines_per_page;
+ 
+   if (double_space)
+-    lines_per_body = lines_per_body / 2;
++    lines_per_body = MAX (1, lines_per_body / 2);
+ 
+   /* If input is stdin, cannot print parallel files.  BSD dumps core
+      on this. */
+diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl
+index 265e6e108..eafc13d81 100755
+--- a/tests/pr/pr-tests.pl
++++ b/tests/pr/pr-tests.pl
+@@ -415,6 +415,9 @@ my @tv = (
+ ['padding2', '-t -n,64', "1\n", (" "x 63)."1,1\n", 0],
+ # Ensure we handle buffer truncation correctly
+ ['padding3', '-t -N1000000 -n,1', "1\n", "0,1\n", 0],
++
++# This entered an infinite loop before coreutils-9.4
++['page-length1', '-dl1', "", "", 0],
+ );
+ 
+ # Convert the above old-style test vectors to the newer
+-- 
+2.36.1
+

_service:tar_scm_kernel_repo:backport-wc-ensure-we-update-file-offset.patch Added

@@ -0,0 +1,75 @@
+From ce630dfc7ef32ff7e35c627bd061a45ce9053d9d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Sun, 5 Feb 2023 19:52:31 +0000
+Subject: [PATCH] wc: ensure we update file offset
+
+* src/wc.c (wc): Update the offset when not reading,
+and do read if we can't update the offset.
+* tests/misc/wc-proc.sh: Add a test case.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/61300
+
+Conflict:NEWS and tests/misc/wc-proc.sh context adaption
+Reference:https://github.com/coreutils/coreutils/commit/ce630dfc7ef32ff7e35c627bd061a45ce9053d9d
+
+---
+ NEWS                  |  4 ++++
+ src/wc.c              |  5 ++++-
+ tests/misc/wc-proc.sh | 12 ++++++++++++
+ 3 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index 5320b9c..ce6e2b7 100644
+--- a/NEWS
++++ b/NEWS
+@@ -3,6 +3,10 @@ GNU coreutils NEWS                                    -*- outline -*-
+ * Noteworthy changes in release 9.0 (2021-09-24) [stable]
+
+ ** Bug fixes
++  `wc -c` will again correctly update the read offset of inputs.
++  Previously it deduced the size of inputs while leaving the offset unchanged.
++  [bug introduced in coreutils-8.27]
++
+   'pr --length=1 --double-space' no longer enters an infinite loop.
+   [This bug was present in "the beginning".]
+
+diff --git a/src/wc.c b/src/wc.c
+index 801396a15..becceda98 100644
+--- a/src/wc.c
++++ b/src/wc.c
+@@ -450,7 +450,10 @@ wc (int fd, char const *file_x, struct fstatus *fstatus, off_t current_pos)
+                  beyond the end of the file.  As in the example above.  */
+ 
+               bytes = end_pos < current_pos ? 0 : end_pos - current_pos;
+-              skip_read = true;
++              if (bytes && 0 <= lseek (fd, bytes, SEEK_CUR))
++                skip_read = true;
++              else
++                bytes = 0;
+             }
+           else
+             {
+diff --git a/tests/misc/wc-proc.sh b/tests/misc/wc-proc.sh
+index 5eb43b982..2307f2c38 100755
+--- a/tests/misc/wc-proc.sh
++++ b/tests/misc/wc-proc.sh
+@@ -42,4 +42,16 @@ cat <<\EOF > exp
+ EOF
+ compare exp out || fail=1
+ 
++# Ensure we update the offset even when not reading,
++# which wasn't the case from coreutils-8.27 to coreutils-9.2
++{ wc -c; wc -c; } < no_read >  out || fail=1
++{ wc -c; wc -c; } < do_read >> out || fail=1
++cat <<\EOF > exp
++2
++0
++1048576
++0
++EOF
++compare exp out || fail=1
++
+ Exit $fail
+-- 
+2.36.1
+