From 5a77508a9b7738167f2270db8d12a7f2639d4dfd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 29 Sep 2017 09:48:05 -0300 Subject: [PATCH] imapfilter: update to 2.6.10. Closes: #7874 [via git-merge-pr] --- srcpkgs/imapfilter/patches/fix-libressl.patch | 22 +++++++++++++++++++ srcpkgs/imapfilter/template | 6 ++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/imapfilter/patches/fix-libressl.patch diff --git a/srcpkgs/imapfilter/patches/fix-libressl.patch b/srcpkgs/imapfilter/patches/fix-libressl.patch new file mode 100644 index 00000000000..bef512845bc --- /dev/null +++ b/srcpkgs/imapfilter/patches/fix-libressl.patch @@ -0,0 +1,22 @@ +Taken from commit c1865ba1ab2fd8da14e5e018ab55c79cbc432295 on upstream + +--- src/auth.c ++++ src/auth.c +@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsigned char *chal) + 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 ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX *ctx; + #else + HMAC_CTX ctx; +@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const char *pass, unsigned char *chal) + + EVP_DecodeBlock(resp, chal, strlen((char *)(chal))); + +-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER) + ctx = HMAC_CTX_new(); + HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass), + EVP_md5(), NULL); diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 7e7eedcc95d..8e4275e4c6c 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,7 +1,7 @@ # Template file for 'imapfilter' pkgname=imapfilter -version=2.6.7 -revision=3 +version=2.6.10 +revision=1 build_style=gnu-makefile make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr" hostmakedepends="lua-devel" @@ -11,7 +11,7 @@ maintainer="lemmi " license="MIT" homepage="https://github.com/lefcha/imapfilter" distfiles="https://github.com/lefcha/imapfilter/archive/v${version}.tar.gz" -checksum=183efd43c805abaf3f60a1bca788d42da7f05c52fc952efd4555fa40233b4868 +checksum=891674d4c605667ad5ce912913784ecffa3b31b67bcf76d81c3c555cf97e5294 post_configure() { sed -i \