diff --git a/.gitignore b/.gitignore index c54486c..596d3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,3 @@ sed-4.2.1.tar.bz2 /sed-4.3.tar.xz /sed-4.4.tar.xz /sed-4.5.tar.xz -/sed-4.8.tar.xz -/sed-4.9.tar.xz diff --git a/sed-4.2.2-binary_copy_args.patch b/sed-4.2.2-binary_copy_args.patch new file mode 100644 index 0000000..1c88342 --- /dev/null +++ b/sed-4.2.2-binary_copy_args.patch @@ -0,0 +1,281 @@ +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/sed-b-flag.patch b/sed-b-flag.patch deleted file mode 100644 index f4e6a03..0000000 --- a/sed-b-flag.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 590ccd0..0000000 --- a/sed-c-flag.patch +++ /dev/null @@ -1,226 +0,0 @@ -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 deleted file mode 100644 index a36eada..0000000 --- a/sed-covscan-annotations.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/sed-gnulib.patch b/sed-gnulib.patch new file mode 100644 index 0000000..902b847 --- /dev/null +++ b/sed-gnulib.patch @@ -0,0 +1,218 @@ +From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 5 Mar 2018 10:56:29 -0800 +Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Daniel P. Berrangé in: +https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +* lib/fbufmode.c (fbufmode): +* lib/fflush.c (clear_ungetc_buffer_preserving_position) +(disable_seek_optimization, rpl_fflush): +* lib/fpending.c (__fpending): +* lib/fpurge.c (fpurge): +* lib/freadable.c (freadable): +* lib/freadahead.c (freadahead): +* lib/freading.c (freading): +* lib/freadptr.c (freadptr): +* lib/freadseek.c (freadptrinc): +* lib/fseeko.c (fseeko): +* lib/fseterr.c (fseterr): +* lib/fwritable.c (fwritable): +* lib/fwriting.c (fwriting): +Check _IO_EOF_SEEN instead of _IO_ftrylockfile. +* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: +Define if not already defined. +--- + ChangeLog | 23 +++++++++++++++++++++++ + lib/fbufmode.c | 2 +- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadable.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/fwritable.c | 2 +- + lib/fwriting.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 15 files changed, 45 insertions(+), 16 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 667f91663..beb835670 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,26 @@ ++2018-03-05 Paul Eggert ++ ++ fflush: adjust to glibc 2.28 libio.h removal ++ Problem reported by Daniel P. Berrangé in: ++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html ++ * lib/fbufmode.c (fbufmode): ++ * lib/fflush.c (clear_ungetc_buffer_preserving_position) ++ (disable_seek_optimization, rpl_fflush): ++ * lib/fpending.c (__fpending): ++ * lib/fpurge.c (fpurge): ++ * lib/freadable.c (freadable): ++ * lib/freadahead.c (freadahead): ++ * lib/freading.c (freading): ++ * lib/freadptr.c (freadptr): ++ * lib/freadseek.c (freadptrinc): ++ * lib/fseeko.c (fseeko): ++ * lib/fseterr.c (fseterr): ++ * lib/fwritable.c (fwritable): ++ * lib/fwriting.c (fwriting): ++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile. ++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: ++ Define if not already defined. ++ + 2017-02-03 Jim Meyering + + version 4.4 +diff --git a/gnulib-tests/fflush.c b/gnulib-tests/fflush.c +index 983ade0ff..a6edfa105 100644 +--- a/gnulib-tests/fflush.c ++++ b/gnulib-tests/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/lib/fpending.c +index c84e3a5b4..789f50e4e 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/gnulib-tests/fpurge.c b/gnulib-tests/fpurge.c +index b1d417c7a..3aedcc373 100644 +--- a/gnulib-tests/fpurge.c ++++ b/gnulib-tests/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/gnulib-tests/freading.c b/gnulib-tests/freading.c +index 73c28acdd..c24d0c88a 100644 +--- a/gnulib-tests/freading.c ++++ b/gnulib-tests/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/gnulib-tests/fseeko.c b/gnulib-tests/fseeko.c +index 0101ab55f..193f4e8ce 100644 +--- a/gnulib-tests/fseeko.c ++++ b/gnulib-tests/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/fwriting.c b/lib/fwriting.c +index 461ab0f1f..4a3d9c8d4 100644 +--- a/lib/fwriting.c ++++ b/lib/fwriting.c +@@ -27,7 +27,7 @@ fwriting (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e9f..05c5752a2 100644 +--- a/gnulib-tests/stdio-impl.h ++++ b/gnulib-tests/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.14.3 + diff --git a/sed-selinux.patch b/sed-selinux.patch new file mode 100644 index 0000000..2dca5ab --- /dev/null +++ b/sed-selinux.patch @@ -0,0 +1,29 @@ +diff --git a/NEWS b/NEWS +index e9335f0..e762b2d 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,4 +1,9 @@ GNU sed NEWS -*- outline -*- + GNU sed NEWS -*- outline -*- ++ ++ sed -i now creates selinux context based on the context of the symlink ++ instead of the symlink target. [Bug present since at least sed-4.2] ++ sed -i --follow-symlinks remains unchanged. ++ + + * Noteworthy changes in release 4.4 (2017-02-03) [stable] + +diff --git a/sed/execute.c b/sed/execute.c +index 1843392..453886e 100644 +--- a/sed/execute.c ++++ b/sed/execute.c +@@ -607,7 +607,7 @@ open_next_file(const char *name, struct input *input) + if (is_selinux_enabled () > 0) + { + security_context_t con; +- if (getfilecon (input->in_file_name, &con) != -1) ++ if (lgetfilecon (input->in_file_name, &con) != -1) + { + /* Save and restore the old context for the sake of w and W + commands. */ +2.9.5 + diff --git a/sed.spec b/sed.spec index ad29b17..1c0c204 100644 --- a/sed.spec +++ b/sed.spec @@ -2,29 +2,19 @@ Summary: A GNU stream text editor Name: sed -Version: 4.9 -Release: 6%{?dist} -License: GPL-3.0-or-later +Version: 4.5 +Release: 3%{?dist} +License: GPLv3+ 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-b-flag.patch -Patch1: sed-c-flag.patch -Patch2: sed-covscan-annotations.patch -BuildRequires: make +Patch0: sed-4.2.2-binary_copy_args.patch +#Patch1: sed-selinux.patch +#Build failure with glibc-2.28 +#https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html +Patch2: sed-gnulib.patch BuildRequires: glibc-devel, libselinux-devel, libacl-devel, automake, autoconf, gcc BuildRequires: perl-Getopt-Long -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 - -%ifarch %{valgrind_arches} -BuildRequires: valgrind -%endif Provides: /bin/sed @@ -39,16 +29,14 @@ that sed performs (substitutions, deletions, insertions, etc.) can be specified in a script file or from the command line. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 -b .copy +#%patch1 -p1 -b .selinux +#%patch2 -p1 -b .gnulib %build %configure --without-included-regex -%make_build - -#rhbz#2396649 -sed -i s/"SELinux is enabled on this system."// ./doc/sed.1 -sed -i s/"SELinux is disabled on this system."// ./doc/sed.1 - +make %{_smp_mflags} install -m 644 -p %{SOURCE1} sedfaq.txt gzip -9 sedfaq.txt @@ -59,7 +47,7 @@ echo ====================TESTING END===================== %install rm -rf ${RPM_BUILD_ROOT} -%make_install +make DESTDIR=$RPM_BUILD_ROOT install rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir %find_lang %{name} @@ -73,85 +61,6 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir %{_mandir}/man1/sed.1* %changelog -* Fri Oct 24 2025 Jakub Martisko - 4.9-6 -- The manpage should no longer mention whether the SELinux is enabled/disabled on the system -- It was based on the build system anyway -- Resolves: rhbz#2396649 - -* Fri Jul 25 2025 Fedora Release Engineering - 4.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 4.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 4.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Apr 22 2024 David Abdurachmanov - 4.9-2 -- Properly check valgrind arches (riscv64 is not ported) - -* 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 - -* Sat Jan 27 2024 Fedora Release Engineering - 4.8-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* 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 diff --git a/sources b/sources index efafbe0..6a0d35d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sed-4.9.tar.xz) = 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc +SHA512 (sed-4.5.tar.xz) = f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196