开源软件构建与测试

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 2

_service:extract_file:sed.spec Deleted

@@ -1,73 +0,0 @@
-Name:	 sed
-Version: 4.8
-Release: 2
-Summary: non-interactive command-line text editor
-
-License: GPLv3+
-URL:	 https://www.gnu.org/software/sed/
-Source0: http://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.xz
-
-Patch1:  backport-sed-c-flag.patch
-Patch2:  backport-sed-handle-very-long-execution-lines-tiny-change.patch
-Patch3:  backport-sed-handle-very-long-input-lines-with-R-tiny-change.patch
-
-BuildRequires: gzip automake autoconf gcc
-BuildRequires: glibc-devel libselinux-devel libacl-devel perl-Getopt-Long
-Provides: /bin/sed
-Provides: bundled(gnulib)
-
-%description
-Sed is a non-interactive command-line text editor. A stream editor is used
-to per-form basic text transformations on an input stream (a file or input
-from a pipeline).
-
-%package        help
-Summary:        Documents for %{name}
-Buildarch:      noarch
-Requires:	man info
-
-%description help
-Man pages and other related documents for %{name}.
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-%configure --without-included-regex
-make %{?_smp_mflags}
-
-%install
-%make_install
-%find_lang %{name}
-
-%files -f %{name}.lang
-%license COPYING
-%{_bindir}/sed
-
-%files help
-%doc ABOUT-NLS AUTHORS BUGS ChangeLog* INSTALL NEWS README THANKS
-%{_infodir}/*.info.gz
-%exclude %{_infodir}/dir*
-%{_mandir}/man1/*.1.gz
-
-%changelog
-* Tue Feb 8 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 4.8-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:backport patches from upstream
-
-* Thu Apr 16 2020 chengquan<chengquan3@huawei.com> - 4.8-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:upgrade software to v4.8
-
-* Tue Jan  7 2020 JeanLeo<liujianliu.liu@huawei.com> - 4.7-0
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:update software to version 4.7
-
-* Fri Aug 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 4.5-3
-- Package init

_service:tar_scm:sed.spec Added

@@ -0,0 +1,73 @@
+Name:	 sed
+Version: 4.8
+Release: 2
+Summary: non-interactive command-line text editor
+
+License: GPLv3+
+URL:	 https://www.gnu.org/software/sed/
+Source0: http://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.xz
+
+Patch1:  backport-sed-c-flag.patch
+Patch2:  backport-sed-handle-very-long-execution-lines-tiny-change.patch
+Patch3:  backport-sed-handle-very-long-input-lines-with-R-tiny-change.patch
+
+BuildRequires: gzip automake autoconf gcc
+BuildRequires: glibc-devel libselinux-devel libacl-devel perl-Getopt-Long
+Provides: /bin/sed
+Provides: bundled(gnulib)
+
+%description
+Sed is a non-interactive command-line text editor. A stream editor is used
+to per-form basic text transformations on an input stream (a file or input
+from a pipeline).
+
+%package        help
+Summary:        Documents for %{name}
+Buildarch:      noarch
+Requires:	man info
+
+%description help
+Man pages and other related documents for %{name}.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+%configure --without-included-regex
+make %{?_smp_mflags}
+
+%install
+%make_install
+%find_lang %{name}
+
+%files -f %{name}.lang
+%license COPYING
+%{_bindir}/sed
+
+%files help
+%doc ABOUT-NLS AUTHORS BUGS ChangeLog* INSTALL NEWS README THANKS
+%{_infodir}/*.info.gz
+%exclude %{_infodir}/dir*
+%{_mandir}/man1/*.1.gz
+
+%changelog
+* Mon Feb 8 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 4.8-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:backport patches from upstream
+
+* Thu Apr 16 2020 chengquan<chengquan3@huawei.com> - 4.8-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:upgrade software to v4.8
+
+* Tue Jan  7 2020 JeanLeo<liujianliu.liu@huawei.com> - 4.7-0
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:update software to version 4.7
+
+* Fri Aug 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 4.5-3
+- Package init

_service:extract_file:backport-sed-c-flag.patch Deleted

@@ -1,247 +0,0 @@
-From f336bde91e3fd9c3c2960aa548b8917eb1216678 Mon Sep 17 00:00:00 2001
-From: Jakub Martisko <jamartis@redhat.com>
-Date: Thu, 6 Feb 2020 15:26:33 +0100
-Subject: PATCH -c flag
-
----
- sed/execute.c | 18 +++++++++--
- sed/sed.c     | 20 +++++++++++-
- sed/sed.h     |  4 +++
- sed/utils.c   | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++
- sed/utils.h   |  2 ++
- 5 files changed, 127 insertions(+), 3 deletions(-)
-
-diff --git a/sed/execute.c b/sed/execute.c
-index c5f07cc..4e5f5b3 100644
---- a/sed/execute.c
-+++ b/sed/execute.c
-@@ -670,11 +670,25 @@ closedown (struct input *input)
-       if (strcmp (in_place_extension, "*") != 0)
-         {
-           char *backup_file_name = get_backup_file_name (target_name);
--          ck_rename (target_name, backup_file_name, input->out_file_name);
-+          if (copy_instead_of_rename)
-+          {
-+            ck_fccopy (target_name, backup_file_name, input->out_file_name);
-+          }
-+          else
-+          {
-+            ck_rename (target_name, backup_file_name, input->out_file_name);
-+          }
-           free (backup_file_name);
-         }
- 
--      ck_rename (input->out_file_name, target_name, input->out_file_name);
-+      if (copy_instead_of_rename)
-+      {
-+        ck_fcmove (input->out_file_name, target_name, input->out_file_name);
-+      }
-+      else
-+      {
-+        ck_rename (input->out_file_name, target_name, input->out_file_name);
-+      }
-       cancel_cleanup ();
-       free (input->out_file_name);
-     }
-diff --git a/sed/sed.c b/sed/sed.c
-index 1ca5839..745159e 100644
---- a/sed/sed.c
-+++ b/sed/sed.c
-@@ -67,6 +67,10 @@ bool debug = false;
- /* How do we edit files in-place? (we don't if NULL) */
- char *in_place_extension = NULL;
- 
-+/* Do we use copy or rename when in in-place edit mode? (boolean
-+ +   value, non-zero for copy, zero for rename).*/
-+int copy_instead_of_rename = 0;
-+
- /* The mode to use to read/write files, either "r"/"w" or "rb"/"wb".  */
- char const *read_mode = "r";
- char const *write_mode = "w";
-@@ -170,6 +174,10 @@ Usage: %s OPTION... {script-only-if-no-other-script} input-file...\n\
- #endif
-   fprintf (out, _("  -iSUFFIX, --in-place=SUFFIX\n\
-                  edit files in place (makes backup if SUFFIX supplied)\n"));
-+
-+  fprintf(out, _("  -c, --copy\n\
-+                 use copy instead of rename when shuffling files in -i mode\n"));
-+
- #if O_BINARY
-   fprintf (out, _("  -b, --binary\n\
-                  open files in binary mode (CR+LFs are not" \
-@@ -214,7 +222,7 @@ specified, then the standard input is read.\n\
- int
- main (int argc, char **argv)
- {
--#define SHORTOPTS "bsnrzuEe:f:l:i::V:"
-+#define SHORTOPTS "bcsnrzuEe:f:l:i::V:"
- 
-   enum { SANDBOX_OPTION = CHAR_MAX+1,
-          DEBUG_OPTION
-@@ -228,6 +236,7 @@ main (int argc, char **argv)
-     {"file", 1, NULL, 'f'},
-     {"in-place", 2, NULL, 'i'},
-     {"line-length", 1, NULL, 'l'},
-+    {"copy", 0, NULL, 'c'},
-     {"null-data", 0, NULL, 'z'},
-     {"zero-terminated", 0, NULL, 'z'},
-     {"quiet", 0, NULL, 'n'},
-@@ -306,6 +315,10 @@ main (int argc, char **argv)
-           follow_symlinks = true;
-           break;
- 
-+        case 'c':
-+          copy_instead_of_rename = true;
-+          break;
-+
-         case 'i':
-           separate_files = true;
-           IF_LINT (free (in_place_extension));
-@@ -376,6 +389,11 @@ main (int argc, char **argv)
-         }
-     }
- 
-+  if (copy_instead_of_rename && in_place_extension == NULL)
-+    {
-+      fprintf (stderr, _("Error: -c used without -i.\n"));
-+      usage(4);
-+    }
-   if (!the_program)
-     {
-       if (optind < argc)
-diff --git a/sed/sed.h b/sed/sed.h
-index 1c8e83a..0859e72 100644
---- a/sed/sed.h
-+++ b/sed/sed.h
-@@ -236,6 +236,10 @@ extern countT lcmd_out_line_len;
- /* How do we edit files in-place? (we don't if NULL) */
- extern char *in_place_extension;
- 
-+/* Do we use copy or rename when in in-place edit mode? (boolean
-+   value, non-zero for copy, zero for rename).*/
-+extern int copy_instead_of_rename;
-+
- /* The mode to use to read and write files, either "rt"/"w" or "rb"/"wb".  */
- extern char const *read_mode;
- extern char const *write_mode;
-diff --git a/sed/utils.c b/sed/utils.c
-index 9576dd1..371d5a9 100644
---- a/sed/utils.c
-+++ b/sed/utils.c
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <fcntl.h>
- 
- #include "binary-io.h"
- #include "unlocked-io.h"
-@@ -400,7 +401,92 @@ ck_rename (const char *from, const char *to, const char *unlink_if_fail)
-   panic (_("cannot rename %s: %s"), from, strerror (errno));
- }
- 
-+/* Downstream -c related functions */
- 
-+/* Panic on failing unlink */
-+void
-+ck_unlink (const char *name)
-+{
-+  if (unlink (name) == -1)
-+    panic (_("cannot remove %s: %s"), name, strerror (errno));
-+}
-+
-+/* Attempt to unlink denoted file if operation rd failed. */
-+static int
-+_unlink_if_fail (int rd,const char * unlink_if_fail)
-+{
-+  if (rd == -1 && unlink_if_fail)
-+    {
-+      int save_errno = errno;
-+      ck_unlink (unlink_if_fail);
-+      errno = save_errno;
-+    }
-+
-+  return rd != -1;
-+}
-+
-+/* Copy contents between files. */
-+static int
-+_copy (from, to)
-+  const char *from, *to;
-+{
-+  static char buf4096;
-+
-+  FILE *infile, *outfile;
-+  int c, retval = 0;
-+  errno = 0;
-+
-+  infile = fopen (from, "r");
-+  if (infile == NULL)
-+    return -1;
-+
-+  outfile = fopen (to, "w");
-+  if (outfile == NULL)
-+    {
-+      fclose (infile);
-+      return -1;
-+    }
-+
-+  while (1)
-+    {
-+      size_t bytes_in = fread (buf, 1, sizeof (buf), infile);
-+      size_t bytes_out;
-+      if (bytes_in == 0)
-+        {
-+          if (ferror (infile))
-+            retval = -1;
-+          break;
-+        }
-+

_service:extract_file:backport-sed-handle-very-long-execution-lines-tiny-change.patch Deleted

@@ -1,56 +0,0 @@
-From 61b5e58f18f152636a77c872dc39281bfb8bf90d Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Fri, 17 Jan 2020 20:49:33 +0100
-Subject: PATCH sed: handle very long execution lines (tiny change)
-
-If sed is called with an excessively long execution line, then it is
-prone to an out of bounds memory access.
-
-The problem is that the length of the execution line, which is a
-size_t, is temporarily stored in an int. This means that on systems
-which have a 64 bit size_t and a 32 bit int (e.g. linux amd64) an
-execution line which exceeds 2 GB will overflow int. If it is just
-slightly larger than 2 GB, the negative int value is used as an
-array index to finish the execution line string with '\0' which
-therefore triggers the out of bounds access.
-
-This problem is probably never triggered in reality, but can be
-provoked like this (given that 'e' support is compiled in):
-
-$ dd if=/dev/zero bs=1M count=2049 | tr '\0' e > e-command.txt
-$ sed -f e-command.txt /etc/fstab
-Segmentation fault (core dumped)
-
-Also adjust another int/size_t conversion, even though it is a
-purely cosmetic change, because it can never be larger than 4096.
-
-* sed/execute.c (execute_program) case 'e': Declare cmd_length
-to be of type size_t, not int.  Likewise for "n" just below.
-* NEWS (Bug fixes): Mention it.
-This addresses https://bugs.gnu.org/39165
----
- sed/execute.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sed/execute.c b/sed/execute.c
-index c5f07cc..8f43f2e 100644
---- a/sed/execute.c
-+++ b/sed/execute.c
-@@ -1347,7 +1347,7 @@ execute_program (struct vector *vec, struct input *input)
-               panic (_("`e' command not supported"));
- #else
-               FILE *pipe_fp;
--              int cmd_length = cur_cmd->x.cmd_txt.text_length;
-+              size_t cmd_length = cur_cmd->x.cmd_txt.text_length;
-               line_reset (&s_accum, NULL);
- 
-               if (!cmd_length)
-@@ -1367,7 +1367,7 @@ execute_program (struct vector *vec, struct input *input)
- 
-               {
-                 char buf4096;
--                int n;
-+                size_t n;
-                 while (!feof (pipe_fp))
-                   if ((n = fread (buf, sizeof (char), 4096, pipe_fp)) > 0)
-                     {

_service:extract_file:backport-sed-handle-very-long-input-lines-with-R-tiny-change.patch Deleted

@@ -1,55 +0,0 @@
-From acabfdb582330345c05e0500d302e9e99f3eb5e9 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Fri, 17 Jan 2020 21:28:28 +0100
-Subject: PATCH sed: handle very long input lines with R (tiny change)
-
-It is possible to trigger an out of bounds memory access when
-using the sed command R with an input file containing very long
-lines.
-
-The problem is that the line length of parsed file is returned as
-a size_t by ck_getdelim, but temporarily stored in an int and
-then converted back into a size_t. On systems like amd64, on which
-this problem can be triggered, size_t and int have different sizes.
-
-If the input line is longer than 2 GB (which is parseable on amd64
-or other 64 bit systems), this means that the temporarily stored
-int turns negative. Converting the negative int back into a size_t
-will lead to an excessively large size_t, as the conversion leads to
-a lot of leading 1 bits.
-
-Eventually ck_fwrite is called with this huge size_t which in turn
-will lead to an out of bounds access on amd64 systems -- after all
-the parsed text was just a bit above 2 GB, not near SIZE_MAX.
-
-You can trigger this issue with GNU sed on OpenBSD like this:
-
-$ dd if=/dev/zero bs=1M count=2049 | tr '\0' e > long.txt
-$ sed Rlong.txt /etc/fstab
-Segmentation fault (core dumped)
-
-I was unable to trigger the bug on a Linux system with glibc due to
-a bug in glibc's fwrite implementation -- it leads to a short write
-and sed treats that correctly as an error.
-
-* sed/execute.c (execute_program) case 'R': Declare result
-to be of type size_t, not int.
-* NEWS (Bug fixes): Mention it.
-This addresses https://bugs.gnu.org/39166
----
- sed/execute.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletion(-)
-
-diff --git a/sed/execute.c b/sed/execute.c
-index 8f43f2e..f94b125 100644
---- a/sed/execute.c
-+++ b/sed/execute.c
-@@ -1518,7 +1518,7 @@ execute_program (struct vector *vec, struct input *input)
-                   struct append_queue *aq;
-                   size_t buflen;
-                   char *text = NULL;
--                  int result;
-+                  size_t result;
- 
-                   result = ck_getdelim (&text, &buflen, buffer_delimiter,
-                                         cur_cmd->x.inf->fp);

_service:tar_scm:backport-sed-c-flag.patch Added

@@ -0,0 +1,247 @@
+From f336bde91e3fd9c3c2960aa548b8917eb1216678 Mon Sep 17 00:00:00 2001
+From: Jakub Martisko <jamartis@redhat.com>
+Date: Thu, 6 Feb 2020 15:26:33 +0100
+Subject: PATCH -c flag
+
+---
+ sed/execute.c | 18 +++++++++--
+ sed/sed.c     | 20 +++++++++++-
+ sed/sed.h     |  4 +++
+ sed/utils.c   | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ sed/utils.h   |  2 ++
+ 5 files changed, 127 insertions(+), 3 deletions(-)
+
+diff --git a/sed/execute.c b/sed/execute.c
+index c5f07cc..4e5f5b3 100644
+--- a/sed/execute.c
++++ b/sed/execute.c
+@@ -670,11 +670,25 @@ closedown (struct input *input)
+       if (strcmp (in_place_extension, "*") != 0)
+         {
+           char *backup_file_name = get_backup_file_name (target_name);
+-          ck_rename (target_name, backup_file_name, input->out_file_name);
++          if (copy_instead_of_rename)
++          {
++            ck_fccopy (target_name, backup_file_name, input->out_file_name);
++          }
++          else
++          {
++            ck_rename (target_name, backup_file_name, input->out_file_name);
++          }
+           free (backup_file_name);
+         }
+ 
+-      ck_rename (input->out_file_name, target_name, input->out_file_name);
++      if (copy_instead_of_rename)
++      {
++        ck_fcmove (input->out_file_name, target_name, input->out_file_name);
++      }
++      else
++      {
++        ck_rename (input->out_file_name, target_name, input->out_file_name);
++      }
+       cancel_cleanup ();
+       free (input->out_file_name);
+     }
+diff --git a/sed/sed.c b/sed/sed.c
+index 1ca5839..745159e 100644
+--- a/sed/sed.c
++++ b/sed/sed.c
+@@ -67,6 +67,10 @@ bool debug = false;
+ /* How do we edit files in-place? (we don't if NULL) */
+ char *in_place_extension = NULL;
+ 
++/* Do we use copy or rename when in in-place edit mode? (boolean
++ +   value, non-zero for copy, zero for rename).*/
++int copy_instead_of_rename = 0;
++
+ /* The mode to use to read/write files, either "r"/"w" or "rb"/"wb".  */
+ char const *read_mode = "r";
+ char const *write_mode = "w";
+@@ -170,6 +174,10 @@ Usage: %s OPTION... {script-only-if-no-other-script} input-file...\n\
+ #endif
+   fprintf (out, _("  -iSUFFIX, --in-place=SUFFIX\n\
+                  edit files in place (makes backup if SUFFIX supplied)\n"));
++
++  fprintf(out, _("  -c, --copy\n\
++                 use copy instead of rename when shuffling files in -i mode\n"));
++
+ #if O_BINARY
+   fprintf (out, _("  -b, --binary\n\
+                  open files in binary mode (CR+LFs are not" \
+@@ -214,7 +222,7 @@ specified, then the standard input is read.\n\
+ int
+ main (int argc, char **argv)
+ {
+-#define SHORTOPTS "bsnrzuEe:f:l:i::V:"
++#define SHORTOPTS "bcsnrzuEe:f:l:i::V:"
+ 
+   enum { SANDBOX_OPTION = CHAR_MAX+1,
+          DEBUG_OPTION
+@@ -228,6 +236,7 @@ main (int argc, char **argv)
+     {"file", 1, NULL, 'f'},
+     {"in-place", 2, NULL, 'i'},
+     {"line-length", 1, NULL, 'l'},
++    {"copy", 0, NULL, 'c'},
+     {"null-data", 0, NULL, 'z'},
+     {"zero-terminated", 0, NULL, 'z'},
+     {"quiet", 0, NULL, 'n'},
+@@ -306,6 +315,10 @@ main (int argc, char **argv)
+           follow_symlinks = true;
+           break;
+ 
++        case 'c':
++          copy_instead_of_rename = true;
++          break;
++
+         case 'i':
+           separate_files = true;
+           IF_LINT (free (in_place_extension));
+@@ -376,6 +389,11 @@ main (int argc, char **argv)
+         }
+     }
+ 
++  if (copy_instead_of_rename && in_place_extension == NULL)
++    {
++      fprintf (stderr, _("Error: -c used without -i.\n"));
++      usage(4);
++    }
+   if (!the_program)
+     {
+       if (optind < argc)
+diff --git a/sed/sed.h b/sed/sed.h
+index 1c8e83a..0859e72 100644
+--- a/sed/sed.h
++++ b/sed/sed.h
+@@ -236,6 +236,10 @@ extern countT lcmd_out_line_len;
+ /* How do we edit files in-place? (we don't if NULL) */
+ extern char *in_place_extension;
+ 
++/* Do we use copy or rename when in in-place edit mode? (boolean
++   value, non-zero for copy, zero for rename).*/
++extern int copy_instead_of_rename;
++
+ /* The mode to use to read and write files, either "rt"/"w" or "rb"/"wb".  */
+ extern char const *read_mode;
+ extern char const *write_mode;
+diff --git a/sed/utils.c b/sed/utils.c
+index 9576dd1..371d5a9 100644
+--- a/sed/utils.c
++++ b/sed/utils.c
+@@ -25,6 +25,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <limits.h>
++#include <fcntl.h>
+ 
+ #include "binary-io.h"
+ #include "unlocked-io.h"
+@@ -400,7 +401,92 @@ ck_rename (const char *from, const char *to, const char *unlink_if_fail)
+   panic (_("cannot rename %s: %s"), from, strerror (errno));
+ }
+ 
++/* Downstream -c related functions */
+ 
++/* Panic on failing unlink */
++void
++ck_unlink (const char *name)
++{
++  if (unlink (name) == -1)
++    panic (_("cannot remove %s: %s"), name, strerror (errno));
++}
++
++/* Attempt to unlink denoted file if operation rd failed. */
++static int
++_unlink_if_fail (int rd,const char * unlink_if_fail)
++{
++  if (rd == -1 && unlink_if_fail)
++    {
++      int save_errno = errno;
++      ck_unlink (unlink_if_fail);
++      errno = save_errno;
++    }
++
++  return rd != -1;
++}
++
++/* Copy contents between files. */
++static int
++_copy (from, to)
++  const char *from, *to;
++{
++  static char buf4096;
++
++  FILE *infile, *outfile;
++  int c, retval = 0;
++  errno = 0;
++
++  infile = fopen (from, "r");
++  if (infile == NULL)
++    return -1;
++
++  outfile = fopen (to, "w");
++  if (outfile == NULL)
++    {
++      fclose (infile);
++      return -1;
++    }
++
++  while (1)
++    {
++      size_t bytes_in = fread (buf, 1, sizeof (buf), infile);
++      size_t bytes_out;
++      if (bytes_in == 0)
++        {
++          if (ferror (infile))
++            retval = -1;
++          break;
++        }
++

_service:tar_scm:backport-sed-handle-very-long-execution-lines-tiny-change.patch Added

@@ -0,0 +1,56 @@
+From 61b5e58f18f152636a77c872dc39281bfb8bf90d Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Fri, 17 Jan 2020 20:49:33 +0100
+Subject: PATCH sed: handle very long execution lines (tiny change)
+
+If sed is called with an excessively long execution line, then it is
+prone to an out of bounds memory access.
+
+The problem is that the length of the execution line, which is a
+size_t, is temporarily stored in an int. This means that on systems
+which have a 64 bit size_t and a 32 bit int (e.g. linux amd64) an
+execution line which exceeds 2 GB will overflow int. If it is just
+slightly larger than 2 GB, the negative int value is used as an
+array index to finish the execution line string with '\0' which
+therefore triggers the out of bounds access.
+
+This problem is probably never triggered in reality, but can be
+provoked like this (given that 'e' support is compiled in):
+
+$ dd if=/dev/zero bs=1M count=2049 | tr '\0' e > e-command.txt
+$ sed -f e-command.txt /etc/fstab
+Segmentation fault (core dumped)
+
+Also adjust another int/size_t conversion, even though it is a
+purely cosmetic change, because it can never be larger than 4096.
+
+* sed/execute.c (execute_program) case 'e': Declare cmd_length
+to be of type size_t, not int.  Likewise for "n" just below.
+* NEWS (Bug fixes): Mention it.
+This addresses https://bugs.gnu.org/39165
+---
+ sed/execute.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sed/execute.c b/sed/execute.c
+index c5f07cc..8f43f2e 100644
+--- a/sed/execute.c
++++ b/sed/execute.c
+@@ -1347,7 +1347,7 @@ execute_program (struct vector *vec, struct input *input)
+               panic (_("`e' command not supported"));
+ #else
+               FILE *pipe_fp;
+-              int cmd_length = cur_cmd->x.cmd_txt.text_length;
++              size_t cmd_length = cur_cmd->x.cmd_txt.text_length;
+               line_reset (&s_accum, NULL);
+ 
+               if (!cmd_length)
+@@ -1367,7 +1367,7 @@ execute_program (struct vector *vec, struct input *input)
+ 
+               {
+                 char buf4096;
+-                int n;
++                size_t n;
+                 while (!feof (pipe_fp))
+                   if ((n = fread (buf, sizeof (char), 4096, pipe_fp)) > 0)
+                     {

_service:tar_scm:backport-sed-handle-very-long-input-lines-with-R-tiny-change.patch Added

@@ -0,0 +1,55 @@
+From acabfdb582330345c05e0500d302e9e99f3eb5e9 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Fri, 17 Jan 2020 21:28:28 +0100
+Subject: PATCH sed: handle very long input lines with R (tiny change)
+
+It is possible to trigger an out of bounds memory access when
+using the sed command R with an input file containing very long
+lines.
+
+The problem is that the line length of parsed file is returned as
+a size_t by ck_getdelim, but temporarily stored in an int and
+then converted back into a size_t. On systems like amd64, on which
+this problem can be triggered, size_t and int have different sizes.
+
+If the input line is longer than 2 GB (which is parseable on amd64
+or other 64 bit systems), this means that the temporarily stored
+int turns negative. Converting the negative int back into a size_t
+will lead to an excessively large size_t, as the conversion leads to
+a lot of leading 1 bits.
+
+Eventually ck_fwrite is called with this huge size_t which in turn
+will lead to an out of bounds access on amd64 systems -- after all
+the parsed text was just a bit above 2 GB, not near SIZE_MAX.
+
+You can trigger this issue with GNU sed on OpenBSD like this:
+
+$ dd if=/dev/zero bs=1M count=2049 | tr '\0' e > long.txt
+$ sed Rlong.txt /etc/fstab
+Segmentation fault (core dumped)
+
+I was unable to trigger the bug on a Linux system with glibc due to
+a bug in glibc's fwrite implementation -- it leads to a short write
+and sed treats that correctly as an error.
+
+* sed/execute.c (execute_program) case 'R': Declare result
+to be of type size_t, not int.
+* NEWS (Bug fixes): Mention it.
+This addresses https://bugs.gnu.org/39166
+---
+ sed/execute.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/sed/execute.c b/sed/execute.c
+index 8f43f2e..f94b125 100644
+--- a/sed/execute.c
++++ b/sed/execute.c
+@@ -1518,7 +1518,7 @@ execute_program (struct vector *vec, struct input *input)
+                   struct append_queue *aq;
+                   size_t buflen;
+                   char *text = NULL;
+-                  int result;
++                  size_t result;
+ 
+                   result = ck_getdelim (&text, &buflen, buffer_delimiter,
+                                         cur_cmd->x.inf->fp);

_service Changed

_service:extract_file:README.md Deleted

@@ -1,49 +0,0 @@
-# sed
-
-sed is a stream editor.
-sed is a non-interactive command-line text editor.
-A stream editor is used to perform basic text transformations on an input stream (a file or input from a pipeline). 
-While in some ways similar to an editor which permits scripted edits (such as ed), sed works by making only one pass over the input(s), and is consequently more efficient. 
-But it is sed’s ability to filter text in a pipeline which particularly distinguishes it from other types of editors.
-
-Example: delete the 4th line in a file
-$ sed '4d' input.txt > output.txt
-
-Example: replace every occurrence of 'hello' with 'world' on lines 10-20
-$ sed '10,20s/hello/world/' input.txt > output.txt
-sed is commonly used to filter text, i.e., it takes text input, performs some operation (or set of operations) on it, and outputs the modified text. 
-sed is typically used for extracting part of a file using pattern matching or substituting multiple occurrences of a string within a file.
-
-### Overview
-Normally sed is invoked like this:
-
-sed SCRIPT INPUTFILE...
-For example, to replace all occurrences of ‘hello’ to ‘world’ in the file input.txt:
-
-sed 's/hello/world/' input.txt > output.txt
-If you do not specify INPUTFILE, or if INPUTFILE is -, sed filters the contents of the standard input. The following commands are equivalent:
-
-sed 's/hello/world/' input.txt > output.txt
-sed 's/hello/world/' < input.txt > output.txt
-cat input.txt | sed 's/hello/world/' - > output.txt
-sed writes output to standard output. Use -i to edit files in-place instead of printing to standard output. See also the W and s///w commands for writing output to other files. The following command modifies file.txt and does not produce any output:
-
-sed -i 's/hello/world/' file.txt
-By default sed prints all processed input (except input that has been modified/deleted by commands such as d). Use -n to suppress output, and the p command to print specific lines. The following command prints only line 45 of the input file:
-
-sed -n '45p' file.txt
-sed treats multiple input files as one long stream. The following example prints the first line of the first file (one.txt) and the last line of the last file (three.txt). Use -s to reverse this behavior.
-
-sed -n  '1p ; $p' one.txt two.txt three.txt
-Without -e or -f options, sed uses the first non-option parameter as the script, and the following non-option parameters as input files. If -e or -f options are used to specify a script, all non-option parameters are taken as input files. Options -e and -f can be combined, and can appear multiple times (in which case the final effective script will be concatenation of all the individual scripts).
-
-The following examples are equivalent:
-
-sed 's/hello/world/' input.txt > output.txt
-
-sed -e 's/hello/world/' input.txt > output.txt
-sed --expression='s/hello/world/' input.txt > output.txt
-
-echo 's/hello/world/' > myscript.sed
-sed -f myscript.sed input.txt > output.txt
-sed --file=myscript.sed input.txt > output.txt
\ No newline at end of file

_service:extract_file:sed-4.8.tar.xz Deleted

_service:extract_file:sed.yaml Deleted

_service:tar_scm:README.md Added

@@ -0,0 +1,49 @@
+# sed
+
+sed is a stream editor.
+sed is a non-interactive command-line text editor.
+A stream editor is used to perform basic text transformations on an input stream (a file or input from a pipeline). 
+While in some ways similar to an editor which permits scripted edits (such as ed), sed works by making only one pass over the input(s), and is consequently more efficient. 
+But it is sed’s ability to filter text in a pipeline which particularly distinguishes it from other types of editors.
+
+Example: delete the 4th line in a file
+$ sed '4d' input.txt > output.txt
+
+Example: replace every occurrence of 'hello' with 'world' on lines 10-20
+$ sed '10,20s/hello/world/' input.txt > output.txt
+sed is commonly used to filter text, i.e., it takes text input, performs some operation (or set of operations) on it, and outputs the modified text. 
+sed is typically used for extracting part of a file using pattern matching or substituting multiple occurrences of a string within a file.
+
+### Overview
+Normally sed is invoked like this:
+
+sed SCRIPT INPUTFILE...
+For example, to replace all occurrences of ‘hello’ to ‘world’ in the file input.txt:
+
+sed 's/hello/world/' input.txt > output.txt
+If you do not specify INPUTFILE, or if INPUTFILE is -, sed filters the contents of the standard input. The following commands are equivalent:
+
+sed 's/hello/world/' input.txt > output.txt
+sed 's/hello/world/' < input.txt > output.txt
+cat input.txt | sed 's/hello/world/' - > output.txt
+sed writes output to standard output. Use -i to edit files in-place instead of printing to standard output. See also the W and s///w commands for writing output to other files. The following command modifies file.txt and does not produce any output:
+
+sed -i 's/hello/world/' file.txt
+By default sed prints all processed input (except input that has been modified/deleted by commands such as d). Use -n to suppress output, and the p command to print specific lines. The following command prints only line 45 of the input file:
+
+sed -n '45p' file.txt
+sed treats multiple input files as one long stream. The following example prints the first line of the first file (one.txt) and the last line of the last file (three.txt). Use -s to reverse this behavior.
+
+sed -n  '1p ; $p' one.txt two.txt three.txt
+Without -e or -f options, sed uses the first non-option parameter as the script, and the following non-option parameters as input files. If -e or -f options are used to specify a script, all non-option parameters are taken as input files. Options -e and -f can be combined, and can appear multiple times (in which case the final effective script will be concatenation of all the individual scripts).
+
+The following examples are equivalent:
+
+sed 's/hello/world/' input.txt > output.txt
+
+sed -e 's/hello/world/' input.txt > output.txt
+sed --expression='s/hello/world/' input.txt > output.txt
+
+echo 's/hello/world/' > myscript.sed
+sed -f myscript.sed input.txt > output.txt
+sed --file=myscript.sed input.txt > output.txt
\ No newline at end of file

_service:tar_scm:sed-1612833536.4ea8e82.tar -> _service:tar_scm:sed-4.8.tar.xz Changed

_service:tar_scm:sed.yaml Added