Accepting request 427260 from security:privacy

- avoid mixing up status and colon line output - bsc#993324
- enable web key discovery tools
- Add an explicit runtime dependency on libgcrypt >= 1.7.0 to
  match runtime version check

OBS-URL: https://build.opensuse.org/request/show/427260
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=149
This commit is contained in:
2016-09-13 13:56:48 +00:00
committed by Git OBS Bridge
parent f88d4275c3
commit 5058b5ebe2
3 changed files with 213 additions and 3 deletions

View File

@@ -35,12 +35,11 @@ Patch8: gnupg-set_umask_before_open_outfile.patch
Patch9: gnupg-detect_FIPS_mode.patch
Patch11: gnupg-add_legacy_FIPS_mode_option.patch
Patch12: 0001-common-Follow-up-to-14479e2-fix-void-return-in-non-v.patch
Patch13: gnupg-2.1.15-bsc993324-status-output.patch
BuildRequires: expect
BuildRequires: fdupes
BuildRequires: libadns-devel
BuildRequires: libassuan-devel >= 2.4.3
# patch11 (gnupg-add_legacy_FIPS_mode_option.patch) mentions GCRYCTL_INACTIVATE_FIPS_FLAG
# raising gcrypt requirement from 1.4.0
BuildRequires: libgcrypt-devel >= 1.7.0
BuildRequires: libgpg-error-devel >= 1.24
BuildRequires: libksba-devel >= 1.3.4
@@ -56,7 +55,9 @@ BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(sqlite3) >= 3.7
BuildRequires: pkgconfig(zlib)
# Add an explicit runtime dependency to match boo#955982
Requires: libassuan0 >= 2.4.1
Requires: libassuan0 >= 2.4.3
# Explicit runtime depencency - runtime version check
Requires: libgcrypt20 >= 1.7.0
Requires: pinentry
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: %{install_info_prereq}
@@ -86,6 +87,7 @@ gpg-agent, and a keybox library.
%patch9 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%build
date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})
@@ -102,6 +104,7 @@ date=$(date -u +%%Y-%%m-%%dT%%H:%%M+0000 -r %{SOURCE99})
--enable-gpgtar \
--enable-g13 \
--enable-large-secmem \
--enable-wks-tools \
--with-gnu-ld \
--enable-build-timestamp=$date