Index: head/mail/imapfilter/Makefile =================================================================== --- head/mail/imapfilter/Makefile (revision 435497) +++ head/mail/imapfilter/Makefile (revision 435498) @@ -1,57 +1,58 @@ # Created by: Lefteris Chatzibarbas # $FreeBSD$ PORTNAME= imapfilter PORTVERSION= 2.6.10 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= mail MAINTAINER= bofh@FreeBSD.org COMMENT= IMAP mail filtering utility LICENSE= MIT LIB_DEPENDS= libpcre.so:devel/pcre USES= lua ssl CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} USE_GITHUB= yes GH_ACCOUNT= lefcha PORTDOCS= LICENSE NEWS README PLIST_FILES= bin/imapfilter \ man/man1/imapfilter.1.gz \ man/man5/imapfilter_config.5.gz \ %%DATADIR%%/account.lua \ %%DATADIR%%/auxiliary.lua \ %%DATADIR%%/common.lua \ %%DATADIR%%/mailbox.lua \ %%DATADIR%%/message.lua \ %%DATADIR%%/options.lua \ %%DATADIR%%/regex.lua \ %%DATADIR%%/set.lua \ %%EXAMPLESDIR%%/config.lua \ %%EXAMPLESDIR%%/extend.lua MAKE_ARGS= PREFIX=${PREFIX} \ MYCFLAGS="${CPPFLAGS}" \ MYLDFLAGS="${LDFLAGS}" \ BINDIR=${PREFIX}/bin \ SHAREDIR=${DATADIR} \ MANDIR=${MANPREFIX}/man \ LIBLUA=-llua-${LUA_VER} post-patch: ${REINPLACE_CMD} 's|-ldl ||' ${WRKSRC}/src/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/imapfilter @${MKDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${EXAMPLESDIR} cd ${WRKSRC}/samples && \ ${INSTALL_DATA} config.lua extend.lua \ ${STAGEDIR}/${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}/${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR} .include Index: head/mail/imapfilter/files/patch-auth.c =================================================================== --- head/mail/imapfilter/files/patch-auth.c (nonexistent) +++ head/mail/imapfilter/files/patch-auth.c (revision 435498) @@ -0,0 +1,20 @@ +--- src/auth.c.orig 2017-02-27 08:30:09 UTC ++++ src//auth.c +@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const ch + unsigned char *resp, *buf, *out; + unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1]; + unsigned int mdlen; +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#ifdef HAVE_OPAQUE_STRUCTS + HMAC_CTX *ctx; + #else + HMAC_CTX ctx; +@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const ch + + EVP_DecodeBlock(resp, chal, strlen((char *)(chal))); + +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#ifdef HAVE_OPAQUE_STRUCTS + ctx = HMAC_CTX_new(); + HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass), + EVP_md5(), NULL); Property changes on: head/mail/imapfilter/files/patch-auth.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/imapfilter/files/patch-imapfilter.c =================================================================== --- head/mail/imapfilter/files/patch-imapfilter.c (nonexistent) +++ head/mail/imapfilter/files/patch-imapfilter.c (revision 435498) @@ -0,0 +1,38 @@ +--- src/imapfilter.c.orig 2017-02-27 08:19:40 UTC ++++ src/imapfilter.c +@@ -21,7 +21,7 @@ + + extern buffer ibuf, obuf, nbuf, cbuf; + extern regexp responses[]; +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER + extern SSL_CTX *sslctx; + #else + extern SSL_CTX *ssl23ctx; +@@ -131,7 +131,7 @@ main(int argc, char *argv[]) + + SSL_library_init(); + SSL_load_error_strings(); +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER + sslctx = SSL_CTX_new(TLS_method()); + #else + ssl23ctx = SSL_CTX_new(SSLv23_client_method()); +@@ -152,7 +152,7 @@ main(int argc, char *argv[]) + capath = opts.truststore; + else if (exists_file(opts.truststore)) + cafile = opts.truststore; +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER + if (sslctx) + SSL_CTX_load_verify_locations(sslctx, cafile, capath); + #else +@@ -193,7 +193,7 @@ main(int argc, char *argv[]) + #endif + stop_lua(); + +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER + if (sslctx) + SSL_CTX_free(sslctx); + #else Property changes on: head/mail/imapfilter/files/patch-imapfilter.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property