From 4a2db795e137007b0642da41a31ccaf133ce306a Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Wed, 1 May 2019 23:43:22 +0200
Subject: [PATCH] upgrading package: mosquitto 1.6.1 -> 1.6.2

---
 mosquitto/mosquitto.patch | 56 +++++++++++++++++++--------------------
 mosquitto/mosquitto.spec  |  4 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/mosquitto/mosquitto.patch b/mosquitto/mosquitto.patch
index 4caa799373..730c40c0ed 100644
--- a/mosquitto/mosquitto.patch
+++ b/mosquitto/mosquitto.patch
@@ -1,6 +1,6 @@
 Index: client/CMakeLists.txt
---- client/CMakeLists.txt.orig	2019-04-26 18:07:59.000000000 +0200
-+++ client/CMakeLists.txt	2019-04-27 20:10:14.445032000 +0200
+--- client/CMakeLists.txt.orig	2019-04-30 15:34:20.000000000 +0200
++++ client/CMakeLists.txt	2019-05-01 23:41:10.067167000 +0200
 @@ -14,9 +14,9 @@
  add_executable(mosquitto_rr rr_client.c pub_shared.c sub_client_output.c ${shared_src})
  
@@ -15,8 +15,8 @@ Index: client/CMakeLists.txt
  if (QNX)
      target_link_libraries(mosquitto_pub socket)
 Index: client/client_shared.h
---- client/client_shared.h.orig	2019-04-26 18:07:59.000000000 +0200
-+++ client/client_shared.h	2019-04-27 20:10:14.445206000 +0200
+--- client/client_shared.h.orig	2019-04-30 15:34:20.000000000 +0200
++++ client/client_shared.h	2019-05-01 23:41:10.067353000 +0200
 @@ -18,6 +18,7 @@
  #define CLIENT_CONFIG_H
  
@@ -26,8 +26,8 @@ Index: client/client_shared.h
  #ifdef WIN32
  #  include <winsock2.h>
 Index: config.mk
---- config.mk.orig	2019-04-26 18:07:59.000000000 +0200
-+++ config.mk	2019-04-27 20:11:15.380045000 +0200
+--- config.mk.orig	2019-04-30 15:34:20.000000000 +0200
++++ config.mk	2019-05-01 23:41:10.067557000 +0200
 @@ -274,20 +274,20 @@
  
  ifeq ($(WITH_WEBSOCKETS),yes)
@@ -56,8 +56,8 @@ Index: config.mk
  
  ifeq ($(WITH_STRIP),yes)
 Index: lib/CMakeLists.txt
---- lib/CMakeLists.txt.orig	2019-04-26 18:07:59.000000000 +0200
-+++ lib/CMakeLists.txt	2019-04-27 20:11:48.552768000 +0200
+--- lib/CMakeLists.txt.orig	2019-04-30 15:34:20.000000000 +0200
++++ lib/CMakeLists.txt	2019-05-01 23:42:11.468580000 +0200
 @@ -76,21 +76,6 @@
  	endif (ARES_HEADER)
  endif (WITH_SRV)
@@ -75,14 +75,14 @@ Index: lib/CMakeLists.txt
 -	SOVERSION 1
 -)
 -
--install(TARGETS libmosquitto LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 -
  if (WITH_STATIC_LIBRARIES)
  	add_library(libmosquitto_static STATIC ${C_SRC})
  	if (WITH_PIC)
 Index: lib/cpp/CMakeLists.txt
---- lib/cpp/CMakeLists.txt.orig	2019-04-26 18:07:59.000000000 +0200
-+++ lib/cpp/CMakeLists.txt	2019-04-27 20:12:19.847829000 +0200
+--- lib/cpp/CMakeLists.txt.orig	2019-04-30 15:34:20.000000000 +0200
++++ lib/cpp/CMakeLists.txt	2019-05-01 23:42:21.526066000 +0200
 @@ -4,17 +4,6 @@
  
  set(CPP_SRC mosquittopp.cpp mosquittopp.h)
@@ -96,14 +96,14 @@ Index: lib/cpp/CMakeLists.txt
 -	VERSION ${VERSION}
 -	SOVERSION 1
 -)
