update paho mqtt lib to 1.3.14 (#80)

* update paho mqtt lib to 1.3.14

* change how paho mqtt build from linux

dependant paho mqtt lib now uses a very recent version of glibc in the provided
pre-build package. now building from source to prevent errors such as
'/lib64/libc.so.6: version `GLIBC_2.38' not found (required by /source/paho.mqtt.c/lib/libpaho-mqtt3c.so.1)

Author: sshanks-kx

docker_linux/Dockerfile.alpine

@@ -10,7 +10,7 @@ RUN mkdir -p /source/mqtt/include
 COPY docker_linux/mqtt_build.sh /source
 
 COPY CMakeLists.txt /source/mqtt
-COPY docker_linux/build_libpaho.sh /source/mqtt
+COPY docker_linux/build_libpaho.sh /source/
 COPY install.sh /source/mqtt
 COPY README.md /source/mqtt
 COPY LICENSE /source/mqtt
@@ -35,13 +35,13 @@ RUN apk add --update && \
     apk add gcompat && \    
 	apk add libnsl && \
     cd /source && \
-    /bin/sh /source/mqtt/build_libpaho.sh && \
+    /bin/sh build_libpaho.sh && tar xvf Eclipse-Paho*.tar.gz -C ./paho.mqtt.c --strip-components=1 && \
     apk del gcc && \
     apk del cmake && \
     apk del make && \
     apk del wget && \
 	apk del build-base && \	
-    rm -rf /source/mqtt_build.sh /source/paho.mqtt.c /source/v1.3.13* /source/mqtt/CmakeLists.txt
+    rm -rf /source/mqtt_build.sh /source/paho.mqtt.c /source/v1.3.14* /source/mqtt/CmakeLists.txt
 
 ## Update this section here to add kdb+
 #COPY q/k4.lic /q/

docker_linux/Dockerfile.centos7

@@ -21,15 +21,17 @@ ENV QHOME /q
 ENV PATH /q/l64:$PATH
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 
-RUN cd /source && wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz && tar xvf Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz -C ./paho.mqtt.c --strip-components=1
+RUN cd /tmp/ && wget https://cmake.org/files/v3.12/cmake-3.12.3.tar.gz && tar zxvf cmake-3.* && cd cmake-3.* && ./bootstrap --prefix=/usr/local && make && make install && rm /tmp/cmake-3.12.3.tar.gz
+RUN yum -y install epel-release && yum -y install mosquitto
+
+COPY build_libpaho.sh /source/
+RUN cd /source && /bin/sh build_libpaho.sh
+RUN cd /source && tar xvf Eclipse-Paho*.tar.gz -C ./paho.mqtt.c --strip-components=1
 ENV BUILD_HOME /source/paho.mqtt.c
 
 COPY mqtt_build.sh /source
 RUN chmod u+x /source/mqtt_build.sh && /source/mqtt_build.sh
 
-RUN cd /tmp/ && wget https://cmake.org/files/v3.12/cmake-3.12.3.tar.gz && tar zxvf cmake-3.* && cd cmake-3.* && ./bootstrap --prefix=/usr/local && make && make install && rm /tmp/cmake-3.12.3.tar.gz
-RUN yum -y install epel-release && yum -y install mosquitto
-
 WORKDIR /source
 
 CMD ["/bin/bash"]

docker_linux/build_libpaho.sh

@@ -1,28 +1,9 @@
 #!/bin/sh
-	
-cd /source
 
-wget https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v1.3.13.tar.gz
-tar xvf v1.3.13.tar.gz -C ./paho.mqtt.c --strip-components=1
-
-cd paho.mqtt.c
-
-# This library is not present in the Alpine image, removing it from the compiler args
-sed -i 's/GAI_LIB = -lanl/#GAI_LIB = -lanl/g' Makefile
-ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1
-
-make
-make install
-mkdir -p  include/lib
-cd include/lib
-
-ln -s /usr/local/lib/libpaho-mqtt3c.so libpaho-mqtt3c.a
-ln -s /usr/local/lib/libpaho-mqtt3cs.so libpaho-mqtt3cs.a
-ln -s /usr/local/lib/libpaho-mqtt3as.so libpaho-mqtt3as.a
-ln -s /usr/local/lib/libpaho-mqtt3a.so libpaho-mqtt3a.a
-
-mkdir /source/mqtt/cmake
-cd  /source/mqtt/cmake
-cmake ..
-make
-make install
+OLD_DIR=`pwd`
+mkdir /tmp/paho && cd /tmp/paho
+wget https://github.com/eclipse-paho/paho.mqtt.c/archive/refs/tags/v1.3.14.tar.gz -O paho_src.tar.gz
+mkdir paho_src && tar xvf paho_src.tar.gz -C ./paho_src --strip-components=1 && cd paho_src
+mkdir build && cd build 
+cmake -DPAHO_BUILD_STATIC=FALSE -DPAHO_BUILD_SHARED=TRUE -DCMAKE_BUILD_TYPE=Release -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR= -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=FALSE -DPAHO_HIGH_PERFORMANCE=TRUE -DCMAKE_INSTALL_LIBDIR=lib .. && cmake --build . && cpack --verbose
+cp Eclipse*.tar.gz $OLD_DIR && rm -rf /tmp/paho 

docs/install.md

@@ -11,6 +11,9 @@
 ## Installing a release
 
 1.  Ensure [MQTT C API](https://github.com/eclipse/paho.mqtt.c/releases) (`paho.mqtt.c`) is installed.
+
+    -    Linux: Paho MQTT provides a pre-build binary which may be built against a more recent version of glibc that may be available on your system, resulting in an error such as `'/lib64/libc.so.6: version `GLIBC_2.38' not found`. To get around this, build from the paho mqtt library from the source code package. See docker_linux/build_libpaho.sh as an example of how to download and build into a `tar.gz` package.
+
 2.  Make the MQTT library available from kdb+:
 
     -   Linux: Add the `lib` directory, which includes `include` and `lib` to the `LD_LIBRARY_PATH` environment variable e.g. if unzipped to `/usr/local/Eclipse-Paho-MQTT-C/`, run:

docs/reference.md

@@ -77,20 +77,25 @@ The underlying Paho Mqtt C lib provides the ability to route traffic through a w
 These can be set using standard web proxy environment variables or parameters per connection. 
 Format can be `http(s)://user:[email protected]:port` or `ip:port`.
 
+Since Paho Mqtt v1.3.14, the environment variable `PAHO_C_CLIENT_USE_HTTP_PROXY` must be set to `TRUE` in order to
+use environment variables for proxy settings.
+
 If multiple options defined, the http proxy configuration are listed below in descending precendence:
 
 1. [Connection option](#general-connection-options) `httpProxy`
 2. Environment variable `mqtt_http_proxy`
 3. Environment variable `http_proxy`
 
-and for https (TLS/SSL) proxy configuration:
+, for https (TLS/SSL) proxy configuration:
 
 1. [Connection option](#general-connection-options) `httpsProxy`
 2. Environment variable `mqtt_https_proxy`
 3. Environment variable `https_proxy`
 
-To prevent mqtt from using any proxy, when http_proxy/https_proxy is being used by another application, set the following on linux/macOS `export mqtt_http_proxy=` or on windows
-set to a space (blank character) `set mqtt_http_proxy= `
+and for `no_proxy` configuration:
+
+1. Environment variable `mqtt_no_proxy`
+2. Environment variable `no_proxy`
 
 ### General Connection Options
 

src/mqtt.c

@@ -127,8 +127,10 @@ static void restoreProxyEnv(const char* sys,const char* sysval){
 EXP K connX(K tcpconn,K pname, K opt){
   static const char* HTTP_PROXY="http_proxy";
   static const char* HTTPS_PROXY="https_proxy";
+  static const char* NO_PROXY="no_proxy";
   const char* system_proxy=getenv(HTTP_PROXY);
   const char* system_proxys=getenv(HTTPS_PROXY);
+  const char* system_noproxy=getenv(NO_PROXY);
   int err;
   if(tcpconn->t != -KS)
     return krr("addr type");
@@ -233,9 +235,11 @@ EXP K connX(K tcpconn,K pname, K opt){
 
   setProxyEnv(HTTP_PROXY,system_proxy,getenv("mqtt_http_proxy"));     /* replace http_proxy setting with mqtt_http_proxy if available */
   setProxyEnv(HTTPS_PROXY,system_proxys,getenv("mqtt_https_proxy"));  /* replace https_proxy setting with mqtt_https_proxy if available */
+  setProxyEnv(NO_PROXY,system_noproxy,getenv("mqtt_no_proxy"));       /* replace https_proxy setting with mqtt_https_proxy if available */
   err = MQTTClient_connect(client, &conn_opts);
   restoreProxyEnv(HTTP_PROXY,system_proxy);
   restoreProxyEnv(HTTPS_PROXY,system_proxys);
+  restoreProxyEnv(HTTPS_PROXY,system_noproxy);
 
   freeOpts(&conn_opts);
 

travis_setup.sh

@@ -3,14 +3,14 @@
 mkdir cbuild
 
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-  wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/Eclipse-Paho-MQTT-C-1.3.13-Darwin.tar.gz
-  tar xvf Eclipse-Paho-MQTT-C-1.3.13-Darwin.tar.gz -C ./cbuild --strip-components=1
+  wget https://github.com/eclipse-paho/paho.mqtt.c/releases/download/v1.3.14/Eclipse-Paho-MQTT-C-1.3.14-Darwin.tar.gz
+  tar xvf Eclipse-Paho-MQTT-C-1.3.14-Darwin.tar.gz -C ./cbuild --strip-components=1
 elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
-  wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz
-  tar xvf Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz -C ./cbuild --strip-components=1
+  /bin/sh docker_linux/build_libpaho.sh
+  tar xvf Eclipse-Paho-MQTT-C-1.3.14-Linux.tar.gz -C ./cbuild --strip-components=1
 elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
-  wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/eclipse-paho-mqtt-c-win64-1.3.13.zip
-   7z x -ocbuild eclipse-paho-mqtt-c-win64-1.3.13.zip
+  wget https://github.com/eclipse-paho/paho.mqtt.c/releases/download/v1.3.14/eclipse-paho-mqtt-c-win64-1.3.14.zip
+   7z x -ocbuild eclipse-paho-mqtt-c-win64-1.3.14.zip
 else
   echo "$TRAVIS_OS_NAME is currently not supported"  
 fi