dovecot: Update to version 2.4.2

Author: essandess

mail/dovecot/Portfile

@@ -2,14 +2,15 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
+PortGroup           gpg_verify 1.0
 
-set core_branch     2.3
-set minor_version   21.1
+set core_branch     2.4
+set minor_version   2
 set core_version    ${core_branch}.${minor_version}
-github.setup        dovecot core ${core_version}
+github.setup        dovecot core ${core_version} v
 github.tarball_from releases
 name                dovecot
-revision            1
+revision            0
 epoch               20060722
 
 categories          mail
@@ -26,7 +27,7 @@ long_description    Dovecot is an IMAP and POP3 server for \
                     the common pitfalls.
 
 subport dovecot-sieve {
-    github.setup    dovecot pigeonhole 0.5.${minor_version}
+    github.project  pigeonhole 
     revision        0
 
     description     Pigeonhole sieve and managesieve plugins for dovecot
@@ -65,18 +66,38 @@ subport dovecot-sieve {
 
     homepage        https://pigeonhole.dovecot.org/
 
-    distname        dovecot-${core_branch}-pigeonhole-${version}
     master_sites    ${homepage}releases/${core_branch}/
-
-    checksums       rmd160 4936e99b2e3ca573acc600b2b060a26b5ee67775 \
-                    sha256 0377db284b620723de060431115fb2e7791e1df4321411af718201d6925c4692 \
-                    size   1956404
+    distname        dovecot-pigeonhole-${version}
+
+    checksums       ${distname}${extract.suffix} \
+                    rmd160  10fb4b0a03c990aa391345898c8881bd16c099e4 \
+                    sha256  c2f90cf2a0154f94842ce0d8cafc81f282d0f98dfc3b51c3b7c2385c53316f97 \
+                    size    2071623
+
+    # https://repo.dovecot.org/DOVECOT-REPO-GPG-2.4
+    set gpg_keyid   4EDC5219
+
+    gpg_verify.use_gpg_verification \
+                    yes
+
+    if {[option gpg_verify.use_gpg_verification]} {
+        distfiles-append \
+                    ${distname}${extract.suffix}.sig
+        checksums-append \
+                    ${distname}${extract.suffix}.sig \
+                    size    119
+
+        post-checksum {
+            gpg_verify.verify_gpg_signature \
+                    ${filespath}/keyid-${gpg_keyid}.txt \
+                    ${distpath}/${distname}${extract.suffix}.sig \
+                    ${distpath}/${distname}${extract.suffix}
+        }
+    }
 
     depends_lib-append \
                     port:dovecot
 
-    patchfiles      dynamic_lookup-11-sieve.patch
-
     configure.ldflags-append \
                     -L${prefix}/lib/dovecot
     configure.args  --with-managesieve=yes \
@@ -88,9 +109,32 @@ set perl5.major     5.34
 if {${name} eq ${subport}} {
     master_sites    https://dovecot.org/releases/${core_branch}/
     distname        ${name}-${version}
-    checksums       rmd160 a1dc152dc823680fd5675f982347251a47b6c8d3 \
-                    sha256 2d90a178c4297611088bf7daae5492a3bc3d5ab6328c3a032eb425d2c249097e \
-                    size 7842044
+
+    checksums       ${distname}${extract.suffix} \
+                    rmd160  550e9fea2499f2cdac8b6d2e988eedbeb4e06e31 \
+                    sha256  2cd62e4d22b9fc1c80bd38649739950f0dbda34fbc3e62624fb6842264e93c6e \
+                    size    7807240
+
+    # https://repo.dovecot.org/DOVECOT-REPO-GPG-2.4
+    set gpg_keyid   4EDC5219
+
+    gpg_verify.use_gpg_verification \
+                    yes
+
+    if {[option gpg_verify.use_gpg_verification]} {
+        distfiles-append \
+                    ${distname}${extract.suffix}.sig
+        checksums-append \
+                    ${distname}${extract.suffix}.sig \
+                    size    119
+
+        post-checksum {
+            gpg_verify.verify_gpg_signature \
+                    ${filespath}/keyid-${gpg_keyid}.txt \
+                    ${distpath}/${distname}${extract.suffix}.sig \
+                    ${distpath}/${distname}${extract.suffix}
+        }
+    }
 
     depends_build-append \
                     port:bison \
@@ -112,22 +156,17 @@ if {${name} eq ${subport}} {
               ${default_login_user}    group=${default_login_user}    realname=Dovenull
 
     patch.pre_args-replace  -p0 -p1
-    patchfiles      patch-doc-example-config-conf.d-10-master.conf.diff \
-                    patch-src-master-master-settings.c.diff \
-                    dynamic_lookup-11.patch \
-                    dbox-storage.c.patch
+    patchfiles      patch-src-master-master-settings.c.diff
 
     post-patch {
         reinplace "s|@@default_internal_user@@|${default_internal_user}|g" \
-            ${worksrcpath}/doc/example-config/conf.d/10-master.conf
+            ${worksrcpath}/src/master/master-settings.c
         reinplace "s|@@default_login_user@@|${default_login_user}|g" \
-            ${worksrcpath}/doc/example-config/conf.d/10-master.conf
+            ${worksrcpath}/src/master/master-settings.c
     }
 
     configure.args  --sysconfdir=${prefix}/etc \
                     --localstatedir=${prefix}/var \
-                    --with-ssl=openssl \
-                    --with-zlib \
                     --with-bzlib \
                     --with-ssldir=${prefix}/etc/openssl \
                     --with-shared-libs \
@@ -138,11 +177,6 @@ if {${name} eq ${subport}} {
     configure.env-append \
                     PANDOC=false
 
-    # Remove next release
-    # https://github.com/dovecot/core/commit/1ccd5b54a408d12fce0c94ab0bbaedbb5ef69830
-    configure.env-append \
-                    LIBICU_LIBS=-licui18n\ -licuuc
-
     # check if dovecot-sieve must be upgraded
     post-activate {
         if { ![catch {set result [registry_active dovecot-sieve]}]
@@ -160,15 +194,17 @@ if {${name} eq ${subport}} {
         configure.args-append       --with-ldap=yes
     }
 
-    variant solr requires lucene description {Enable apache-solr support} {
+    variant solr description {Enable apache-solr support} {
         depends_lib-append          port:curl port:expat
         depends_run-append          port:apache-solr9
         configure.args-append       --with-solr
     }
 
-    variant lucene description {Enable lucene support} {
-        depends_lib-append          port:clucene
-        configure.args-append       --with-lucene
+    # remove after 2027-01-01
+    variant lucene \
+        description "Enable Lucene support \[deprecated]" {
+        notes-append \
+            "Dovecot no longer provides this option."
     }
 
     variant libstemmer description {Use libstemmer for full-text search} {

mail/dovecot/files/dbox-storage.c.patch

@@ -0,0 +1,25 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZ49ZxhYJKwYBBAHaRw8BAQdABhVJFqsoq7gZeXhY/xcz5Vc0i+vM/Df8RDSW
+lzPHsoC0MkRvdmVjb3QgQ29tbXVuaXR5IEVkaXRpb24gPGRvdmVjb3QtY2VAZG92
+ZWNvdC5vcmc+iJAEExYIADgWIQTvCIIHn9TtMr+LI7KhsJ74TtxSGQUCZ49ZxgIb
+AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRChsJ74TtxSGUgvAP9gNC6pZKBV
+micPYvE2UOTvX8WoEcjWI1UptTxFsHXOjwEA6DZiPoPn9Vvl4PuyG8TavjDslOL8
+pfn+XKZho2WoAgSJAjMEEAEKAB0WIQQr50qrPudU37nIDTMYo0iu7UCdoQUCZ49a
+xgAKCRAYo0iu7UCdoVPOD/452ZnhEYW2/VxgDmD7DNaaxdfL/vKifc9MP2sJm+a2
+T95zHpm/erV2xw3gPpKcLuMaPhkexf6MMhoh9GnUnwEuoOfMWhMAn26RNPFvuUL0
+a73qoxRY9D+Q/PUNjNsNFj/3c8VIC3DeQhO77wVblLWr9+7J9GrzKtBCkb7zC5Xf
+8zjLkCWZ15S0kVKNvBsZzEzLYVN/+Kk1s1WP4x1gnQdPm8N7+b4XAQSOUXLjkL5S
+vGyIUuHwnYHQJeH51L+q8SpzEr59K9OiVYOCm0ICl28xjOjIC9Ym7a8W5Xa5new3
+ScxNeTuxRItYeDyxXi+YIYGHWYGjmppmlq3VksXirUHfgNoipVSbmGxCukShSsfH
+f/40iO8DRFRnsUN2lzN4TCcT1ayQvKoyMFuoXQJonuLdbc7E+YLNIPsW66+aoAuW
+g+5j2QFMFxAJS9IoTCsVQv52MuCj2X5KgwmBcYSgWGpoog9Yx+aaVQQ+X++9FX8r
+RcnyOGOBaA6htH4g1kUOWwZ/NxObRiA7QLo4Rz6CJrU7ueRIaeSCCXTxCb5dJDeE
+IB1MZh1artKZ6Rko+cv/Vy0Ojb0JfPDDoQyhblPIXhlJN8/4zFCjxilMDA9CTAB6
+kY1TVGp138CDnJHZvCdvbrlWf7ktw3+CGKQsZq96Jf756L28dTA42E+WqCBFMZna
+V7g4BGePWcYSCisGAQQBl1UBBQEBB0A50U//EHUvujYRMNqQ3XMVt8lxU7HtdmsH
+Bamh6BjmLgMBCAeIeAQYFggAIBYhBO8Iggef1O0yv4sjsqGwnvhO3FIZBQJnj1nG
+AhsMAAoJEKGwnvhO3FIZEZQBAKuMI//Cjl38pD68fQfcnIMDV2YnXjvaswe7jbDr
+Jyo4AQDr/VanhFwPxSlZ3MKY4PWyLw4Fm9mTT2ofcluFttRsDg==
+=eQ4x
+-----END PGP PUBLIC KEY BLOCK-----