Accepting request 850115 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/850115
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=256
This commit is contained in:
Dominique Leuenberger 2020-11-26 22:11:54 +00:00 committed by Git OBS Bridge
parent 9c6f1d7116
commit 02b9a804d7
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 20 21:53:07 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- only pull asciidoctor for the default ruby version
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 29 23:07:17 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de> Thu Oct 29 23:07:17 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
@ -111,7 +116,7 @@ Fri Apr 17 17:56:32 UTC 2020 - Michal Suchanek <msuchanek@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 14 18:32:57 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de> Tue Apr 14 18:32:57 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
- git 2.26.1: - git 2.26.1: (boo#1168930)
* CVE-2020-5260: Specially crafted URLs with newline characters * CVE-2020-5260: Specially crafted URLs with newline characters
could have been used to make the Git client to send credential could have been used to make the Git client to send credential
information for a wrong host to the attacker's site boo#1168930 information for a wrong host to the attacker's site boo#1168930

View File

@ -16,6 +16,9 @@
# #
%define rb_build_ruby_abis %{rb_default_ruby_abi}
%define rb_build_versions %{rb_default_ruby}
%define gitexecdir %{_libexecdir}/git %define gitexecdir %{_libexecdir}/git
%if 0%{?suse_version} < 1500 %if 0%{?suse_version} < 1500
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
@ -89,7 +92,7 @@ BuildRequires: sgml-skel
BuildRequires: xmlto BuildRequires: xmlto
%if %{with asciidoctor} %if %{with asciidoctor}
BuildRequires: docbook5-xsl-stylesheets BuildRequires: docbook5-xsl-stylesheets
BuildRequires: rubygem(asciidoctor) BuildRequires: %{rubygem asciidoctor}
%else %else
BuildRequires: asciidoc BuildRequires: asciidoc
%endif %endif