From 9f3a373ebee2e1da1af107997a92d9fffb75f8729a50385acca0acbeddb81b4c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 12 Feb 2024 16:59:56 +0000 Subject: [PATCH] - update to 2.43.1: * https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.43.1.txt OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=634 --- completion-wordbreaks.diff | 8 ++++---- git-2.43.0.tar.sign | Bin 566 -> 0 bytes git-2.43.0.tar.xz | 3 --- git-2.43.1.tar.sign | Bin 0 -> 566 bytes git-2.43.1.tar.xz | 3 +++ git-prevent_xss-default.diff | 18 +++++++++--------- git.changes | 6 ++++++ git.spec | 2 +- ...il-if-commondir-reference-is-deleted.patch | 15 ++++++--------- 9 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 git-2.43.0.tar.sign delete mode 100644 git-2.43.0.tar.xz create mode 100644 git-2.43.1.tar.sign create mode 100644 git-2.43.1.tar.xz diff --git a/completion-wordbreaks.diff b/completion-wordbreaks.diff index ee2d130..dbc56da 100644 --- a/completion-wordbreaks.diff +++ b/completion-wordbreaks.diff @@ -2,11 +2,11 @@ contrib/completion/git-completion.bash | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -Index: git-2.40.0/contrib/completion/git-completion.bash +Index: git-2.43.1/contrib/completion/git-completion.bash =================================================================== ---- git-2.40.0.orig/contrib/completion/git-completion.bash -+++ git-2.40.0/contrib/completion/git-completion.bash -@@ -65,10 +65,12 @@ +--- git-2.43.1.orig/contrib/completion/git-completion.bash ++++ git-2.43.1/contrib/completion/git-completion.bash +@@ -67,10 +67,12 @@ # case insensitively, even on systems with case sensitive file systems # (e.g., completing tag name "FOO" on "git checkout f"). diff --git a/git-2.43.0.tar.sign b/git-2.43.0.tar.sign deleted file mode 100644 index ed4a605d3ce74d63345de18d876a30ea1efcc0ba6907ce757aa5e5aa1db9ae91..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c(E2e8;;hTXQ3UK z&BvS~9=|$(|Bo@ekWvKO0Zb*T2#OqlCTS|gXli7(wtnLC>5m7!AE?j+Jj}UtUNtb{Ry5HEV~@A%k!@C zl^R{M*Sh{epX`Mz?5KSv1p+OM6COYozDtm;po&$Ap(NSl)yk(N1{`lAgI}`&l^2`t z3Ba&jhPJ#~C7gqnNs9ojl@#smBn}O52AaG;OyIf&lTF&7B!W{{(endT Eqt_e}!2kdN diff --git a/git-2.43.0.tar.xz b/git-2.43.0.tar.xz deleted file mode 100644 index a9d1f11..0000000 --- a/git-2.43.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec -size 7382996 diff --git a/git-2.43.1.tar.sign b/git-2.43.1.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..5d168b32dc7dd9adfdaeb559c3fc15dda60cae5032497f0d1d2de1b933ff73b1 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cbFR}=q5gk17q8Jwow$6y#-kr!A(>I zJ9#Uu@mz@|zQ#zyWJd^nTs^}ViO$iTXfEFJQ~dt$Cd)lHjfxnNz8G5EU`~!OWe-^z z+cXx1GQ2dKQG@!)jMY|1NEr<0LWfnpdMJ3(uq#31dhUr0kJqt!i`Wd<_n~kVlQF3F zMr%z~QeM`OibB*41?iv>O$Z&C2U3muk`Asqs=FZsAvB%vXS=0IykP4AZoR~dxxw%J zXPF@3}?;xIj(NVA9t?5GSG_xSJ z?(*FwRDbYc7ZJr*vb~Ey!6M9kc0PY0d*RG?jhFOEnt7LVt=6zp(I62^S0UBz;s0#9 z{wvR#6w^1w__P=u$arPJ4ACv#j|#2~2WAbU!K!Tn>g!Bt?f^^K#~3y`XDNyx^=Pt- EDkf|d;s5{u literal 0 HcmV?d00001 diff --git a/git-2.43.1.tar.xz b/git-2.43.1.tar.xz new file mode 100644 index 0000000..31d1bec --- /dev/null +++ b/git-2.43.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2234f37b453ff8e4672c21ad40d41cc7393c9a8dcdfe640bec7ac5b5358f30d2 +size 7388400 diff --git a/git-prevent_xss-default.diff b/git-prevent_xss-default.diff index 7b97c0b..6e08001 100644 --- a/git-prevent_xss-default.diff +++ b/git-prevent_xss-default.diff @@ -12,11 +12,11 @@ Signed-off-by: Jakub Narebski gitweb/gitweb.perl | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) -Index: git-2.11.0/git-instaweb.sh +Index: git-2.43.1/git-instaweb.sh =================================================================== ---- git-2.11.0.orig/git-instaweb.sh -+++ git-2.11.0/git-instaweb.sh -@@ -598,6 +598,10 @@ our \$projectroot = "$(dirname "$fqgitdi +--- git-2.43.1.orig/git-instaweb.sh ++++ git-2.43.1/git-instaweb.sh +@@ -721,6 +721,10 @@ our \$projectroot = "$(dirname "$fqgitdi our \$git_temp = "$fqgitdir/gitweb/tmp"; our \$projects_list = \$projectroot; @@ -27,11 +27,11 @@ Index: git-2.11.0/git-instaweb.sh \$feature{'remote_heads'}{'default'} = [1]; EOF } -Index: git-2.11.0/gitweb/gitweb.perl +Index: git-2.43.1/gitweb/gitweb.perl =================================================================== ---- git-2.11.0.orig/gitweb/gitweb.perl -+++ git-2.11.0/gitweb/gitweb.perl -@@ -190,7 +190,7 @@ our @diff_opts = ('-M'); # taken from gi +--- git-2.43.1.orig/gitweb/gitweb.perl ++++ git-2.43.1/gitweb/gitweb.perl +@@ -194,7 +194,7 @@ our @diff_opts = ('-M'); # taken from gi # Disables features that would allow repository owners to inject script into # the gitweb domain. @@ -39,4 +39,4 @@ Index: git-2.11.0/gitweb/gitweb.perl +our $prevent_xss = 1; # Path to the highlight executable to use (must be the one from - # http://www.andre-simon.de due to assumptions about parameters and output). + # http://andre-simon.de/zip/download.php due to assumptions about parameters and output). diff --git a/git.changes b/git.changes index 94c7bb1..9e1f68c 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 12 16:59:37 UTC 2024 - Dirk Müller + +- update to 2.43.1: + * https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.43.1.txt + ------------------------------------------------------------------- Tue Jan 9 21:02:19 UTC 2024 - Christian Boltz diff --git a/git.spec b/git.spec index 6d5f25f..683782e 100644 --- a/git.spec +++ b/git.spec @@ -35,7 +35,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.43.0 +Version: 2.43.1 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only diff --git a/setup-don-t-fail-if-commondir-reference-is-deleted.patch b/setup-don-t-fail-if-commondir-reference-is-deleted.patch index dc462a0..5af891b 100644 --- a/setup-don-t-fail-if-commondir-reference-is-deleted.patch +++ b/setup-don-t-fail-if-commondir-reference-is-deleted.patch @@ -28,11 +28,11 @@ v3: setup.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -diff --git a/setup.c b/setup.c -index ca9e8a949ed8..49306e36990d 100644 ---- a/setup.c -+++ b/setup.c -@@ -270,12 +270,20 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir) +Index: git-2.43.1/setup.c +=================================================================== +--- git-2.43.1.orig/setup.c ++++ git-2.43.1/setup.c +@@ -316,12 +316,20 @@ int get_common_dir_noenv(struct strbuf * { struct strbuf data = STRBUF_INIT; struct strbuf path = STRBUF_INIT; @@ -56,7 +56,7 @@ index ca9e8a949ed8..49306e36990d 100644 while (data.len && (data.buf[data.len - 1] == '\n' || data.buf[data.len - 1] == '\r')) data.len--; -@@ -286,8 +294,6 @@ int get_common_dir_noenv(struct strbuf *sb, const char *gitdir) +@@ -332,8 +340,6 @@ int get_common_dir_noenv(struct strbuf * strbuf_addbuf(&path, &data); strbuf_add_real_path(sb, path.buf); ret = 1; @@ -65,6 +65,3 @@ index ca9e8a949ed8..49306e36990d 100644 } strbuf_release(&data); --- -2.20.1 -