cyrus-imapd 3.8.2-1: Update to new version

1 files changed, 11 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b40813399c95..bc70cfaa2c4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,29 +6,26 @@
 
 pkgbase=cyrus-imapd
 pkgname=(cyrus-imapd cyrus-imapd-docs)
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="An email, contacts and calendar server"
 arch=('x86_64' 'armv6h' 'armv7h')
 url="https://www.cyrusimap.org/"
-license=('BSD')
+license=('BSD-Attribution-HPND-disclaimer')
 makedepends=('libsasl' 'icu' 'jansson' 'libical' 'libxml2' 'krb5' 'sqlite'
              'mariadb-libs' 'postgresql-libs' 'libnghttp2' 'brotli' 'zstd'
              'shapelib' 'libldap' 'libcap' 'xapian-core' 'perl' 'clamav' 'rsync'
-             'libchardet' 'python-six' 'python-sphinx' 'python-gitpython'
-             'perl-pod-pom-view-restructured')
+             'libchardet' 'pcre')
 source=("https://github.com/cyrusimap/cyrus-imapd/releases/download/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz"{,.sig}
         "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=('95473c7fbe0ccfae2b4f4dddd0448b33079c50848334054d9ce0489e74c70bc99c53f12ec3e46c9d8055480b31cc412896fc26a60ae2844cb8d7f61f9867caed'
+sha512sums=('16319110ad4ad10700a4e08273a7411534b4b8fa5700eca09704d2079ef95a702520083b87ac47c71a9cb223372956465d14804fbdfc78b999bf519261827501'
             'SKIP'
             '575db085359af83605e89972ab20e2e1f62e67418242f954f4ed5e60d29acf66dfea07f41537327688857eddb0b310b5ee6361155a7588299d5adbaea487307a'
-            '6634e985548f2a80e4db7dca11c9de5943848d8cfb301cf6d45a39d52b401dc15f5242a692bca38b4e05ebca157a6f3e4469ff011d489da83bc1fcc13b09bcca'
             '0862ffc8c05208efd4d2fb50a6e3719ebc65fc2d72f8e6404235aa32cc44d8227056a17b78f2726e15ff8e38d473795f837c34bfbe89b694b2298c9baab9d5db'
             '738242e80cec2c25ae6a85a889cc8d35d7c2f43b2b4d64d74f99a230b21024f168a885f1e319aec1aab0e0599e41211478b99dc608a4ba036be90f8d7e23fd96'
             '28612e491371515b414ce6d34554f1c2286624f5b80872e6be7037a2cccba1ed5bd2c4bfed27ed978478debdfb5f3d56aaa30d767f50b125f2ad38e76a37702c'
@@ -39,8 +36,6 @@ prepare() {
 
   # 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() {
@@ -52,7 +47,7 @@ build() {
   # Work around Cyrus bug #3562
   export CFLAGS="${CFLAGS} -fno-toplevel-reorder"
   # Work around Cyrus bug #2629
-  export LDFLAGS="${LDFLAGS/,--as-needed}"
+  export LDFLAGS="${LDFLAGS/-Wl,--as-needed}"
 
   ./configure \
     --prefix=/usr \
@@ -88,7 +83,8 @@ check() {
 package_cyrus-imapd() {
   depends=('libsasl' 'icu' 'jansson' 'libical' 'libxml2' 'krb5' 'sqlite'
            'mariadb-libs' 'postgresql-libs' 'libnghttp2' 'brotli' 'zstd'
-           'shapelib' 'libldap' 'libcap' 'xapian-core' 'perl' 'libchardet')
+           'shapelib' 'libldap' 'libcap' 'xapian-core' 'perl' 'libchardet'
+           'pcre')
   optdepends=('cyrus-imapd-docs: documentation'
               'clamav: for cyr_virusscan'
               'rsync: for compacting Xapian databases')
@@ -115,20 +111,10 @@ package_cyrus-imapd() {
     "${pkgdir}/usr/share/man/man8/master.8cyrus"
 
   # Install additional utilities
-  for i in arbitronsort.pl masssievec mkimap mknewsgroups rehash \
-           translatesieve; do
-    install -Dm755 "tools/${i}" "${pkgdir}/usr/bin/${i}"
-  done
-
-  # Install additional manpages
-  for i in arbitronsort.pl synctest dav_reconstruct; do
-    install -Dm644 "man/${i}.1" "${pkgdir}/usr/share/man/man1/${i}.1"
-  done
-  for i in cvt_xlist_specialuse cyradm cyrdump cyr_ls cyr_userseen lmtpproxyd \
-           masssievec mkimap mknewsgroups mupdate pop3proxyd proxyd ptdump \
-           ptexpire ptloader rehash relocate_by_id sievec sieved translatesieve
-  do
-    install -Dm644 "man/${i}.8" "${pkgdir}/usr/share/man/man8/${i}.8"
+  for i in arbitronsort.pl.1 masssievec.8 mkimap.8 mknewsgroups.8 rehash.8 \
+           translatesieve.8; do
+    install -Dm755 "tools/${i::-2}" "${pkgdir}/usr/bin/${i::-2}"
+    install -Dm755 "man/${i}" "${pkgdir}/usr/share/man/man${i: -1}/${i}"
   done
 
   # Install configuration files