From f57085bea7c12bf2010c520f9b1b82faed2c879ed7751bd240a55b02f654f779 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 14 Jul 2022 14:33:18 +0000
Subject: [PATCH] Accepting request 988914 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/988914
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=283
---
 git-2.37.0.tar.sign | Bin 566 -> 0 bytes
 git-2.37.0.tar.xz   |   3 ---
 git-2.37.1.tar.sign | Bin 0 -> 566 bytes
 git-2.37.1.tar.xz   |   3 +++
 git.changes         |  18 ++++++++++++++++++
 git.spec            |   4 ++--
 6 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 git-2.37.0.tar.sign
 delete mode 100644 git-2.37.0.tar.xz
 create mode 100644 git-2.37.1.tar.sign
 create mode 100644 git-2.37.1.tar.xz

diff --git a/git-2.37.0.tar.sign b/git-2.37.0.tar.sign
deleted file mode 100644
index d822c8b6996a7082c543f862d455f4df5d428d65be87189765e78ee2ace8dd01..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%E!4L;wm25U{oA
zhL*49%QOWL0OGrIs64d%aj)|BLPrUl+DaD4;oWRm8_W-XK`v;6Ox3Ay{^u6>aJB2Y
z+M<12lwYo6mru6}wtPlvUGib`1snRus+!XQi)Qd%PP&`=*2+#<z*F@4`WDkLZC<_&
zb{)?uv|!E3t0HY7%C`&SZg=gyvYNZW2h@FxMl!5=tWS+1!=Ko+NOySbDh{y1lpfo(
z$<N61+7-X_9L*u5j5t_jKrbLeQEE-FWwd$)JNTv$&9^<0#LmDH5pJ*B$3`IsbM*qm
zO3p^I%OO4NgpADKkcUg=UcZMuy!}e(pUPwU%)=L|g%XQLIlRq`_PKBzgg$o_kt6Ns
z-)d~upb<sXx6cZFUZAF>aDnHluDCs+-LsmXib4vz9r)UR=hO|>042U2e3W|j_bYD1
zTmUva{p`sGFwDvoaN41-uZQ9&A_gzxpCdXL#qxfSGxZ3hGN^PPhiPztk`&tXsN(8J
z749EBA4{>2>FNtTW|uKPATm#!mD+L*r-@Xiy$cp+34(u=a|LDBm5>0T(5&qB<O4+6
zj#ga(yZ(;%0=2H8LL0Ie{Z%{Vr0llu-CKrMq2QiF`q4;Av`0lONTUO(ao<(5aU`*E
zHHS_Po?*Z%fI}6aDnmr1Oxs-~5`B#c0W4i@?nCxYmLaHDh!~Rwyy2t{xataR8fTM(
Ey5?6LVE_OC

diff --git a/git-2.37.0.tar.xz b/git-2.37.0.tar.xz
deleted file mode 100644
index d87b385..0000000
--- a/git-2.37.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f7fa1711bd00c4ec3dde2fe44407dc13f12e4772b5e3c72a58db4c07495411f
-size 6978796
diff --git a/git-2.37.1.tar.sign b/git-2.37.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..188fe2c67b9dd893e307c4d3a8ef977169cec0ae015d2dfeb4fd18138ca75028
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%FX~djJXv5U{oA
zhL*49%QHm}`v;2$yy!p*q@JS|Bm(V@FaEw<YK!N`(EtMu3&^0NQO+B4Z7KN4UG<x_
zBv@z=LrAaVLGguy2t6U;+cVu*WMP$Cs#};#>h%4_?iEN4{%XSRiZH9z1Ljf8_2gM{
z7dU6<h8zRp$d@j=c3$faL{-IR!wo7H2tL*yy{M!EIeb+$nA{bUE7&PR1b4FU-eM6M
zO$pS;PYVdkN&moBz;5R(InIZxm{^xd6!U%lHH%#ZN}RfcZnT9Cf}>@#k$wQSx&S~|
z-&bSn3!V_|i-ghNuu5JlA|^7_4KYZxX{x_zG-0}q>XQQScO2NxiHtgXw@H$T9C5FL
zn~}Ger-Bmu1I>qS!RGM_CsyH)@BBhxa0-l4B}FoH?cQD3q^3f+{``JT9NL(CCE9JY
zEKUqUSqJlKL`Na#>MovPbV{D%oVvxT0B_-r2=%G#p(JP2;;nVJW<}qP2W5kCbB|LQ
zjjjxO;$Ef&&TA07+r89VC#3Io-6$`RotS=2x&4zd!0g_W_OWwaCYq<q9gt%2Ad?S1
z;#bP`(EG>!vI3fRz!Xdie>q0BFhi<3M0Ym^+_5Yc%5X=whVU1=lCy1HEIK|L@}LY6
zJ*!=6+D+_>PbFT(zb&^@4sLFrg9hL-*S#C84g7-m?YsUU#16LTVMx8v=;8Hmru>!d
Evfm;YF#rGn

literal 0
HcmV?d00001

diff --git a/git-2.37.1.tar.xz b/git-2.37.1.tar.xz
new file mode 100644
index 0000000..990658e
--- /dev/null
+++ b/git-2.37.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8162c6b8b8f1c5db706ab01b4ee29e31061182135dc27c4860224aaec1b3500
+size 6980388
diff --git a/git.changes b/git.changes
index d55e229..d0e4c7c 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Jul 12 18:35:14 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.37.1:
+  * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
+    correctly record a removed file to the index, which is an old
+    regression but has become widely known because the C version has
+    become the default in the latest release.
+  * Fix for CVE-2022-29187 [boo#1201431]:
+    The safety check that verifies a safe ownership of the Git
+    worktree is now extended to also cover the ownership of the Git
+    directory (and the `.git` file, if there is any).
+
+-------------------------------------------------------------------
+Tue Jul 11 11:11:11 UTC 2022 - olaf@aepfle.de
+
+- Usage of sysusers_requires is optional, like during quilt setup
+
 -------------------------------------------------------------------
 Fri Jul  8 09:00:10 UTC 2022 - Petr Vorel <pvorel@suse.cz>
 
diff --git a/git.spec b/git.spec
index 0305998..b2e7b60 100644
--- a/git.spec
+++ b/git.spec
@@ -36,7 +36,7 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.37.0
+Version:        2.37.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
@@ -248,7 +248,7 @@ Requires:       git-core = %{version}
 Requires(pre):  %fillup_prereq
 %if 0%{?suse_version} >= 1500
 Requires(pre):  group(nogroup)
-%sysusers_requires
+%{?sysusers_requires}
 %{?systemd_requires}
 %else
 Requires(pre):  %{_sbindir}/useradd