jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mosquitto: update to 1.5.4.

Browse source
This commit is contained in:
maxice8 2018-11-08 18:47:53 -02:00 committed by maxice8
parent 8247291644
commit a4a4a82ed9
2 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
srcpkgs/mosquitto/patches/fix-libressl.patch
View file

@ -1,35 +0,0 @@
--- 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);

6
srcpkgs/mosquitto/template
View file

@ -1,7 +1,7 @@
# Template file for 'mosquitto'
pkgname=mosquitto
version=1.5.3
revision=2
version=1.5.4
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"
@ -13,7 +13,7 @@ maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
license="EPL-1.0, BSD-3-Clause-Attribution"
homepage="http://mosquitto.org"
distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz"
checksum=3081a998d303a883b1cd064009beabc88aa9159e26f5258a4ae6007160491d10
checksum=5fd7f3454fd6d286645d032bc07f44a1c8583cec02ef2422c9eb32e0a89a9b2f
conf_files="/etc/mosquitto/mosquitto.conf"
case "$XBPS_TARGET_MACHINE" in