开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:coreutils.spec Changed

@@ -1,6 +1,6 @@
 Name:       coreutils
-Version:    9.4
-Release:    7
+Version:    9.5
+Release:    1
 License:    GPLv3+
 Summary:    A set of basic GNU tools commonly used in shell scripts
 Url:        https://www.gnu.org/software/coreutils/
@@ -13,21 +13,17 @@
 Patch0:    0001-disable-test-of-rwlock.patch
 # uname -p/-i to display processor type
 Patch1:    coreutils-8.2-uname-processortype.patch
-
-Patch2:    coreutils-getgrouplist.patch
-Patch3:    bugfix-remove-usr-local-lib-from-m4.patch
-Patch4:    bugfix-dummy_help2man.patch
-Patch6:    skip-the-tests-that-require-selinux-if-selinux-is-di.patch 
-Patch7:    backport-config-color-alias-for-ls.patch
-Patch8:    backport-coreutils-df-direct.patch
-Patch9:    backport-coreutils-i18n.patch
-patch10:   backport-CVE-2024-0684-split-do-not-shrink-hold-buffer.patch
-patch11:   test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch
-patch12:   backport-sort-don-t-trust-st_size-on-proc-files.patch
-patch13:   backport-cat-don-t-trust-st_size-on-proc-files.patch
-patch14:   backport-dd-don-t-trust-st_size-on-proc-files.patch
-patch15:   backport-split-don-t-trust-st_size-on-proc-files.patch
-patch16:   fix-coredump-if-enable-systemd.patch
+Patch2:    bugfix-remove-usr-local-lib-from-m4.patch
+Patch3:    bugfix-dummy_help2man.patch
+Patch4:    skip-the-tests-that-require-selinux-if-selinux-is-di.patch 
+Patch5:    backport-config-color-alias-for-ls.patch
+Patch6:    backport-coreutils-df-direct.patch
+Patch7:    backport-coreutils-i18n.patch
+patch8:    test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch
+#patch9:   backport-sort-don-t-trust-st_size-on-proc-files.patch
+#patch10:   backport-cat-don-t-trust-st_size-on-proc-files.patch
+#patch11:   backport-dd-don-t-trust-st_size-on-proc-files.patch
+#patch12:   backport-split-don-t-trust-st_size-on-proc-files.patch
 
 %ifarch sw_64
 Patch9001:   coreutils-9.0-sw.patch
@@ -171,6 +167,13 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Jul 15 2024 dillon chen <dillon.chen@gmail.com> - 9.5-1
+- update to 9.5
+- getgrouplist.patch: drop a patch no longer needed
+- CVE-2024-0684 patch: drop a patch no longer needed
+- fix-coredump-if-enable-systemd.patch: drop a patch no longer needed
+- coreutils-i18n.patch: update
+
 * Thu Jul 11 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 9.4-7
 - add a workaround for fixing clang building issues

_service:tar_scm:backport-CVE-2024-0684-split-do-not-shrink-hold-buffer.patch Deleted

@@ -1,38 +0,0 @@
-From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Tue, 16 Jan 2024 13:48:32 -0800
-Subject: PATCH split: do not shrink hold buffer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* src/split.c (line_bytes_split): Do not shrink hold buffer.
-If it's large for this batch it's likely to be large for the next
-batch, and for 'split' it's not worth the complexity/CPU hassle to
-shrink it. Do not assume hold_size can be bufsize.
-
-Conflict: NA
-Reference: https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9
-
----
- src/split.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/split.c b/src/split.c
-index d872ec5..4337b2d 100644
---- a/src/split.c
-+++ b/src/split.c
-@@ -811,10 +811,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t bufsize)
-             {
-               cwrite (n_out == 0, hold, n_hold);
-               n_out += n_hold;
--              if (n_hold > bufsize)
--                hold = xirealloc (hold, bufsize);
-               n_hold = 0;
--              hold_size = bufsize;
-             }
- 
-           /* Output to eol if present.  */
--- 
-2.36.1
-

_service:tar_scm:backport-coreutils-i18n.patch Changed

