cyrus-imapd-3.8.1-1: Update to new version

Co-authored-by: Lukasz Michalski <lm@zork.pl>

4 files changed, 40 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04aa3188ac91..88b44ef03f88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cyrus-imapd
 	pkgdesc = An email, contacts and calendar server
-	pkgver = 3.6.0
+	pkgver = 3.8.1
 	pkgrel = 1
 	url = https://www.cyrusimap.org/
 	arch = x86_64
@@ -31,24 +31,25 @@ 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.6.0/cyrus-imapd-3.6.0.tar.gz
-	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.6.0/cyrus-imapd-3.6.0.tar.gz.sig
-	source = sphinx4.patch
+	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.8.1/cyrus-imapd-3.8.1.tar.gz
+	source = https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.8.1/cyrus-imapd-3.8.1.tar.gz.sig
+	source = https://src.fedoraproject.org/rpms/cyrus-imapd/raw/4176c0e5983b3d19752f2db3860c33bafa7c259b/f/patch-cyrus-remove-always-inline-for-buf-len
+	source = docs.patch
 	source = imapd.conf.patch
 	source = cyrus-imapd.service
 	source = cyrus-imapd.sysusers.conf
 	source = cyrus-imapd.tmpfiles.conf
 	validpgpkeys = 5B55619A9D7040A9DEE2A2CB554F04FEB36378E0
-	sha512sums = d2b21117e7d0dd93212a43ca42098dc8b59613cb45ed2287d381c8c363026ac29386dfd90f07fa2ce8a77f56dddd19f2cc5b80d9c60c400d65cbb1d52a8db93c
+	sha512sums = 95473c7fbe0ccfae2b4f4dddd0448b33079c50848334054d9ce0489e74c70bc99c53f12ec3e46c9d8055480b31cc412896fc26a60ae2844cb8d7f61f9867caed
 	sha512sums = SKIP
-	sha512sums = 61ea7c6079ffd32bc99b07911088e772cb0ddb0757b4673f9335b0f00e79934b77af67f6d3bbed68e9446ea4b50c7a07abcca363b2b767331136ccbe34852b6b
+	sha512sums = 575db085359af83605e89972ab20e2e1f62e67418242f954f4ed5e60d29acf66dfea07f41537327688857eddb0b310b5ee6361155a7588299d5adbaea487307a
+	sha512sums = 6634e985548f2a80e4db7dca11c9de5943848d8cfb301cf6d45a39d52b401dc15f5242a692bca38b4e05ebca157a6f3e4469ff011d489da83bc1fcc13b09bcca
 	sha512sums = 0862ffc8c05208efd4d2fb50a6e3719ebc65fc2d72f8e6404235aa32cc44d8227056a17b78f2726e15ff8e38d473795f837c34bfbe89b694b2298c9baab9d5db
 	sha512sums = 738242e80cec2c25ae6a85a889cc8d35d7c2f43b2b4d64d74f99a230b21024f168a885f1e319aec1aab0e0599e41211478b99dc608a4ba036be90f8d7e23fd96
 	sha512sums = 28612e491371515b414ce6d34554f1c2286624f5b80872e6be7037a2cccba1ed5bd2c4bfed27ed978478debdfb5f3d56aaa30d767f50b125f2ad38e76a37702c
 	sha512sums = 70fedcd78f4e505038e2716a0446e7bb7f7a344faf2ab43c51f47380ff56a9c2407cfbe0f24c006618a901e44ff124a7f6ed19203478a6b852d7bda7771210c5
 
 pkgname = cyrus-imapd
-	install = cyrus-imapd.install
 	depends = libsasl
 	depends = icu
 	depends = jansson
diff --git a/PKGBUILD b/PKGBUILD
index 48250552d6eb..b40813399c95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgbase=cyrus-imapd
 pkgname=(cyrus-imapd cyrus-imapd-docs)
-pkgver=3.6.0
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="An email, contacts and calendar server"
 arch=('x86_64' 'armv6h' 'armv7h')
@@ -18,15 +18,17 @@ makedepends=('libsasl' 'icu' 'jansson' 'libical' 'libxml2' 'krb5' 'sqlite'
              'libchardet' 'python-six' '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}
-        "sphinx4.patch"
+        "https://src.fedoraproject.org/rpms/cyrus-imapd/raw/4176c0e5983b3d19752f2db3860c33bafa7c259b/f/patch-cyrus-remove-always-inline-for-buf-len"
+        "docs.patch"
         "imapd.conf.patch"
         "cyrus-imapd.service"
         "cyrus-imapd.sysusers.conf"
         "cyrus-imapd.tmpfiles.conf")
 validpgpkeys=('5B55619A9D7040A9DEE2A2CB554F04FEB36378E0')
