From 315f626340f80e0d074d7e08009415d26bc53018 Mon Sep 17 00:00:00 2001
From: Martin Osvald <mosvald@redhat.com>
Date: Thu, 5 Jan 2023 09:00:10 +0100
Subject: [PATCH] New version 3.6.0 (rhbz#2134350)

Add source code signature verification
---
 .gitignore       |  2 ++
 cyrus-imapd.spec | 13 +++++++++++--
 sources          |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d5233d..b248b55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /cyrus-imapd-3.2.6.tar.gz
 /cyrus-imapd-3.4.3.tar.gz
 /cyrus-imapd-3.4.4.tar.gz
+/cyrus-imapd-3.6.0.tar.gz
+/cyrus-imapd-3.6.0.tar.gz.sig
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 3dd8e6b..a2ec65f 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -5,8 +5,8 @@
 %bcond_with cassandane
 
 Name: cyrus-imapd
-Version: 3.4.4
-Release: 4%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -25,6 +25,8 @@ License: BSD
 URL: http://www.cyrusimap.org/
 
 Source0: https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-%version/cyrus-imapd-%version.tar.gz
+Source1: https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-%version/cyrus-imapd-%version.tar.gz.sig
+Source2: ellie-pub.key
 
 
 # Adapt a timeout to handle our slower builders
@@ -230,6 +232,9 @@ This package contains Perl libraries used to interface with Cyrus IMAPd.
 
 
 %prep
+%if 0%{?fedora}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%endif
 %autosetup -p1
 echo %version > VERSION
 
@@ -669,6 +674,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Wed Jan 04 2023 Martin Osvald <mosvald@redhat.com> - 3.6.0-1
+- New version 3.6.0 (rhbz#2134350)
+- Add source code signature verification
+
 * Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 3.4.4-4
 - Rebuild for ICU 72
 
diff --git a/sources b/sources
index 8dfea37..bbfea2f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
+SHA512 (cyrus-imapd-3.6.0.tar.gz) = d2b21117e7d0dd93212a43ca42098dc8b59613cb45ed2287d381c8c363026ac29386dfd90f07fa2ce8a77f56dddd19f2cc5b80d9c60c400d65cbb1d52a8db93c
+SHA512 (cyrus-imapd-3.6.0.tar.gz.sig) = 190cc2f1ec43ccd18500855346249dbb1aca834ced862dc601c7c5fd91e3f161a633166969da48b1c185e690b02c6e8c55e2cca06bf4e9bc0c110f2e086bdf5d
 SHA512 (cassandane-testdata-ca669d4b.tar.gz) = c153ab0a57d04d9deeabc5ef724eaecc05030c23b170abaa44eaea2e7df409efcdeb24871f7896759e85d64193fb9f289a470b0af9a593a740ffcc45c80033ff
-SHA512 (cyrus-imapd-3.4.4.tar.gz) = 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2