cyrus-imapd 3.4.1-1: Update to new version

4 files changed, 34 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 028d5ad3cc82..055755e3b1e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cyrus-imapd
 	pkgdesc = An email, contacts and calendar server
-	pkgver = 3.2.5
+	pkgver = 3.4.1
 	pkgrel = 1
 	url = https://www.cyrusimap.org/
 	arch = x86_64
@@ -30,17 +30,17 @@ pkgbase = cyrus-imapd
 	makedepends = python-sphinx
 	makedepends = python-gitpython
 	makedepends = perl-pod-pom-view-restructured
-	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.2.5/cyrus-imapd-3.2.5.tar.gz
-	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.2.5/cyrus-imapd-3.2.5.tar.gz.sig
-	source = sphinx3.patch
+	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.4.1/cyrus-imapd-3.4.1.tar.gz
+	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.4.1/cyrus-imapd-3.4.1.tar.gz.sig
+	source = sphinx4.patch
 	source = imapd.conf.patch
 	source = cyrus-imapd.service
 	source = cyrus-imapd.sysusers.conf
 	source = cyrus-imapd.tmpfiles.conf
 	validpgpkeys = 5B55619A9D7040A9DEE2A2CB554F04FEB36378E0
-	sha512sums = 549e0e430b3899f66fec16ae138f299434fc4882a83fbb30139667907c31cf26bf3533295a4dc343794a11f296eb2b4e84c08124ab2301c95e9c3bf7c06ab37b
+	sha512sums = 9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa
 	sha512sums = SKIP
-	sha512sums = 3f4cb6d4383cd41ce168255d5c5123ff2c350d33e293643971e51c4fd04faaab2b08067d77559376cbd60663358f467284097d86bb476eb85312797354bab174
+	sha512sums = 61ea7c6079ffd32bc99b07911088e772cb0ddb0757b4673f9335b0f00e79934b77af67f6d3bbed68e9446ea4b50c7a07abcca363b2b767331136ccbe34852b6b
 	sha512sums = 0862ffc8c05208efd4d2fb50a6e3719ebc65fc2d72f8e6404235aa32cc44d8227056a17b78f2726e15ff8e38d473795f837c34bfbe89b694b2298c9baab9d5db
 	sha512sums = 738242e80cec2c25ae6a85a889cc8d35d7c2f43b2b4d64d74f99a230b21024f168a885f1e319aec1aab0e0599e41211478b99dc608a4ba036be90f8d7e23fd96
 	sha512sums = 28612e491371515b414ce6d34554f1c2286624f5b80872e6be7037a2cccba1ed5bd2c4bfed27ed978478debdfb5f3d56aaa30d767f50b125f2ad38e76a37702c
diff --git a/PKGBUILD b/PKGBUILD
index 6585d16722d1..efaab0b81a13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgbase=cyrus-imapd
 pkgname=(cyrus-imapd cyrus-imapd-docs)
-pkgver=3.2.5
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="An email, contacts and calendar server"
 arch=('x86_64' 'armv6h' 'armv7h')
@@ -18,15 +18,15 @@ makedepends=('libsasl' 'icu' 'jansson' 'libical' 'libxml2' 'krb5' 'sqlite'
              'libchardet' 'python-sphinx' 'python-gitpython'
              'perl-pod-pom-view-restructured')
 source=("https://github.com/cyrusimap/cyrus-imapd/releases/download/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.sig}
-        "sphinx3.patch"
+        "sphinx4.patch"
         "imapd.conf.patch"
         "cyrus-imapd.service"
         "cyrus-imapd.sysusers.conf"
         "cyrus-imapd.tmpfiles.conf")
 validpgpkeys=('5B55619A9D7040A9DEE2A2CB554F04FEB36378E0')
