diff --git a/srcpkgs/mosquitto/patches/fix-libressl.patch b/srcpkgs/mosquitto/patches/fix-libressl.patch new file mode 100644 index 00000000000..d06775bcdbf --- /dev/null +++ b/srcpkgs/mosquitto/patches/fix-libressl.patch @@ -0,0 +1,35 @@ +--- src/security_default.c.orig 2016-10-09 08:20:06.369091258 +0200 ++++ src/security_default.c 2016-10-09 08:19:55.795797957 +0200 +@@ -795,13 +795,13 @@ int _pw_digest(const char *password, con + return 1; + } + +- context = EVP_MD_CTX_new(); ++ context = EVP_MD_CTX_create(); + EVP_DigestInit_ex(context, digest, NULL); + EVP_DigestUpdate(context, password, strlen(password)); + EVP_DigestUpdate(context, salt, salt_len); + /* hash is assumed to be EVP_MAX_MD_SIZE bytes long. */ + EVP_DigestFinal_ex(context, hash, hash_len); +- EVP_MD_CTX_free(context); ++ EVP_MD_CTX_destroy(context); + #endif + + return MOSQ_ERR_SUCCESS; +--- src/mosquitto_passwd.c.orig 2016-10-09 08:20:35.189890751 +0200 ++++ src/mosquitto_passwd.c 2016-10-09 08:18:56.799161385 +0200 +@@ -125,12 +125,12 @@ int output_new_password(FILE *fptr, cons + EVP_DigestFinal_ex(&context, hash, &hash_len); + EVP_MD_CTX_cleanup(&context); + #else +- context = EVP_MD_CTX_new(); ++ context = EVP_MD_CTX_create(); + EVP_DigestInit_ex(context, digest, NULL); + EVP_DigestUpdate(context, password, strlen(password)); + EVP_DigestUpdate(context, salt, SALT_LEN); + EVP_DigestFinal_ex(context, hash, &hash_len); +- EVP_MD_CTX_free(context); ++ EVP_MD_CTX_destroy(context); + #endif + + rc = base64_encode(hash, hash_len, &hash64); diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index ba5c7e06dc9..fcdf4fcac66 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -1,7 +1,7 @@ # Template file for 'mosquitto' pkgname=mosquitto -version=1.4.9 -revision=2 +version=1.4.10 +revision=1 build_style=gnu-makefile make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl make_install_args="prefix=/usr" @@ -12,7 +12,7 @@ maintainer="Lukas Braun " license="epl-v10, edl-v10" homepage="http://mosquitto.org/" distfiles="http://mosquitto.org/files/source/mosquitto-${version}.tar.gz" -checksum=1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b +checksum=437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770 pre_install() { sed -i 's,sbin,bin,g' */Makefile