diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
| commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
| tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /app-misc/mosquitto/files | |
| parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) | |
gentoo resync : 22.10.2018
Diffstat (limited to 'app-misc/mosquitto/files')
| -rw-r--r-- | app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch | 29 | ||||
| -rw-r--r-- | app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch (renamed from app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch) | 0 |
2 files changed, 29 insertions, 0 deletions
diff --git a/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch new file mode 100644 index 000000000000..7e9778e8b70f --- /dev/null +++ b/app-misc/mosquitto/files/mosquitto-1.5-fix-socket_get_address.patch @@ -0,0 +1,29 @@ +# Fix missing rename of mosquitto__socket_get_address. Mosquitto bug 810. + +diff --git a/src/conf.c b/src/conf.c +index f3d812d..daf2bf4 100644 +--- a/src/conf.c ++++ b/src/conf.c +@@ -735,8 +735,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct + struct mosquitto__listener *cur_listener = &config->default_listener; + #ifdef WITH_BRIDGE + char *address; +- int i; + #endif ++ int i; + int lineno_ext; + struct mosquitto__security_options *cur_security_options = NULL; + +diff --git a/src/net.c b/src/net.c +index 7397de5..670b7e2 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -114,7 +114,7 @@ int net__socket_accept(struct mosquitto_db *db, mosq_sock_t listensock) + fromhost(&wrap_req); + if(!hosts_access(&wrap_req)){ + /* Access is denied */ +- if(!mosquitto__socket_get_address(new_sock, address, 1024)){ ++ if(!net__socket_get_address(new_sock, address, 1024)){ + log__printf(NULL, MOSQ_LOG_NOTICE, "Client connection from %s denied access by tcpd.", address); + } + COMPAT_CLOSE(new_sock); diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch index 1642597c5620..1642597c5620 100644 --- a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch +++ b/app-misc/mosquitto/files/mosquitto-fix-conditional-tests.patch |