From 5515a89021d8e676ae81ef02b96cc2b036350b1a Mon Sep 17 00:00:00 2001
From: Brian C. Lane <bcl@redhat.com>
Date: Jul 20 2017 17:57:44 +0000
Subject: - Removed workaround for ARM build problems fixed by upstream.

- Switch to using %autosetup macro
- Update Source to use https instead of ftp
- New upstream v1.4.22
- build: Avoid check gpg --version during make distcheck. (wk)
- indent: Fix indentation of an if block. (wk)
- gpg: Fix memory leak. (gniibe)
- rsa: Reduce secmem pressure. (gniibe)
- rsa: Allow different build directory. (gniibe)
- rsa: Add exponent blinding. (mb)
- mpi: Minor fix for mpi_pow. (gniibe)
- mpi: Same computation for square and multiply for mpi_pow. (gniibe)
- mpi: Simplify mpi_powm. (gniibe)
- mpi: Fix ARM assembler in longlong.h. (marcus.brinkmann) (#1424619)
- g10: Fix secmem leak. (ineiev)
- gpg: Fix exporting of zero length user ID packets. (wk)
- tools: Fix option parsing for gpg-zip. (neal)

(cherry picked from commit d16aed39d04fc2d44ff69761c8e5e676e04d4e9f)

---

diff --git a/gnupg.spec b/gnupg.spec
index 5eb7e69..00b559a 100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@ -1,11 +1,11 @@
 Summary: A GNU utility for secure communication and data storage
 Name: gnupg
-Version: 1.4.21
-Release: 4%{?dist}
+Version: 1.4.22
+Release: 1%{?dist}
 License: GPLv3+ with exceptions
 Group: Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: https://gnupg.org/ftp/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 Source2: gnupg-shm-coprocessing.expect
 Patch0: gnupg-1.4.1-gcc.patch
 
@@ -33,14 +33,7 @@ algorithm, it is not compatible with any version of PGP2 (PGP2.x uses
 only IDEA for symmetric-key encryption, which is patented worldwide).
 
 %prep
-%setup -q
-
-git init
-git config user.email "gnupg-owner@fedoraproject.org"
-git config user.name "Fedora Ninjas"
-git add .
-git commit -a -q -m "%{version} baseline."
-git am %{patches}
+%autosetup -S git
 # Convert these files to UTF-8, per rpmlint.
 iconv -f iso-8859-15 -t utf-8 THANKS > THANKS.utf8
 mv THANKS.utf8 THANKS
@@ -56,11 +49,6 @@ configure_flags=
 configure_flags=--disable-asm
 %endif
 
-# Workaround for gcc -O2 problems on ARM: https://bugzilla.redhat.com/show_bug.cgi?id=1424619
-%ifarch %{arm}
-RPM_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed s/-O2/-O1/)
-%endif
-
 CFLAGS="$RPM_OPT_FLAGS -fPIE -DPIC" ; export CFLAGS
 LDFLAGS="$RPM_OPT_FLAGS -pie -Wl,-z,relro,-z,now" ; export LDFLAGS
 %configure \
@@ -125,6 +113,25 @@ exit 0
 %{_mandir}/man1/gpgv.1.gz
 
 %changelog
+* Thu Jul 20 2017 Brian C. Lane <bcl@redhat.com> - 1.4.22-1
+- Removed workaround for ARM build problems fixed by upstream.
+- Switch to using %%autosetup macro
+- Update Source to use https instead of ftp
+- New upstream v1.4.22
+- build: Avoid check gpg --version during make distcheck. (wk)
+- indent: Fix indentation of an if block. (wk)
+- gpg: Fix memory leak. (gniibe)
+- rsa: Reduce secmem pressure. (gniibe)
+- rsa: Allow different build directory. (gniibe)
+- rsa: Add exponent blinding. (mb)
+- mpi: Minor fix for mpi_pow. (gniibe)
+- mpi: Same computation for square and multiply for mpi_pow. (gniibe)
+- mpi: Simplify mpi_powm. (gniibe)
+- mpi: Fix ARM assembler in longlong.h. (marcus.brinkmann) (#1424619)
+- g10: Fix secmem leak. (ineiev)
+- gpg: Fix exporting of zero length user ID packets. (wk)
+- tools: Fix option parsing for gpg-zip. (neal)
+
 * Mon May 15 2017 Brian C. Lane <bcl@redhat.com> - 1.4.21-4
 + Build with -O1 on arm to work around gcc problems with -O2 in rhbz#1424619
 - Revert disabling checks on arm.
diff --git a/sources b/sources
index 667fd0b..4cb8bab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9bdeabf3c0f87ff21cb3f9216efdd01d  gnupg-1.4.21.tar.bz2
-5024d3f942e78894089fa0aaa6cdbbba  gnupg-1.4.21.tar.bz2.sig
+SHA512 (gnupg-1.4.22.tar.bz2) = c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
+SHA512 (gnupg-1.4.22.tar.bz2.sig) = 14155496b052fc3ae84a9ce4db6338cad2f6362c21acf50442fb228c7f662f23062ba0ba77bc0f879664832fa133d326eec72a33697e0bb645a6de6a2584317c