From a0030f8fd4d57aa9a702093317b6ebf32044a2790a673effb3be2a0532425788 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sun, 19 Apr 2020 19:35:26 +0000
Subject: [PATCH] Accepting request 795368 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/795368
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=247
---
 git-2.26.0.tar.sign | Bin 566 -> 0 bytes
 git-2.26.0.tar.xz   |   3 ---
 git-2.26.1.tar.sign | Bin 0 -> 566 bytes
 git-2.26.1.tar.xz   |   3 +++
 git-daemon.service  |   2 +-
 git.changes         |  14 ++++++++++++++
 git.spec            |   2 +-
 7 files changed, 19 insertions(+), 5 deletions(-)
 delete mode 100644 git-2.26.0.tar.sign
 delete mode 100644 git-2.26.0.tar.xz
 create mode 100644 git-2.26.1.tar.sign
 create mode 100644 git-2.26.1.tar.xz

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

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$z9lasUbm5U{oA
zhL*49%Q4^&|7f%oG$1Kqhx5&L4<Zv!p8W6=({k7w5#1*(rF{JXz8k1T^{3j94S=L^
z->3?Ya^OI?UYcuIe;ijljDLtOylli4f?9NdJ>SdwE?V(gn1lw4tFU_b1s)uN$yN%n
zUlw;oV}bsVsi%U>GWUjcuXi)L-PcWJbrgL4M({~Nib?00(?AuTJ_x<`5`cUYw2LI5
zHwA9=0U=n+EYeWyxuPze#?0z<loQ&<f|W->%o%F5AhcFSY+!BM3o=|GaEZBx0)7GB
zZ;N%OC#~H;X~gLX==7u^)YNJxN60|}V5D3)vdZ!huxi7LhND>yEgtG?Tcdw2T!S7O
z`gBNf!gm*bq={`WoRA`G4&EnRRCNM100vY)W_~wjM{&#sj>*#ZOk~m=fDT!g4d-^I
zkZ^k|hDH36Nh3hq*Rk8bB?_H;hhtnlW~)drN`E7!5^6Ccu>qs+E85$3uj<v~9R`xJ
zPho)nt<O@YsloK2kSFvurWD+~{AI}nj^Mg)9W0f}Gktf|#43{uX|1vARNPaO7{-?m
z`kk?Hh5SV8cypq5%gllDgHlosT|VB24e%cF$I(Gi<cC-Syk7qWl0KGZ`hew`!AXd!
z9cWN!8tbO7zyW{-R}=00J-QGEmq#uU3WKT0J@v{NNTnlfY<jo6ettSxDi4`qjA__(
EEb{#gU;qFB

diff --git a/git-2.26.0.tar.xz b/git-2.26.0.tar.xz
deleted file mode 100644
index 1b80d9f..0000000
--- a/git-2.26.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ece0dcb07a5e0d7366a92b613b201cca11ae368ab7687041364b3e756e495d6
-size 6005104
diff --git a/git-2.26.1.tar.sign b/git-2.26.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..baf44ad72da0609efe79e7c35368c79c665a4d91b357ddd50df9ba07faf8e6cd
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$!E$uK)@O5U{oA
zhL*49%ecW10O_&I6XbARoz30)V#7p&(o<*&T}C&X2EsDnB&~qa3|BVrlJ;MCG*BUh
z@bX?FBS2T1>|RC<&sa6GG57%M7t@Pf<Gf^y5_iozv1fWI9nNh;BACzWP;ke%P#tsC
zM%KpwN|59pPASIo+F&x3V9ovH1b?kBw~*RG|I{Nv+Iq&>V>FAJ=SNCAYX{3Bi1T?Y
zfi?BUIK4^>kM@{WOPvABGfV%WS+4y+bt2vK-&mm2aH|d>BBdZBL2BTEOhN-DXNvF|
zrv?!OS;_M03*^E~t5Lo>%!SuE_S)wsw|uQPd?~&N_t%;U_Y6O9dH$r}*P#4Ds8)_S
zz#fV<{2W;aIVtf*S*OJ_E3~33oJR_g@Fi$+N;zWG4$k&Fe22dtFOsfkR9oT{yTOdO
zWCA=WkBerIqx3B6ze#4wZjLFAcB1s`xm=e^a|5PPF0g7$t+siTV<;k8?q=K?Rb9V|
zssT=WPyZY)=ixeve0ZzhVd;Fg<!3Q}6w&%xau{IoR#E?-z(&FvD_L47KB>9uc-A)2
zFmz4!Eulx$6lFedV1@{<6C2$pzuy|1D&n4$`?mJ($$EEZ0`<Z9(A4~s2{)FqYw}q(
z^eA1xl(BhU&YfOXDY^12WkK%q%~^SE9%?CeZApty`HKqUBx1hbx<g2^WqB}m@bI`K
EYN1XTssI20

literal 0
HcmV?d00001

diff --git a/git-2.26.1.tar.xz b/git-2.26.1.tar.xz
new file mode 100644
index 0000000..5cab290
--- /dev/null
+++ b/git-2.26.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:888228408f254634330234df3cece734d190ef6381063821f31ec020538f0368
+size 6006104
diff --git a/git-daemon.service b/git-daemon.service
index f1f9e48..2acab1e 100644
--- a/git-daemon.service
+++ b/git-daemon.service
@@ -3,7 +3,7 @@ Description=Start Git Daemon
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/git-daemon
-ExecStart=/bin/sh -c 'exec git daemon --reuseaddr --base-path=${GIT_DAEMON_BASE_PATH:-/srv/git/} --user=${GIT_DAEMON_USER:-git-daemon} --group=${GIT_DAEMON_GROUP:-nogroup} $GIT_DAEMON_ARGS'
+ExecStart=/bin/bash -c 'exec git daemon --reuseaddr --base-path=$${GIT_DAEMON_BASE_PATH:-/srv/git/} --user=$${GIT_DAEMON_USER:-git-daemon} --group=$${GIT_DAEMON_GROUP:-nogroup} $GIT_DAEMON_ARGS'
 
 Restart=always
 RestartSec=500ms
diff --git a/git.changes b/git.changes
index b7e1ef8..ad66787 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Apr 17 17:56:32 UTC 2020 - Michal Suchanek <msuchanek@suse.com>
+
+- Fix git-daemon not starting after conversion from sysvinit to systemd service
+  (bsc#1169605).
+
+-------------------------------------------------------------------
+Tue Apr 14 18:32:57 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- git 2.26.1:
+  * CVE-2020-5260: Specially crafted URLs with newline characters
+    could have been used to make the Git client to send credential
+    information for a wrong host to the attacker's site boo#1168930
+    
 -------------------------------------------------------------------
 Mon Mar 23 16:45:06 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/git.spec b/git.spec
index bd4f037..6bd8778 100644
--- a/git.spec
+++ b/git.spec
@@ -32,7 +32,7 @@
 %endif
 
 Name:           git
-Version:        2.26.0
+Version:        2.26.1
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
 License:        GPL-2.0-only