-sha512sums=('549e0e430b3899f66fec16ae138f299434fc4882a83fbb30139667907c31cf26bf3533295a4dc343794a11f296eb2b4e84c08124ab2301c95e9c3bf7c06ab37b'
+sha512sums=('9fd13e93755aca98215c1bd9c21fa3ef3a3db8b1ff48f71dd6070e614e9c68cb591b1cb411fa1319d46ab1d49ddc971f188a41cc0c9a2e2c9df0cc08299f8bfa'
             'SKIP'
-            '3f4cb6d4383cd41ce168255d5c5123ff2c350d33e293643971e51c4fd04faaab2b08067d77559376cbd60663358f467284097d86bb476eb85312797354bab174'
+            '61ea7c6079ffd32bc99b07911088e772cb0ddb0757b4673f9335b0f00e79934b77af67f6d3bbed68e9446ea4b50c7a07abcca363b2b767331136ccbe34852b6b'
             '0862ffc8c05208efd4d2fb50a6e3719ebc65fc2d72f8e6404235aa32cc44d8227056a17b78f2726e15ff8e38d473795f837c34bfbe89b694b2298c9baab9d5db'
             '738242e80cec2c25ae6a85a889cc8d35d7c2f43b2b4d64d74f99a230b21024f168a885f1e319aec1aab0e0599e41211478b99dc608a4ba036be90f8d7e23fd96'
             '28612e491371515b414ce6d34554f1c2286624f5b80872e6be7037a2cccba1ed5bd2c4bfed27ed978478debdfb5f3d56aaa30d767f50b125f2ad38e76a37702c'
@@ -35,7 +35,7 @@ sha512sums=('549e0e430b3899f66fec16ae138f299434fc4882a83fbb30139667907c31cf26bf3
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -Np1 < "${srcdir}/sphinx3.patch"
+  patch -Np1 < "${srcdir}/sphinx4.patch"
 }
 
 build() {
diff --git a/sphinx3.patch b/sphinx3.patch
deleted file mode 100644
index fee40d4bb502..000000000000
--- a/sphinx3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -aur package.pristine/docsrc/exts/sphinxlocal/builders/manpage.py package.new/docsrc/exts/sphinxlocal/builders/manpage.py
---- package.pristine/docsrc/exts/sphinxlocal/builders/manpage.py	2020-03-13 03:11:22.000000000 +0100
-+++ package.new/docsrc/exts/sphinxlocal/builders/manpage.py	2020-05-10 13:45:28.271723458 +0200
-@@ -21,7 +21,7 @@
- from sphinx import addnodes
- from sphinx.errors import SphinxError
- from sphinx.builders import Builder
--from sphinx.environment import NoUri
-+from sphinx.errors import NoUri
- from sphinx.util.nodes import inline_all_toctrees
- from sphinx.util.console import bold, darkgreen
- from sphinx.writers.manpage import ManualPageWriter
-diff -aur package.pristine/docsrc/exts/sphinxlocal/writers/manpage.py package.new/docsrc/exts/sphinxlocal/writers/manpage.py
---- package.pristine/docsrc/exts/sphinxlocal/writers/manpage.py	2020-03-13 03:11:22.000000000 +0100
-+++ package.new/docsrc/exts/sphinxlocal/writers/manpage.py	2020-05-10 13:58:51.876605768 +0200
-@@ -26,7 +26,7 @@
- 
- from sphinx import addnodes
- from sphinx.locale import admonitionlabels, _
--from sphinx.util.osutil import ustrftime
-+from sphinx.util.i18n import format_date
- 
- class CyrusManualPageWriter(ManualPageWriter):
- 
-@@ -71,8 +71,9 @@
-         if builder.config.today:
-             self._docinfo['date'] = builder.config.today
-         else:
--            self._docinfo['date'] = ustrftime(builder.config.today_fmt
--                                              or _('%B %d, %Y'))
-+            self._docinfo['date'] = format_date(builder.config.today_fmt or
-+                                                _('MMMM dd, YYYY'),
-+                                                language=builder.config.language)
-         self._docinfo['copyright'] = builder.config.copyright
-         self._docinfo['version'] = builder.config.version
-         self._docinfo['manual_group'] = builder.config.project
diff --git a/sphinx4.patch b/sphinx4.patch
new file mode 100644
index 000000000000..37f512a51d71
--- /dev/null
+++ b/sphinx4.patch
@@ -0,0 +1,23 @@
+diff -aur package.pristine/docsrc/exts/sphinxlocal/writers/manpage.py package.new/docsrc/exts/sphinxlocal/writers/manpage.py
+--- package.pristine/docsrc/exts/sphinxlocal/writers/manpage.py	2021-05-10 06:34:24.000000000 +0200
++++ package.new/docsrc/exts/sphinxlocal/writers/manpage.py	2021-05-11 03:09:40.483441245 +0200
+@@ -38,7 +38,7 @@
+         self.builder = builder
+ 
+     def translate(self):
+-        visitor = CyrusManualPageTranslator(self.builder, self.document)
++        visitor = CyrusManualPageTranslator(self.document, self.builder)
+         self.visitor = visitor
+         self.document.walkabout(visitor)
+         self.output = visitor.astext()
+@@ -49,8 +49,8 @@
+     Custom translator.
+     """
+ 
+-    def __init__(self, builder, *args, **kwds):
+-        BaseTranslator.__init__(self, builder, *args, **kwds)
++    def __init__(self, document, builder, *args, **kwds):
++        BaseTranslator.__init__(self, document, builder, *args, **kwds)
+         self.builder = builder
+ 
+         self.in_productionlist = 0