From 99e3879156ab24858f296069227d3daff5a0c4c4 Mon Sep 17 00:00:00 2001 From: Jakub Martisko Date: Wed, 12 Feb 2020 12:37:56 +0100 Subject: [PATCH] Rebase to sed 4.8 Refresht the downstream options patch --- .gitignore | 1 + sed-4.2.2-binary_copy_args.patch | 281 ------------------------------- sed-b-flag.patch | 29 ++++ sed-c-flag.patch | 247 +++++++++++++++++++++++++++ sed.spec | 17 +- sources | 2 +- 6 files changed, 289 insertions(+), 288 deletions(-) delete mode 100644 sed-4.2.2-binary_copy_args.patch create mode 100644 sed-b-flag.patch create mode 100644 sed-c-flag.patch diff --git a/.gitignore b/.gitignore index 596d3ec..bb24a27 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/sed-4.2.2-binary_copy_args.patch b/sed-4.2.2-binary_copy_args.patch deleted file mode 100644 index 1c88342..0000000 --- a/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/sed-b-flag.patch b/sed-b-flag.patch new file mode 100644 index 0000000..809ad9e --- /dev/null +++ b/sed-b-flag.patch @@ -0,0 +1,29 @@ +From 613057152c4f6caba22a15ed2ff0aeb9c4ce6a83 Mon Sep 17 00:00:00 2001 +From: Jakub Martisko +Date: Wed, 5 Feb 2020 15:50:15 +0100 +Subject: [PATCH] enable the -b option on all platforms + +--- + sed/sed.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sed/sed.c b/sed/sed.c +index f75e4b6..1ca5839 100644 +--- a/sed/sed.c ++++ b/sed/sed.c +@@ -174,7 +174,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.24.1 + diff --git a/sed-c-flag.patch b/sed-c-flag.patch new file mode 100644 index 0000000..114d5c7 --- /dev/null +++ b/sed-c-flag.patch @@ -0,0 +1,247 @@ +From f336bde91e3fd9c3c2960aa548b8917eb1216678 Mon Sep 17 00:00:00 2001 +From: Jakub Martisko +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, _(" -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" \ +@@ -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 + #include + #include ++#include + + #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 buf[4096]; ++ ++ 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; ++ } ++ ++ 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, 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 (const char *from, const char *to,const char *unlink_if_fail) ++{ ++ ck_fccopy (from, to, unlink_if_fail); ++ 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 47a029e..0aba107 100644 +--- a/sed/utils.h ++++ b/sed/utils.h +@@ -40,6 +40,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, 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 *ck_realloc (void *ptr, size_t size); +-- +2.24.1 + diff --git a/sed.spec b/sed.spec index 1a30337..76cbde2 100644 --- a/sed.spec +++ b/sed.spec @@ -2,13 +2,14 @@ Summary: A GNU stream text editor Name: sed -Version: 4.5 -Release: 5%{?dist} +Version: 4.8 +Release: 1%{?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-4.2.2-binary_copy_args.patch +Patch0: sed-b-flag.patch +Patch1: sed-c-flag.patch #Patch1: sed-selinux.patch #Build failure with glibc-2.28 #https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html @@ -30,9 +31,9 @@ specified in a script file or from the command line. %prep %setup -q -%patch0 -p1 -b .copy -#%patch1 -p1 -b .selinux -#%patch2 -p1 -b .gnulib +%patch0 -p1 +%patch1 -p1 +#%patch2 -p1 %build %configure --without-included-regex @@ -61,6 +62,10 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir %{_mandir}/man1/sed.1* %changelog +* 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 diff --git a/sources b/sources index 6a0d35d..63247e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sed-4.5.tar.xz) = f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 +SHA512 (sed-4.8.tar.xz) = 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8