diff options
Diffstat (limited to 'mail/cyrus-imapd310')
| -rw-r--r-- | mail/cyrus-imapd310/Makefile | 14 | ||||
| -rw-r--r-- | mail/cyrus-imapd310/distinfo | 6 | ||||
| -rw-r--r-- | mail/cyrus-imapd310/files/patch-imap__httpd.c | 25 |
3 files changed, 37 insertions, 8 deletions
diff --git a/mail/cyrus-imapd310/Makefile b/mail/cyrus-imapd310/Makefile index 0dd447f7c632..352125318c6b 100644 --- a/mail/cyrus-imapd310/Makefile +++ b/mail/cyrus-imapd310/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd -DISTVERSION= 3.10.1 -PORTREVISION= 3 +DISTVERSION= 3.10.2 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/ PKGNAMESUFFIX= ${CYRUS_IMAPD_VER} @@ -23,7 +23,7 @@ CYRUS_IMAPD_VER= 310 LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libicuuc.so:devel/icu \ libjansson.so:devel/jansson \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libical.so:devel/libical CONFLICTS_INSTALL= cyrus-imapd2? cyrus-imapd3[0-9] cyrus-imapd3[0-9]-http @@ -140,8 +140,12 @@ OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi -GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ - --with-gss_impl=heimdal +GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" +.if exists(/usr/libdata/pkgconfig/mit-krb5.pc) +GSSAPI_BASE_CONFIGURE_ON+= --with-gss_impl=mit +.else +GSSAPI_BASE_CONFIGURE_ON+= --with-gss_impl=heimdal +.endif GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal diff --git a/mail/cyrus-imapd310/distinfo b/mail/cyrus-imapd310/distinfo index 68b253a48ef4..e39e95aeeaed 100644 --- a/mail/cyrus-imapd310/distinfo +++ b/mail/cyrus-imapd310/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737543423 -SHA256 (cyrus-imapd-3.10.1.tar.gz) = 4f2245fbc5cd869959c53e98796ad45ceb6a836058034a43db0bb1f7b82d3530 -SIZE (cyrus-imapd-3.10.1.tar.gz) = 11497536 +TIMESTAMP = 1751038682 +SHA256 (cyrus-imapd-3.10.2.tar.gz) = 90440bac0a3ab8ebae7dab97ad6b6b3295b26f866d7e034a32244af99fe2f1cc +SIZE (cyrus-imapd-3.10.2.tar.gz) = 11503922 diff --git a/mail/cyrus-imapd310/files/patch-imap__httpd.c b/mail/cyrus-imapd310/files/patch-imap__httpd.c new file mode 100644 index 000000000000..efec7547cc68 --- /dev/null +++ b/mail/cyrus-imapd310/files/patch-imap__httpd.c @@ -0,0 +1,25 @@ +--- imap/httpd.c.orig 2025-06-27 04:15:42 UTC ++++ imap/httpd.c +@@ -1286,7 +1286,22 @@ static int tls_init(int client_auth, struct buf *serve + + static int tls_init(int client_auth, struct buf *serverinfo) + { ++#ifdef OPENSSL_FULL_VERSION_STR + buf_printf(serverinfo, " OpenSSL/%s", OPENSSL_FULL_VERSION_STR); ++#else ++ unsigned long version = OPENSSL_VERSION_NUMBER; ++ unsigned int status = version & 0x0f; version >>= 4; ++ unsigned int patch = version & 0xff; version >>= 8; ++ unsigned int fix = version & 0xff; version >>= 8; ++ unsigned int minor = version & 0xff; version >>= 8; ++ unsigned int major = version & 0xff; ++ ++ buf_printf(serverinfo, " OpenSSL/%u.%u.%u", major, minor, fix); ++ ++ if (status == 0) buf_appendcstr(serverinfo, "-dev"); ++ else if (status < 15) buf_printf(serverinfo, "-beta%u", status); ++ else if (patch) buf_putc(serverinfo, patch + 'a' - 1); ++#endif + + if (!tls_enabled()) return HTTP_UNAVAILABLE; + |