diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2018-01-12 06:36:36 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2018-01-12 06:36:36 +0000 |
| commit | 391b64a00b2e8733118f41a2b8c885cebc3057b4 (patch) | |
| tree | a2d0667f7a34d6fccf19c1957799f32197c9d4f3 /mail/imapfilter | |
| parent | da01a4ce583ff6e564426e264a61ecaa5e30a110 (diff) | |
| download | ports-391b64a00b2e8733118f41a2b8c885cebc3057b4.tar.gz ports-391b64a00b2e8733118f41a2b8c885cebc3057b4.zip | |
mail/imapfilter: Fix missed patch
- Make patches makepatch compatible
Notes
Notes:
svn path=/head/; revision=458805
Diffstat (limited to 'mail/imapfilter')
| -rw-r--r-- | mail/imapfilter/Makefile | 3 | ||||
| -rw-r--r-- | mail/imapfilter/files/patch-auth.c | 20 | ||||
| -rw-r--r-- | mail/imapfilter/files/patch-src_auth.c | 20 |
3 files changed, 22 insertions, 21 deletions
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile index 5e51a50a4ce7..62116eedac31 100644 --- a/mail/imapfilter/Makefile +++ b/mail/imapfilter/Makefile @@ -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 diff --git a/mail/imapfilter/files/patch-auth.c b/mail/imapfilter/files/patch-auth.c deleted file mode 100644 index fdd3e6872480..000000000000 --- a/mail/imapfilter/files/patch-auth.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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); diff --git a/mail/imapfilter/files/patch-src_auth.c b/mail/imapfilter/files/patch-src_auth.c new file mode 100644 index 000000000000..606ffb8a87c5 --- /dev/null +++ b/mail/imapfilter/files/patch-src_auth.c @@ -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); |