From 428fe914c7d2e217b5b44b4b9bbb1552e8c926d6 Mon Sep 17 00:00:00 2001
From: Archana Choudhary <36061892+arc9693@users.noreply.github.com>
Date: Thu, 14 Sep 2023 21:27:04 +0530
Subject: [PATCH] Upgrade imaptest 20210305 to 20210511 (#6215)

---
 .../imaptest/imaptest.signatures.json         |  2 +-
 SPECS-EXTENDED/imaptest/imaptest.spec         | 26 ++++++++++++-------
 cgmanifest.json                               |  6 ++---
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/SPECS-EXTENDED/imaptest/imaptest.signatures.json b/SPECS-EXTENDED/imaptest/imaptest.signatures.json
index a9dd8a7655..b6099f206e 100644
--- a/SPECS-EXTENDED/imaptest/imaptest.signatures.json
+++ b/SPECS-EXTENDED/imaptest/imaptest.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "imaptest-20210305.tar.gz": "cd5e380bd2fc70bc5efdda55f579f5b0453bd7aeb1dc6e5c74b615aac9f53494"
+  "imaptest-20210511.tar.gz": "8cc24fd0da194d1f935f7c92431d6bd9ae9af436045d57ba7ed73fee07da09d2"
  }
 }
\ No newline at end of file
diff --git a/SPECS-EXTENDED/imaptest/imaptest.spec b/SPECS-EXTENDED/imaptest/imaptest.spec
index 58cfa3c132..90213038ec 100644
--- a/SPECS-EXTENDED/imaptest/imaptest.spec
+++ b/SPECS-EXTENDED/imaptest/imaptest.spec
@@ -1,15 +1,19 @@
-Vendor:         Microsoft Corporation
-Distribution:   Mariner
 Summary:        Generic IMAP server compliancy tester
 Name:           imaptest
 # Upstream is not really planning on adding version numbers
-Version:        20210305
-Release:        2%{?dist}
+Version:        20210511
+Release:        1%{?dist}
 License:        MIT
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
 URL:            https://www.imapwiki.org/ImapTest
 Source0:        https://dovecot.org/nightly/%{name}/%{name}-%{version}.tar.gz
-BuildRequires:  gcc, make, dovecot-devel >= 2.3.0
-BuildRequires:  autoconf, automake, libtool
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  dovecot-devel >= 2.3.15
+BuildRequires:  gcc
+BuildRequires:  libtool
+BuildRequires:  make
 
 %description
 ImapTest is a generic IMAP server compliancy tester that works with all IMAP
@@ -36,11 +40,11 @@ sed -e 's@\(^LIBDOVECOT .*\)@\1 -Wl,-rpath -Wl,%{_libdir}/dovecot@' -i src/Makef
 %make_install
 
 # Copy test files for later shipping
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
-cp -pr src/tests/ $RPM_BUILD_ROOT%{_datadir}/%{name}/
+mkdir -p %{buildroot}%{_datadir}/%{name}/
+cp -pr src/tests/ %{buildroot}%{_datadir}/%{name}/
 
 %check
-$RPM_BUILD_ROOT%{_bindir}/%{name} --help
+%{buildroot}%{_bindir}/%{name} --help
 
 %files
 %license COPYING COPYING.MIT
@@ -49,6 +53,10 @@ $RPM_BUILD_ROOT%{_bindir}/%{name} --help
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Sep 14 2023 Archana Choudhary <archana1@microsoft.com> - 20210511-1
+- Upgrade to 20210511 to support dovecot>=2.3.15
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 20210305-2
 - Initial CBL-Mariner import from Fedora 34 (license: MIT).
 
diff --git a/cgmanifest.json b/cgmanifest.json
index bb264797e8..9bfba9b533 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -7221,8 +7221,8 @@
         "type": "other",
         "other": {
           "name": "imaptest",
-          "version": "20210305",
-          "downloadUrl": "https://dovecot.org/nightly/imaptest/imaptest-20210305.tar.gz"
+          "version": "20210511",
+          "downloadUrl": "https://dovecot.org/nightly/imaptest/imaptest-20210511.tar.gz"
         }
       }
     },
@@ -30827,4 +30827,4 @@
     }
   ],
   "Version": 1
-}
\ No newline at end of file
+}