gnupg2-2.2.5-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11563 ec354946-7b23-47d6-9f5a-488ba84defc7

g/gnupg2/gnupg2-vl.spec

@@ -1,7 +1,9 @@
+%global install_as_gpg2 1
+
 Summary: Utility for secure communication and data storage
 Summary(ja): GnuPG2 - 安全なデータ交換と保存のためのユーティリティ
 Name:    gnupg2
-Version: 2.1.18
+Version: 2.2.5
 Release: 1%{?_dist_release}
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -13,14 +15,17 @@ Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
 Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.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.11-insttools.patch
+Patch1:  gnupg-2.1.21-insttools.patch
+# exponential backoff when waiting on gpg-agent and dirmngr to save time
+Patch2:  gnupg-2.1.19-exponential.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.1.18-file-is-digest.patch
+Patch4:  gnupg-2.2.0-file-is-digest.patch
 Patch5:  gnupg-2.1.1-ocsp-keyusage.patch
 Patch6:  gnupg-2.1.1-fips-algo.patch
-Patch7:  gnupg-2.1.18-build.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/
 
@@ -105,14 +110,13 @@ to the base GnuPG package
 %prep
 %setup -q -n gnupg-%{version}
 
-%if 0%{?rhel} > 5
 %patch1 -p1 -b .insttools
-%endif
+%patch2 -p1 -b .exponential
 %patch3 -p1 -b .secmem
 %patch4 -p1 -b .file-is-digest
 %patch5 -p1 -b .keyusage
 %patch6 -p1 -b .fips
-%patch7 -p1 -b .build
+%patch9 -p1 -b .large-rsa
 
 # 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,
@@ -124,10 +128,14 @@ 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-g13 \
+  --enable-large-secmem
+
 
 # need scratch gpg database for tests
 mkdir -p $HOME/.gnupg
@@ -140,9 +148,22 @@ make install DESTDIR=%{buildroot} \
   INSTALL="install -p" \
   docdir=%{_pkgdocdir}
 
-%if ! (0%{?rhel} > 5)
+%if 0%{?install_as_gpg2}
 # rename file conflicting with gnupg-1.x
 rename gnupg.7 gnupg2.7 %{buildroot}%{_mandir}/man7/gnupg.7*
+mv %{buildroot}%{_bindir}/gpg %{buildroot}%{_bindir}/gpg2
+mv %{buildroot}%{_bindir}/gpgv %{buildroot}%{_bindir}/gpgv2
+mv %{buildroot}%{_mandir}/man1/gpg.1 %{buildroot}%{_mandir}/man1/gpg2.1
+mv %{buildroot}%{_mandir}/man1/gpgv.1 %{buildroot}%{_mandir}/man1/gpgv2.1
+
+rm -f %{buildroot}%{_bindir}/gpg-zip
+rm -f %{buildroot}%{_bindir}/gpgsplit
+%else
+ln -sf gpg %{buildroot}%{_bindir}/gpg2
+ln -sf gpgv %{buildroot}%{_bindir}/gpgv2
+ln -sf gpg.1 %{buildroot}%{_mandir}/man1/gpg2.1
+ln -sf gpgv.1 %{buildroot}%{_mandir}/man1/gpgv2.1
+ln -sf gnupg.7 %{buildroot}%{_mandir}/man7/gnupg2.7
 %endif
 
 %find_lang %{name}
@@ -155,15 +176,6 @@ touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
 install -m644 -p AUTHORS NEWS THANKS TODO \
   %{buildroot}%{_pkgdocdir}
 
-%if 0%{?rhel} > 5
-# compat symlinks
-ln -sf gpg2 %{buildroot}%{_bindir}/gpg
-ln -sf gpgv2 %{buildroot}%{_bindir}/gpgv
-ln -sf gpg2.1 %{buildroot}%{_mandir}/man1/gpg.1
-ln -sf gpgv2.1 %{buildroot}%{_mandir}/man1/gpgv.1
-ln -sf gnupg.7 %{buildroot}%{_mandir}/man7/gnupg2.7
-%endif
-
 # info dir
 rm -f %{buildroot}%{_infodir}/dir
 
@@ -192,8 +204,15 @@ fi
 %dir %{_sysconfdir}/gnupg
 %ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 ## docs say to install suid root, but fedora/rh security folk say not to
+%if %{?install_as_gpg2}
 %{_bindir}/gpg2
 %{_bindir}/gpgv2
+%else
+%{_bindir}/gpg
+%{_bindir}/gpgv
+%{_bindir}/gpg-zip
+%{_bindir}/gpgsplit
+%endif
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
@@ -202,19 +221,12 @@ fi
 %{_bindir}/g13
 %{_bindir}/dirmngr
 %{_bindir}/dirmngr-client
-%if 0%{?rhel} > 5
-%{_bindir}/gpg
-%{_bindir}/gpgv
-%{_bindir}/gpgsplit
-%{_bindir}/gpg-zip
-%endif
 %{_bindir}/watchgnupg
 %{_sbindir}/*
 %{_datadir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*.info*
 %{_mandir}/man?/*
-%exclude %{_datadir}/gnupg/com-certs.pem
 %exclude %{_mandir}/man?/gpgsm*
 %exclude %{_mandir}/man?/scdaemon*
 %exclude %{_libexecdir}/scdaemon
@@ -225,10 +237,15 @@ fi
 %{_libexecdir}/scdaemon
 %{_mandir}/man?/gpgsm*
 %{_mandir}/man?/scdaemon*
-#%{_datadir}/gnupg/com-certs.pem
 
 
 %changelog
+* Thu Mar 01 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2.5-1
+- update to 2.2.5.
+- updated Patch1 and 4.
+- dropped Patch7.
+- imported Patch2 and 9 from rawhide.
+
 * Mon Mar 20 2017 IWAI, Masaharu <iwaim.sub@gmail.com> - 2.1.18-1
 - update to 2.1.18
 - update file-is-digest patch (Patch4)