1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00

mail/imapfilter: Fix missed patch

- Make patches makepatch compatible
This commit is contained in:
Muhammad Moinur Rahman 2018-01-12 06:36:36 +00:00
parent da01a4ce58
commit 391b64a00b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=458805
3 changed files with 22 additions and 21 deletions

View File

@ -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

View File

@ -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);

View File

@ -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);