mirror of
https://github.com/cjdelisle/openwrt.git
synced 2025-11-06 07:34:58 +00:00
1a253a2bb5
The latest versions of gettext rely on several changes to gnulib including both changes to modules and new modules and some previously gettext specific code being moved to gnulib. Backport these changes in order to allow updating gettext while using the local gnulib copy of sources. Add patch: - 640-mem-hash-map.patch - 645-next-prime.patch - 646-hashcode-string.patch - 647-hashkey-string.patch - 650-package-version.patch - 651-package-version-simplify.patch - 652-package-version-simplify-further.patch - 653-package-version-warning.patch - 660-version-stamp.patch - 689-vc-mtime.patch - 755-clean-temp-hashkey.patch - 795-string-desc-rename-functions.patch - 796-vc-mtime-less-read.patch - 797-vc-mtime-add-api.patch - 798-vc-mtime-add-api.patch - 799-vc-mtime-old-git.patch - 900-str_startswith-module.patch - 901-str_endswith-module.patch Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
126 lines
4.7 KiB
Diff
126 lines
4.7 KiB
Diff
From 47548a77525a0f4489c9c420ccc2159079365da8 Mon Sep 17 00:00:00 2001
|
|
From: Bruno Haible <bruno@clisp.org>
|
|
Date: Fri, 2 May 2025 12:09:40 +0200
|
|
Subject: [PATCH] vc-mtime: Make it work with git versions < 2.28.
|
|
|
|
* lib/vc-mtime.c (git_version): New variable.
|
|
(is_git_present): Read the output of "git --version", and set
|
|
git_version.
|
|
(max_vc_mtime): Don't pass option --no-relative if the git version
|
|
is < 2.28.
|
|
---
|
|
ChangeLog | 9 ++++++
|
|
lib/vc-mtime.c | 82 +++++++++++++++++++++++++++++++++++++++++++++-----
|
|
2 files changed, 83 insertions(+), 8 deletions(-)
|
|
|
|
--- a/lib/vc-mtime.c
|
|
+++ b/lib/vc-mtime.c
|
|
@@ -53,7 +53,9 @@
|
|
|
|
/* ========================================================================== */
|
|
|
|
-/* Determines whether git is present. */
|
|
+static const char *git_version;
|
|
+
|
|
+/* Determines whether git is present, and sets git_version if so. */
|
|
static bool
|
|
is_git_present (void)
|
|
{
|
|
@@ -63,17 +65,67 @@ is_git_present (void)
|
|
if (!git_tested)
|
|
{
|
|
/* Test for presence of git:
|
|
- "git --version >/dev/null 2>/dev/null" */
|
|
+ "git --version 2>/dev/null" */
|
|
const char *argv[3];
|
|
- int exitstatus;
|
|
+ pid_t child;
|
|
+ int fd[1];
|
|
|
|
argv[0] = "git";
|
|
argv[1] = "--version";
|
|
argv[2] = NULL;
|
|
- exitstatus = execute ("git", "git", argv, NULL, NULL,
|
|
- false, false, true, true,
|
|
- true, false, NULL);
|
|
- git_present = (exitstatus == 0);
|
|
+ child = create_pipe_in ("git", "git", argv, NULL, NULL,
|
|
+ DEV_NULL, true, true, false, fd);
|
|
+ if (child == -1)
|
|
+ git_present = false;
|
|
+ else
|
|
+ {
|
|
+ /* Retrieve its result. */
|
|
+ FILE *fp = fdopen (fd[0], "r");
|
|
+ if (fp == NULL)
|
|
+ error (EXIT_FAILURE, errno, _("fdopen() failed"));
|
|
+
|
|
+ char *line = NULL;
|
|
+ size_t linesize = 0;
|
|
+ size_t linelen = getline (&line, &linesize, fp);
|
|
+ if (linelen == (size_t)(-1))
|
|
+ {
|
|
+ fclose (fp);
|
|
+ wait_subprocess (child, "git", true, true, true, false, NULL);
|
|
+ git_present = false;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (linelen > 0 && line[linelen - 1] == '\n')
|
|
+ line[linelen - 1] = '\0';
|
|
+
|
|
+ /* Read until EOF (otherwise the child process may get a SIGPIPE
|
|
+ signal). */
|
|
+ while (getc (fp) != EOF)
|
|
+ ;
|
|
+
|
|
+ fclose (fp);
|
|
+
|
|
+ /* Remove zombie process from process list, and retrieve exit
|
|
+ status. */
|
|
+ int exitstatus =
|
|
+ wait_subprocess (child, "git", true, true, true, false, NULL);
|
|
+ if (exitstatus != 0)
|
|
+ {
|
|
+ free (line);
|
|
+ git_present = false;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ /* The version starts at the first digit in the line. */
|
|
+ const char *p = line;
|
|
+ for (; *p != '0'; p++)
|
|
+ if (*p >= '0' && *p <= '9')
|
|
+ break;
|
|
+ git_version = p;
|
|
+ git_present = true;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
git_tested = true;
|
|
}
|
|
|
|
@@ -660,7 +712,21 @@ max_vc_mtime (struct timespec *max_of_mt
|
|
argv[i++] = "git";
|
|
argv[i++] = "diff";
|
|
argv[i++] = "--name-only";
|
|
- argv[i++] = "--no-relative";
|
|
+ /* With git versions >= 2.28, we pass option --no-relative,
|
|
+ in order to neutralize any possible customization of the
|
|
+ "diff.relative" property. With git versions < 2.28, this
|
|
+ is not needed, and the option --no-relative does not
|
|
+ exist. */
|
|
+ if (!(git_version[0] <= '1'
|
|
+ || (git_version[0] == '2' && git_version[1] == '.'
|
|
+ && ((git_version[2] >= '0' && git_version[2] <= '9'
|
|
+ && !(git_version[3] >= '0' && git_version[3] <= '9'))
|
|
+ || (((git_version[2] == '1'
|
|
+ && git_version[3] >= '0' && git_version[3] <= '9')
|
|
+ || (git_version[2] == '2'
|
|
+ && git_version[3] >= '0' && git_version[3] <= '7'))
|
|
+ && !(git_version[4] >= '0' && git_version[4] <= '9'))))))
|
|
+ argv[i++] = "--no-relative";
|
|
argv[i++] = "-z";
|
|
argv[i++] = "HEAD";
|
|
argv[i++] = "--";
|