Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildenv
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions stable-patches/generate-perl.sh.patch
Original file line number Diff line number Diff line change
@@ -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{' \
Expand Down
24 changes: 14 additions & 10 deletions stable-patches/lockfile.c.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
diff --git a/lockfile.c b/lockfile.c
index 67082a9..0944d14 100644
index 7add2f1..e5aef33 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,14 @@ 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);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we need to tag the pid tempfile as well?

+ if (lk->pid_tempfile)
+ {
+ __chgfdccsid(lk->pid_tempfile->fd, 819);
+ }
+ }

strbuf_release(&base_path);
strbuf_release(&lock_path);
Loading