View | Details | Raw Unified | Return to bug 198988
Collapse All | Expand All

(-)net/mosquitto/files/patch-CMakeList.txt (-18 lines)
Lines 1-18 Link Here
1 
--- CMakeLists.txt.orig	2014-05-16 15:15:44.000000000 -0700
2 
+++ CMakeLists.txt	2014-05-16 15:28:39.000000000 -0700
3 
@@ -8,6 +8,9 @@
4
5 
 set (VERSION 1.3.1)
6
7 
+include_directories(/usr/local/include)
8 
+link_directories(/usr/local/lib)
9 
+
10 
 if (WIN32)
11 
 	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
12 
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
13 
@@ -71,4 +73,4 @@
14 
 # Install config file
15 
 # ========================================
16
17 
-install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})
18 
+install(FILES mosquitto.conf.example aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})
(-)net/mosquitto/files/patch-CMakeLists.txt (+18 lines)
Line 0 Link Here
1 
--- CMakeLists.txt.orig	2014-05-16 15:15:44.000000000 -0700
2 
+++ CMakeLists.txt	2014-05-16 15:28:39.000000000 -0700
3 
@@ -8,6 +8,9 @@
4
5 
 set (VERSION 1.3.1)
6
7 
+include_directories(/usr/local/include)
8 
+link_directories(/usr/local/lib)
9 
+
10 
 if (WIN32)
11 
 	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
12 
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
13 
@@ -71,4 +73,4 @@
14 
 # Install config file
15 
 # ========================================
16
17 
-install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})
18 
+install(FILES mosquitto.conf.example aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})
(-)net/mosquitto/files/patch-config.mk (-3 / +4 lines)
Lines 1-6 Link Here
1 
--- config.mk.orig	2014-05-07 17:09:56.000000000 -0700
 1 
--- config.mk.orig	2014-10-08 21:50:07 UTC
2 
+++ config.mk	2014-05-07 17:10:31.000000000 -0700
 2 
+++ config.mk
3 
@@ -213,6 +213,6 @@
 3 
@@ -213,7 +213,7 @@ endif
4
4
5
5
6 
 INSTALL?=install
 6 
 INSTALL?=install
Lines 10-12 Link Here
10 
+prefix=${PREFIX}
 10 
+prefix=${PREFIX}
11 
+mandir=${PREFIX}/share/man
 11 
+mandir=${PREFIX}/share/man
12 
+localedir=${PREFIX}/share/locale
 12 
+localedir=${PREFIX}/share/locale
13 
 STRIP?=strip
(-)net/mosquitto/files/patch-lib-tls_mosq.h (-4 / +7 lines)
Lines 1-10 Link Here
1 
--- lib/tls_mosq.h.orig	2014-05-07 14:39:22.000000000 -0700
 1 
--- lib/tls_mosq.h.orig	2014-10-08 21:50:07 UTC
2 
+++ lib/tls_mosq.h	2014-05-07 14:39:47.000000000 -0700
 2 
+++ lib/tls_mosq.h
3 
@@ -33,6 +33,7 @@
 3 
@@ -33,8 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
4 
 #ifdef WITH_TLS
 4 
 #ifdef WITH_TLS
5
5
6 
 #include <openssl/ssl.h>
 6 
 #include <openssl/ssl.h>
7 
+#include <sys/socket.h>
 7 
+#include <sys/socket.h>
8 
 #ifdef WITH_TLS_PSK
 8 
 #ifdef WITH_TLS_PSK
9 
 #  if OPENSSL_VERSION_NUMBER >= 0x10000000
 9 
-#  if OPENSSL_VERSION_NUMBER >= 0x10000000
10 
+#  if OPENSSL_VERSION_NUMBER >= 0x10000000 && !defined(OPENSSL_NO_PSK)
10 
 #    define REAL_WITH_TLS_PSK
 11 
 #    define REAL_WITH_TLS_PSK
12 
 #  else
13 
 #    warning "TLS-PSK not supported, openssl too old."

Return to bug 198988