diff options
Diffstat (limited to 'mail/cyrus-imapd38')
| -rw-r--r-- | mail/cyrus-imapd38/Makefile | 12 | ||||
| -rw-r--r-- | mail/cyrus-imapd38/files/patch-imap__httpd.c | 25 |
2 files changed, 33 insertions, 4 deletions
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile index 83a1fb18cbc9..2a684cc04dce 100644 --- a/mail/cyrus-imapd38/Makefile +++ b/mail/cyrus-imapd38/Makefile @@ -1,6 +1,6 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.8.6 -PORTREVISION= 0 +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= 38 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-57-] cyrus-imapd3[0-57-]-http @@ -133,8 +133,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/libexec/krb5kdc) +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-imapd38/files/patch-imap__httpd.c b/mail/cyrus-imapd38/files/patch-imap__httpd.c new file mode 100644 index 000000000000..efec7547cc68 --- /dev/null +++ b/mail/cyrus-imapd38/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; + |