--install(TARGETS mosquittopp LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 -
  if (WITH_STATIC_LIBRARIES)
  	add_library(mosquittopp_static STATIC
  		${C_SRC}
 Index: lib/mosquitto.c
---- lib/mosquitto.c.orig	2019-04-26 18:07:59.000000000 +0200
-+++ lib/mosquitto.c	2019-04-27 20:10:16.396570000 +0200
+--- lib/mosquitto.c.orig	2019-04-30 15:34:20.000000000 +0200
++++ lib/mosquitto.c	2019-05-01 23:41:43.041325000 +0200
 @@ -16,6 +16,10 @@
  
  #include "config.h"
@@ -116,8 +116,8 @@ Index: lib/mosquitto.c
  #include <signal.h>
  #include <string.h>
 Index: lib/tls_mosq.c
---- lib/tls_mosq.c.orig	2019-04-26 18:07:59.000000000 +0200
-+++ lib/tls_mosq.c	2019-04-27 20:10:16.396682000 +0200
+--- lib/tls_mosq.c.orig	2019-04-30 15:34:20.000000000 +0200
++++ lib/tls_mosq.c	2019-05-01 23:41:43.041443000 +0200
 @@ -24,6 +24,7 @@
  #else
  #  include <arpa/inet.h>
@@ -127,8 +127,8 @@ Index: lib/tls_mosq.c
  #endif
  
 Index: lib/tls_mosq.h
---- lib/tls_mosq.h.orig	2019-04-26 18:07:59.000000000 +0200
-+++ lib/tls_mosq.h	2019-04-27 20:10:16.396777000 +0200
+--- lib/tls_mosq.h.orig	2019-04-30 15:34:20.000000000 +0200
++++ lib/tls_mosq.h	2019-05-01 23:41:43.041548000 +0200
 @@ -27,6 +27,7 @@
  
  #include <openssl/ssl.h>
@@ -138,8 +138,8 @@ Index: lib/tls_mosq.h
  int mosquitto__server_certificate_verify(int preverify_ok, X509_STORE_CTX *ctx);
  int mosquitto__verify_certificate_hostname(X509 *cert, const char *hostname);
 Index: src/CMakeLists.txt
---- src/CMakeLists.txt.orig	2019-04-26 18:07:59.000000000 +0200
-+++ src/CMakeLists.txt	2019-04-27 20:10:16.396932000 +0200
+--- src/CMakeLists.txt.orig	2019-04-30 15:34:20.000000000 +0200
++++ src/CMakeLists.txt	2019-05-01 23:41:43.041676000 +0200
 @@ -149,7 +149,11 @@
      elseif(QNX)
          set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
@@ -170,8 +170,8 @@ Index: src/CMakeLists.txt
  endif (WITH_WEBSOCKETS)
  
 Index: src/mosquitto.c
---- src/mosquitto.c.orig	2019-04-26 18:07:59.000000000 +0200
-+++ src/mosquitto.c	2019-04-27 20:10:16.397102000 +0200
+--- src/mosquitto.c.orig	2019-04-30 15:34:20.000000000 +0200
++++ src/mosquitto.c	2019-05-01 23:41:43.041824000 +0200
 @@ -16,6 +16,11 @@
  
  #include "config.h"
@@ -202,8 +202,8 @@ Index: src/mosquitto.c
  #  include <systemd/sd-daemon.h>
  #endif
 Index: src/mosquitto_broker_internal.h
---- src/mosquitto_broker_internal.h.orig	2019-04-26 18:07:59.000000000 +0200
-+++ src/mosquitto_broker_internal.h	2019-04-27 20:10:16.397265000 +0200
+--- src/mosquitto_broker_internal.h.orig	2019-04-30 15:34:20.000000000 +0200
++++ src/mosquitto_broker_internal.h	2019-05-01 23:41:43.041989000 +0200
 @@ -20,6 +20,8 @@
  
  #include "config.h"
@@ -214,8 +214,8 @@ Index: src/mosquitto_broker_internal.h
  #ifdef WITH_WEBSOCKETS
  #  include <libwebsockets.h>
 Index: src/signals.c
---- src/signals.c.orig	2019-04-26 18:07:59.000000000 +0200
-+++ src/signals.c	2019-04-27 20:10:16.397366000 +0200
+--- src/signals.c.orig	2019-04-30 15:34:20.000000000 +0200
++++ src/signals.c	2019-05-01 23:41:43.042098000 +0200
 @@ -39,6 +39,8 @@
  #include <signal.h>
  #include <stdio.h>
@@ -226,8 +226,8 @@ Index: src/signals.c
  #  include <systemd/sd-daemon.h>
  #endif
 Index: src/websockets.c
---- src/websockets.c.orig	2019-04-26 18:07:59.000000000 +0200
-+++ src/websockets.c	2019-04-27 20:10:16.397518000 +0200
+--- src/websockets.c.orig	2019-04-30 15:34:20.000000000 +0200
++++ src/websockets.c	2019-05-01 23:41:43.042253000 +0200
 @@ -31,6 +31,8 @@
  
  #include "config.h"
diff --git a/mosquitto/mosquitto.spec b/mosquitto/mosquitto.spec
index 247f271a84..60065d0563 100644
--- a/mosquitto/mosquitto.spec
+++ b/mosquitto/mosquitto.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Networking
 License:      EPL
-Version:      1.6.1
-Release:      20190427
+Version:      1.6.2
+Release:      20190501
 
 #   list of sources
 Source0:      http://mosquitto.org/files/source/mosquitto-%{version}.tar.gz