@@ -1,66 +1,69 @@
-From 3a1b92e80708319bcc89852e3da1029c3d1ff6b3 Mon Sep 17 00:00:00 2001
+From 94cf02dfcb1be23dedf8a39af295f28ee2de6013 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
 Date: Wed, 30 Aug 2023 17:19:58 +0200
 Subject: PATCH coreutils-i18n.patch
 
 ---
- bootstrap.conf              |   1 +
+ bootstrap.conf              |   2 +
  configure.ac                |   6 +
  lib/linebuffer.h            |   8 +
+ lib/mbchar.c                |  23 ++
+ lib/mbchar.h                | 373 +++++++++++++++++
  lib/mbfile.c                |  20 +
  lib/mbfile.h                | 267 ++++++++++++
+ m4/mbchar.m4                |  13 +
  m4/mbfile.m4                |  14 +
  src/cut.c                   | 508 +++++++++++++++++++++--
  src/expand-common.c         | 114 ++++++
  src/expand-common.h         |  12 +
  src/expand.c                |  90 +++-
  src/fold.c                  | 312 ++++++++++++--
- src/join.c                  | 359 ++++++++++++++--
  src/local.mk                |   4 +-
  src/pr.c                    | 443 ++++++++++++++++++--
  src/sort.c                  | 792 +++++++++++++++++++++++++++++++++---
  src/unexpand.c              | 102 ++++-
- src/uniq.c                  | 119 +++++-
  tests/Coreutils.pm          |   3 +
  tests/expand/mb.sh          | 183 +++++++++
  tests/i18n/sort.sh          |  29 ++
  tests/local.mk              |   4 +
  tests/misc/expand.pl        |  42 ++
  tests/misc/fold.pl          |  50 ++-
- tests/misc/join.pl          |  50 +++
  tests/misc/sort-mb-tests.sh |  45 ++
  tests/misc/unexpand.pl      |  39 ++
  tests/pr/pr-tests.pl        |  49 +++
  tests/sort/sort-merge.pl    |  42 ++
  tests/sort/sort.pl          |  40 +-
  tests/unexpand/mb.sh        | 172 ++++++++
- tests/uniq/uniq.pl          |  55 +++
- 31 files changed, 3732 insertions(+), 242 deletions(-)
+ 30 files changed, 3605 insertions(+), 196 deletions(-)
+ create mode 100644 lib/mbchar.c
+ create mode 100644 lib/mbchar.h
  create mode 100644 lib/mbfile.c
  create mode 100644 lib/mbfile.h
+ create mode 100644 m4/mbchar.m4
  create mode 100644 m4/mbfile.m4
- create mode 100755 tests/expand/mb.sh
- create mode 100755 tests/i18n/sort.sh
- create mode 100755 tests/misc/sort-mb-tests.sh
- create mode 100755 tests/unexpand/mb.sh
+ create mode 100644 tests/expand/mb.sh
+ create mode 100644 tests/i18n/sort.sh
+ create mode 100644 tests/misc/sort-mb-tests.sh
+ create mode 100644 tests/unexpand/mb.sh
 
 diff --git a/bootstrap.conf b/bootstrap.conf
-index bd73ff2..0e450cd 100644
+index 126e1e8..b4ccebf 100644
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
-@@ -167,6 +167,7 @@ gnulib_modules="
+@@ -163,6 +163,8 @@ gnulib_modules="
    maintainer-makefile
    malloc-gnu
    manywarnings
++  mbchar
 +  mbfile
    mbrlen
+   mbrtoc32
    mbrtowc
-   mbsalign
 diff --git a/configure.ac b/configure.ac
-index 8ffc0b7..ca3305d 100644
+index 9cb6ee1..1131ce3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -448,6 +448,12 @@ fi
+@@ -504,6 +504,12 @@ fi
  # I'm leaving it here for now.  This whole thing needs to be modernized...
  gl_WINSIZE_IN_PTEM
  
@@ -74,7 +77,7 @@
  
  if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
 diff --git a/lib/linebuffer.h b/lib/linebuffer.h
-index b4cc8e4..f2bbb52 100644
+index ae0d55d..5bf5350 100644
 --- a/lib/linebuffer.h
 +++ b/lib/linebuffer.h
 @@ -22,6 +22,11 @@
@@ -99,6 +102,414 @@
  };
  
  /* Initialize linebuffer LINEBUFFER for use. */
