From c4394bb51c744038d079bcf871d0c3de0a933358 Mon Sep 17 00:00:00 2001
From: Konstantin Podsvirov <konstantin@podsvirov.pro>
Date: Tue, 7 Dec 2021 21:46:31 +0300
Subject: [PATCH] mosquitto: Update to 2.0.14

Remove already applied patches.
---
 ...-2.0.13-install-libmosquitto-archive.patch | 16 ----------------
 ...0.13-fix-security-module-destination.patch | 19 -------------------
 ....0.13-install-libmosquittopp-archive.patch | 16 ----------------
 mingw-w64-mosquitto/PKGBUILD                  | 17 ++++-------------
 4 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100644 mingw-w64-mosquitto/002-mosquitto-2.0.13-install-libmosquitto-archive.patch
 delete mode 100644 mingw-w64-mosquitto/003-mosquitto-2.0.13-fix-security-module-destination.patch
 delete mode 100644 mingw-w64-mosquitto/005-mosquitto-2.0.13-install-libmosquittopp-archive.patch

diff --git a/mingw-w64-mosquitto/002-mosquitto-2.0.13-install-libmosquitto-archive.patch b/mingw-w64-mosquitto/002-mosquitto-2.0.13-install-libmosquitto-archive.patch
deleted file mode 100644
index ed4f860053..0000000000
--- a/mingw-w64-mosquitto/002-mosquitto-2.0.13-install-libmosquitto-archive.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 5da221dc..31cc35e3 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -96,7 +96,10 @@ set_target_properties(libmosquitto PROPERTIES
- 	SOVERSION 1
- )
- 
--install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+install(TARGETS libmosquitto
-+	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
- 
- if (WITH_STATIC_LIBRARIES)
- 	add_library(libmosquitto_static STATIC ${C_SRC})
diff --git a/mingw-w64-mosquitto/003-mosquitto-2.0.13-fix-security-module-destination.patch b/mingw-w64-mosquitto/003-mosquitto-2.0.13-fix-security-module-destination.patch
deleted file mode 100644
index 26c2decd12..0000000000
--- a/mingw-w64-mosquitto/003-mosquitto-2.0.13-fix-security-module-destination.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
-index 465b99b2..643de1de 100644
---- a/plugins/dynamic-security/CMakeLists.txt
-+++ b/plugins/dynamic-security/CMakeLists.txt
-@@ -35,7 +35,12 @@ if (CJSON_FOUND AND WITH_TLS)
- 	target_link_libraries(mosquitto_dynamic_security ${CJSON_LIBRARIES} ${OPENSSL_LIBRARIES})
- 	if(WIN32)
- 		target_link_libraries(mosquitto_dynamic_security mosquitto)
--	endif(WIN32)
-+		install(TARGETS mosquitto_dynamic_security
-+			DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+	else()
-+		install(TARGETS mosquitto_dynamic_security
-+			RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+			LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+	endif()
- 
--	install(TARGETS mosquitto_dynamic_security RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
- endif()
diff --git a/mingw-w64-mosquitto/005-mosquitto-2.0.13-install-libmosquittopp-archive.patch b/mingw-w64-mosquitto/005-mosquitto-2.0.13-install-libmosquittopp-archive.patch
deleted file mode 100644
index 40d82b7f3b..0000000000
--- a/mingw-w64-mosquitto/005-mosquitto-2.0.13-install-libmosquittopp-archive.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
-index 1748b14c..882b662c 100644
---- a/lib/cpp/CMakeLists.txt
-+++ b/lib/cpp/CMakeLists.txt
-@@ -14,7 +14,10 @@ set_target_properties(mosquittopp PROPERTIES
- 	VERSION ${VERSION}
- 	SOVERSION 1
- )
--install(TARGETS mosquittopp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+install(TARGETS mosquittopp
-+	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
- 
- if (WITH_STATIC_LIBRARIES)
- 	add_library(mosquittopp_static STATIC
diff --git a/mingw-w64-mosquitto/PKGBUILD b/mingw-w64-mosquitto/PKGBUILD
index 4a496dee7f..2b32495885 100644
--- a/mingw-w64-mosquitto/PKGBUILD
+++ b/mingw-w64-mosquitto/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=mosquitto
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.0.13
+pkgver=2.0.14
 pkgrel=1
 pkgdesc="An Open Source MQTT Broker (mingw-w64)"
 arch=('any')
@@ -22,25 +22,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
 options=('staticlibs' '!strip' '!buildflags')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/eclipse/mosquitto/archive/v${pkgver}.tar.gz"
         '001-mosquitto-2.0.13-win-threads.patch'
-        '002-mosquitto-2.0.13-install-libmosquitto-archive.patch'
-        '003-mosquitto-2.0.13-fix-security-module-destination.patch'
-        '004-mosquitto-2.0.13-make-man.patch'
-        '005-mosquitto-2.0.13-install-libmosquittopp-archive.patch')
-sha256sums=('303a05823b3aaef531c10031d85722959e7365453d6fe80193d63289028e18f4'
+        '004-mosquitto-2.0.13-make-man.patch')
+sha256sums=('c0ce97b1911d1769ccfd65da237e919fd7eaa60209fd190c113d63fbd0c40347'
             'cb7117abf7ea9ec7c5895277cb0de0e04fba7d7a5ff341ae926565bfb95bcc21'
-            '70df36f050967bec3e784938480fa50a071d2400a321409b9f1d9905e08cc460'
-            'd722372d407310816b03ca44ad68136026c07a831770b7338a7155abd3492bfa'
-            '8f2a4e8ba68a225fba339aa2550ba1de697a469dc248497c9592dfa8e6ff3bec'
-            '70aeb38c93b30182103a86fe831c4d6f9efd0ae5dddb0ff1f47ef1900ee9e8ef')
+            '8f2a4e8ba68a225fba339aa2550ba1de697a469dc248497c9592dfa8e6ff3bec')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
   patch -p1 -i "${srcdir}/001-mosquitto-2.0.13-win-threads.patch"
-  patch -p1 -i "${srcdir}/002-mosquitto-2.0.13-install-libmosquitto-archive.patch"
-  patch -p1 -i "${srcdir}/003-mosquitto-2.0.13-fix-security-module-destination.patch"
   patch -p1 -i "${srcdir}/004-mosquitto-2.0.13-make-man.patch"
-  patch -p1 -i "${srcdir}/005-mosquitto-2.0.13-install-libmosquittopp-archive.patch"
 }
 
 build() {