From 2cd92dbf184e64add57ed04aee176c2a68253899 Mon Sep 17 00:00:00 2001 From: zopencommunity Date: Tue, 21 Apr 2026 15:28:15 +0000 Subject: [PATCH 1/3] Update git-version to 2.54.0 from 2.53.0 --- buildenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv b/buildenv index 4040e79..e1eb9c2 100644 --- a/buildenv +++ b/buildenv @@ -3,7 +3,7 @@ export ZOPEN_BUILD_LINE="STABLE" export ZOPEN_CATEGORIES="development source_control" # bump: git-version /GIT_VERSION="(.*)"/ https://github.com/git/git.git|* -GIT_VERSION="2.53.0" +GIT_VERSION="2.54.0" export ZOPEN_DEV_URL="https://github.com/git/git.git" export ZOPEN_DEV_DEPS="curl git make m4 perl autoconf automake help2man texinfo xz zlib openssl expat gettext coreutils diffutils bash tar check_python gawk zusage libpsl libssh2" From 4e68ad04322370b8f70ba2af671f2fef18d2e3dc Mon Sep 17 00:00:00 2001 From: D Harithamma Date: Tue, 5 May 2026 04:09:36 -0400 Subject: [PATCH 2/3] bump patch fix --- stable-patches/generate-perl.sh.patch | 8 ++++---- stable-patches/lockfile.c.patch | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stable-patches/generate-perl.sh.patch b/stable-patches/generate-perl.sh.patch index a21b939..c4f9e52 100644 --- a/stable-patches/generate-perl.sh.patch +++ b/stable-patches/generate-perl.sh.patch @@ -1,7 +1,7 @@ -diff --git a/generate-perl.sh b/generate-perl.sh -index 65f122ebfc..154ae533f8 100755 ---- a/generate-perl.sh -+++ b/generate-perl.sh +diff --git a/tools/generate-perl.sh b/tools/generate-perl.sh +index 796d835932..4441891559 100755 +--- a/tools/generate-perl.sh ++++ b/tools/generate-perl.sh @@ -19,7 +19,7 @@ OUTPUT="$5" sed -e '1{' \ diff --git a/stable-patches/lockfile.c.patch b/stable-patches/lockfile.c.patch index 9fa7d3e..566dce5 100644 --- a/stable-patches/lockfile.c.patch +++ b/stable-patches/lockfile.c.patch @@ -1,15 +1,15 @@ diff --git a/lockfile.c b/lockfile.c -index 67082a9..0944d14 100644 +index 7add2f136a..f9ffba3d80 100644 --- a/lockfile.c +++ b/lockfile.c -@@ -83,6 +83,10 @@ static int lock_file(struct lock_file *lk, const char *path, int flags, +@@ -178,7 +178,10 @@ static int lock_file(struct lock_file *lk, const char *path, int flags, - strbuf_addstr(&filename, LOCK_SUFFIX); - lk->tempfile = create_tempfile_mode(filename.buf, mode); -+#ifdef __MVS__ -+ if (lk->tempfile) + lk->tempfile = create_tempfile_mode(lock_path.buf, mode); + if (lk->tempfile) ++ { + __chgfdccsid(lk->tempfile->fd, 819); -+#endif - strbuf_release(&filename); - return lk->tempfile ? lk->tempfile->fd : -1; - } + lk->pid_tempfile = create_lock_pid_file(pid_path.buf, mode); ++ } + + strbuf_release(&base_path); + strbuf_release(&lock_path); From e11985807167f756c813afcb0e0b52cbd697a26b Mon Sep 17 00:00:00 2001 From: D Harithamma Date: Wed, 6 May 2026 00:52:15 -0400 Subject: [PATCH 3/3] Tagged the pid tempfile --- stable-patches/lockfile.c.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stable-patches/lockfile.c.patch b/stable-patches/lockfile.c.patch index 566dce5..6926a15 100644 --- a/stable-patches/lockfile.c.patch +++ b/stable-patches/lockfile.c.patch @@ -1,14 +1,18 @@ diff --git a/lockfile.c b/lockfile.c -index 7add2f136a..f9ffba3d80 100644 +index 7add2f1..e5aef33 100644 --- a/lockfile.c +++ b/lockfile.c -@@ -178,7 +178,10 @@ static int lock_file(struct lock_file *lk, const char *path, int flags, +@@ -178,7 +178,14 @@ static int lock_file(struct lock_file *lk, const char *path, int flags, lk->tempfile = create_tempfile_mode(lock_path.buf, mode); if (lk->tempfile) + { + __chgfdccsid(lk->tempfile->fd, 819); lk->pid_tempfile = create_lock_pid_file(pid_path.buf, mode); ++ if (lk->pid_tempfile) ++ { ++ __chgfdccsid(lk->pid_tempfile->fd, 819); ++ } + } strbuf_release(&base_path);