From de4f9430961411391bae8266d1b81afeaca0cd09cc26e83f983ca45ada20fedf Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 1 Dec 2021 19:46:36 +0000
Subject: [PATCH] Accepting request 934174 from devel:tools:scm

- update to 2.34.1:
  * "git grep" looking in a blob that has non-UTF8 payload was
    completely broken when linked with certain versions of PCREv2
    library in the latest release.
  * "git pull" with any strategy when the other side is behind us
    should succeed as it is a no-op, but doesn't.
  * An earlier change in 2.34.0 caused JGit application (that abused
    GIT_EDITOR mechanism when invoking "git config") to get stuck with
    a SIGTTOU signal; it has been reverted.
  * An earlier change that broke .gitignore matching has been reverted.
  * SubmittingPatches document gained a syntactically incorrect mark-up,
    which has been corrected.

- fix url

OBS-URL: https://build.opensuse.org/request/show/934174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=271
---
 git-2.34.0.tar.sign | Bin 566 -> 0 bytes
 git-2.34.0.tar.xz   |   3 ---
 git-2.34.1.tar.sign | Bin 0 -> 566 bytes
 git-2.34.1.tar.xz   |   3 +++
 git.changes         |  21 +++++++++++++++++++++
 git.spec            |   5 +++--
 6 files changed, 27 insertions(+), 5 deletions(-)
 delete mode 100644 git-2.34.0.tar.sign
 delete mode 100644 git-2.34.0.tar.xz
 create mode 100644 git-2.34.1.tar.sign
 create mode 100644 git-2.34.1.tar.xz

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

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%4L3fB*^!5U{oA
zhL*49%SLk#{x5FvV_Q8Cl_`+b4~24k^o&USn>EO69P)Cnzj-)B_I`62KN~^k18)I`
zbppUT*b*O4b<w4*b28@SqkamxDkPWWU$5XQBxLVmCuaEGGx*_#PYv$sCX!RgVZB$#
ziTUeEHh@_(eUqOB-LMi2$JI&Xg-pC;3KG|27^&4(YODerpvGogMkn$8BVdZfJ?wiv
zCsJyv_6U$$Cw)@c9wThwAyb*8NL((0u}Oxm%*+&Qg|}{hL({pLHZq!Q$5ksua|Cc@
zv4`Iu>VGY@0%Z1qKfOh_o`FSk7=)$(v@U^`OdwKs1CF1rF6@gLss;Ba$v16&xpW`D
z-f}25l6*7YqcS6QBvTisI*@L|ucYZ#GiXh&P+JW)EgS#aOQCK8Xiymns+W}+OjJ`_
z7#=!{Qe#}vh#6zB?NZ&_o#%AcIS5OJq)90-BpQa*p@Ob~QCt-TbWT;HPWs#SDda6(
zXw!5T%ONrv*$5n6v-kFPgq+2WIHK3oSQVVr+!p^0f`s^`B1p0>?h$sPJp(Qhr69_9
zrS%e>bH6uHhCNmFrICDIktQYs=C4+YsOF=EeuI>$m=(v9{?=V3Enp{e^n&{Fc_B98
zd+MkWHqTGEf4|Pg5#4(5wp@ke?;T;A5%YC!7kAO1-J0+|uD6mgG}<bOiWF&0$IK&z
ED(pWBng9R*

diff --git a/git-2.34.0.tar.xz b/git-2.34.0.tar.xz
deleted file mode 100644
index 393e918..0000000
--- a/git-2.34.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
-size 6623924
diff --git a/git-2.34.1.tar.sign b/git-2.34.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..22c648c018e87f33cc1a72c1c27e81290a3cdb41011abc60232a9504efbeee49
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0%4w$egFyy5U{oA
zhL*49%Rn~||9#Y)!<t85OqR+wFsZpcf@dz_&HSB_;zZk4PEky97wLY&HK!&i2{U_W
zGRW&7ZcD5!2yuTCDW4Zrx&2)nR}s9rIjxsr?y+gaU7_k<;J~DLKrPJnss96n030|?
zEJ=Tbdd=9mh~b{in+!%?)Mp~#o#y-|7z=?dHIdtK=J31>rUXAhcu7-Q#J@>XaxQDk
zC=QVT&&*?-5|VyA#QgD2RyJX=-!?_1REl*_{9?+HPuM1wb%A-~OK8hH!v}ijB4RxJ
zBf8ACmslW36BC)KFTm+qgoy+L+-(Q4))&ikvDn6*Gm|lhxf3uBNI9rE_&1swq-wfm
z2Mm7U69f!oejG3yO0p?MZrp}^qv^u^`_pwgmfZipGX*<#caicNBBOxzkM9d0LP3b2
z3!OG)>$()lx}KiEGBSuKvV4J(VT3%hVMG-G>`@>2e2v|sHb<P0hqY`m=nf0LyYSV_
zUexn6LvorNbH^BnEg6IRXMwh4p<f{3(G?_zG(Nk1AEaFB6A>~P-}CVznR4rTTx6at
zolmZLvxT$lHJh4>(hwOZ>=5*I9~8bwP8FpV-b_PI(txlxDm&*-7!f53P~9>WoeG<E
zZ2rqSv6(bgJu$Pq=x4;>tLH^W`XD_Yks2cegz}|*@<&Pda+o$W%Rr=9?NMLG3qIn?
EhG;Je%>V!Z

literal 0
HcmV?d00001

diff --git a/git-2.34.1.tar.xz b/git-2.34.1.tar.xz
new file mode 100644
index 0000000..6f7e8b2
--- /dev/null
+++ b/git-2.34.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3a0755dd1cfab71a24dd96df3498c29cd0acd13b04f3d08bf933e81286db802c
+size 6623760
diff --git a/git.changes b/git.changes
index 9a1d651..e88b9e7 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Nov 26 21:20:00 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update to 2.34.1:
+  * "git grep" looking in a blob that has non-UTF8 payload was
+    completely broken when linked with certain versions of PCREv2
+    library in the latest release.
+  * "git pull" with any strategy when the other side is behind us
+    should succeed as it is a no-op, but doesn't.
+  * An earlier change in 2.34.0 caused JGit application (that abused
+    GIT_EDITOR mechanism when invoking "git config") to get stuck with
+    a SIGTTOU signal; it has been reverted.
+  * An earlier change that broke .gitignore matching has been reverted.
+  * SubmittingPatches document gained a syntactically incorrect mark-up,
+    which has been corrected.
+
+-------------------------------------------------------------------
+Sun Nov 21 11:11:10 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- fix url 
+
 -------------------------------------------------------------------
 Thu Nov 18 15:41:32 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/git.spec b/git.spec
index d84d9e0..ca97fd4 100644
--- a/git.spec
+++ b/git.spec
@@ -36,12 +36,12 @@
 %bcond_with    asciidoctor
 %endif
 Name:           git
-Version:        2.34.0
+Version:        2.34.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only
 Group:          Development/Tools/Version Control
-URL:            http://git-scm.com
+URL:            https://git-scm.com/
 Source0:        https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
 Source1:        apache2-gitweb.conf
 Source2:        sysconfig.git-daemon
@@ -88,6 +88,7 @@ Recommends:     gitk
 Suggests:       git-daemon
 Suggests:       git-web
 %if 0%{?suse_version} >= 1500
+BuildRequires:  openssh-clients
 BuildRequires:  sysuser-tools
 %endif
 %if %{with docs}