Date: Fri, 12 Jan 2018 06:36:37 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458805 - in head/mail/imapfilter: . files Message-ID: <201801120636.w0C6ab1b069740@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Fri Jan 12 06:36:36 2018 New Revision: 458805 URL: https://svnweb.freebsd.org/changeset/ports/458805 Log: mail/imapfilter: Fix missed patch - Make patches makepatch compatible Added: head/mail/imapfilter/files/patch-src_auth.c (contents, props changed) Deleted: head/mail/imapfilter/files/patch-auth.c Modified: head/mail/imapfilter/Makefile Modified: head/mail/imapfilter/Makefile ============================================================================== --- head/mail/imapfilter/Makefile Fri Jan 12 03:09:55 2018 (r458804) +++ head/mail/imapfilter/Makefile Fri Jan 12 06:36:36 2018 (r458805) @@ -3,6 +3,7 @@ PORTNAME= imapfilter PORTVERSION= 2.6.11 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= mail @@ -30,7 +31,7 @@ MAKE_ARGS= PREFIX=${PREFIX} \ LIBLUA=-llua-${LUA_VER} post-patch: - ${REINPLACE_CMD} 's|-ldl ||' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} 's|-ldl ||' ${WRKSRC}/src/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/imapfilter Added: head/mail/imapfilter/files/patch-src_auth.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/imapfilter/files/patch-src_auth.c Fri Jan 12 06:36:36 2018 (r458805) @@ -0,0 +1,20 @@ +--- src/auth.c.orig 2017-11-19 09:38:24 UTC ++++ src/auth.c +@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi + 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 && !defined(LIBRESSL_VERSION_NUMBER) ++#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX *ctx; + #else + HMAC_CTX ctx; +@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsi + + EVP_DecodeBlock(resp, chal, strlen((char *)(chal))); + +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) ++#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER) + ctx = HMAC_CTX_new(); + HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass), + EVP_md5(), NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801120636.w0C6ab1b069740>