From 1df0b363c4a30cab34938ef776794d4197b39609 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:29:44 +0000 Subject: [PATCH] import UBI sed-4.9-3.el10 --- .gitignore | 2 +- .sed.metadata | 1 - SOURCES/sed-4.2.2-binary_copy_args.patch | 281 ----------------------- SOURCES/sed-fuse.patch | 13 -- SOURCES/sed-selinux-testsuite.patch | 12 - sed-b-flag.patch | 30 +++ sed-c-flag.patch | 226 ++++++++++++++++++ sed-covscan-annotations.patch | 46 ++++ SPECS/sed.spec => sed.spec | 142 ++++++++---- SOURCES/sedfaq.txt => sedfaq.txt | 0 sources | 1 + 11 files changed, 403 insertions(+), 351 deletions(-) delete mode 100644 .sed.metadata delete mode 100644 SOURCES/sed-4.2.2-binary_copy_args.patch delete mode 100644 SOURCES/sed-fuse.patch delete mode 100644 SOURCES/sed-selinux-testsuite.patch create mode 100644 sed-b-flag.patch create mode 100644 sed-c-flag.patch create mode 100644 sed-covscan-annotations.patch rename SPECS/sed.spec => sed.spec (74%) rename SOURCES/sedfaq.txt => sedfaq.txt (100%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 21fdfb3..4d6f185 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/sed-4.5.tar.xz +sed-4.9.tar.xz diff --git a/.sed.metadata b/.sed.metadata deleted file mode 100644 index 01a824f..0000000 --- a/.sed.metadata +++ /dev/null @@ -1 +0,0 @@ -6635c344956ef928cc33aca798ad20c6c1ea25f7 SOURCES/sed-4.5.tar.xz diff --git a/SOURCES/sed-4.2.2-binary_copy_args.patch b/SOURCES/sed-4.2.2-binary_copy_args.patch deleted file mode 100644 index 1c88342..0000000 --- a/SOURCES/sed-4.2.2-binary_copy_args.patch +++ /dev/null @@ -1,281 +0,0 @@ -diff -urN sed-4.3/sed/execute.c sed-4.3.new00/sed/execute.c ---- sed-4.3/sed/execute.c 2012-03-16 10:13:31.000000000 +0100 -+++ sed-4.3.new00/sed/execute.c 2014-02-10 14:40:25.603629422 +0100 -@@ -703,11 +703,13 @@ - 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); -+ (copy_instead_of_rename?ck_fccopy: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); -+ (copy_instead_of_rename?ck_fcmove:ck_rename) -+ (input->out_file_name, target_name, input->out_file_name); - cancel_cleanup (); - free (input->out_file_name); - } -diff -urN sed-4.3/sed/sed.c sed-4.3.new00/sed/sed.c ---- sed-4.3/sed/sed.c 2012-03-16 10:13:31.000000000 +0100 -+++ sed-4.3.new00/sed/sed.c 2014-02-10 17:37:19.381273509 +0100 -@@ -56,6 +56,10 @@ - /* 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"; -@@ -117,11 +121,16 @@ - fprintf(out, _(" -i[SUFFIX], --in-place[=SUFFIX]\n\ - edit files in place (makes backup if SUFFIX supplied)\n")); --#if defined WIN32 || defined _WIN32 || defined __CYGWIN__ \ -- || defined MSDOS || defined __EMX__ -- fprintf(out, _(" -b, --binary\n\ -- open files in binary mode (CR+LFs are not" \ -- " processed specially)\n")); -+ fprintf(out, _(" -c, --copy\n\ -+ use copy instead of rename when shuffling files in -i mode\n")); -+ fprintf(out, _(" -b, --binary\n" -+#if ! ( defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) ) -+" does nothing; for compatibility with WIN32/CYGWIN/MSDOS/EMX (\n" -+#endif -+" open files in binary mode (CR+LFs are not treated specially)" -+#if ! ( defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) ) -+ ")" - #endif -+ "\n")); - fprintf(out, _(" -l N, --line-length=N\n\ - specify the desired line-wrap length for the `l' command\n")); - fprintf(out, _(" --posix\n\ -@@ -138,8 +149,10 @@ - the output buffers more often\n")); - fprintf(out, _(" -z, --null-data\n\ - separate lines by NUL characters\n")); -- fprintf(out, _(" --help display this help and exit\n")); -- fprintf(out, _(" --version output version information and exit\n")); -+ fprintf(out, _(" --help\n\ -+ display this help and exit\n")); -+ fprintf(out, _(" --version\n\ -+ output version information and exit\n")); - fprintf(out, _("\n\ - If no -e, --expression, -f, or --file option is given, then the first\n\ - non-option argument is taken as the sed script to interpret. All\n\ -@@ -158,9 +171,9 @@ - main (int argc, char **argv) - { - #ifdef REG_PERL --#define SHORTOPTS "bsnrzRuEe:f:l:i::V:" -+#define SHORTOPTS "bcsnrzRuEe:f:l:i::" - #else --#define SHORTOPTS "bsnrzuEe:f:l:i::V:" -+#define SHORTOPTS "bcsnrzuEe:f:l:i::" - #endif - - enum { SANDBOX_OPTION = CHAR_MAX+1 }; -@@ -172,6 +185,7 @@ - {"expression", 1, NULL, 'e'}, - {"file", 1, NULL, 'f'}, - {"in-place", 2, NULL, 'i'}, -+ {"copy", 0, NULL, 'c'}, - {"line-length", 1, NULL, 'l'}, - {"null-data", 0, NULL, 'z'}, - {"zero-terminated", 0, NULL, 'z'}, -@@ -246,6 +260,10 @@ - follow_symlinks = true; - break; - -+ case 'c': -+ copy_instead_of_rename = true; -+ break; -+ - case 'i': - separate_files = true; - if (optarg == NULL) -@@ -272,9 +290,11 @@ - posixicity = POSIXLY_BASIC; - break; - -- case 'b': -+ case 'b': -+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) - read_mode = "rb"; - write_mode = "wb"; -+#endif - break; - - case 'E': -@@ -314,6 +334,12 @@ - } - } - -+ 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 -urN sed-4.3/sed/sed.h sed-4.3.new00/sed/sed.h ---- sed-4.3/sed/sed.h 2012-07-25 12:33:09.000000000 +0200 -+++ sed-4.3.new00/sed/sed.h 2014-02-10 14:40:25.602629419 +0100 -@@ -230,6 +230,10 @@ - /* 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 -urN sed-4.3/sed/utils.c sed-4.3.new00/sed/utils.c ---- sed-4.3/sed/utils.c 2012-03-16 10:13:31.000000000 +0100 -+++ sed-4.3.new00/sed/utils.c 2014-02-10 14:40:25.603629422 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "unlocked-io.h" - #include "utils.h" -@@ -363,31 +364,106 @@ - #endif /* ENABLE_FOLLOW_SYMLINKS */ - } - --/* Panic on failing rename */ -+/* Panic on failing unlink */ - void --ck_rename (const char *from, const char *to, const char *unlink_if_fail) -+ck_unlink (const char *name) - { -- int rd = rename (from, to); -- if (rd != -1) -- return; -+ if (unlink (name) == -1) -+ panic (_("cannot remove %s: %s"), name, strerror (errno)); -+} - -- if (unlink_if_fail) -+/* Attempt to unlink denoted file if operation rd failed. */ -+static int -+_unlink_if_fail (rd, 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 buf[4096]; -+ -+ FILE *infile, *outfile; -+ int c, retval = 0; - errno = 0; -- unlink (unlink_if_fail); - -- /* Failure to remove the temporary file is more severe, -- so trigger it first. */ -- if (errno != 0) -- panic (_("cannot remove %s: %s"), unlink_if_fail, strerror (errno)); -+ infile = fopen (from, "r"); -+ if (infile == NULL) -+ return -1; - -- errno = save_errno; -+ 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; -+ } -+ -+ bytes_out = fwrite (buf, 1, bytes_in, outfile); -+ if (bytes_out != bytes_in) -+ { -+ retval = -1; -+ break; -+ } - } - -+ fclose (outfile); -+ fclose (infile); -+ -+ return retval; -+} -+ -+/* Panic on failing rename */ -+void -+ck_rename (from, to, unlink_if_fail) -+ const char *from, *to; -+ const char *unlink_if_fail; -+{ -+ if (!_unlink_if_fail (rename (from, to), unlink_if_fail)) - panic (_("cannot rename %s: %s"), from, strerror (errno)); - } - -+/* Attempt to copy file contents between the files. */ -+void -+ck_fccopy (from, to, unlink_if_fail) -+ const char *from, *to; -+ const char *unlink_if_fail; -+{ -+ if (!_unlink_if_fail (_copy (from, to), unlink_if_fail)) -+ panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno)); -+} -+ -+/* Copy contents between files, and then unlink the source. */ -+void -+ck_fcmove (from, to, unlink_if_fail) -+ const char *from, *to; -+ const char *unlink_if_fail; -+{ -+ ck_fccopy (from, to, unlink_if_fail); -+ ck_unlink (from); -+} - - - -diff -urN sed-4.3/sed/utils.h sed-4.3.new00/sed/utils.h ---- sed-4.3/sed/utils.h 2012-03-16 10:13:31.000000000 +0100 -+++ sed-4.3.new00/sed/utils.h 2014-02-10 14:40:25.603629422 +0100 -@@ -33,6 +33,8 @@ - FILE * ck_mkstemp (char **p_filename, const char *tmpdir, const char *base, - const char *mode) _GL_ARG_NONNULL ((1, 2, 3, 4)); - void ck_rename (const char *from, const char *to, const char *unlink_if_fail); -+void ck_fccopy (const char *from, const char *to, const char *unlink_if_fail); -+void ck_fcmove (const char *from, const char *to, const char *unlink_if_fail); - - void *ck_malloc (size_t size); - void *xmalloc (size_t size); diff --git a/SOURCES/sed-fuse.patch b/SOURCES/sed-fuse.patch deleted file mode 100644 index 78a5640..0000000 --- a/SOURCES/sed-fuse.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sed/utils.c b/sed/utils.c -index 4028d98..2e74654 100644 ---- a/sed/utils.c -+++ b/sed/utils.c -@@ -181,7 +181,7 @@ ck_mkstemp (char **p_filename, const char *tmpdir, - /* The ownership might change, so omit some permissions at first - so unauthorized users cannot nip in before the file is ready. - mkstemp forces O_BINARY on cygwin, so use mkostemp instead. */ -- mode_t save_umask = umask (0700); -+ mode_t save_umask = umask (0077); - int fd = mkostemp (template, 0); - umask (save_umask); - if (fd == -1) diff --git a/SOURCES/sed-selinux-testsuite.patch b/SOURCES/sed-selinux-testsuite.patch deleted file mode 100644 index f8e8bb1..0000000 --- a/SOURCES/sed-selinux-testsuite.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/sed-4.5/testsuite/inplace-selinux.sh 2018-03-31 06:33:01.000000000 +0200 -+++ b/sed-4.5/testsuite/inplace-selinux.sh 2021-10-05 17:10:32.259956822 +0200 -@@ -24,6 +24,9 @@ - chcon -u system_u a || skip_ "chcon doesn't work" - chcon -u user_u a || skip_ "chcon doesn't work" - -+cp --preserve=context ./a ./b 2>&1 | grep "cannot preserve security context" >/dev/null && skip_ "cannot preserve security context without an SELinux-enabled kernel" -+ -+ - # Create the first file and symlink pointing at it. - echo "Hello World" > inplace-selinux-file || framework_failure_ - ln -s ./inplace-selinux-file inplace-selinux-link || framework_failure_ diff --git a/sed-b-flag.patch b/sed-b-flag.patch new file mode 100644 index 0000000..f4e6a03 --- /dev/null +++ b/sed-b-flag.patch @@ -0,0 +1,30 @@ +From f40556883a40ed7aaa4f44c9c9c95215c95eab9f Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 30 Jan 2024 10:31:57 +0100 +Subject: [PATCH 1/3] enable the -b option on all platforms +Content-Type: text/plain; charset=UTF-8 + +--- + sed/sed.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sed/sed.c b/sed/sed.c +index af83065..bdf590b 100644 +--- a/sed/sed.c ++++ b/sed/sed.c +@@ -153,7 +153,12 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\ + fprintf (out, _(" -b, --binary\n\ + open files in binary mode (CR+LFs are not" \ + " processed specially)\n")); ++#else ++ fprintf (out, _(" -b, --binary\n\ ++ does nothing; for compatibility with WIN32/CYGWIN/MSDOS/EMX \n\ ++ (open files in binary mode; CR+LF are not processed specially)\n" )); + #endif ++ + fprintf (out, _(" -l N, --line-length=N\n\ + specify the desired line-wrap length for the `l' command\n")); + fprintf (out, _(" --posix\n\ +-- +2.43.0 + diff --git a/sed-c-flag.patch b/sed-c-flag.patch new file mode 100644 index 0000000..590ccd0 --- /dev/null +++ b/sed-c-flag.patch @@ -0,0 +1,226 @@ +From 100738652ca35e39f21742b8c54c1181efb38a0f Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 30 Jan 2024 10:38:50 +0100 +Subject: [PATCH 2/3] -c flag +Content-Type: text/plain; charset=UTF-8 + +--- + sed/execute.c | 10 ++++-- + sed/sed.c | 20 +++++++++++- + sed/sed.h | 4 +++ + sed/utils.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ + sed/utils.h | 2 ++ + 5 files changed, 119 insertions(+), 3 deletions(-) + +diff --git a/sed/execute.c b/sed/execute.c +index 485bca7..8d0cde7 100644 +--- a/sed/execute.c ++++ b/sed/execute.c +@@ -673,11 +673,17 @@ 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); ++ if (copy_instead_of_rename) ++ ck_fccopy (target_name, backup_file_name); ++ else ++ ck_rename (target_name, backup_file_name); + free (backup_file_name); + } + +- ck_rename (input->out_file_name, target_name); ++ if (copy_instead_of_rename) ++ ck_fcmove (input->out_file_name, target_name); ++ else ++ ck_rename (input->out_file_name, target_name); + cancel_cleanup (); + free (input->out_file_name); + } +diff --git a/sed/sed.c b/sed/sed.c +index bdf590b..cebef70 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"; +@@ -149,6 +153,10 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\ + #endif + fprintf (out, _(" -i[SUFFIX], --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" \ +@@ -193,7 +201,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 +@@ -207,6 +215,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'}, +@@ -285,6 +294,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)); +@@ -355,6 +368,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 1c96bc5..2de60ae 100644 +--- a/sed/sed.h ++++ b/sed/sed.h +@@ -241,6 +241,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 4bd6587..05f7a44 100644 +--- a/sed/utils.c ++++ b/sed/utils.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "binary-io.h" + #include "eloop-threshold.h" +@@ -408,7 +409,78 @@ ck_rename (const char *from, const char *to) + 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)); ++} ++ ++/* Copy contents between files. */ ++static int ++_copy (from, to) ++ const char *from, *to; ++{ ++ static char buf[4096]; ++ ++ FILE *infile, *outfile; ++ int 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; ++ } ++ ++ bytes_out = fwrite (buf, 1, bytes_in, outfile); ++ if (bytes_out != bytes_in) ++ { ++ retval = -1; ++ break; ++ } ++ } ++ ++ fclose (outfile); ++ fclose (infile); ++ ++ return retval; ++} ++ ++/* Attempt to copy file contents between the files. */ ++void ++ck_fccopy (const char *from, const char *to) ++{ ++ if (_copy (from, to) == -1) ++ panic (_("cannot copy %s to %s: %s"), from, to, strerror (errno)); ++} ++ ++/* Copy contents between files, and then unlink the source. */ ++void ++ck_fcmove (const char *from, const char *to) ++{ ++ ck_fccopy (from, to); ++ ck_unlink (from); ++} + + + /* Implement a variable sized buffer of `stuff'. We don't know what it is, +diff --git a/sed/utils.h b/sed/utils.h +index cac8a05..93bbcf2 100644 +--- a/sed/utils.h ++++ b/sed/utils.h +@@ -41,6 +41,8 @@ size_t ck_getdelim (char **text, size_t *buflen, char buffer_delimiter, + FILE * ck_mkstemp (char **p_filename, const char *tmpdir, const char *base, + const char *mode) _GL_ARG_NONNULL ((1, 2, 3, 4)); + void ck_rename (const char *from, const char *to); ++void ck_fccopy (const char *from, const char *to); ++void ck_fcmove (const char *from, const char *to); + + void *ck_malloc (size_t size); + void *ck_realloc (void *ptr, size_t size); +-- +2.43.0 + diff --git a/sed-covscan-annotations.patch b/sed-covscan-annotations.patch new file mode 100644 index 0000000..a36eada --- /dev/null +++ b/sed-covscan-annotations.patch @@ -0,0 +1,46 @@ +From 7dbe9c0c2b3f2cac602ce352cad11dab4defe896 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 30 Jan 2024 10:41:40 +0100 +Subject: [PATCH 3/3] covscan annotations +Content-Type: text/plain; charset=UTF-8 + +--- + lib/malloca.c | 1 + + sed/compile.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/lib/malloca.c b/lib/malloca.c +index 1e19978..11783b4 100644 +--- a/lib/malloca.c ++++ b/lib/malloca.c +@@ -71,6 +71,7 @@ mmalloca (size_t n) + [mem, mem + nplus). */ + p[-1] = offset; + /* p ≡ sa_alignment_max mod 2*sa_alignment_max. */ ++ /* cppcheck-suppress memleak */ + return p; + } + } +diff --git a/sed/compile.c b/sed/compile.c +index f96fbca..52759a5 100644 +--- a/sed/compile.c ++++ b/sed/compile.c +@@ -830,6 +830,7 @@ setup_replacement (struct subst *sub, const char *text, size_t length) + + tail->next = NULL; + sub->replacement = root.next; ++ /* coverity [leaked_storage] */ + } + + static void +@@ -1328,6 +1329,7 @@ compile_program (struct vector *vector) + bad_prog (_(Y_CMD_LEN)); + + IF_LINT (free (src_lens)); ++ /* coverity [leaked_storage] */ + } + else + { +-- +2.43.0 + diff --git a/SPECS/sed.spec b/sed.spec similarity index 74% rename from SPECS/sed.spec rename to sed.spec index d014c6e..a30515f 100644 --- a/SPECS/sed.spec +++ b/sed.spec @@ -2,20 +2,25 @@ Summary: A GNU stream text editor Name: sed -Version: 4.5 -Release: 5%{?dist} -License: GPLv3+ -Group: Applications/Text +Version: 4.9 +Release: 3%{?dist} +License: GPL-3.0-or-later URL: http://sed.sourceforge.net/ Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz Source1: http://sed.sourceforge.net/sedfaq.txt -Patch0: sed-4.2.2-binary_copy_args.patch -Patch2: sed-fuse.patch -Patch3: sed-selinux-testsuite.patch -BuildRequires: glibc-devel, libselinux-devel, libacl-devel, automake, autoconf +Patch0: sed-b-flag.patch +Patch1: sed-c-flag.patch +Patch2: sed-covscan-annotations.patch +BuildRequires: make +BuildRequires: glibc-devel, libselinux-devel, libacl-devel, automake, autoconf, gcc BuildRequires: perl-Getopt-Long -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +BuildRequires: perl(FileHandle) + +# for tests. More tests require a ja_JP locale, but glibc-langpack-ja gives: +# invalid-mb-seq-UMR.sh: skipped test: locale 'ja_JP' is buggy +# mb-charclass-non-utf8.sh: skipped test: ja_JP shift-jis locale not found +BuildRequires: glibc-langpack-el, glibc-langpack-en +BuildRequires: glibc-langpack-ru, valgrind Provides: /bin/sed @@ -30,14 +35,11 @@ that sed performs (substitutions, deletions, insertions, etc.) can be specified in a script file or from the command line. %prep -%setup -q -%patch0 -p1 -b .copy -%patch2 -p1 -%patch3 -p2 +%autosetup -p1 %build %configure --without-included-regex -make %{_smp_mflags} +%make_build install -m 644 -p %{SOURCE1} sedfaq.txt gzip -9 sedfaq.txt @@ -48,50 +50,104 @@ echo ====================TESTING END===================== %install rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=$RPM_BUILD_ROOT install +%make_install rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir %find_lang %{name} -%post -/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir || &> /dev/null -: - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir || &> /dev/null -fi -: - %files -f %{name}.lang -%defattr(-,root,root) %{!?_licensedir:%global license %%doc} %license COPYING %doc BUGS NEWS THANKS README AUTHORS sedfaq.txt.gz %{_bindir}/sed -%{_infodir}/*.info* -%{_mandir}/man*/* +%{_infodir}/sed.info* +%{_mandir}/man1/sed.1* %changelog -* Tue Oct 05 2021 Jakub Martisko - 4.5-5 -- Minor cleanup - remove unused patch from the spec file too (related to 4.5-3) -- Resolves: rhbz#1869253 +* Tue Oct 29 2024 Troy Dawson - 4.9-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Tue Oct 05 2021 Jakub Martisko - 4.5-4 -- Skip selinux test when selinux is not working -- Resolves: rhbz#1905777 +* Mon Jun 24 2024 Troy Dawson - 4.9-2 +- Bump release for June 2024 mass rebuild -* Tue Oct 05 2021 Jakub Martisko - 4.5-3 -- Minor cleanup - remove unused patch from the git -- Resolves: rhbz#1869253 +* Tue Jan 30 2024 Paolo Bonzini - 4.9-1 +- Rebase to 4.9 +- Update downstream patches +- Resolves: rhbz#2140486 +- Remove change to gnulib tests, they pass anyway +- Install valgrind and langpacks to increase test coverage -* Mon May 18 2020 Jakub Martisko - 4.5-2 -- fix "in-place edits on FUSE filesystems create files with all-zero mode bits" -- Resolves: #1835761 +* Sat Jan 27 2024 Fedora Release Engineering - 4.8-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Mon Apr 09 2018 Jakub Martisko - 4.5-1 +* Sat Jul 22 2023 Fedora Release Engineering - 4.8-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 11 2023 Lukáš Zaoral - 4.8-13 +- migrate to SPDX license format + +* Sat Jan 21 2023 Fedora Release Engineering - 4.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 4.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 4.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 16 2021 Jakub Martisko - 4.8-9 +- Add annotations to disable false positives in the covscan +- Related: rhbz#1938867 + +* Fri Jul 23 2021 Fedora Release Engineering - 4.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 4.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 17 2020 Jakub Martisko - 4.8-6 +- Minor spec cleanup + +* Mon Aug 03 2020 Jakub Martisko - 4.8-5 +- Use make macros + +* Mon Aug 03 2020 Jakub Martisko - 4.8-4 +- Replace some hardcoded constants in the gnulib-testsuite + ... that caused build failures on arm7 + +* Sat Aug 01 2020 Fedora Release Engineering - 4.8-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Feb 11 2020 Jakub Martisko - 4.8-1 +- Rebase to 4.8 +- Refresh the downstream patch and split it into two + +* Thu Jan 30 2020 Fedora Release Engineering - 4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 4.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Apr 03 2018 Jakub Martisko - 4.5-1 - Rebase to 4.5 -- Drop patch from 4.4-4 (is included in the upstream archive) +- Drop patches from 4.4-4 and 4.4-7 + +* Thu Mar 08 2018 Jakub Martisko - 4.4-7 +- Fix build failure with glibc-2.28 + +* Thu Mar 08 2018 Jakub Martisko - 4.4-6 +- Add gcc to BuildRequires * Fri Feb 09 2018 Fedora Release Engineering - 4.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/SOURCES/sedfaq.txt b/sedfaq.txt similarity index 100% rename from SOURCES/sedfaq.txt rename to sedfaq.txt diff --git a/sources b/sources new file mode 100644 index 0000000..efafbe0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (sed-4.9.tar.xz) = 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc