|
@@ -3,30 +3,35 @@
|
|
|
Summary: Utility for secure communication and data storage
|
|
|
Summary(ja): GnuPG2 - 安全なデータ交換と保存のためのユーティリティ
|
|
|
Name: gnupg2
|
|
|
-Version: 2.2.19
|
|
|
+Version: 2.2.23
|
|
|
Release: 1%{?_dist_release}
|
|
|
-Group: Applications/System
|
|
|
+Group: security
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: iwaim
|
|
|
|
|
|
License: GPLv3+
|
|
|
+URL: http://www.gnupg.org/
|
|
|
Source0: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-%{version}.tar.bz2
|
|
|
Source1: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
|
|
|
|
|
|
-# svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
|
|
|
-#Source0: gnupg2-20090809svn.tar.bz2
|
|
|
-Patch1: gnupg-2.1.21-insttools.patch
|
|
|
+Patch1: gnupg-2.2.23-insttools.patch
|
|
|
# needed for compatibility with system FIPS mode
|
|
|
Patch3: gnupg-2.1.10-secmem.patch
|
|
|
# non-upstreamable patch adding file-is-digest option needed for Copr
|
|
|
-Patch4: gnupg-2.2.0-file-is-digest.patch
|
|
|
-Patch5: gnupg-2.1.1-ocsp-keyusage.patch
|
|
|
+Patch4: gnupg-2.2.20-file-is-digest.patch
|
|
|
+# fix handling of missing key usage on ocsp replies - upstream T1333
|
|
|
+Patch5: gnupg-2.2.16-ocsp-keyusage.patch
|
|
|
Patch6: gnupg-2.1.1-fips-algo.patch
|
|
|
# allow 8192 bit RSA keys in keygen UI with large RSA
|
|
|
-Patch9: gnupg-2.1.21-large-rsa.patch
|
|
|
-
|
|
|
-URL: http://www.gnupg.org/
|
|
|
+Patch9: gnupg-2.2.23-large-rsa.patch
|
|
|
+# fix missing uid on refresh from keys.openpgp.org
|
|
|
+# https://salsa.debian.org/debian/gnupg2/commit/f292beac1171c6c77faf41d1f88c2e0942ed4437
|
|
|
+Patch20: gnupg-2.2.18-tests-add-test-cases-for-import-without-uid.patch
|
|
|
+Patch21: gnupg-2.2.18-gpg-allow-import-of-previously-known-keys-even-without-UI.patch
|
|
|
+Patch22: gnupg-2.2.18-gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
|
|
|
+# Fixes for issues found in Coverity scan - reported upstream
|
|
|
+Patch30: gnupg-2.2.21-coverity.patch
|
|
|
|
|
|
#BuildRequires: automake libtool texinfo transfig
|
|
|
BuildRequires: bzip2-devel
|
|
@@ -66,13 +71,6 @@ Obsoletes: dirmngr < 1.2.0-1
|
|
|
|
|
|
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
|
|
|
|
|
-%package smime
|
|
|
-Summary: CMS encryption and signing tool and smart card support for GnuPG
|
|
|
-Summary(ja): GnuPG2用のCMS暗号化・スマートカード機能
|
|
|
-Requires: gnupg2 = %{version}-%{release}
|
|
|
-Group: Applications/Internet
|
|
|
-
|
|
|
-
|
|
|
%description
|
|
|
GnuPG is GNU's tool for secure communication and data storage. It can
|
|
|
be used to encrypt data and to create digital signatures. It includes
|
|
@@ -96,6 +94,13 @@ RFC2440として提案され承認されたOpenPGPインターネット標準、
|
|
|
ています。S/SMIMEやスマートカード機能はgnupg2-smimeパッケージにて
|
|
|
提供されています。
|
|
|
|
|
|
+
|
|
|
+%package smime
|
|
|
+Summary: CMS encryption and signing tool and smart card support for GnuPG
|
|
|
+Summary(ja): GnuPG2用のCMS暗号化・スマートカード機能
|
|
|
+Requires: gnupg2 = %{version}-%{release}
|
|
|
+Group: security
|
|
|
+
|
|
|
%description smime
|
|
|
GnuPG is GNU's tool for secure communication and data storage. This
|
|
|
package adds support for smart cards and S/MIME encryption and signing
|
|
@@ -106,6 +111,10 @@ to the base GnuPG package
|
|
|
ケージはGnuPG2パッケージにスマートカードやS/MIME暗号化・署名機能
|
|
|
を追加します。
|
|
|
|
|
|
+
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q -n gnupg-%{version}
|
|
|
|
|
@@ -116,6 +125,12 @@ to the base GnuPG package
|
|
|
%patch6 -p1 -b .fips
|
|
|
%patch9 -p1 -b .large-rsa
|
|
|
|
|
|
+%patch20 -p1 -b .test_missing_uid
|
|
|
+%patch21 -p1 -b .prev_known_key
|
|
|
+%patch22 -p1 -b .good_revoc
|
|
|
+
|
|
|
+%patch30 -p1 -b .coverity
|
|
|
+
|
|
|
# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
|
|
|
# Note: this is just the name of the default shared lib to load in scdaemon,
|
|
|
# it can use other implementations too (including non-pcsc ones).
|
|
@@ -125,16 +140,13 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/scdaemon.c
|
|
|
|
|
|
|
|
|
%build
|
|
|
-
|
|
|
# --enable-gpg-is-gpg2=no is still exists but has no effects.
|
|
|
-
|
|
|
%configure \
|
|
|
--disable-gpgtar \
|
|
|
--disable-rpath \
|
|
|
--enable-g13 \
|
|
|
--enable-large-secmem
|
|
|
|
|
|
-
|
|
|
# need scratch gpg database for tests
|
|
|
mkdir -p $HOME/.gnupg
|
|
|
|
|
@@ -185,6 +197,21 @@ mkdir -p $HOME/.gnupg
|
|
|
make -k check
|
|
|
|
|
|
|
|
|
+%if !0%{?install_as_gpg2}
|
|
|
+%pre
|
|
|
+for f in \
|
|
|
+ %{_bindir}/gpg2 \
|
|
|
+ %{_bindir}/gpgv2 \
|
|
|
+ %{_mandir}/man1/gpg2.1* \
|
|
|
+ %{_mandir}/man1/gpgv2.1* \
|
|
|
+ %{_mandir}/man7/gnupg2.7*
|
|
|
+do
|
|
|
+ if [ -e $f -a ! -L $f ]; then
|
|
|
+ rm -f $f
|
|
|
+ fi
|
|
|
+done
|
|
|
+%endif
|
|
|
+
|
|
|
%post
|
|
|
/sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
|
|
|
|
|
@@ -239,6 +266,11 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Sep 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.23-1
|
|
|
+- update to 2.2.23.
|
|
|
+- re-imported Patch1, 5 and 9 from rawhide.
|
|
|
+- imported Patch20-30 from rawhide.
|
|
|
+
|
|
|
* Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.19-1
|
|
|
- update to 2.2.19.
|
|
|
|