-sha512sums=('d2b21117e7d0dd93212a43ca42098dc8b59613cb45ed2287d381c8c363026ac29386dfd90f07fa2ce8a77f56dddd19f2cc5b80d9c60c400d65cbb1d52a8db93c'
+sha512sums=('95473c7fbe0ccfae2b4f4dddd0448b33079c50848334054d9ce0489e74c70bc99c53f12ec3e46c9d8055480b31cc412896fc26a60ae2844cb8d7f61f9867caed'
             'SKIP'
-            '61ea7c6079ffd32bc99b07911088e772cb0ddb0757b4673f9335b0f00e79934b77af67f6d3bbed68e9446ea4b50c7a07abcca363b2b767331136ccbe34852b6b'
+            '575db085359af83605e89972ab20e2e1f62e67418242f954f4ed5e60d29acf66dfea07f41537327688857eddb0b310b5ee6361155a7588299d5adbaea487307a'
+            '6634e985548f2a80e4db7dca11c9de5943848d8cfb301cf6d45a39d52b401dc15f5242a692bca38b4e05ebca157a6f3e4469ff011d489da83bc1fcc13b09bcca'
             '0862ffc8c05208efd4d2fb50a6e3719ebc65fc2d72f8e6404235aa32cc44d8227056a17b78f2726e15ff8e38d473795f837c34bfbe89b694b2298c9baab9d5db'
             '738242e80cec2c25ae6a85a889cc8d35d7c2f43b2b4d64d74f99a230b21024f168a885f1e319aec1aab0e0599e41211478b99dc608a4ba036be90f8d7e23fd96'
             '28612e491371515b414ce6d34554f1c2286624f5b80872e6be7037a2cccba1ed5bd2c4bfed27ed978478debdfb5f3d56aaa30d767f50b125f2ad38e76a37702c'
@@ -35,7 +37,10 @@ sha512sums=('d2b21117e7d0dd93212a43ca42098dc8b59613cb45ed2287d381c8c363026ac2938
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -Np1 < "${srcdir}/sphinx4.patch"
+  # https://bugzilla.redhat.com/show_bug.cgi?id=2223951
+  patch -Np1 < "${srcdir}/patch-cyrus-remove-always-inline-for-buf-len"
+  # https://github.com/cyrusimap/cyrus-imapd/issues/4491
+  patch -Np1 < "${srcdir}/docs.patch"
 }
 
 build() {
@@ -89,12 +94,19 @@ package_cyrus-imapd() {
               'rsync: for compacting Xapian databases')
   provides=('imap-server' 'pop3-server')
   backup=('etc/cyrus/cyrus.conf' 'etc/cyrus/imapd.conf')
-  install="${pkgname}.install"
+  #install="${pkgname}.install"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   make install INSTALLDIRS=vendor DESTDIR="${pkgdir}"
 
+  # Rename restore so it doesn't conflict with the identically named command
+  # from tar
+  mv "${pkgdir}/usr/bin/restore" \
+    "${pkgdir}/usr/bin/cyr_restore"
+  mv "${pkgdir}/usr/share/man/man8/restore.8" \
+    "${pkgdir}/usr/share/man/man8/cyr_restore.8"
+
   # Rename httpd.8 and master.8 so they don't conflict with the identically
   # named manpages from postfix and apache
   mv "${pkgdir}/usr/share/man/man8/httpd.8" \
diff --git a/docs.patch b/docs.patch
new file mode 100644
index 000000000000..3a4cd18a9f33
--- /dev/null
+++ b/docs.patch
@@ -0,0 +1,14 @@
+Reported as https://github.com/cyrusimap/cyrus-imapd/issues/4491
+--- package.pristine/docsrc/conf.py 2022-12-12 03:05:16.000000000 +0100
++++ package.patched/docsrc/conf.py  2023-04-27 15:49:52.022327117 +0200
+@@ -527,8 +527,8 @@
+ # XXX handlers here, except that these urls require expanding the version string
+ # XXX twice, and the sphinx extlinks thingy currently only supports a single %s
+ extlinks = {
+-        'draft':('https://tools.ietf.org/html/%s', ''),
+-        'issue':('https://github.com/cyrusimap/cyrus-imapd/issues/%s', 'Issue #'),
++        'draft':('https://tools.ietf.org/html/%s', None),
++        'issue':('https://github.com/cyrusimap/cyrus-imapd/issues/%s', 'Issue #%s'),
+         'cyrus-2.5':('https://www.cyrusimap.org/2.5%s',None),
+         'cyrus-3.0':('https://www.cyrusimap.org/3.0%s',None),
+         'cyrus-3.2':('https://www.cyrusimap.org/3.2%s',None),
diff --git a/sphinx4.patch b/sphinx4.patch
deleted file mode 100644
index 37f512a51d71..000000000000
--- a/sphinx4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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