+diff --git a/lib/mbchar.c b/lib/mbchar.c
+new file mode 100644
+index 0000000..d94b7c3
+--- /dev/null
++++ b/lib/mbchar.c
+@@ -0,0 +1,23 @@
++/* Copyright (C) 2001, 2006, 2009-2024 Free Software Foundation, Inc.
++
++   This file is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as
++   published by the Free Software Foundation; either version 2.1 of the
++   License, or (at your option) any later version.
++
++   This file is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
++
++
++#include <config.h>
++
++#define MBCHAR_INLINE _GL_EXTERN_INLINE
++
++#include <limits.h>
++
++#include "mbchar.h"
+diff --git a/lib/mbchar.h b/lib/mbchar.h
+new file mode 100644
+index 0000000..c06ef11
+--- /dev/null
++++ b/lib/mbchar.h
+@@ -0,0 +1,373 @@
++/* Multibyte character data type.
++   Copyright (C) 2001, 2005-2007, 2009-2024 Free Software Foundation, Inc.
++
++   This file is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as
++   published by the Free Software Foundation; either version 2.1 of the
++   License, or (at your option) any later version.
++
++   This file is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
++
++/* Written by Bruno Haible <bruno@clisp.org>.  */
++
++/* A multibyte character is a short subsequence of a char* string,
++   representing a single 32-bit wide character.
++
++   We use multibyte characters instead of 32-bit wide characters because
++   of the following goals:
++   1) correct multibyte handling, i.e. operate according to the LC_CTYPE
++      locale,
++   2) ease of maintenance, i.e. the maintainer needs not know all details
++      of the ISO C 99 standard,
++   3) don't fail grossly if the input is not in the encoding set by the
++      locale, because often different encodings are in use in the same
++      countries (ISO-8859-1/UTF-8, EUC-JP/Shift_JIS, ...),
++   4) fast in the case of ASCII characters.
++
++   Multibyte characters are only accessed through the mb* macros.
++
++   mb_ptr (mbc)
++     return a pointer to the beginning of the multibyte sequence.
++
++   mb_len (mbc)
++     returns the number of bytes occupied by the multibyte sequence.
++     Always > 0.
++
++   mb_iseq (mbc, sc)
++     returns true if mbc is the standard ASCII character sc.
++
++   mb_isnul (mbc)
++     returns true if mbc is the nul character.
++
++   mb_cmp (mbc1, mbc2)
++     returns a positive, zero, or negative value depending on whether mbc1
++     sorts after, same or before mbc2.
++
++   mb_casecmp (mbc1, mbc2)
++     returns a positive, zero, or negative value depending on whether mbc1
++     sorts after, same or before mbc2, modulo upper/lowercase conversion.
++
++   mb_equal (mbc1, mbc2)
++     returns true if mbc1 and mbc2 are equal.
++
++   mb_caseequal (mbc1, mbc2)
++     returns true if mbc1 and mbc2 are equal modulo upper/lowercase conversion.
++
++   mb_isalnum (mbc)
++     returns true if mbc is alphanumeric.
++
++   mb_isalpha (mbc)
++     returns true if mbc is alphabetic.

_service:tar_scm:coreutils-getgrouplist.patch Deleted

@@ -1,94 +0,0 @@
-diff --git a/lib/getugroups.c b/lib/getugroups.c
-index 299bae6..8ece29b 100644
---- a/lib/getugroups.c
-+++ b/lib/getugroups.c
-@@ -19,6 +19,9 @@
- 
- #include <config.h>
- 
-+/* We do not need this code if getgrouplist(3) is available.  */
-+#ifndef HAVE_GETGROUPLIST
-+
- #include "getugroups.h"
- 
- #include <errno.h>
-@@ -126,3 +129,4 @@ getugroups (int maxcount, gid_t *grouplist, char const *username,
- }
- 
- #endif /* HAVE_GRP_H */
-+#endif	/* have getgrouplist */
-diff --git a/lib/mgetgroups.c b/lib/mgetgroups.c
-index 76474c2..0a9d221 100644
---- a/lib/mgetgroups.c
-+++ b/lib/mgetgroups.c
-@@ -31,6 +31,7 @@
- #endif
- 
- #include "getugroups.h"
-+#include "xalloc.h"
- #include "xalloc-oversized.h"
- 
- /* Work around an incompatibility of OS X 10.11: getgrouplist
-@@ -121,9 +122,17 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
-   /* else no username, so fall through and use getgroups. */
- #endif
- 
--  max_n_groups = (username
--                  ? getugroups (0, NULL, username, gid)
--                  : getgroups (0, NULL));
-+  if (!username)
-+    max_n_groups = getgroups(0, NULL);
-+  else
-+  {
-+#ifdef HAVE_GETGROUPLIST
-+    max_n_groups = 0;
-+    getgrouplist (username, gid, NULL, &max_n_groups);
-+#else
-+    max_n_groups = getugroups (0, NULL, username, gid);
-+#endif
-+  }
- 
-   /* If we failed to count groups because there is no supplemental
-      group support, then return an array containing just GID.
-@@ -145,10 +154,25 @@ mgetgroups (char const *username, gid_t gid, gid_t **groups)
-   if (g == NULL)
-     return -1;
- 
--  ng = (username
--        ? getugroups (max_n_groups, g, username, gid)
--        : getgroups (max_n_groups - (gid != (gid_t) -1),
--                                g + (gid != (gid_t) -1)));
-+  if (!username)
-+    ng = getgroups (max_n_groups - (gid != (gid_t)-1), g + (gid != (gid_t)-1));
-+  else
-+  {
-+#ifdef HAVE_GETGROUPLIST
-+    int e;
-+    ng = max_n_groups;
-+    while ((e = getgrouplist (username, gid, g, &ng)) == -1
-+	&& ng > max_n_groups)
-+    {
-+      max_n_groups = ng;
-+      g = xrealloc (g, max_n_groups * sizeof (GETGROUPS_T));
-+    }
-+    if (e == -1)
-+      ng = -1;
-+#else
-+    ng = getugroups (max_n_groups, g, username, gid);
-+#endif
-+  }
- 
-   if (ng < 0)
-     {
-diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
-index 62777c7..5180243 100644
---- a/m4/jm-macros.m4
-+++ b/m4/jm-macros.m4
-@@ -82,6 +82,7 @@ AC_DEFUN(coreutils_MACROS,
-     fchown
-     fchmod
-     ftruncate
-+    getgrouplist
-     iswspace
-     mkfifo
-     mbrlen

_service:tar_scm:fix-coredump-if-enable-systemd.patch Deleted

@@ -1,35 +0,0 @@
-From d501347a8ae23a2fb312949c588c7565eb54b2da Mon Sep 17 00:00:00 2001
-From: Paul Eggert  <eggert@cs.ucla.edu>	
-Date: Mon, 18 Mar 2024 09:10:31 +0800
-Subject: PATCH fix core dump if --enable-systemd
-
-From gnulib upstream commits:
-* 1e6a26f9312bb47e070f94b17b14dc1a6ffbb74f ("readutmp: fix core dump if --enable-systemd")
-Problem reported by Thorsten Kukuk <https://bugs.gnu.org/65617>.
-lib/readutmp.c (read_utmp_from_systemd):
-Don’t assume session_ptr != NULL if num_sessions == 0.
-In practice it can be null, and the man page OKs this behavior.
-
-* 3af1d7b0ce3a8e3ae565e7cea10cee6fd7cb8109 ("readutmp: Fix memory leak introduced by last commit.")
-lib/readutmp.c (read_utmp_from_systemd): If num_sessions == 0 and
-sessions != NULL, do call free (sessions).
----
- lib/readutmp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/readutmp.c b/lib/readutmp.c
-index 0173b7e..ec09feb 100644
---- a/lib/readutmp.c
-+++ b/lib/readutmp.c
-@@ -795,7 +795,7 @@ read_utmp_from_systemd (idx_t *n_entries, STRUCT_UTMP **utmp_buf, int options)
-     {
-       char **sessions;
-       int num_sessions = sd_get_sessions (&sessions);
--      if (num_sessions >= 0)
-+      if (num_sessions >= 0 && sessions != NULL)
-         {
-           char **session_ptr;
-           for (session_ptr = sessions; *session_ptr != NULL; session_ptr++)
--- 
-2.41.0
-

_service Changed

_service:tar_scm:coreutils-9.4.tar.xz -> _service:tar_scm:coreutils-9.5.tar.xz Changed