up to 2.17.1 (fixes CVE-2018-11233 CVE-2018-11235)

[packages/git-core.git] / git-core.spec

diff --git a/git-core.spec b/git-core.spec
index 388797f9ac1ce7aa54f7d9dfdb5552f4e13f5ba0..b92f2d570d950521ff71873e6fe991dbc489165c 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,12 +14,12 @@
 Summary:       Distributed version control system focused on speed, effectivity and usability
 Summary(pl.UTF-8):     Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:          git-core
-Version:       2.17.0
+Version:       2.17.1
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5: 371985891f467969802fe1c7584a45bf
+# Source0-md5: 5179245515c637357b4a134e8d4e9a6f
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
@@ -30,7 +30,6 @@ Source7:      gitolite.pl
 Patch0:                %{name}-key-bindings.patch
 Patch1:                %{name}-sysconfdir.patch
 Patch2:                cherry-picked-commitlog.patch
-Patch3:                %{name}-race_test.patch
 URL:           http://git-scm.com/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -48,6 +47,7 @@ BuildRequires:        pkgconfig
 BuildRequires: openssl-devel
 %{?with_pcre:BuildRequires:    pcre2-8-devel}
 BuildRequires: perl-Error > 0.15
+BuildRequires: perl-MailTools
 BuildRequires: perl-base
 BuildRequires: python-devel
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -363,6 +363,8 @@ Summary:    Git tools for sending email
 Summary(pl.UTF-8):     Narzędzia Gita do wysyłania poczty
 Group:         Development/Tools
 Requires:      %{name} = %{version}-%{release}
+Requires:      perl-Error
+Requires:      perl-MailTools
 Suggests:      perl-Net-SMTP-SSL
 
 %description email
@@ -436,7 +438,6 @@ Moduł trzeba zarejestrować poleceniem:
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 
@@ -476,10 +477,16 @@ echo "BLK_SHA1=1" >> config.mak
 %endif
 
 %if %{with tests}
+# t5770 has multiple race conditions making it very unstable
+GIT_SKIP_TESTS=t5570
 %if %{without tests_cvs}
 %{__rm} t/t*cvs*.sh || :
 %endif
-%{!?with_tests_svn:GIT_SKIP_TESTS='t91??'} %{__make} test
+%if %{without tests_svn}
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t91??"
+%endif
+export GIT_SKIP_TESTS
+%{__make} test
 %endif
 
 %install