diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index 4da4937868014..f2ae032dcbc57 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -1,4 +1,2 @@ -DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd -DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b DIST patch-2.8.tar.xz 907208 BLAKE2B 687f566201adb2e32c3832b911adaddd9994aacb25b66886d6315bfe2752e09fd551b3856a39024b8472b2d95efebf412d4a7c085812a13620de811073a397ad SHA512 d689d696660a662753e8660792733c3be0a94c76abfe7a28b0f9f70300c3a42d6437d081553a59bfde6e1b0d5ee13ed89be48d0b00b6da2cadbfc14a15ada603 DIST patch-2.8.tar.xz.sig 833 BLAKE2B 6890bd25e2b4b5633b58073949f28f7c71c57667af9e4d92acc8f1736740c6433adf7078bf9ed3199158bd9734d080dba5b7eb46577d5714aa487d79fd938603 SHA512 8050bc11cd52ee930025e40550afe6c1a866a4a74fdc99332087c2d0fe8358b83d031322bf64480333fe682a7f52127fba7aceffa0cf6747e1ee3f239539f5f7 diff --git a/sys-devel/patch/files/patch-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch b/sys-devel/patch/files/patch-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch deleted file mode 100644 index 5eef875b85d47..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Mon, 15 Jul 2019 19:10:02 +0200 -Subject: Avoid invalid memory access in context format diffs - -* src/pch.c (another_hunk): Avoid invalid memory access in context format -diffs. ---- - src/pch.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pch.c b/src/pch.c -index a500ad9..cb54e03 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev) - ptrn_prefix_context = context; - ptrn_suffix_context = context; - if (repl_beginning -+ || p_end <= 0 - || (p_end - != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n'))) - { --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix1.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix1.patch deleted file mode 100644 index d2492f593175a..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix1.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 19599883ffb6a450d2884f081f8ecf68edbed7ee Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Thu, 3 May 2018 14:31:55 +0200 -Subject: Don't leak temporary file on failed ed-style patch - -Now that we write ed-style patches to a temporary file before we -apply them, we need to ensure that the temporary file is removed -before we leave, even on fatal error. - -* src/pch.c (do_ed_script): Use global TMPEDNAME instead of local - tmpname. Don't unlink the file directly, instead tag it for removal - at exit time. -* src/patch.c (cleanup): Unlink TMPEDNAME at exit. - -This closes bug #53820: -https://savannah.gnu.org/bugs/index.php?53820 - -Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)") ---- - src/common.h | 2 ++ - src/patch.c | 1 + - src/pch.c | 11 +++++------ - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/common.h b/src/common.h -index 904a3f8..53c5e32 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -94,10 +94,12 @@ XTERN char const *origsuff; - XTERN char const * TMPINNAME; - XTERN char const * TMPOUTNAME; - XTERN char const * TMPPATNAME; -+XTERN char const * TMPEDNAME; - - XTERN bool TMPINNAME_needs_removal; - XTERN bool TMPOUTNAME_needs_removal; - XTERN bool TMPPATNAME_needs_removal; -+XTERN bool TMPEDNAME_needs_removal; - - #ifdef DEBUGGING - XTERN int debug; -diff --git a/src/patch.c b/src/patch.c -index 3fcaec5..9146597 100644 ---- a/src/patch.c -+++ b/src/patch.c -@@ -2003,6 +2003,7 @@ cleanup (void) - remove_if_needed (TMPINNAME, &TMPINNAME_needs_removal); - remove_if_needed (TMPOUTNAME, &TMPOUTNAME_needs_removal); - remove_if_needed (TMPPATNAME, &TMPPATNAME_needs_removal); -+ remove_if_needed (TMPEDNAME, &TMPEDNAME_needs_removal); - remove_if_needed (TMPREJNAME, &TMPREJNAME_needs_removal); - output_files (NULL); - } -diff --git a/src/pch.c b/src/pch.c -index 79a3c99..1bb3153 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -2392,7 +2392,6 @@ do_ed_script (char const *inname, char c - file_offset beginning_of_this_line; - size_t chars_read; - FILE *tmpfp = 0; -- char const *tmpname; - int tmpfd; - pid_t pid; - -@@ -2404,12 +2403,13 @@ do_ed_script (char const *inname, char const *outname, - invalid commands and treats the next line as a new command, which - can lead to arbitrary command execution. */ - -- tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0); -+ tmpfd = make_tempfile (&TMPEDNAME, 'e', NULL, O_RDWR | O_BINARY, 0); - if (tmpfd == -1) -- pfatal ("Can't create temporary file %s", quotearg (tmpname)); -+ pfatal ("Can't create temporary file %s", quotearg (TMPEDNAME)); -+ TMPEDNAME_needs_removal = true; - tmpfp = fdopen (tmpfd, "w+b"); - if (! tmpfp) -- pfatal ("Can't open stream for file %s", quotearg (tmpname)); -+ pfatal ("Can't open stream for file %s", quotearg (TMPEDNAME)); - } - - for (;;) { -@@ -2449,7 +2449,7 @@ do_ed_script (char const *inname, char c - write_fatal (); - - if (lseek (tmpfd, 0, SEEK_SET) == -1) -- pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname)); -+ pfatal ("Can't rewind to the beginning of file %s", quotearg (TMPEDNAME)); - - if (! dry_run && ! skip_rest_of_patch) { - int exclusive = *outname_needs_removal ? 0 : O_EXCL; -@@ -2482,7 +2482,6 @@ do_ed_script (char const *inname, char c - } - - fclose (tmpfp); -- safe_unlink (tmpname); - - if (ofp) - { --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix2.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix2.patch deleted file mode 100644 index 7b74ff06c4bde..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 369dcccdfa6336e5a873d6d63705cfbe04c55727 Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Mon, 7 May 2018 15:14:45 +0200 -Subject: Don't leak temporary file on failed multi-file ed-style patch - -The previous fix worked fine with single-file ed-style patches, but -would still leak temporary files in the case of multi-file ed-style -patch. Fix that case as well, and extend the test case to check for -it. - -* src/patch.c (main): Unlink TMPEDNAME if needed before moving to - the next file in a patch. - -This closes bug #53820: -https://savannah.gnu.org/bugs/index.php?53820 - -Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)") -Fixes: 19599883ffb6 ("Don't leak temporary file on failed ed-style patch") ---- - src/patch.c | 1 + - 2 files changed, 32 insertions(+) - -diff --git a/src/patch.c b/src/patch.c -index 9146597..81c7a02 100644 ---- a/src/patch.c -+++ b/src/patch.c -@@ -236,6 +236,7 @@ main (int argc, char **argv) - } - remove_if_needed (TMPOUTNAME, &TMPOUTNAME_needs_removal); - } -+ remove_if_needed (TMPEDNAME, &TMPEDNAME_needs_removal); - - if (! skip_rest_of_patch && ! file_type) - { --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156.patch deleted file mode 100644 index c0324d082fcdf..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Fri, 6 Apr 2018 12:14:49 +0200 -Subject: Fix arbitrary command execution in ed-style patches - (CVE-2018-1000156) - -* src/pch.c (do_ed_script): Write ed script to a temporary file instead -of piping it to ed: this will cause ed to abort on invalid commands -instead of rejecting them and carrying on. -* tests/ed-style: New test case. -* tests/Makefile.am (TESTS): Add test case. - - -Without test to avoid automake due to @system package. ---- - -diff --git a/src/pch.c b/src/pch.c -index 0c5cc26..4fd5a05 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -33,6 +33,7 @@ - # include - #endif - #include -+#include - - #define INITHUNKMAX 125 /* initial dynamic allocation size */ - -@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname, - static char const editor_program[] = EDITOR_PROGRAM; - - file_offset beginning_of_this_line; -- FILE *pipefp = 0; - size_t chars_read; -+ FILE *tmpfp = 0; -+ char const *tmpname; -+ int tmpfd; -+ pid_t pid; -+ -+ if (! dry_run && ! skip_rest_of_patch) -+ { -+ /* Write ed script to a temporary file. This causes ed to abort on -+ invalid commands such as when line numbers or ranges exceed the -+ number of available lines. When ed reads from a pipe, it rejects -+ invalid commands and treats the next line as a new command, which -+ can lead to arbitrary command execution. */ -+ -+ tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0); -+ if (tmpfd == -1) -+ pfatal ("Can't create temporary file %s", quotearg (tmpname)); -+ tmpfp = fdopen (tmpfd, "w+b"); -+ if (! tmpfp) -+ pfatal ("Can't open stream for file %s", quotearg (tmpname)); -+ } - -- if (! dry_run && ! skip_rest_of_patch) { -- int exclusive = *outname_needs_removal ? 0 : O_EXCL; -- if (inerrno != ENOENT) -- { -- *outname_needs_removal = true; -- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); -- } -- sprintf (buf, "%s %s%s", editor_program, -- verbosity == VERBOSE ? "" : "- ", -- outname); -- fflush (stdout); -- pipefp = popen(buf, binary_transput ? "wb" : "w"); -- if (!pipefp) -- pfatal ("Can't open pipe to %s", quotearg (buf)); -- } - for (;;) { - char ed_command_letter; - beginning_of_this_line = file_tell (pfp); -@@ -2417,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname, - } - ed_command_letter = get_ed_command_letter (buf); - if (ed_command_letter) { -- if (pipefp) -- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) -+ if (tmpfp) -+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) - write_fatal (); - if (ed_command_letter != 'd' && ed_command_letter != 's') { - p_pass_comments_through = true; - while ((chars_read = get_line ()) != 0) { -- if (pipefp) -- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) -+ if (tmpfp) -+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) - write_fatal (); - if (chars_read == 2 && strEQ (buf, ".\n")) - break; -@@ -2437,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname, - break; - } - } -- if (!pipefp) -+ if (!tmpfp) - return; -- if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0 -- || fflush (pipefp) != 0) -+ if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0 -+ || fflush (tmpfp) != 0) - write_fatal (); -- if (pclose (pipefp) != 0) -- fatal ("%s FAILED", editor_program); -+ -+ if (lseek (tmpfd, 0, SEEK_SET) == -1) -+ pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname)); -+ -+ if (! dry_run && ! skip_rest_of_patch) { -+ int exclusive = *outname_needs_removal ? 0 : O_EXCL; -+ *outname_needs_removal = true; -+ if (inerrno != ENOENT) -+ { -+ *outname_needs_removal = true; -+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); -+ } -+ sprintf (buf, "%s %s%s", editor_program, -+ verbosity == VERBOSE ? "" : "- ", -+ outname); -+ fflush (stdout); -+ -+ pid = fork(); -+ if (pid == -1) -+ pfatal ("Can't fork"); -+ else if (pid == 0) -+ { -+ dup2 (tmpfd, 0); -+ execl ("/bin/sh", "sh", "-c", buf, (char *) 0); -+ _exit (2); -+ } -+ else -+ { -+ int wstatus; -+ if (waitpid (pid, &wstatus, 0) == -1 -+ || ! WIFEXITED (wstatus) -+ || WEXITSTATUS (wstatus) != 0) -+ fatal ("%s FAILED", editor_program); -+ } -+ } -+ -+ fclose (tmpfp); -+ safe_unlink (tmpname); - - if (ofp) - { --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-6951.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-6951.patch deleted file mode 100644 index 002d8ffd9d3a3..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2018-6951.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Mon, 12 Feb 2018 16:48:24 +0100 -Subject: Fix segfault with mangled rename patch - -http://savannah.gnu.org/bugs/?53132 -* src/pch.c (intuit_diff_type): Ensure that two filenames are specified -for renames and copies (fix the existing check). ---- - src/pch.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/pch.c b/src/pch.c -index ff9ed2c..bc6278c 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) - if ((pch_rename () || pch_copy ()) - && ! inname - && ! ((i == OLD || i == NEW) && -- p_name[! reverse] && -+ p_name[reverse] && p_name[! reverse] && -+ name_is_valid (p_name[reverse]) && - name_is_valid (p_name[! reverse]))) - { - say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy"); --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch deleted file mode 100644 index d9ad374a2ae7e..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Fri, 17 Aug 2018 13:35:40 +0200 -Subject: Fix swapping fake lines in pch_swap - -* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a -blank line in the middle of a context-diff hunk: that empty line stays -in the middle of the hunk and isn't swapped. - -Fixes: https://savannah.gnu.org/bugs/index.php?53133 ---- - src/pch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pch.c b/src/pch.c -index e92bc64..a500ad9 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -2122,7 +2122,7 @@ pch_swap (void) - } - if (p_efake >= 0) { /* fix non-freeable ptr range */ - if (p_efake <= i) -- n = p_end - i + 1; -+ n = p_end - p_ptrn_lines; - else - n = -i; - p_efake += n; --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2019-13636.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2019-13636.patch deleted file mode 100644 index 3515399f073de..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2019-13636.patch +++ /dev/null @@ -1,108 +0,0 @@ -From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Mon, 15 Jul 2019 16:21:48 +0200 -Subject: Don't follow symlinks unless --follow-symlinks is given - -* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file, -append_to_file): Unless the --follow-symlinks option is given, open files with -the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing -that consistently for input files. -* src/util.c (create_backup): When creating empty backup files, (re)create them -with O_CREAT | O_EXCL to avoid following symlinks in that case as well. ---- - src/inp.c | 12 ++++++++++-- - src/util.c | 14 +++++++++++--- - 2 files changed, 21 insertions(+), 5 deletions(-) - -diff --git a/src/inp.c b/src/inp.c -index 32d0919..22d7473 100644 ---- a/src/inp.c -+++ b/src/inp.c -@@ -238,8 +238,13 @@ plan_a (char const *filename) - { - if (S_ISREG (instat.st_mode)) - { -- int ifd = safe_open (filename, O_RDONLY|binary_transput, 0); -+ int flags = O_RDONLY | binary_transput; - size_t buffered = 0, n; -+ int ifd; -+ -+ if (! follow_symlinks) -+ flags |= O_NOFOLLOW; -+ ifd = safe_open (filename, flags, 0); - if (ifd < 0) - pfatal ("can't open file %s", quotearg (filename)); - -@@ -340,6 +345,7 @@ plan_a (char const *filename) - static void - plan_b (char const *filename) - { -+ int flags = O_RDONLY | binary_transput; - int ifd; - FILE *ifp; - int c; -@@ -353,7 +359,9 @@ plan_b (char const *filename) - - if (instat.st_size == 0) - filename = NULL_DEVICE; -- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0 -+ if (! follow_symlinks) -+ flags |= O_NOFOLLOW; -+ if ((ifd = safe_open (filename, flags, 0)) < 0 - || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r"))) - pfatal ("Can't open file %s", quotearg (filename)); - if (TMPINNAME_needs_removal) -diff --git a/src/util.c b/src/util.c -index 1cc08ba..fb38307 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -393,7 +393,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original) - - try_makedirs_errno = ENOENT; - safe_unlink (bakname); -- while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0) -+ while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0) - { - if (errno != try_makedirs_errno) - pfatal ("Can't create file %s", quotearg (bakname)); -@@ -584,10 +584,13 @@ create_file (char const *file, int open_flags, mode_t mode, - static void - copy_to_fd (const char *from, int tofd) - { -+ int from_flags = O_RDONLY | O_BINARY; - int fromfd; - ssize_t i; - -- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0) -+ if (! follow_symlinks) -+ from_flags |= O_NOFOLLOW; -+ if ((fromfd = safe_open (from, from_flags, 0)) < 0) - pfatal ("Can't reopen file %s", quotearg (from)); - while ((i = read (fromfd, buf, bufsize)) != 0) - { -@@ -630,6 +633,8 @@ copy_file (char const *from, char const *to, struct stat *tost, - else - { - assert (S_ISREG (mode)); -+ if (! follow_symlinks) -+ to_flags |= O_NOFOLLOW; - tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode, - to_dir_known_to_exist); - copy_to_fd (from, tofd); -@@ -645,9 +650,12 @@ copy_file (char const *from, char const *to, struct stat *tost, - void - append_to_file (char const *from, char const *to) - { -+ int to_flags = O_WRONLY | O_APPEND | O_BINARY; - int tofd; - -- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0) -+ if (! follow_symlinks) -+ to_flags |= O_NOFOLLOW; -+ if ((tofd = safe_open (to, to_flags, 0)) < 0) - pfatal ("Can't reopen file %s", quotearg (to)); - copy_to_fd (from, tofd); - if (close (tofd) != 0) --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2019-13638.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2019-13638.patch deleted file mode 100644 index 38caff628aafa..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-CVE-2019-13638.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Fri, 6 Apr 2018 19:36:15 +0200 -Subject: Invoke ed directly instead of using the shell - -* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell -command to avoid quoting vulnerabilities. ---- - src/pch.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/pch.c b/src/pch.c -index 4fd5a05..16e001a 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname, - *outname_needs_removal = true; - copy_file (inname, outname, 0, exclusive, instat.st_mode, true); - } -- sprintf (buf, "%s %s%s", editor_program, -- verbosity == VERBOSE ? "" : "- ", -- outname); - fflush (stdout); - - pid = fork(); -@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname, - else if (pid == 0) - { - dup2 (tmpfd, 0); -- execl ("/bin/sh", "sh", "-c", buf, (char *) 0); -+ assert (outname[0] != '!' && outname[0] != '-'); -+ execlp (editor_program, editor_program, "-", outname, (char *) NULL); - _exit (2); - } - else --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch b/sys-devel/patch/files/patch-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch deleted file mode 100644 index 961e578613820..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 61d7788b83b302207a67b82786f4fd79e3538f30 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher -Date: Thu, 27 Jun 2019 11:10:43 +0200 -Subject: Don't crash when RLIMIT_NOFILE is set to RLIM_INFINITY - -* src/safe.c (min_cached_fds): Define minimum number of cached dir file -descriptors. -(max_cached_fds): Change type to rlim_t to allow storing RLIM_INFINITY. -(init_dirfd_cache): Set max_cached_fds to RLIM_INFINITY when RLIMIT_NOFILE is -RLIM_INFINITY. Set the initial hash table size to min_cached_fds, independent -of RLIMIT_NOFILE: patches commonly only affect one or a few files, so a small -hash table will usually suffice; if needed, the hash table will grow. -(insert_cached_dirfd): Don't shrink the cache when max_cached_fds is -RLIM_INFINITY. ---- - src/safe.c | 36 +++++++++++++++++++++++------------- - 1 file changed, 23 insertions(+), 13 deletions(-) - -diff --git a/src/safe.c b/src/safe.c -index 5a7202f..f147b0e 100644 ---- a/src/safe.c -+++ b/src/safe.c -@@ -67,7 +67,8 @@ struct cached_dirfd { - }; - - static Hash_table *cached_dirfds = NULL; --static size_t max_cached_fds; -+static rlim_t min_cached_fds = 8; -+static rlim_t max_cached_fds; - LIST_HEAD (lru_list); - - static size_t hash_cached_dirfd (const void *entry, size_t table_size) -@@ -98,11 +99,17 @@ static void init_dirfd_cache (void) - { - struct rlimit nofile; - -- max_cached_fds = 8; - if (getrlimit (RLIMIT_NOFILE, &nofile) == 0) -- max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds); -+ { -+ if (nofile.rlim_cur == RLIM_INFINITY) -+ max_cached_fds = RLIM_INFINITY; -+ else -+ max_cached_fds = MAX (nofile.rlim_cur / 4, min_cached_fds); -+ } -+ else -+ max_cached_fds = min_cached_fds; - -- cached_dirfds = hash_initialize (max_cached_fds, -+ cached_dirfds = hash_initialize (min_cached_fds, - NULL, - hash_cached_dirfd, - compare_cached_dirfds, -@@ -148,20 +155,23 @@ static void insert_cached_dirfd (struct cached_dirfd *entry, int keepfd) - if (cached_dirfds == NULL) - init_dirfd_cache (); - -- /* Trim off the least recently used entries */ -- while (hash_get_n_entries (cached_dirfds) >= max_cached_fds) -+ if (max_cached_fds != RLIM_INFINITY) - { -- struct cached_dirfd *last = -- list_entry (lru_list.prev, struct cached_dirfd, lru_link); -- if (&last->lru_link == &lru_list) -- break; -- if (last->fd == keepfd) -+ /* Trim off the least recently used entries */ -+ while (hash_get_n_entries (cached_dirfds) >= max_cached_fds) - { -- last = list_entry (last->lru_link.prev, struct cached_dirfd, lru_link); -+ struct cached_dirfd *last = -+ list_entry (lru_list.prev, struct cached_dirfd, lru_link); - if (&last->lru_link == &lru_list) - break; -+ if (last->fd == keepfd) -+ { -+ last = list_entry (last->lru_link.prev, struct cached_dirfd, lru_link); -+ if (&last->lru_link == &lru_list) -+ break; -+ } -+ remove_cached_dirfd (last); - } -- remove_cached_dirfd (last); - } - - /* Only insert if the parent still exists. */ --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/patch/files/patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch b/sys-devel/patch/files/patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch deleted file mode 100644 index 2d2863c0ccf68..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch +++ /dev/null @@ -1,25 +0,0 @@ -b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 - -Allow input files to be missing for ed-style patches -* src/pch.c (do_ed_script): Allow input files to be missing so that new -files will be created as with non-ed-style patches. - -diff --git a/src/pch.c b/src/pch.c -index bc6278c..0c5cc26 100644 ---- a/src/pch.c -+++ b/src/pch.c -@@ -2394,9 +2394,11 @@ do_ed_script (char const *inname, char const *outname, - - if (! dry_run && ! skip_rest_of_patch) { - int exclusive = *outname_needs_removal ? 0 : O_EXCL; -- assert (! inerrno); -- *outname_needs_removal = true; -- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); -+ if (inerrno != ENOENT) -+ { -+ *outname_needs_removal = true; -+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true); -+ } - sprintf (buf, "%s %s%s", editor_program, - verbosity == VERBOSE ? "" : "- ", - outname); diff --git a/sys-devel/patch/files/patch-2.7.6-configure-mkdir-spruced-up.patch b/sys-devel/patch/files/patch-2.7.6-configure-mkdir-spruced-up.patch deleted file mode 100644 index 8ef7a954a4d9d..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-configure-mkdir-spruced-up.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/898598 -https://github.com/coreutils/gnulib/commit/3c136a2cc38d71083f123231a8b9ad4b01930789 ---- a/configure -+++ b/configure -@@ -17084,6 +17084,8 @@ else - #include - #include - #include -+/* Android 4.3 declares fchownat() in instead. */ -+#include - #include - int - main () -@@ -17130,6 +17132,8 @@ else - /* end confdefs.h. */ - #include - #include -+ /* Android 4.3 declares fchownat() in instead. */ -+ #include - - int - main () ---- a/lib/unistd.in.h -+++ b/lib/unistd.in.h -@@ -113,6 +113,13 @@ - # include - #endif - -+/* Android 4.3 declares fchownat in , not in . */ -+/* But avoid namespace pollution on glibc systems. */ -+#if (@GNULIB_FCHOWNAT@ || defined GNULIB_POSIXCHECK) && defined __ANDROID__ \ -+ && !defined __GLIBC__ -+# include -+#endif -+ - /* MSVC defines off_t in . - May also define off_t to a 64-bit type on native Windows. */ - #if !@HAVE_UNISTD_H@ || @WINDOWS_64_BIT_OFF_T@ diff --git a/sys-devel/patch/files/patch-2.7.6-configure-mkdir.patch b/sys-devel/patch/files/patch-2.7.6-configure-mkdir.patch deleted file mode 100644 index b29d7b0875386..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-configure-mkdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/898598 -https://github.com/coreutils/gnulib/commit/3c136a2cc38d71083f123231a8b9ad4b01930789 - -diff '--color=auto' -ruN patch-2.7.6.orig/configure patch-2.7.6/configure ---- patch-2.7.6.orig/configure 2018-02-03 14:41:50.000000000 +0100 -+++ patch-2.7.6/configure 2024-11-19 23:19:08.710565121 +0100 -@@ -17130,6 +17130,7 @@ - /* end confdefs.h. */ - #include - #include -+ #include - - int - main () diff --git a/sys-devel/patch/files/patch-2.7.6-fix-error-handling-with-git-style-patches.patch b/sys-devel/patch/files/patch-2.7.6-fix-error-handling-with-git-style-patches.patch deleted file mode 100644 index a4f127dd7ce49..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-fix-error-handling-with-git-style-patches.patch +++ /dev/null @@ -1,125 +0,0 @@ -Backport for Gentoo patch-2.7.x. - -https://bugs.gentoo.org/664640 - - -Original patch: -Author: Lubomir Rintel -Date: Tue Feb 27 16:52:00 2018 +0100 -Subject: Fix error handling with git-style patches - -When an error is encountered in output_files(), the subsequent call to -cleanup() calls back into output_files() resulting in an infinte recursion. -This is trivially reproduced with a git-style patch (which utilizes -output_file_later()) that tries to patch a nonexistent or unreadable -file (see attached test case). - -* src/patch.c: (output_files) clear the files_to_output list before -iterating it, so that recursive calls won't iterate the same files. -* tests/git-error: New test case. -* tests/Makefile.am (TESTS): Add test case. - -Origin: https://lists.gnu.org/archive/html/bug-patch/2018-02/msg00010.html - ---- a/src/patch.c -+++ b/src/patch.c -@@ -1938,8 +1938,12 @@ output_files (struct stat const *st) - { - gl_list_iterator_t iter; - const void *elt; -+ gl_list_t files; - -- iter = gl_list_iterator (files_to_output); -+ files = files_to_output; -+ init_files_to_output (); -+ -+ iter = gl_list_iterator (files); - while (gl_list_iterator_next (&iter, &elt, NULL)) - { - const struct file_to_output *file_to_output = elt; -@@ -1957,8 +1961,8 @@ output_files (struct stat const *st) - /* Free the list up to here. */ - for (;;) - { -- const void *elt2 = gl_list_get_at (files_to_output, 0); -- gl_list_remove_at (files_to_output, 0); -+ const void *elt2 = gl_list_get_at (files, 0); -+ gl_list_remove_at (files, 0); - if (elt == elt2) - break; - } -@@ -1967,7 +1971,7 @@ output_files (struct stat const *st) - } - } - gl_list_iterator_free (&iter); -- gl_list_clear (files_to_output); -+ gl_list_free (files); - } - - /* Fatal exit with cleanup. */ ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -40,6 +40,7 @@ TESTS = \ - filename-choice \ - git-binary-diff \ - git-cleanup \ -+ git-error \ - garbage \ - global-reject-files \ - inname \ ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -1316,6 +1316,7 @@ TESTS = \ - filename-choice \ - git-binary-diff \ - git-cleanup \ -+ git-error \ - garbage \ - global-reject-files \ - inname \ -@@ -1695,6 +1696,13 @@ git-cleanup.log: git-cleanup - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) -+git-error.log: git-error -+ @p='git-error'; \ -+ b='git-error'; \ -+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ -+ --log-file $$b.log --trs-file $$b.trs \ -+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ -+ "$$tst" $(AM_TESTS_FD_REDIRECT) - garbage.log: garbage - @p='garbage'; \ - b='garbage'; \ ---- /dev/null -+++ b/tests/git-error -@@ -0,0 +1,29 @@ -+# Copyright (C) 2018 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+. $srcdir/test-lib.sh -+ -+require cat -+use_local_patch -+use_tmpdir -+ -+cat > f.diff < a ---- a/tests/git-cleanup -+++ b/tests/git-cleanup -@@ -36,8 +36,8 @@ BAD PATCH - EOF - - echo 1 > f --echo -n '' > g --echo -n '' > h -+printf '' > g -+printf '' > h - - check 'patch -f -i 1.diff || echo status: $?' < a.sed -- echo "$body" | sed -f a.sed > b -+ done > b.sed -+ echo "$body" | sed -f b.sed > b - shift - while test $# -gt 0 ; do - echo "$1" - shift -- done > b.sed -- echo "$body" | sed -f b.sed > c -- rm -f a.sed b.sed -+ done > c.sed -+ echo "$body" | sed -f c.sed > c -+ rm -f b.sed c.sed - output=`diff -u a b | patch $ARGS -f c` - status=$? - echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d' - cat c -- test $status == 0 || echo "Status: $status" -+ test $status = 0 || echo "Status: $status" - } - - x() { -- ARGS="$ARGS --merge" x2 "$@" -+ ARGS="--merge" x2 "$@" - echo -- ARGS="$ARGS --merge=diff3" x2 "$@" -+ ARGS="--merge=diff3" x2 "$@" - } - --unset ARGS -- - # ============================================================== - - check 'x 3' <&3 -+ printf "\n\n" >&3 - gdbserver localhost:53153 $PATCH "$@" 2>&3 - else - $PATCH "$@" -@@ -113,22 +113,15 @@ cleanup() { - exit $status - } - --if test -z "`echo -n`"; then -- if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then -- eval ' -- _start_test() { -- echo -n "[${BASH_LINENO[2]}] $* -- " -- }' -- else -- eval ' -- _start_test() { -- echo -n "* $* -- " -- }' -- fi -+if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then -+ eval ' -+ _start_test() { -+ printf "[${BASH_LINENO[2]}] %s -- " "$*" -+ }' - else - eval ' - _start_test() { -- echo "* $*" -+ printf "* %s -- " "$*" - }' - fi - ---- a/tests/merge -+++ b/tests/merge -@@ -32,7 +32,7 @@ x2() { - shift - done > b.sed - echo "$body" | sed -f b.sed > b -- shift -+ test $# -eq 0 || shift - while test $# -gt 0 ; do - echo "$1" - shift - ---- a/tests/test-lib.sh -+++ b/tests/test-lib.sh -@@ -113,7 +113,7 @@ cleanup() { - exit $status - } - --if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then -+if ( eval 'test -n "${BASH_LINENO[0]}"' 2>/dev/null ); then - eval ' - _start_test() { - printf "[${BASH_LINENO[2]}] %s -- " "$*" - diff --git a/sys-devel/patch/files/patch-2.7.6-ndebug-assert-hash-table.patch b/sys-devel/patch/files/patch-2.7.6-ndebug-assert-hash-table.patch deleted file mode 100644 index 3993fdc9ce186..0000000000000 --- a/sys-devel/patch/files/patch-2.7.6-ndebug-assert-hash-table.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://git.savannah.gnu.org/cgit/patch.git/commit/?id=86ac7e2d7b19e2fd9aab58a8cbeeebd5c6343e5c -https://lists.gnu.org/archive/html/bug-patch/2025-02/msg00002.html - -From 01ae7ce6a7f270937face6aec75db28d30d83059 Mon Sep 17 00:00:00 2001 -Message-ID: <01ae7ce6a7f270937face6aec75db28d30d83059.1738773172.git.sam@gentoo.org> -From: Sam James -Date: Wed, 5 Feb 2025 16:16:06 +0000 -Subject: [PATCH] Fix dodgy assert with side-effects in insert_cached_dirfd -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Michał Górny reported that patch was running out of -FDs and that the `deep-directories` test was failing. This turns out -to be because `hash_insert` isn't called at all with `-DNDEBUG` because -`insert_cached_dirfd` only calls it in one case inside of an `assert`. - -See https://github.com/conda-forge/patch-feedstock/issues/11. - -This regressed in 025a54b789bd88ed15430f8633514e296826983e. - -* src/safe.c (insert_cached_dirfd): Don't use 'assert' for 'hash_insert' - call with side-effects. ---- a/src/safe.c -+++ b/src/safe.c -@@ -183,7 +183,8 @@ static void insert_cached_dirfd (struct cached_dirfd *entry, int keepfd) - - /* Only insert if the parent still exists. */ - if (! list_empty (&entry->children_link)) -- assert (hash_insert (cached_dirfds, entry) == entry); -+ if (hash_insert (cached_dirfds, entry) != entry) -+ xalloc_die (); - } - - static void invalidate_cached_dirfd (int dirfd, const char *name) - -base-commit: 1da6bf84db2ed0be88ccb47139256e48243a75f0 --- -2.48.1 - diff --git a/sys-devel/patch/patch-2.7.6-r6.ebuild b/sys-devel/patch/patch-2.7.6-r6.ebuild deleted file mode 100644 index 917d8776aceed..0000000000000 --- a/sys-devel/patch/patch-2.7.6-r6.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc -inherit flag-o-matic verify-sig - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/patch.git" - inherit git-r3 -else - SRC_URI="mirror://gnu/patch/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" - - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="static test xattr" -RESTRICT="!test? ( test )" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( sys-apps/ed ) - verify-sig? ( sec-keys/openpgp-keys-patch ) -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-test-suite.patch - "${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch - "${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch - "${FILESDIR}"/${PN}-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix1.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix2.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2019-13636.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2019-13638.patch - "${FILESDIR}"/${PN}-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch - "${FILESDIR}"/${PN}-2.7.6-configure-mkdir.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - - cd "${S}" || die - ./bootstrap || die - elif use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} - fi - - default -} - -src_configure() { - use static && append-ldflags -static - - local myeconfargs=( - $(use_enable xattr) - # rename to gpatch for better BSD compatibility - --program-prefix=g - ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf "${myeconfargs[@]}" -} - -src_test() { - emake check gl_public_submodule_commit= -} - -src_install() { - default - - # symlink to the standard name - dosym gpatch /usr/bin/patch - dosym gpatch.1 /usr/share/man/man1/patch.1 -} diff --git a/sys-devel/patch/patch-2.7.6-r8.ebuild b/sys-devel/patch/patch-2.7.6-r8.ebuild deleted file mode 100644 index 8b96ed080c9a1..0000000000000 --- a/sys-devel/patch/patch-2.7.6-r8.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc -inherit flag-o-matic verify-sig - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/patch.git" - inherit git-r3 -else - SRC_URI="mirror://gnu/patch/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" - - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="static test xattr" -RESTRICT="!test? ( test )" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( sys-apps/ed ) - verify-sig? ( sec-keys/openpgp-keys-patch ) -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-test-suite.patch - "${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch - "${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch - "${FILESDIR}"/${PN}-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix1.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix2.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2019-13636.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2019-13638.patch - "${FILESDIR}"/${PN}-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch - "${FILESDIR}"/${PN}-2.7.6-configure-mkdir-spruced-up.patch - "${FILESDIR}"/${PN}-2.7.6-ndebug-assert-hash-table.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - - cd "${S}" || die - ./bootstrap || die - elif use verify-sig ; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} - fi - - default -} - -src_configure() { - use static && append-ldflags -static - - local myeconfargs=( - $(use_enable xattr) - # rename to gpatch for better BSD compatibility - --program-prefix=g - ) - # Do not let $ED or $PATH (split-usr) mess up the search for `ed`: - # bug 470210 / bug 957593 - ac_cv_path_ED="${EPREFIX}/bin/ed" \ - econf "${myeconfargs[@]}" -} - -src_test() { - emake check gl_public_submodule_commit= -} - -src_install() { - default - - # symlink to the standard name - dosym gpatch /usr/bin/patch - dosym gpatch.1 /usr/share/man/man1/patch.1 -}