Merge lp:~roger.light/ubuntu/vivid/mosquitto/fix-for-1423037 into lp:ubuntu/vivid/mosquitto

[Roger Light]

[lp:~roger.light/ubuntu/vivid/mosquitto/fix-for-1423037]

13. By Roger Light on 2015-02-18

Downgrade libwebsockets requirement to libwebsockets3.

14. By Roger Light on 2015-02-18

Upstream license has changed from BSD-3 to EPL-1.0 or EDL-1.0.

15. By Roger Light on 2015-02-18

Unapply patches.

[Daniel Holbach (dholbach)]

Text conflict in client/Makefile
Text conflict in config.mk
Text conflict in lib/Makefile
Text conflict in lib/cpp/Makefile
Text conflict in src/Makefile
Conflict adding file src/uthash.h. Moved existing file to src/uthash.h.moved.
Text conflict in test/lib/Makefile

review: Needs Fixing

Unmerged revisions

15. By Roger Light on 2015-02-18

Unapply patches.

14. By Roger Light on 2015-02-18

Upstream license has changed from BSD-3 to EPL-1.0 or EDL-1.0.

13. By Roger Light on 2015-02-18

Downgrade libwebsockets requirement to libwebsockets3.

12. By Roger Light on 2015-02-18

Amend changelog with bug info.

11. By Roger Light on 2015-02-18

* python3-mosquitto and python-mosquitto packages removed because the python
  module is no longer part of upstream.
* Remove unused patches.
* Added dependency on libwebsockets, uuid.

10. By Roger Light on 2015-02-18

Merge 1.4 from upstream.

9. By Roger Light on 2015-02-18

Put upstream signing key in correct place.

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2015-01-15 14:08:09 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-disable-bad-test.patch
-enable-libwrap.patch
-fix-prefix.patch
-nostrip.patch
-pynomake.patch
-disable-in-tree-uthash.patch
-install-apparmor.patch

=== removed directory '.pc/disable-bad-test.patch'
=== removed directory '.pc/disable-bad-test.patch/test'
=== removed directory '.pc/disable-bad-test.patch/test/lib'
=== removed file '.pc/disable-bad-test.patch/test/lib/Makefile'
--- .pc/disable-bad-test.patch/test/lib/Makefile	2014-08-16 10:52:12 +0000
+++ .pc/disable-bad-test.patch/test/lib/Makefile	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-.PHONY: all test test-compile test-compile-c test-compile-cpp c cpp python python3
-.NOTPARALLEL:
-
-LD_LIBRARY_PATH=../../lib
-
-all :
-
-test : c cpp python python3
-
-test-compile : test-compile-c test-compile-cpp
-
-test-compile-c : 
-	$(MAKE) -C c
-
-test-compile-cpp : 
-	$(MAKE) -C cpp
-
-c cpp python python3 : test-compile
-	./01-con-discon-success.py $@/01-con-discon-success.test
-	./01-will-set.py $@/01-will-set.test
-	./01-unpwd-set.py $@/01-unpwd-set.test
-	./01-will-unpwd-set.py $@/01-will-unpwd-set.test
-	./01-no-clean-session.py $@/01-no-clean-session.test
-	./01-keepalive-pingreq.py $@/01-keepalive-pingreq.test
-	./02-subscribe-qos0.py $@/02-subscribe-qos0.test
-	./02-subscribe-qos1.py $@/02-subscribe-qos1.test
-	./02-subscribe-qos2.py $@/02-subscribe-qos2.test
-	./02-unsubscribe.py $@/02-unsubscribe.test
-	./03-publish-qos0.py $@/03-publish-qos0.test
-	./03-publish-qos0-no-payload.py $@/03-publish-qos0-no-payload.test
-	./03-publish-c2b-qos1-timeout.py $@/03-publish-c2b-qos1-timeout.test
-	./03-publish-c2b-qos1-disconnect.py $@/03-publish-c2b-qos1-disconnect.test
-	./03-publish-c2b-qos2.py $@/03-publish-c2b-qos2.test
-	./03-publish-c2b-qos2-timeout.py $@/03-publish-c2b-qos2-timeout.test
-	./03-publish-c2b-qos2-disconnect.py $@/03-publish-c2b-qos2-disconnect.test
-	./03-publish-b2c-qos1.py $@/03-publish-b2c-qos1.test
-	./03-publish-b2c-qos2.py $@/03-publish-b2c-qos2.test
-	./04-retain-qos0.py $@/04-retain-qos0.test
-	./08-ssl-connect-no-auth.py $@/08-ssl-connect-no-auth.test
-	./08-ssl-connect-cert-auth.py $@/08-ssl-connect-cert-auth.test
-	./08-ssl-bad-cacert.py $@/08-ssl-bad-cacert.test
-	./08-ssl-fake-cacert.py $@/08-ssl-fake-cacert.test
-	./09-util-topic-matching.py $@/09-util-topic-matching.test
-	./09-util-topic-tokenise.py $@/09-util-topic-tokenise.test
-
-clean : 
-	$(MAKE) -C c clean
-	$(MAKE) -C cpp clean

=== removed directory '.pc/disable-in-tree-uthash.patch'
=== removed directory '.pc/disable-in-tree-uthash.patch/src'
=== removed file '.pc/disable-in-tree-uthash.patch/src/uthash.h'
--- .pc/disable-in-tree-uthash.patch/src/uthash.h	2013-08-07 23:26:19 +0000
+++ .pc/disable-in-tree-uthash.patch/src/uthash.h	1970-01-01 00:00:00 +0000
@@ -1,948 +0,0 @@
-/*
-Copyright (c) 2003-2013, Troy D. Hanson     http://troydhanson.github.com/uthash/
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef UTHASH_H
-#define UTHASH_H 
-
-#include <string.h>   /* memcmp,strlen */
-#include <stddef.h>   /* ptrdiff_t */
-#include <stdlib.h>   /* exit() */
-
-/* These macros use decltype or the earlier __typeof GNU extension.
-   As decltype is only available in newer compilers (VS2010 or gcc 4.3+
-   when compiling c++ source) this code uses whatever method is needed
-   or, for VS2008 where neither is available, uses casting workarounds. */
-#ifdef _MSC_VER         /* MS compiler */
-#if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
-#define DECLTYPE(x) (decltype(x))
-#else                   /* VS2008 or older (or VS2010 in C mode) */
-#define NO_DECLTYPE
-#define DECLTYPE(x)
-#endif
-#else                   /* GNU, Sun and other compilers */
-#define DECLTYPE(x) (__typeof(x))
-#endif
-
-#ifdef NO_DECLTYPE
-#define DECLTYPE_ASSIGN(dst,src)                                                 \
-do {                                                                             \
-  char **_da_dst = (char**)(&(dst));                                             \
-  *_da_dst = (char*)(src);                                                       \
-} while(0)
-#else 
-#define DECLTYPE_ASSIGN(dst,src)                                                 \
-do {                                                                             \
-  (dst) = DECLTYPE(dst)(src);                                                    \
-} while(0)
-#endif
-
-/* a number of the hash function use uint32_t which isn't defined on win32 */
-#ifdef _MSC_VER
-typedef unsigned int uint32_t;
-typedef unsigned char uint8_t;
-#else
-#include <inttypes.h>   /* uint32_t */
-#endif
-
-#define UTHASH_VERSION 1.9.8
-
-#ifndef uthash_fatal
-#define uthash_fatal(msg) exit(-1)        /* fatal error (out of memory,etc) */
-#endif
-#ifndef uthash_malloc
-#define uthash_malloc(sz) malloc(sz)      /* malloc fcn                      */
-#endif
-#ifndef uthash_free
-#define uthash_free(ptr,sz) free(ptr)     /* free fcn                        */
-#endif
-
-#ifndef uthash_noexpand_fyi
-#define uthash_noexpand_fyi(tbl)          /* can be defined to log noexpand  */
-#endif
-#ifndef uthash_expand_fyi
-#define uthash_expand_fyi(tbl)            /* can be defined to log expands   */
-#endif
-
-/* initial number of buckets */
-#define HASH_INITIAL_NUM_BUCKETS 32      /* initial number of buckets        */
-#define HASH_INITIAL_NUM_BUCKETS_LOG2 5  /* lg2 of initial number of buckets */
-#define HASH_BKT_CAPACITY_THRESH 10      /* expand when bucket count reaches */
-
-/* calculate the element whose hash handle address is hhe */
-#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho)))
-
-#define HASH_FIND(hh,head,keyptr,keylen,out)                                     \
-do {                                                                             \
-  unsigned _hf_bkt,_hf_hashv;                                                    \
-  out=NULL;                                                                      \
-  if (head) {                                                                    \
-     HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt);   \
-     if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) {                           \
-       HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ],  \
-                        keyptr,keylen,out);                                      \
-     }                                                                           \
-  }                                                                              \
-} while (0)
-
-#ifdef HASH_BLOOM
-#define HASH_BLOOM_BITLEN (1ULL << HASH_BLOOM)
-#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8) + ((HASH_BLOOM_BITLEN%8) ? 1:0)
-#define HASH_BLOOM_MAKE(tbl)                                                     \
-do {                                                                             \
-  (tbl)->bloom_nbits = HASH_BLOOM;                                               \
-  (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN);                 \
-  if (!((tbl)->bloom_bv))  { uthash_fatal( "out of memory"); }                   \
-  memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN);                                \
-  (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE;                                       \
-} while (0) 
-
-#define HASH_BLOOM_FREE(tbl)                                                     \
-do {                                                                             \
-  uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN);                              \
-} while (0) 
-
-#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8)))
-#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8)))
-
-#define HASH_BLOOM_ADD(tbl,hashv)                                                \
-  HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
-
-#define HASH_BLOOM_TEST(tbl,hashv)                                               \
-  HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
-
-#else
-#define HASH_BLOOM_MAKE(tbl) 
-#define HASH_BLOOM_FREE(tbl) 
-#define HASH_BLOOM_ADD(tbl,hashv) 
-#define HASH_BLOOM_TEST(tbl,hashv) (1)
-#define HASH_BLOOM_BYTELEN 0
-#endif
-
-#define HASH_MAKE_TABLE(hh,head)                                                 \
-do {                                                                             \
-  (head)->hh.tbl = (UT_hash_table*)uthash_malloc(                                \
-                  sizeof(UT_hash_table));                                        \
-  if (!((head)->hh.tbl))  { uthash_fatal( "out of memory"); }                    \
-  memset((head)->hh.tbl, 0, sizeof(UT_hash_table));                              \
-  (head)->hh.tbl->tail = &((head)->hh);                                          \
-  (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS;                        \
-  (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2;              \
-  (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head);                    \
-  (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc(                      \
-          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));               \
-  if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); }             \
-  memset((head)->hh.tbl->buckets, 0,                                             \
-          HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket));               \
-  HASH_BLOOM_MAKE((head)->hh.tbl);                                               \
-  (head)->hh.tbl->signature = HASH_SIGNATURE;                                    \
-} while(0)
-
-#define HASH_ADD(hh,head,fieldname,keylen_in,add)                                \
-        HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add)
-
-#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced)                   \
-do {                                                                             \
-  replaced=NULL;                                                                 \
-  HASH_FIND(hh,head,&((add)->fieldname),keylen_in,replaced);                     \
-  if (replaced!=NULL) {                                                          \
-     HASH_DELETE(hh,head,replaced);                                              \
-  };                                                                             \
-  HASH_ADD(hh,head,fieldname,keylen_in,add);                                     \
-} while(0)
- 
-#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add)                            \
-do {                                                                             \
- unsigned _ha_bkt;                                                               \
- (add)->hh.next = NULL;                                                          \
- (add)->hh.key = (char*)keyptr;                                                  \
- (add)->hh.keylen = (unsigned)keylen_in;                                                   \
- if (!(head)) {                                                                  \
-    head = (add);                                                                \
-    (head)->hh.prev = NULL;                                                      \
-    HASH_MAKE_TABLE(hh,head);                                                    \
- } else {                                                                        \
-    (head)->hh.tbl->tail->next = (add);                                          \
-    (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail);         \
-    (head)->hh.tbl->tail = &((add)->hh);                                         \
- }                                                                               \
- (head)->hh.tbl->num_items++;                                                    \
- (add)->hh.tbl = (head)->hh.tbl;                                                 \
- HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets,                         \
-         (add)->hh.hashv, _ha_bkt);                                              \
- HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh);                   \
- HASH_BLOOM_ADD((head)->hh.tbl,(add)->hh.hashv);                                 \
- HASH_EMIT_KEY(hh,head,keyptr,keylen_in);                                        \
- HASH_FSCK(hh,head);                                                             \
-} while(0)
-
-#define HASH_TO_BKT( hashv, num_bkts, bkt )                                      \
-do {                                                                             \
-  bkt = ((hashv) & ((num_bkts) - 1));                                            \
-} while(0)
-
-/* delete "delptr" from the hash table.
- * "the usual" patch-up process for the app-order doubly-linked-list.
- * The use of _hd_hh_del below deserves special explanation.
- * These used to be expressed using (delptr) but that led to a bug
- * if someone used the same symbol for the head and deletee, like
- *  HASH_DELETE(hh,users,users);
- * We want that to work, but by changing the head (users) below
- * we were forfeiting our ability to further refer to the deletee (users)
- * in the patch-up process. Solution: use scratch space to
- * copy the deletee pointer, then the latter references are via that
- * scratch pointer rather than through the repointed (users) symbol.
- */
-#define HASH_DELETE(hh,head,delptr)                                              \
-do {                                                                             \
-    unsigned _hd_bkt;                                                            \
-    struct UT_hash_handle *_hd_hh_del;                                           \
-    if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) )  {         \
-        uthash_free((head)->hh.tbl->buckets,                                     \
-                    (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
-        HASH_BLOOM_FREE((head)->hh.tbl);                                         \
-        uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                      \
-        head = NULL;                                                             \
-    } else {                                                                     \
-        _hd_hh_del = &((delptr)->hh);                                            \
-        if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) {     \
-            (head)->hh.tbl->tail =                                               \
-                (UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) +               \
-                (head)->hh.tbl->hho);                                            \
-        }                                                                        \
-        if ((delptr)->hh.prev) {                                                 \
-            ((UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) +                  \
-                    (head)->hh.tbl->hho))->next = (delptr)->hh.next;             \
-        } else {                                                                 \
-            DECLTYPE_ASSIGN(head,(delptr)->hh.next);                             \
-        }                                                                        \
-        if (_hd_hh_del->next) {                                                  \
-            ((UT_hash_handle*)((ptrdiff_t)_hd_hh_del->next +                     \
-                    (head)->hh.tbl->hho))->prev =                                \
-                    _hd_hh_del->prev;                                            \
-        }                                                                        \
-        HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt);   \
-        HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del);        \
-        (head)->hh.tbl->num_items--;                                             \
-    }                                                                            \
-    HASH_FSCK(hh,head);                                                          \
-} while (0)
-
-
-/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
-#define HASH_FIND_STR(head,findstr,out)                                          \
-    HASH_FIND(hh,head,findstr,strlen(findstr),out)
-#define HASH_ADD_STR(head,strfield,add)                                          \
-    HASH_ADD(hh,head,strfield,strlen(add->strfield),add)
-#define HASH_REPLACE_STR(head,strfield,add,replaced)                             \
-  HASH_REPLACE(hh,head,strfield,strlen(add->strfield),add,replaced)
-#define HASH_FIND_INT(head,findint,out)                                          \
-    HASH_FIND(hh,head,findint,sizeof(int),out)
-#define HASH_ADD_INT(head,intfield,add)                                          \
-    HASH_ADD(hh,head,intfield,sizeof(int),add)
-#define HASH_REPLACE_INT(head,intfield,add,replaced)                             \
-    HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced)
-#define HASH_FIND_PTR(head,findptr,out)                                          \
-    HASH_FIND(hh,head,findptr,sizeof(void *),out)
-#define HASH_ADD_PTR(head,ptrfield,add)                                          \
-    HASH_ADD(hh,head,ptrfield,sizeof(void *),add)
-#define HASH_REPLACE_PTR(head,ptrfield,add)                                      \
-    HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced)
-#define HASH_DEL(head,delptr)                                                    \
-    HASH_DELETE(hh,head,delptr)
-
-/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
- * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
- */
-#ifdef HASH_DEBUG
-#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
-#define HASH_FSCK(hh,head)                                                       \
-do {                                                                             \
-    unsigned _bkt_i;                                                             \
-    unsigned _count, _bkt_count;                                                 \
-    char *_prev;                                                                 \
-    struct UT_hash_handle *_thh;                                                 \
-    if (head) {                                                                  \
-        _count = 0;                                                              \
-        for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) {       \
-            _bkt_count = 0;                                                      \
-            _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head;                      \
-            _prev = NULL;                                                        \
-            while (_thh) {                                                       \
-               if (_prev != (char*)(_thh->hh_prev)) {                            \
-                   HASH_OOPS("invalid hh_prev %p, actual %p\n",                  \
-                    _thh->hh_prev, _prev );                                      \
-               }                                                                 \
-               _bkt_count++;                                                     \
-               _prev = (char*)(_thh);                                            \
-               _thh = _thh->hh_next;                                             \
-            }                                                                    \
-            _count += _bkt_count;                                                \
-            if ((head)->hh.tbl->buckets[_bkt_i].count !=  _bkt_count) {          \
-               HASH_OOPS("invalid bucket count %d, actual %d\n",                 \
-                (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count);              \
-            }                                                                    \
-        }                                                                        \
-        if (_count != (head)->hh.tbl->num_items) {                               \
-            HASH_OOPS("invalid hh item count %d, actual %d\n",                   \
-                (head)->hh.tbl->num_items, _count );                             \
-        }                                                                        \
-        /* traverse hh in app order; check next/prev integrity, count */         \
-        _count = 0;                                                              \
-        _prev = NULL;                                                            \
-        _thh =  &(head)->hh;                                                     \
-        while (_thh) {                                                           \
-           _count++;                                                             \
-           if (_prev !=(char*)(_thh->prev)) {                                    \
-              HASH_OOPS("invalid prev %p, actual %p\n",                          \
-                    _thh->prev, _prev );                                         \
-           }                                                                     \
-           _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh);                    \
-           _thh = ( _thh->next ?  (UT_hash_handle*)((char*)(_thh->next) +        \
-                                  (head)->hh.tbl->hho) : NULL );                 \
-        }                                                                        \
-        if (_count != (head)->hh.tbl->num_items) {                               \
-            HASH_OOPS("invalid app item count %d, actual %d\n",                  \
-                (head)->hh.tbl->num_items, _count );                             \
-        }                                                                        \
-    }                                                                            \
-} while (0)
-#else
-#define HASH_FSCK(hh,head) 
-#endif
-
-/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to 
- * the descriptor to which this macro is defined for tuning the hash function.
- * The app can #include <unistd.h> to get the prototype for write(2). */
-#ifdef HASH_EMIT_KEYS
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                                   \
-do {                                                                             \
-    unsigned _klen = fieldlen;                                                   \
-    write(HASH_EMIT_KEYS, &_klen, sizeof(_klen));                                \
-    write(HASH_EMIT_KEYS, keyptr, fieldlen);                                     \
-} while (0)
-#else 
-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)                    
-#endif
-
-/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
-#ifdef HASH_FUNCTION 
-#define HASH_FCN HASH_FUNCTION
-#else
-#define HASH_FCN HASH_JEN
-#endif
-
-/* The Bernstein hash function, used in Perl prior to v5.6 */
-#define HASH_BER(key,keylen,num_bkts,hashv,bkt)                                  \
-do {                                                                             \
-  unsigned _hb_keylen=keylen;                                                    \
-  char *_hb_key=(char*)(key);                                                    \
-  (hashv) = 0;                                                                   \
-  while (_hb_keylen--)  { (hashv) = ((hashv) * 33) + *_hb_key++; }               \
-  bkt = (hashv) & (num_bkts-1);                                                  \
-} while (0)
-
-
-/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at 
- * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
-#define HASH_SAX(key,keylen,num_bkts,hashv,bkt)                                  \
-do {                                                                             \
-  unsigned _sx_i;                                                                \
-  char *_hs_key=(char*)(key);                                                    \
-  hashv = 0;                                                                     \
-  for(_sx_i=0; _sx_i < keylen; _sx_i++)                                          \
-      hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i];                     \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while (0)
-
-#define HASH_FNV(key,keylen,num_bkts,hashv,bkt)                                  \
-do {                                                                             \
-  unsigned _fn_i;                                                                \
-  char *_hf_key=(char*)(key);                                                    \
-  hashv = 2166136261UL;                                                          \
-  for(_fn_i=0; _fn_i < keylen; _fn_i++)                                          \
-      hashv = (hashv * 16777619) ^ _hf_key[_fn_i];                               \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while(0) 
- 
-#define HASH_OAT(key,keylen,num_bkts,hashv,bkt)                                  \
-do {                                                                             \
-  unsigned _ho_i;                                                                \
-  char *_ho_key=(char*)(key);                                                    \
-  hashv = 0;                                                                     \
-  for(_ho_i=0; _ho_i < keylen; _ho_i++) {                                        \
-      hashv += _ho_key[_ho_i];                                                   \
-      hashv += (hashv << 10);                                                    \
-      hashv ^= (hashv >> 6);                                                     \
-  }                                                                              \
-  hashv += (hashv << 3);                                                         \
-  hashv ^= (hashv >> 11);                                                        \
-  hashv += (hashv << 15);                                                        \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while(0)
-
-#define HASH_JEN_MIX(a,b,c)                                                      \
-do {                                                                             \
-  a -= b; a -= c; a ^= ( c >> 13 );                                              \
-  b -= c; b -= a; b ^= ( a << 8 );                                               \
-  c -= a; c -= b; c ^= ( b >> 13 );                                              \
-  a -= b; a -= c; a ^= ( c >> 12 );                                              \
-  b -= c; b -= a; b ^= ( a << 16 );                                              \
-  c -= a; c -= b; c ^= ( b >> 5 );                                               \
-  a -= b; a -= c; a ^= ( c >> 3 );                                               \
-  b -= c; b -= a; b ^= ( a << 10 );                                              \
-  c -= a; c -= b; c ^= ( b >> 15 );                                              \
-} while (0)
-
-#define HASH_JEN(key,keylen,num_bkts,hashv,bkt)                                  \
-do {                                                                             \
-  unsigned _hj_i,_hj_j,_hj_k;                                                    \
-  unsigned char *_hj_key=(unsigned char*)(key);                                  \
-  hashv = 0xfeedbeef;                                                            \
-  _hj_i = _hj_j = 0x9e3779b9;                                                    \
-  _hj_k = (unsigned)keylen;                                                      \
-  while (_hj_k >= 12) {                                                          \
-    _hj_i +=    (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 )                      \
-        + ( (unsigned)_hj_key[2] << 16 )                                         \
-        + ( (unsigned)_hj_key[3] << 24 ) );                                      \
-    _hj_j +=    (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 )                      \
-        + ( (unsigned)_hj_key[6] << 16 )                                         \
-        + ( (unsigned)_hj_key[7] << 24 ) );                                      \
-    hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 )                         \
-        + ( (unsigned)_hj_key[10] << 16 )                                        \
-        + ( (unsigned)_hj_key[11] << 24 ) );                                     \
-                                                                                 \
-     HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                          \
-                                                                                 \
-     _hj_key += 12;                                                              \
-     _hj_k -= 12;                                                                \
-  }                                                                              \
-  hashv += keylen;                                                               \
-  switch ( _hj_k ) {                                                             \
-     case 11: hashv += ( (unsigned)_hj_key[10] << 24 );                          \
-     case 10: hashv += ( (unsigned)_hj_key[9] << 16 );                           \
-     case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );                            \
-     case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );                           \
-     case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );                           \
-     case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );                            \
-     case 5:  _hj_j += _hj_key[4];                                               \
-     case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );                           \
-     case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );                           \
-     case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );                            \
-     case 1:  _hj_i += _hj_key[0];                                               \
-  }                                                                              \
-  HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                             \
-  bkt = hashv & (num_bkts-1);                                                    \
-} while(0)
-
-/* The Paul Hsieh hash function */
-#undef get16bits
-#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__)             \
-  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
-#define get16bits(d) (*((const uint16_t *) (d)))
-#endif
-
-#if !defined (get16bits)
-#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)             \
-                       +(uint32_t)(((const uint8_t *)(d))[0]) )
-#endif
-#define HASH_SFH(key,keylen,num_bkts,hashv,bkt)                                  \
-do {                                                                             \
-  unsigned char *_sfh_key=(unsigned char*)(key);                                 \
-  uint32_t _sfh_tmp, _sfh_len = keylen;                                          \
-                                                                                 \
-  int _sfh_rem = _sfh_len & 3;                                                   \
-  _sfh_len >>= 2;                                                                \
-  hashv = 0xcafebabe;                                                            \
-                                                                                 \
-  /* Main loop */                                                                \
-  for (;_sfh_len > 0; _sfh_len--) {                                              \
-    hashv    += get16bits (_sfh_key);                                            \
-    _sfh_tmp       = (uint32_t)(get16bits (_sfh_key+2)) << 11  ^ hashv;          \
-    hashv     = (hashv << 16) ^ _sfh_tmp;                                        \
-    _sfh_key += 2*sizeof (uint16_t);                                             \
-    hashv    += hashv >> 11;                                                     \
-  }                                                                              \
-                                                                                 \
-  /* Handle end cases */                                                         \
-  switch (_sfh_rem) {                                                            \
-    case 3: hashv += get16bits (_sfh_key);                                       \
-            hashv ^= hashv << 16;                                                \
-            hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)] << 18);              \
-            hashv += hashv >> 11;                                                \
-            break;                                                               \
-    case 2: hashv += get16bits (_sfh_key);                                       \
-            hashv ^= hashv << 11;                                                \
-            hashv += hashv >> 17;                                                \
-            break;                                                               \
-    case 1: hashv += *_sfh_key;                                                  \
-            hashv ^= hashv << 10;                                                \
-            hashv += hashv >> 1;                                                 \
-  }                                                                              \
-                                                                                 \
-    /* Force "avalanching" of final 127 bits */                                  \
-    hashv ^= hashv << 3;                                                         \
-    hashv += hashv >> 5;                                                         \
-    hashv ^= hashv << 4;                                                         \
-    hashv += hashv >> 17;                                                        \
-    hashv ^= hashv << 25;                                                        \
-    hashv += hashv >> 6;                                                         \
-    bkt = hashv & (num_bkts-1);                                                  \
-} while(0) 
-
-#ifdef HASH_USING_NO_STRICT_ALIASING
-/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
- * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
- * MurmurHash uses the faster approach only on CPU's where we know it's safe. 
- *
- * Note the preprocessor built-in defines can be emitted using:
- *
- *   gcc -m64 -dM -E - < /dev/null                  (on gcc)
- *   cc -## a.c (where a.c is a simple test file)   (Sun Studio)
- */
-#if (defined(__i386__) || defined(__x86_64__)  || defined(_M_IX86))
-#define MUR_GETBLOCK(p,i) p[i]
-#else /* non intel */
-#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
-#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1)
-#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
-#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
-#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
-#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
-#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))
-#define MUR_TWO_TWO(p)   ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16))
-#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >>  8))
-#else /* assume little endian non-intel */
-#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24))
-#define MUR_TWO_TWO(p)   ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16))
-#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) <<  8))
-#endif
-#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) :           \
-                            (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \
-                             (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) :  \
-                                                      MUR_ONE_THREE(p))))
-#endif
-#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
-#define MUR_FMIX(_h) \
-do {                 \
-  _h ^= _h >> 16;    \
-  _h *= 0x85ebca6b;  \
-  _h ^= _h >> 13;    \
-  _h *= 0xc2b2ae35l; \
-  _h ^= _h >> 16;    \
-} while(0)
-
-#define HASH_MUR(key,keylen,num_bkts,hashv,bkt)                        \
-do {                                                                   \
-  const uint8_t *_mur_data = (const uint8_t*)(key);                    \
-  const int _mur_nblocks = (keylen) / 4;                               \
-  uint32_t _mur_h1 = 0xf88D5353;                                       \
-  uint32_t _mur_c1 = 0xcc9e2d51;                                       \
-  uint32_t _mur_c2 = 0x1b873593;                                       \
-  uint32_t _mur_k1 = 0;                                                \
-  const uint8_t *_mur_tail;                                            \
-  const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \
-  int _mur_i;                                                          \
-  for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) {                      \
-    _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i);                        \
-    _mur_k1 *= _mur_c1;                                                \
-    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
-    _mur_k1 *= _mur_c2;                                                \
-                                                                       \
-    _mur_h1 ^= _mur_k1;                                                \
-    _mur_h1 = MUR_ROTL32(_mur_h1,13);                                  \
-    _mur_h1 = _mur_h1*5+0xe6546b64;                                    \
-  }                                                                    \
-  _mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4);            \
-  _mur_k1=0;                                                           \
-  switch((keylen) & 3) {                                               \
-    case 3: _mur_k1 ^= _mur_tail[2] << 16;                             \
-    case 2: _mur_k1 ^= _mur_tail[1] << 8;                              \
-    case 1: _mur_k1 ^= _mur_tail[0];                                   \
-    _mur_k1 *= _mur_c1;                                                \
-    _mur_k1 = MUR_ROTL32(_mur_k1,15);                                  \
-    _mur_k1 *= _mur_c2;                                                \
-    _mur_h1 ^= _mur_k1;                                                \
-  }                                                                    \
-  _mur_h1 ^= (keylen);                                                 \
-  MUR_FMIX(_mur_h1);                                                   \
-  hashv = _mur_h1;                                                     \
-  bkt = hashv & (num_bkts-1);                                          \
-} while(0)
-#endif  /* HASH_USING_NO_STRICT_ALIASING */
-
-/* key comparison function; return 0 if keys equal */
-#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) 
-
-/* iterate over items in a known bucket to find desired item */
-#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out)                       \
-do {                                                                             \
- if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head));          \
- else out=NULL;                                                                  \
- while (out) {                                                                   \
-    if ((out)->hh.keylen == keylen_in) {                                           \
-        if ((HASH_KEYCMP((out)->hh.key,keyptr,keylen_in)) == 0) break;             \
-    }                                                                            \
-    if ((out)->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,(out)->hh.hh_next)); \
-    else out = NULL;                                                             \
- }                                                                               \
-} while(0)
-
-/* add an item to a bucket  */
-#define HASH_ADD_TO_BKT(head,addhh)                                              \
-do {                                                                             \
- head.count++;                                                                   \
- (addhh)->hh_next = head.hh_head;                                                \
- (addhh)->hh_prev = NULL;                                                        \
- if (head.hh_head) { (head).hh_head->hh_prev = (addhh); }                        \
- (head).hh_head=addhh;                                                           \
- if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH)             \
-     && (addhh)->tbl->noexpand != 1) {                                           \
-       HASH_EXPAND_BUCKETS((addhh)->tbl);                                        \
- }                                                                               \
-} while(0)
-
-/* remove an item from a given bucket */
-#define HASH_DEL_IN_BKT(hh,head,hh_del)                                          \
-    (head).count--;                                                              \
-    if ((head).hh_head == hh_del) {                                              \
-      (head).hh_head = hh_del->hh_next;                                          \
-    }                                                                            \
-    if (hh_del->hh_prev) {                                                       \
-        hh_del->hh_prev->hh_next = hh_del->hh_next;                              \
-    }                                                                            \
-    if (hh_del->hh_next) {                                                       \
-        hh_del->hh_next->hh_prev = hh_del->hh_prev;                              \
-    }                                                                
-
-/* Bucket expansion has the effect of doubling the number of buckets
- * and redistributing the items into the new buckets. Ideally the
- * items will distribute more or less evenly into the new buckets
- * (the extent to which this is true is a measure of the quality of
- * the hash function as it applies to the key domain). 
- * 
- * With the items distributed into more buckets, the chain length
- * (item count) in each bucket is reduced. Thus by expanding buckets
- * the hash keeps a bound on the chain length. This bounded chain 
- * length is the essence of how a hash provides constant time lookup.
- * 
- * The calculation of tbl->ideal_chain_maxlen below deserves some
- * explanation. First, keep in mind that we're calculating the ideal
- * maximum chain length based on the *new* (doubled) bucket count.
- * In fractions this is just n/b (n=number of items,b=new num buckets).
- * Since the ideal chain length is an integer, we want to calculate 
- * ceil(n/b). We don't depend on floating point arithmetic in this
- * hash, so to calculate ceil(n/b) with integers we could write
- * 
- *      ceil(n/b) = (n/b) + ((n%b)?1:0)
- * 
- * and in fact a previous version of this hash did just that.
- * But now we have improved things a bit by recognizing that b is
- * always a power of two. We keep its base 2 log handy (call it lb),
- * so now we can write this with a bit shift and logical AND:
- * 
- *      ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
- * 
- */
-#define HASH_EXPAND_BUCKETS(tbl)                                                 \
-do {                                                                             \
-    unsigned _he_bkt;                                                            \
-    unsigned _he_bkt_i;                                                          \
-    struct UT_hash_handle *_he_thh, *_he_hh_nxt;                                 \
-    UT_hash_bucket *_he_new_buckets, *_he_newbkt;                                \
-    _he_new_buckets = (UT_hash_bucket*)uthash_malloc(                            \
-             2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));              \
-    if (!_he_new_buckets) { uthash_fatal( "out of memory"); }                    \
-    memset(_he_new_buckets, 0,                                                   \
-            2 * tbl->num_buckets * sizeof(struct UT_hash_bucket));               \
-    tbl->ideal_chain_maxlen =                                                    \
-       (tbl->num_items >> (tbl->log2_num_buckets+1)) +                           \
-       ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0);                    \
-    tbl->nonideal_items = 0;                                                     \
-    for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++)                \
-    {                                                                            \
-        _he_thh = tbl->buckets[ _he_bkt_i ].hh_head;                             \
-        while (_he_thh) {                                                        \
-           _he_hh_nxt = _he_thh->hh_next;                                        \
-           HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt);            \
-           _he_newbkt = &(_he_new_buckets[ _he_bkt ]);                           \
-           if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) {                \
-             tbl->nonideal_items++;                                              \
-             _he_newbkt->expand_mult = _he_newbkt->count /                       \
-                                        tbl->ideal_chain_maxlen;                 \
-           }                                                                     \
-           _he_thh->hh_prev = NULL;                                              \
-           _he_thh->hh_next = _he_newbkt->hh_head;                               \
-           if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev =               \
-                _he_thh;                                                         \
-           _he_newbkt->hh_head = _he_thh;                                        \
-           _he_thh = _he_hh_nxt;                                                 \
-        }                                                                        \
-    }                                                                            \
-    uthash_free( tbl->buckets, tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
-    tbl->num_buckets *= 2;                                                       \
-    tbl->log2_num_buckets++;                                                     \
-    tbl->buckets = _he_new_buckets;                                              \
-    tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ?         \
-        (tbl->ineff_expands+1) : 0;                                              \
-    if (tbl->ineff_expands > 1) {                                                \
-        tbl->noexpand=1;                                                         \
-        uthash_noexpand_fyi(tbl);                                                \
-    }                                                                            \
-    uthash_expand_fyi(tbl);                                                      \
-} while(0)
-
-
-/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
-/* Note that HASH_SORT assumes the hash handle name to be hh. 
- * HASH_SRT was added to allow the hash handle name to be passed in. */
-#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
-#define HASH_SRT(hh,head,cmpfcn)                                                 \
-do {                                                                             \
-  unsigned _hs_i;                                                                \
-  unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize;               \
-  struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail;            \
-  if (head) {                                                                    \
-      _hs_insize = 1;                                                            \
-      _hs_looping = 1;                                                           \
-      _hs_list = &((head)->hh);                                                  \
-      while (_hs_looping) {                                                      \
-          _hs_p = _hs_list;                                                      \
-          _hs_list = NULL;                                                       \
-          _hs_tail = NULL;                                                       \
-          _hs_nmerges = 0;                                                       \
-          while (_hs_p) {                                                        \
-              _hs_nmerges++;                                                     \
-              _hs_q = _hs_p;                                                     \
-              _hs_psize = 0;                                                     \
-              for ( _hs_i = 0; _hs_i  < _hs_insize; _hs_i++ ) {                  \
-                  _hs_psize++;                                                   \
-                  _hs_q = (UT_hash_handle*)((_hs_q->next) ?                      \
-                          ((void*)((char*)(_hs_q->next) +                        \
-                          (head)->hh.tbl->hho)) : NULL);                         \
-                  if (! (_hs_q) ) break;                                         \
-              }                                                                  \
-              _hs_qsize = _hs_insize;                                            \
-              while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) {           \
-                  if (_hs_psize == 0) {                                          \
-                      _hs_e = _hs_q;                                             \
-                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                  \
-                              ((void*)((char*)(_hs_q->next) +                    \
-                              (head)->hh.tbl->hho)) : NULL);                     \
-                      _hs_qsize--;                                               \
-                  } else if ( (_hs_qsize == 0) || !(_hs_q) ) {                   \
-                      _hs_e = _hs_p;                                             \
-                      if (_hs_p){                                                \
-                        _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
-                                ((void*)((char*)(_hs_p->next) +                  \
-                                (head)->hh.tbl->hho)) : NULL);                   \
-                       }                                                         \
-                      _hs_psize--;                                               \
-                  } else if ((                                                   \
-                      cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \
-                             DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \
-                             ) <= 0) {                                           \
-                      _hs_e = _hs_p;                                             \
-                      if (_hs_p){                                                \
-                        _hs_p = (UT_hash_handle*)((_hs_p->next) ?                \
-                               ((void*)((char*)(_hs_p->next) +                   \
-                               (head)->hh.tbl->hho)) : NULL);                    \
-                       }                                                         \
-                      _hs_psize--;                                               \
-                  } else {                                                       \
-                      _hs_e = _hs_q;                                             \
-                      _hs_q = (UT_hash_handle*)((_hs_q->next) ?                  \
-                              ((void*)((char*)(_hs_q->next) +                    \
-                              (head)->hh.tbl->hho)) : NULL);                     \
-                      _hs_qsize--;                                               \
-                  }                                                              \
-                  if ( _hs_tail ) {                                              \
-                      _hs_tail->next = ((_hs_e) ?                                \
-                            ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL);          \
-                  } else {                                                       \
-                      _hs_list = _hs_e;                                          \
-                  }                                                              \
-                  if (_hs_e) {                                                   \
-                  _hs_e->prev = ((_hs_tail) ?                                    \
-                     ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL);              \
-                  }                                                              \
-                  _hs_tail = _hs_e;                                              \
-              }                                                                  \
-              _hs_p = _hs_q;                                                     \
-          }                                                                      \
-          if (_hs_tail){                                                         \
-            _hs_tail->next = NULL;                                               \
-          }                                                                      \
-          if ( _hs_nmerges <= 1 ) {                                              \
-              _hs_looping=0;                                                     \
-              (head)->hh.tbl->tail = _hs_tail;                                   \
-              DECLTYPE_ASSIGN(head,ELMT_FROM_HH((head)->hh.tbl, _hs_list));      \
-          }                                                                      \
-          _hs_insize *= 2;                                                       \
-      }                                                                          \
-      HASH_FSCK(hh,head);                                                        \
- }                                                                               \
-} while (0)
-
-/* This function selects items from one hash into another hash. 
- * The end result is that the selected items have dual presence 
- * in both hashes. There is no copy of the items made; rather 
- * they are added into the new hash through a secondary hash 
- * hash handle that must be present in the structure. */
-#define HASH_SELECT(hh_dst, dst, hh_src, src, cond)                              \
-do {                                                                             \
-  unsigned _src_bkt, _dst_bkt;                                                   \
-  void *_last_elt=NULL, *_elt;                                                   \
-  UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL;                         \
-  ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst));                 \
-  if (src) {                                                                     \
-    for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) {     \
-      for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head;                \
-          _src_hh;                                                               \
-          _src_hh = _src_hh->hh_next) {                                          \
-          _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh);                       \
-          if (cond(_elt)) {                                                      \
-            _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho);               \
-            _dst_hh->key = _src_hh->key;                                         \
-            _dst_hh->keylen = _src_hh->keylen;                                   \
-            _dst_hh->hashv = _src_hh->hashv;                                     \
-            _dst_hh->prev = _last_elt;                                           \
-            _dst_hh->next = NULL;                                                \
-            if (_last_elt_hh) { _last_elt_hh->next = _elt; }                     \
-            if (!dst) {                                                          \
-              DECLTYPE_ASSIGN(dst,_elt);                                         \
-              HASH_MAKE_TABLE(hh_dst,dst);                                       \
-            } else {                                                             \
-              _dst_hh->tbl = (dst)->hh_dst.tbl;                                  \
-            }                                                                    \
-            HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt);    \
-            HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh);            \
-            (dst)->hh_dst.tbl->num_items++;                                      \
-            _last_elt = _elt;                                                    \
-            _last_elt_hh = _dst_hh;                                              \
-          }                                                                      \
-      }                                                                          \
-    }                                                                            \
-  }                                                                              \
-  HASH_FSCK(hh_dst,dst);                                                         \
-} while (0)
-
-#define HASH_CLEAR(hh,head)                                                      \
-do {                                                                             \
-  if (head) {                                                                    \
-    uthash_free((head)->hh.tbl->buckets,                                         \
-                (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket));      \
-    HASH_BLOOM_FREE((head)->hh.tbl);                                             \
-    uthash_free((head)->hh.tbl, sizeof(UT_hash_table));                          \
-    (head)=NULL;                                                                 \
-  }                                                                              \
-} while(0)
-
-#define HASH_OVERHEAD(hh,head)                                                   \
- (size_t)((((head)->hh.tbl->num_items   * sizeof(UT_hash_handle))   +            \
-           ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket))   +            \
-            (sizeof(UT_hash_table))                                 +            \
-            (HASH_BLOOM_BYTELEN)))
-
-#ifdef NO_DECLTYPE
-#define HASH_ITER(hh,head,el,tmp)                                                \
-for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL);       \
-  el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) 
-#else
-#define HASH_ITER(hh,head,el,tmp)                                                \
-for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL);                 \
-  el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL))
-#endif
-
-/* obtain a count of items in the hash */
-#define HASH_COUNT(head) HASH_CNT(hh,head) 
-#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0)
-
-typedef struct UT_hash_bucket {
-   struct UT_hash_handle *hh_head;
-   unsigned count;
-
-   /* expand_mult is normally set to 0. In this situation, the max chain length
-    * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
-    * the bucket's chain exceeds this length, bucket expansion is triggered). 
-    * However, setting expand_mult to a non-zero value delays bucket expansion
-    * (that would be triggered by additions to this particular bucket)
-    * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
-    * (The multiplier is simply expand_mult+1). The whole idea of this
-    * multiplier is to reduce bucket expansions, since they are expensive, in
-    * situations where we know that a particular bucket tends to be overused.
-    * It is better to let its chain length grow to a longer yet-still-bounded
-    * value, than to do an O(n) bucket expansion too often. 
-    */
-   unsigned expand_mult;
-
-} UT_hash_bucket;
-
-/* random signature used only to find hash tables in external analysis */
-#define HASH_SIGNATURE 0xa0111fe1
-#define HASH_BLOOM_SIGNATURE 0xb12220f2
-
-typedef struct UT_hash_table {
-   UT_hash_bucket *buckets;
-   unsigned num_buckets, log2_num_buckets;
-   unsigned num_items;
-   struct UT_hash_handle *tail; /* tail hh in app order, for fast append    */
-   ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */
-
-   /* in an ideal situation (all buckets used equally), no bucket would have
-    * more than ceil(#items/#buckets) items. that's the ideal chain length. */
-   unsigned ideal_chain_maxlen;
-
-   /* nonideal_items is the number of items in the hash whose chain position
-    * exceeds the ideal chain maxlen. these items pay the penalty for an uneven
-    * hash distribution; reaching them in a chain traversal takes >ideal steps */
-   unsigned nonideal_items;
-
-   /* ineffective expands occur when a bucket doubling was performed, but 
-    * afterward, more than half the items in the hash had nonideal chain
-    * positions. If this happens on two consecutive expansions we inhibit any
-    * further expansion, as it's not helping; this happens when the hash
-    * function isn't a good fit for the key domain. When expansion is inhibited
-    * the hash will still work, albeit no longer in constant time. */
-   unsigned ineff_expands, noexpand;
-
-   uint32_t signature; /* used only to find hash tables in external analysis */
-#ifdef HASH_BLOOM
-   uint32_t bloom_sig; /* used only to test bloom exists in external analysis */
-   uint8_t *bloom_bv;
-   char bloom_nbits;
-#endif
-
-} UT_hash_table;
-
-typedef struct UT_hash_handle {
-   struct UT_hash_table *tbl;
-   void *prev;                       /* prev element in app order      */
-   void *next;                       /* next element in app order      */
-   struct UT_hash_handle *hh_prev;   /* previous hh in bucket order    */
-   struct UT_hash_handle *hh_next;   /* next hh in bucket order        */
-   void *key;                        /* ptr to enclosing struct's key  */
-   unsigned keylen;                  /* enclosing struct's key len     */
-   unsigned hashv;                   /* result of hash-fcn(key)        */
-} UT_hash_handle;
-
-#endif /* UTHASH_H */

=== removed directory '.pc/enable-libwrap.patch'
=== removed file '.pc/enable-libwrap.patch/config.mk'
--- .pc/enable-libwrap.patch/config.mk	2015-01-15 14:08:09 +0000
+++ .pc/enable-libwrap.patch/config.mk	1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-# =============================================================================
-# User configuration section.
-#
-# Largely, these are options that are designed to make mosquitto run more
-# easily in restrictive environments by removing features.
-#
-# Modify the variable below to enable/disable features.
-#
-# Can also be overriden at the command line, e.g.:
-#
-# make WITH_TLS=no
-# =============================================================================
-
-# Uncomment to compile the broker with tcpd/libwrap support.
-#WITH_WRAP:=yes
-
-# Comment out to disable SSL/TLS support in the broker and client.
-# Disabling this will also mean that passwords must be stored in plain text. It
-# is strongly recommended that you only disable WITH_TLS if you are not using
-# password authentication at all.
-WITH_TLS:=yes
-
-# Comment out to disable TLS/PSK support in the broker and client. Requires
-# WITH_TLS=yes.
-# This must be disabled if using openssl < 1.0.
-WITH_TLS_PSK:=yes
-
-# Comment out to disable client client threading support.
-WITH_THREADING:=yes
-
-# Uncomment to compile the broker with strict protocol support. This means that
-# both the client library and the broker will be very strict about protocol
-# compliance on incoming data. Neither of them will return an error on
-# incorrect "remaining length" values if this is commented out. The old
-# behaviour (prior to 0.12) is equivalent to compiling with
-# WITH_STRICT_PROTOCOL defined and means that clients will be immediately
-# disconnected from the broker on non-compliance.
-#WITH_STRICT_PROTOCOL:=yes
-
-# Comment out to remove bridge support from the broker. This allow the broker
-# to connect to other brokers and subscribe/publish to topics. You probably
-# want to leave this included unless you want to save a very small amount of
-# memory size and CPU time.
-WITH_BRIDGE:=yes
-
-# Comment out to remove persistent database support from the broker. This
-# allows the broker to store retained messages and durable subscriptions to a
-# file periodically and on shutdown. This is usually desirable (and is
-# suggested by the MQTT spec), but it can be disabled if required.
-WITH_PERSISTENCE:=yes
-
-# Comment out to remove memory tracking support from the broker. If disabled,
-# mosquitto won't track heap memory usage nor export '$SYS/broker/heap/current
-# size', but will use slightly less memory and CPU time.
-WITH_MEMORY_TRACKING:=yes
-
-# Compile with database upgrading support? If disabled, mosquitto won't
-# automatically upgrade old database versions.
-# Not currently supported.
-#WITH_DB_UPGRADE:=yes
-
-# Comment out to remove publishing of the $SYS topic hierarchy containing
-# information about the broker state.
-WITH_SYS_TREE:=yes
-
-# Build with Python module. Comment out if Python is not installed, or required
-# Python modules are not available.
-WITH_PYTHON:=yes
-
-# Build with SRV lookup support.
-WITH_SRV:=yes
-
-# =============================================================================
-# End of user configuration
-# =============================================================================
-
-
-# Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt,
-# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=1.3.4
-TIMESTAMP:=$(shell date "+%F %T%z")
-
-# Client library SO version. Bump if incompatible API/ABI changes are made.
-SOVERSION=1
-
-# Man page generation requires xsltproc and docbook-xsl
-XSLTPROC=xsltproc
-# For html generation
-DB_HTML_XSL=man/html.xsl
-
-#MANCOUNTRIES=en_GB
-
-UNAME:=$(shell uname -s)
-ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		CFLAGS?=-O
-	else
-		CFLAGS?=-Wall -ggdb -O2
-	endif
-else
-	CFLAGS?=-Wall -ggdb -O2
-endif
-
-LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
-LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
-LIB_LDFLAGS:=${LDFLAGS}
-
-BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
-CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
-
-ifeq ($(UNAME),FreeBSD)
-	BROKER_LIBS:=-lm
-else
-	BROKER_LIBS:=-ldl -lm
-endif
-LIB_LIBS:=
-PASSWD_LIBS:=
-
-ifeq ($(UNAME),Linux)
-	BROKER_LIBS:=$(BROKER_LIBS) -lrt
-	LIB_LIBS:=$(LIB_LIBS) -lrt
-endif
-
-CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib ../lib/libmosquitto.so.${SOVERSION}
-
-ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		LIB_CFLAGS:=$(LIB_CFLAGS) -xc99 -KPIC
-	else
-		LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
-	endif
-
-	ifeq ($(CXX),CC)
-		LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -KPIC
-	else
-		LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -fPIC
-	endif
-else
-	LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
-	LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -fPIC
-endif
-
-ifneq ($(UNAME),SunOS)
-	LIB_LDFLAGS:=$(LIB_LDFLAGS) -Wl,--version-script=linker.version -Wl,-soname,libmosquitto.so.$(SOVERSION)
-endif
-
-ifeq ($(UNAME),QNX)
-	BROKER_LIBS:=$(BROKER_LIBS) -lsocket
-	LIB_LIBS:=$(LIB_LIBS) -lsocket
-endif
-
-ifeq ($(WITH_WRAP),yes)
-	BROKER_LIBS:=$(BROKER_LIBS) -lwrap
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP
-endif
-
-ifeq ($(WITH_TLS),yes)
-	BROKER_LIBS:=$(BROKER_LIBS) -lssl -lcrypto
-	LIB_LIBS:=$(LIB_LIBS) -lssl -lcrypto
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS
-	PASSWD_LIBS:=-lcrypto
-	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS
-
-	ifeq ($(WITH_TLS_PSK),yes)
-		BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS_PSK
-		LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS_PSK
-		CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS_PSK
-	endif
-endif
-
-ifeq ($(WITH_THREADING),yes)
-	LIB_LIBS:=$(LIB_LIBS) -lpthread
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_THREADING
-endif
-
-ifeq ($(WITH_STRICT_PROTOCOL),yes)
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_STRICT_PROTOCOL
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_STRICT_PROTOCOL
-endif
-
-ifeq ($(WITH_BRIDGE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_BRIDGE
-endif
-
-ifeq ($(WITH_PERSISTENCE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_PERSISTENCE
-endif
-
-ifeq ($(WITH_MEMORY_TRACKING),yes)
-	ifneq ($(UNAME),SunOS)
-		BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_MEMORY_TRACKING
-	endif
-endif
-
-#ifeq ($(WITH_DB_UPGRADE),yes)
-#	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_DB_UPGRADE
-#endif
-
-ifeq ($(WITH_SYS_TREE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYS_TREE
-endif
-
-ifeq ($(WITH_SRV),yes)
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_SRV
-	LIB_LIBS:=$(LIB_LIBS) -lcares
-endif
-
-ifeq ($(UNAME),SunOS)
-	BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl
-	LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl
-endif
-
-
-INSTALL?=install
-prefix=/usr/local
-mandir=${prefix}/share/man
-localedir=${prefix}/share/locale
-STRIP?=strip

=== removed directory '.pc/fix-prefix.patch'
=== removed file '.pc/fix-prefix.patch/config.mk'
--- .pc/fix-prefix.patch/config.mk	2015-01-15 14:08:09 +0000
+++ .pc/fix-prefix.patch/config.mk	1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-# =============================================================================
-# User configuration section.
-#
-# Largely, these are options that are designed to make mosquitto run more
-# easily in restrictive environments by removing features.
-#
-# Modify the variable below to enable/disable features.
-#
-# Can also be overriden at the command line, e.g.:
-#
-# make WITH_TLS=no
-# =============================================================================
-
-# Uncomment to compile the broker with tcpd/libwrap support.
-WITH_WRAP:=yes
-
-# Comment out to disable SSL/TLS support in the broker and client.
-# Disabling this will also mean that passwords must be stored in plain text. It
-# is strongly recommended that you only disable WITH_TLS if you are not using
-# password authentication at all.
-WITH_TLS:=yes
-
-# Comment out to disable TLS/PSK support in the broker and client. Requires
-# WITH_TLS=yes.
-# This must be disabled if using openssl < 1.0.
-WITH_TLS_PSK:=yes
-
-# Comment out to disable client client threading support.
-WITH_THREADING:=yes
-
-# Uncomment to compile the broker with strict protocol support. This means that
-# both the client library and the broker will be very strict about protocol
-# compliance on incoming data. Neither of them will return an error on
-# incorrect "remaining length" values if this is commented out. The old
-# behaviour (prior to 0.12) is equivalent to compiling with
-# WITH_STRICT_PROTOCOL defined and means that clients will be immediately
-# disconnected from the broker on non-compliance.
-#WITH_STRICT_PROTOCOL:=yes
-
-# Comment out to remove bridge support from the broker. This allow the broker
-# to connect to other brokers and subscribe/publish to topics. You probably
-# want to leave this included unless you want to save a very small amount of
-# memory size and CPU time.
-WITH_BRIDGE:=yes
-
-# Comment out to remove persistent database support from the broker. This
-# allows the broker to store retained messages and durable subscriptions to a
-# file periodically and on shutdown. This is usually desirable (and is
-# suggested by the MQTT spec), but it can be disabled if required.
-WITH_PERSISTENCE:=yes
-
-# Comment out to remove memory tracking support from the broker. If disabled,
-# mosquitto won't track heap memory usage nor export '$SYS/broker/heap/current
-# size', but will use slightly less memory and CPU time.
-WITH_MEMORY_TRACKING:=yes
-
-# Compile with database upgrading support? If disabled, mosquitto won't
-# automatically upgrade old database versions.
-# Not currently supported.
-#WITH_DB_UPGRADE:=yes
-
-# Comment out to remove publishing of the $SYS topic hierarchy containing
-# information about the broker state.
-WITH_SYS_TREE:=yes
-
-# Build with Python module. Comment out if Python is not installed, or required
-# Python modules are not available.
-WITH_PYTHON:=yes
-
-# Build with SRV lookup support.
-WITH_SRV:=yes
-
-# =============================================================================
-# End of user configuration
-# =============================================================================
-
-
-# Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt,
-# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=1.3.4
-TIMESTAMP:=$(shell date "+%F %T%z")
-
-# Client library SO version. Bump if incompatible API/ABI changes are made.
-SOVERSION=1
-
-# Man page generation requires xsltproc and docbook-xsl
-XSLTPROC=xsltproc
-# For html generation
-DB_HTML_XSL=man/html.xsl
-
-#MANCOUNTRIES=en_GB
-
-UNAME:=$(shell uname -s)
-ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		CFLAGS?=-O
-	else
-		CFLAGS?=-Wall -ggdb -O2
-	endif
-else
-	CFLAGS?=-Wall -ggdb -O2
-endif
-
-LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
-LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
-LIB_LDFLAGS:=${LDFLAGS}
-
-BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
-CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
-
-ifeq ($(UNAME),FreeBSD)
-	BROKER_LIBS:=-lm
-else
-	BROKER_LIBS:=-ldl -lm
-endif
-LIB_LIBS:=
-PASSWD_LIBS:=
-
-ifeq ($(UNAME),Linux)
-	BROKER_LIBS:=$(BROKER_LIBS) -lrt
-	LIB_LIBS:=$(LIB_LIBS) -lrt
-endif
-
-CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib ../lib/libmosquitto.so.${SOVERSION}
-
-ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		LIB_CFLAGS:=$(LIB_CFLAGS) -xc99 -KPIC
-	else
-		LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
-	endif
-
-	ifeq ($(CXX),CC)
-		LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -KPIC
-	else
-		LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -fPIC
-	endif
-else
-	LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
-	LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -fPIC
-endif
-
-ifneq ($(UNAME),SunOS)
-	LIB_LDFLAGS:=$(LIB_LDFLAGS) -Wl,--version-script=linker.version -Wl,-soname,libmosquitto.so.$(SOVERSION)
-endif
-
-ifeq ($(UNAME),QNX)
-	BROKER_LIBS:=$(BROKER_LIBS) -lsocket
-	LIB_LIBS:=$(LIB_LIBS) -lsocket
-endif
-
-ifeq ($(WITH_WRAP),yes)
-	BROKER_LIBS:=$(BROKER_LIBS) -lwrap
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP
-endif
-
-ifeq ($(WITH_TLS),yes)
-	BROKER_LIBS:=$(BROKER_LIBS) -lssl -lcrypto
-	LIB_LIBS:=$(LIB_LIBS) -lssl -lcrypto
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS
-	PASSWD_LIBS:=-lcrypto
-	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS
-
-	ifeq ($(WITH_TLS_PSK),yes)
-		BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS_PSK
-		LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS_PSK
-		CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS_PSK
-	endif
-endif
-
-ifeq ($(WITH_THREADING),yes)
-	LIB_LIBS:=$(LIB_LIBS) -lpthread
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_THREADING
-endif
-
-ifeq ($(WITH_STRICT_PROTOCOL),yes)
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_STRICT_PROTOCOL
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_STRICT_PROTOCOL
-endif
-
-ifeq ($(WITH_BRIDGE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_BRIDGE
-endif
-
-ifeq ($(WITH_PERSISTENCE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_PERSISTENCE
-endif
-
-ifeq ($(WITH_MEMORY_TRACKING),yes)
-	ifneq ($(UNAME),SunOS)
-		BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_MEMORY_TRACKING
-	endif
-endif
-
-#ifeq ($(WITH_DB_UPGRADE),yes)
-#	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_DB_UPGRADE
-#endif
-
-ifeq ($(WITH_SYS_TREE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYS_TREE
-endif
-
-ifeq ($(WITH_SRV),yes)
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_SRV
-	LIB_LIBS:=$(LIB_LIBS) -lcares
-endif
-
-ifeq ($(UNAME),SunOS)
-	BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl
-	LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl
-endif
-
-
-INSTALL?=install
-prefix=/usr/local
-mandir=${prefix}/share/man
-localedir=${prefix}/share/locale
-STRIP?=strip

=== removed directory '.pc/install-apparmor.patch'
=== removed file '.pc/install-apparmor.patch/Makefile'
--- .pc/install-apparmor.patch/Makefile	2015-01-15 14:08:09 +0000
+++ .pc/install-apparmor.patch/Makefile	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-include config.mk
-
-DIRS=lib client src
-DOCDIRS=man
-DISTDIRS=man
-
-.PHONY : all mosquitto docs binary clean reallyclean test install uninstall dist sign copy
-
-all : mosquitto docs
-
-docs :
-	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d}; done
-
-binary : mosquitto
-
-mosquitto :
-	set -e; for d in ${DIRS}; do $(MAKE) -C $${d}; done
-
-clean :
-	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} clean; done
-	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} clean; done
-	$(MAKE) -C test clean
-
-reallyclean : 
-	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done
-	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} reallyclean; done
-	$(MAKE) -C test reallyclean
-	-rm -f *.orig
-
-test : mosquitto
-	$(MAKE) -C test test
-
-install : mosquitto
-	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} install; done
-	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} install; done
-	$(INSTALL) -d ${DESTDIR}/etc/mosquitto
-	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf.example
-	$(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example
-	$(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example
-	$(INSTALL) -m 644 pskfile.example ${DESTDIR}/etc/mosquitto/pskfile.example
-
-uninstall :
-	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
-	rm -f ${DESTDIR}/etc/mosquitto/mosquitto.conf
-	rm -f ${DESTDIR}/etc/mosquitto/aclfile.example
-	rm -f ${DESTDIR}/etc/mosquitto/pwfile.example
-	rm -f ${DESTDIR}/etc/mosquitto/pskfile.example
-
-dist : reallyclean
-	set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
-	
-	echo $$(hg log -r . --template "{node}") > changeset
-	mkdir -p dist/mosquitto-${VERSION}
-	cp -r client changeset examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/
-	cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
-	set -e; for m in man/*.xml; \
-		do \
-		hfile=$$(echo $${m} | sed -e 's#man/\(.*\)\.xml#\1#' | sed -e 's/\./-/g'); \
-		$(XSLTPROC) $(DB_HTML_XSL) $${m} > dist/$${hfile}.html; \
-	done
-
-
-sign : dist
-	cd dist; gpg --detach-sign -a mosquitto-${VERSION}.tar.gz
-
-copy : sign
-	cd dist; scp mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}.tar.gz.asc mosquitto:site/mosquitto.org/files/source/
-	cd dist; scp *.html mosquitto:site/mosquitto.org/man/
-	scp ChangeLog.txt mosquitto:site/mosquitto.org/
-

=== removed directory '.pc/nostrip.patch'
=== removed directory '.pc/nostrip.patch/client'
=== removed file '.pc/nostrip.patch/client/Makefile'
--- .pc/nostrip.patch/client/Makefile	2014-08-06 00:43:39 +0000
+++ .pc/nostrip.patch/client/Makefile	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-include ../config.mk
-
-.PHONY: all install uninstall reallyclean clean
-
-all : mosquitto_pub mosquitto_sub
-
-mosquitto_pub : pub_client.o ../lib/libmosquitto.so.${SOVERSION}
-	${CC} $< -o $@ ${CLIENT_LDFLAGS}
-
-mosquitto_sub : sub_client.o ../lib/libmosquitto.so.${SOVERSION}
-	${CC} $< -o $@ ${CLIENT_LDFLAGS}
-
-pub_client.o : pub_client.c ../lib/libmosquitto.so.${SOVERSION}
-	${CC} -c $< -o $@ ${CLIENT_CFLAGS}
-
-sub_client.o : sub_client.c ../lib/libmosquitto.so.${SOVERSION}
-	${CC} -c $< -o $@ ${CLIENT_CFLAGS}
-
-../lib/libmosquitto.so.${SOVERSION} :
-	$(MAKE) -C ../lib
-
-install : all
-	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
-	$(INSTALL) -s --strip-program=$(STRIP) mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
-	$(INSTALL) -s --strip-program=$(STRIP) mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
-
-uninstall :
-	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub
-	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_sub
-
-reallyclean : clean
-
-clean : 
-	-rm -f *.o mosquitto_pub mosquitto_sub

=== removed directory '.pc/nostrip.patch/lib'
=== removed file '.pc/nostrip.patch/lib/Makefile'
--- .pc/nostrip.patch/lib/Makefile	2014-08-06 00:43:39 +0000
+++ .pc/nostrip.patch/lib/Makefile	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-include ../config.mk
-
-.PHONY : really clean install
-
-MOSQ_OBJS=mosquitto.o \
-		  logging_mosq.o \
-		  memory_mosq.o \
-		  messages_mosq.o \
-		  net_mosq.o \
-		  read_handle.o \
-		  read_handle_client.o \
-		  read_handle_shared.o \
-		  send_mosq.o \
-		  send_client_mosq.o \
-		  srv_mosq.o \
-		  thread_mosq.o \
-		  time_mosq.o \
-		  tls_mosq.o \
-		  util_mosq.o \
-		  will_mosq.o
-
-all : libmosquitto.so.${SOVERSION} libmosquitto.a
-	$(MAKE) -C cpp
-	$(MAKE) -C python
-
-install : all
-	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
-	$(INSTALL) -s --strip-program=$(STRIP) libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
-	ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so
-	$(INSTALL) -d ${DESTDIR}${prefix}/include/
-	$(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h
-	$(MAKE) -C cpp install
-	$(MAKE) -C python install
-
-uninstall :
-	-rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
-	-rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so
-	-rm -f ${DESTDIR}${prefix}/include/mosquitto.h
-
-reallyclean : clean
-
-clean :
-	-rm -f *.o libmosquitto.so.${SOVERSION} libmosquitto.so libmosquitto.a
-	$(MAKE) -C cpp clean
-	$(MAKE) -C python clean
-
-libmosquitto.so.${SOVERSION} : ${MOSQ_OBJS}
-	$(CC) -shared $(LIB_LDFLAGS) $^ -o $@ ${LIB_LIBS}
-
-libmosquitto.a : ${MOSQ_OBJS}
-	$(AR) cr $@ $^
-mosquitto.o : mosquitto.c mosquitto.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-logging_mosq.o : logging_mosq.c logging_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-messages_mosq.o : messages_mosq.c messages_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-memory_mosq.o : memory_mosq.c memory_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-net_mosq.o : net_mosq.c net_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-read_handle.o : read_handle.c read_handle.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-read_handle_client.o : read_handle_client.c read_handle.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-read_handle_shared.o : read_handle_shared.c read_handle.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-send_mosq.o : send_mosq.c send_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-send_client_mosq.o : send_client_mosq.c send_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-srv_mosq.o : srv_mosq.c
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-thread_mosq.o : thread_mosq.c
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-time_mosq.o : time_mosq.c
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-tls_mosq.o : tls_mosq.c
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-util_mosq.o : util_mosq.c util_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-
-will_mosq.o : will_mosq.c will_mosq.h
-	$(CC) $(LIB_CFLAGS) -c $< -o $@
-

=== removed directory '.pc/nostrip.patch/lib/cpp'
=== removed file '.pc/nostrip.patch/lib/cpp/Makefile'
--- .pc/nostrip.patch/lib/cpp/Makefile	2014-08-06 00:43:39 +0000
+++ .pc/nostrip.patch/lib/cpp/Makefile	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-include ../../config.mk
-
-ifneq ($(UNAME),SunOS)
-	LIB_LDFLAGS:=$(LDFLAGS) -Wl,-soname,libmosquittopp.so.${SOVERSION}
-endif
-
-.PHONY : clean install
-
-all : libmosquittopp.so.${SOVERSION}
-
-install : all
-	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
-	$(INSTALL) -s --strip-program=$(STRIP) libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
-	ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so
-	$(INSTALL) -d ${DESTDIR}${prefix}/include/
-	$(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h
-	
-uninstall :
-	-rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
-	-rm -f ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so
-	-rm -f ${DESTDIR}${prefix}/include/mosquittopp.h
-
-clean :
-	-rm -f *.o libmosquittopp.so.${SOVERSION}
-
-libmosquittopp.so.${SOVERSION} : mosquittopp.o
-	$(CXX) -shared $(LIB_LDFLAGS) $< -o $@ ../libmosquitto.so.${SOVERSION}
-
-mosquittopp.o : mosquittopp.cpp mosquittopp.h
-	$(CXX) $(LIB_CXXFLAGS) -c $< -o $@
-

=== removed directory '.pc/nostrip.patch/src'
=== removed file '.pc/nostrip.patch/src/Makefile'
--- .pc/nostrip.patch/src/Makefile	2014-08-06 00:43:39 +0000
+++ .pc/nostrip.patch/src/Makefile	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-include ../config.mk
-
-.PHONY: all install uninstall clean reallyclean
-
-ifeq ($(WITH_TLS),yes)
-all : mosquitto mosquitto_passwd
-else
-all : mosquitto
-endif
-
-mosquitto : mosquitto.o bridge.o conf.o context.o database.o logging.o loop.o memory_mosq.o persist.o net.o net_mosq.o read_handle.o read_handle_client.o read_handle_server.o read_handle_shared.o security.o security_default.o send_client_mosq.o send_mosq.o send_server.o service.o subs.o sys_tree.o time_mosq.o tls_mosq.o util_mosq.o will_mosq.o
-	${CC} $^ -o $@ ${LDFLAGS} $(BROKER_LIBS)
-
-mosquitto.o : mosquitto.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@ -DCHANGESET=\"$$(cat ../changeset)\"
-
-bridge.o : bridge.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-	
-conf.o : conf.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-	
-context.o : context.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-database.o : database.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-logging.o : logging.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-loop.o : loop.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-memory_mosq.o : ../lib/memory_mosq.c ../lib/memory_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-net.o : net.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-net_mosq.o : ../lib/net_mosq.c ../lib/net_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-	
-persist.o : persist.c persist.h mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-	
-read_handle.o : read_handle.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-read_handle_client.o : read_handle_client.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-read_handle_server.o : read_handle_server.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-read_handle_shared.o : ../lib/read_handle_shared.c ../lib/read_handle.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-security.o : security.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-security_default.o : security_default.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-send_client_mosq.o : ../lib/send_client_mosq.c ../lib/send_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-send_mosq.o : ../lib/send_mosq.c ../lib/send_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-send_server.o : send_server.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-service.o : service.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-subs.o : subs.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-sys_tree.o : sys_tree.c mosquitto_broker.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-time_mosq.o : ../lib/time_mosq.c ../lib/time_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-tls_mosq.o : ../lib/tls_mosq.c
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-util_mosq.o : ../lib/util_mosq.c ../lib/util_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-will_mosq.o : ../lib/will_mosq.c ../lib/will_mosq.h
-	${CC} $(BROKER_CFLAGS) -c $< -o $@
-
-mosquitto_passwd : mosquitto_passwd.o
-	${CC} $^ -o $@ ${LDFLAGS} $(PASSWD_LIBS)
-
-mosquitto_passwd.o : mosquitto_passwd.c
-	${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@
-
-install : all
-	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
-	$(INSTALL) -s --strip-program=$(STRIP) mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
-	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
-ifeq ($(WITH_TLS),yes)
-	$(INSTALL) -s --strip-program=$(STRIP) mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
-endif
-
-uninstall :
-	-rm -f ${DESTDIR}${prefix}/sbin/mosquitto
-	-rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h
-	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd
-
-clean : 
-	-rm -f *.o mosquitto mosquitto_passwd
-
-reallyclean : clean
-	-rm -rf *.orig *.db

=== removed directory '.pc/pynomake.patch'
=== removed file '.pc/pynomake.patch/config.mk'
--- .pc/pynomake.patch/config.mk	2014-08-06 00:43:39 +0000
+++ .pc/pynomake.patch/config.mk	1970-01-01 00:00:00 +0000
@@ -1,219 +0,0 @@
-# =============================================================================
-# User configuration section.
-#
-# Largely, these are options that are designed to make mosquitto run more
-# easily in restrictive environments by removing features.
-#
-# Modify the variable below to enable/disable features.
-#
-# Can also be overriden at the command line, e.g.:
-#
-# make WITH_TLS=no
-# =============================================================================
-
-# Uncomment to compile the broker with tcpd/libwrap support.
-WITH_WRAP:=yes
-
-# Comment out to disable SSL/TLS support in the broker and client.
-# Disabling this will also mean that passwords must be stored in plain text. It
-# is strongly recommended that you only disable WITH_TLS if you are not using
-# password authentication at all.
-WITH_TLS:=yes
-
-# Comment out to disable TLS/PSK support in the broker and client. Requires
-# WITH_TLS=yes.
-# This must be disabled if using openssl < 1.0.
-WITH_TLS_PSK:=yes
-
-# Comment out to disable client client threading support.
-WITH_THREADING:=yes
-
-# Uncomment to compile the broker with strict protocol support. This means that
-# both the client library and the broker will be very strict about protocol
-# compliance on incoming data. Neither of them will return an error on
-# incorrect "remaining length" values if this is commented out. The old
-# behaviour (prior to 0.12) is equivalent to compiling with
-# WITH_STRICT_PROTOCOL defined and means that clients will be immediately
-# disconnected from the broker on non-compliance.
-#WITH_STRICT_PROTOCOL:=yes
-
-# Comment out to remove bridge support from the broker. This allow the broker
-# to connect to other brokers and subscribe/publish to topics. You probably
-# want to leave this included unless you want to save a very small amount of
-# memory size and CPU time.
-WITH_BRIDGE:=yes
-
-# Comment out to remove persistent database support from the broker. This
-# allows the broker to store retained messages and durable subscriptions to a
-# file periodically and on shutdown. This is usually desirable (and is
-# suggested by the MQTT spec), but it can be disabled if required.
-WITH_PERSISTENCE:=yes
-
-# Comment out to remove memory tracking support from the broker. If disabled,
-# mosquitto won't track heap memory usage nor export '$SYS/broker/heap/current
-# size', but will use slightly less memory and CPU time.
-WITH_MEMORY_TRACKING:=yes
-
-# Compile with database upgrading support? If disabled, mosquitto won't
-# automatically upgrade old database versions.
-# Not currently supported.
-#WITH_DB_UPGRADE:=yes
-
-# Comment out to remove publishing of the $SYS topic hierarchy containing
-# information about the broker state.
-WITH_SYS_TREE:=yes
-
-# Build with Python module. Comment out if Python is not installed, or required
-# Python modules are not available.
-WITH_PYTHON:=yes
-
-# Build with SRV lookup support.
-WITH_SRV:=yes
-
-# =============================================================================
-# End of user configuration
-# =============================================================================
-
-
-# Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt,
-# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=1.3.4
-TIMESTAMP:=$(shell date "+%F %T%z")
-
-# Client library SO version. Bump if incompatible API/ABI changes are made.
-SOVERSION=1
-
-# Man page generation requires xsltproc and docbook-xsl
-XSLTPROC=xsltproc
-# For html generation
-DB_HTML_XSL=man/html.xsl
-
-#MANCOUNTRIES=en_GB
-
-UNAME:=$(shell uname -s)
-ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		CFLAGS?=-O
-	else
-		CFLAGS?=-Wall -ggdb -O2
-	endif
-else
-	CFLAGS?=-Wall -ggdb -O2
-endif
-
-LIB_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I. -I.. -I../lib
-LIB_CXXFLAGS:=$(LIB_CFLAGS) ${CPPFLAGS}
-LIB_LDFLAGS:=${LDFLAGS}
-
-BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
-CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
-
-ifeq ($(UNAME),FreeBSD)
-	BROKER_LIBS:=-lm
-else
-	BROKER_LIBS:=-ldl -lm
-endif
-LIB_LIBS:=
-PASSWD_LIBS:=
-
-ifeq ($(UNAME),Linux)
-	BROKER_LIBS:=$(BROKER_LIBS) -lrt
-	LIB_LIBS:=$(LIB_LIBS) -lrt
-endif
-
-CLIENT_LDFLAGS:=$(LDFLAGS) -L../lib ../lib/libmosquitto.so.${SOVERSION}
-
-ifeq ($(UNAME),SunOS)
-	ifeq ($(CC),cc)
-		LIB_CFLAGS:=$(LIB_CFLAGS) -xc99 -KPIC
-	else
-		LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
-	endif
-
-	ifeq ($(CXX),CC)
-		LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -KPIC
-	else
-		LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -fPIC
-	endif
-else
-	LIB_CFLAGS:=$(LIB_CFLAGS) -fPIC
-	LIB_CXXFLAGS:=$(LIB_CXXFLAGS) -fPIC
-endif
-
-ifneq ($(UNAME),SunOS)
-	LIB_LDFLAGS:=$(LIB_LDFLAGS) -Wl,--version-script=linker.version -Wl,-soname,libmosquitto.so.$(SOVERSION)
-endif
-
-ifeq ($(UNAME),QNX)
-	BROKER_LIBS:=$(BROKER_LIBS) -lsocket
-	LIB_LIBS:=$(LIB_LIBS) -lsocket
-endif
-
-ifeq ($(WITH_WRAP),yes)
-	BROKER_LIBS:=$(BROKER_LIBS) -lwrap
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_WRAP
-endif
-
-ifeq ($(WITH_TLS),yes)
-	BROKER_LIBS:=$(BROKER_LIBS) -lssl -lcrypto
-	LIB_LIBS:=$(LIB_LIBS) -lssl -lcrypto
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS
-	PASSWD_LIBS:=-lcrypto
-	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS
-
-	ifeq ($(WITH_TLS_PSK),yes)
-		BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_TLS_PSK
-		LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_TLS_PSK
-		CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_TLS_PSK
-	endif
-endif
-
-ifeq ($(WITH_THREADING),yes)
-	LIB_LIBS:=$(LIB_LIBS) -lpthread
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_THREADING
-endif
-
-ifeq ($(WITH_STRICT_PROTOCOL),yes)
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_STRICT_PROTOCOL
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_STRICT_PROTOCOL
-endif
-
-ifeq ($(WITH_BRIDGE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_BRIDGE
-endif
-
-ifeq ($(WITH_PERSISTENCE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_PERSISTENCE
-endif
-
-ifeq ($(WITH_MEMORY_TRACKING),yes)
-	ifneq ($(UNAME),SunOS)
-		BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_MEMORY_TRACKING
-	endif
-endif
-
-#ifeq ($(WITH_DB_UPGRADE),yes)
-#	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_DB_UPGRADE
-#endif
-
-ifeq ($(WITH_SYS_TREE),yes)
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_SYS_TREE
-endif
-
-ifeq ($(WITH_SRV),yes)
-	LIB_CFLAGS:=$(LIB_CFLAGS) -DWITH_SRV
-	LIB_LIBS:=$(LIB_LIBS) -lcares
-endif
-
-ifeq ($(UNAME),SunOS)
-	BROKER_LIBS:=$(BROKER_LIBS) -lsocket -lnsl
-	LIB_LIBS:=$(LIB_LIBS) -lsocket -lnsl
-endif
-
-
-INSTALL?=install
-prefix=/usr
-mandir=${prefix}/share/man
-localedir=${prefix}/share/locale
-STRIP?=strip

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-06 00:43:39 +0000
+++ CMakeLists.txt	2015-02-18 20:26:49 +0000
@@ -1,12 +1,17 @@
-# This is a cmake script.
+# This is a cmake script. Process it with the CMake gui or command line utility
+# to produce makefiles / Visual Studio project files on Mac OS X and Windows.
+#
+# To configure the build options either use the CMake gui, or run the command
+# line utility including the "-i" option.
 
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 
 project(mosquitto)
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 1.3.4)
+set (VERSION 1.4)
 
 if (WIN32)
 	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
@@ -26,8 +31,9 @@
 	set (INCLUDEDIR include)
 	set (DATAROOTDIR share)
 	set (MANDIR man)
-    set (SHAREDEST .)
-    add_definitions("-D_CRT_SECURE_NO_WARNINGS")
+	set (SHAREDEST .)
+	add_definitions("-D_CRT_SECURE_NO_WARNINGS")
+	add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE")
 else (WIN32)
 	set (BINDIR bin)
 	set (SBINDIR sbin)
@@ -38,6 +44,7 @@
 	endif (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
 	
 	set (LIBDIR lib${LIB_SUFFIX})
+	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
 	set (INCLUDEDIR include)
 	set (DATAROOTDIR share)
 	set (MANDIR ${DATAROOTDIR}/man)
@@ -48,16 +55,28 @@
 	"Include SSL/TLS support?" ON)
 option(WITH_TLS_PSK
 	"Include TLS-PSK support (requires WITH_TLS)?" ON)
+option(WITH_EC
+	"Include Elliptic Curve support (requires WITH_TLS)?" ON)
 if (${WITH_TLS} STREQUAL ON)
 	find_package(OpenSSL REQUIRED)
 	add_definitions("-DWITH_TLS")
+
 	if (${WITH_TLS_PSK} STREQUAL ON)
 		add_definitions("-DWITH_TLS_PSK")
 	endif (${WITH_TLS_PSK} STREQUAL ON)
+
+	if (${WITH_EC} STREQUAL ON)
+		add_definitions("-DWITH_EC")
+	endif (${WITH_EC} STREQUAL ON)
 else (${WITH_TLS} STREQUAL ON)
 	set (OPENSSL_INCLUDE_DIR "")
 endif (${WITH_TLS} STREQUAL ON)
 
+option(WITH_SOCKS "Include SOCKS5 support?" ON)
+if (${WITH_SOCKS} STREQUAL ON)
+	add_definitions("-DWITH_SOCKS")
+endif (${WITH_SOCKS} STREQUAL ON)
+
 option(WITH_SRV "Include SRV lookup support?" ON)
 
 # ========================================

=== added file 'CONTRIBUTING.md'
--- CONTRIBUTING.md	1970-01-01 00:00:00 +0000
+++ CONTRIBUTING.md	2015-02-18 20:26:49 +0000
@@ -0,0 +1,100 @@
+Contributing to Mosquitto
+=========================
+
+Thank you for your interest in this project.
+
+Project description:
+--------------------
+
+The Mosquitto project has been created to provide a light weight, open-source
+implementation, of an MQTT broker to allow new, existing, and emerging
+applications for Machine-to-Machine (M2M) and Internet of Things (IoT).
+
+- https://projects.eclipse.org/projects/technology.mosquitto
+
+
+Source
+------
+
+The Mosquitto code is stored in a git repository. The URLs to access it are:
+
+ssh://<username>@git.eclipse.org:29418/mosquitto/org.eclipse.mosquitto
+https://<username>@git.eclipse.org/r/mosquitto/org.eclipse.mosquitto
+
+A web browsable repository is available at
+
+http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git
+
+Contributing a patch
+--------------------
+
+The Mosquitto repositories are accessed through Gerrit, the code review
+project, which makes it possible for anybody to clone the repository, make
+changes and push them back for review and eventual acceptance into the project.
+
+To do this, you must follow a few steps. The first of these are described at
+
+- https://wiki.eclipse.org/Development_Resources/Contributing_via_Git
+
+* Sign the Eclipse CLA
+* Use a valid commit record, including a signed-off-by entry.
+
+There are further details at
+
+- https://wiki.eclipse.org/Development_Resources/Handling_Git_Contributions
+
+Once the patch is pushed back to Gerrit, the project committers will be
+informed and they will undertake a review of the code. The patch may need
+modifying for some reason. In order to make amending commits more
+straightforward, the steps at
+https://git.eclipse.org/r/Documentation/cmd-hook-commit-msg.html should be
+followed. This automatically inserts a "Change-Id" entry to your commit message
+which allows you to amend commits and have Gerrit track them as the same
+change.
+
+What happens next depends on the content of the patch. If it is 100% authored
+by the contributor and is less than 1000 lines (and meets the needs of the
+project), then it can be committed to the main repository. If not, more steps
+are required. These are detailed in the legal process poster:
+
+- http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf
+
+Developer resources:
+--------------------
+
+More information regarding source code management, builds, coding standards,
+and other topics can be found at.
+
+- https://projects.eclipse.org/projects/technology.mosquitto/developer
+
+
+Contributor License Agreement:
+------------------------------
+
+Before your contribution can be accepted by the project, you need to create and
+electronically sign the Eclipse Foundation Contributor License Agreement (CLA).
+
+- http://www.eclipse.org/legal/CLA.php
+
+
+Contact:
+--------
+
+Contact the project developers via the project's "dev" list.
+
+- https://dev.eclipse.org/mailman/listinfo/mosquitto-dev
+
+
+Search for bugs:
+----------------
+
+This project uses Bugzilla to track ongoing development and issues.
+
+- https://bugs.eclipse.org/bugs/buglist.cgi?product=Mosquitto
+
+Create a new bug:
+-----------------
+
+Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+
+- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Mosquitto

=== modified file 'ChangeLog.txt'
--- ChangeLog.txt	2014-08-06 00:43:39 +0000
+++ ChangeLog.txt	2015-02-18 20:26:49 +0000
@@ -1,8 +1,120 @@
+1.4 - 20150218
+==============
+
+Important changes:
+- Websockets support in the broker.
+- Bridge behaviour on the local broker has changed due to the introduction of
+  the local_* options. This may affect you if you are using authentication
+  and/or ACLs with bridges.
+- The default TLS behaviour has changed to accept all of TLS v1.2, v1.1 and
+  v1.0, rather than only only one version of the protocol. It is still
+  possible to restrict a listener to a single version of TLS.
+- The Python client has been removed now that the Eclipse Paho Python client
+  has had a release.
+- When a durable client reconnects, its queued messages are now checked
+  against ACLs in case of a change in username/ACL state since it last
+  connected.
+- New use_username_as_clientid option on the broker, for preventing hijacking
+  of a client id.
+- The client library and clients now have experimental SOCKS5 support.
+- Wildcard TLS certificates are now supported for bridges and clients.
+- The clients have support for config files with default options.
+- Client and client libraries have support for MQTT v3.1.1.
+- Bridge support for MQTT v3.1.1.
+
+
+Broker:
+- Websockets support in the broker.
+- Add local_clientid, local_username, local_password for bridge connections to
+  authenticate to the local broker.
+- Default TLS mode now accepts TLS v1.2, v1.1 and v1.0.
+- Support for ECDHE-ECDSA family ciphers.
+- Fix bug #1324411, which could have had unexpected consequences for delayed
+  messages in rare circumstances.
+- Add support for "session present" in CONNACK messages for MQTT v3.1.1.
+- Remove strict protocol #ifdefs.
+- Change $SYS/broker/clients/active -> $SYS/broker/clients/connected
+- Change $SYS/broker/clients/inactive -> $SYS/broker/clients/disconnected
+- When a durable client reconnects, its queued messages are now checked
+  against ACLs in case of a change in username/ACL state since it last
+  connected.
+- libuuid is used to generate client ids, where it is available, when an MQTT
+  v3.1.1 client connects with a zero length client id.
+- Anonymous clients are no longer accidently disconnected from the broker
+  after a SIGHUP.
+- mosquitto_passwd now supports -b (batch mode) to allow the password to be
+  provided at the command line.
+- Removed $SYS/broker/changeset. This was intended for use with debugging, but
+  in practice is of no use.
+- Add support for use_username_as_clientid which can be used with
+  authentication to restrict ownership of client ids and hence prevent one
+  client disconnecting another by using the same client id.
+- When "require_certificate" was false, the broker was incorrectly asking for
+  a certificate (but not checking it). This caused problems with some clients
+  and has been fixed so the broker no longer asks.
+- When using syslog logging on non-Windows OSs, it is now possible to specify
+  the logging facility to one of local0-7 instead of the default "daemon".
+- The bridge_attempt_unsubscribe option has been added, to allow the sending
+  of UNSUBSCRIBE requests to be disabled for topics with "out" direction.
+  Closes bug #456899.
+- Wildcard TLS certificates are now supported for bridges.
+- Support for "hour" client expiration lengths for the
+  persistent_client_expiration option. Closes bug #425835.
+- Bridge support for MQTT v3.1.1.
+- Root privileges are now dropped after starting listeners and loading
+  certificates/private keys, to allow private keys to have their permissions
+  restricted to the root user only. Closes bug #452914.
+- Usernames and topics given in ACL files can now include a space. Closes bug
+  #431780.
+- Fix hang if pattern acl contains a %u but an anonymous client connect.
+  Closes bug #455402.
+- Fix man page installation with cmake. Closes bug #458843.
+- When using "log_dest file" the output file is now flushed periodically.
+
+Clients:
+- Both clients can now load default configuration options from a file.
+- Add -C option to mosquitto_sub to allow the client to quit after receiving a
+  certain count of messages. Closes bug #453850.
+- Add --proxy SOCKS5 support for both clients.
+- Pub client supports setting its keepalive. Closes bug #454852.
+- Add support for config files with default options.
+- Add support for MQTT v3.1.1.
+
+Client library:
+- Add experimental SOCKS5 support.
+- mosquitto_loop_forever now quits after a fatal error, rather than blindly
+  retrying.
+- SRV support is now not compiled in by default.
+- Wildcard TLS certificates are now supported.
+- mosquittopp now has a virtual destructor. Closes bug #452915.
+- Add support for MQTT v3.1.1.
+- Don't quit mosquitto_loop_forever() if broker not available on first
+  connect. Closes bug #453293, but requires more work.
+
+
+1.3.5 - 20141008
+================
+
+Broker:
+- Fix possible memory leak when using a topic that has a leading slash. Fixes
+  bug #1360985.
+- Fix saving persistent database on Windows.
+- Temporarily disable ACL checks on subscriptions when using MQTT v3.1.1. This
+  is due to the complexity of checking wildcard ACLs against wildcard
+  subscriptions. This does not have a negative impact on security because
+  checks are still made before a message is sent to a client.
+  Fixes bug #1374291.
+- When using -v and the broker receives a SIGHUP, verbose logging was being
+  disabled. This has been fixed.
+
+Client library:
+- Fix mutex being incorrectly passed by value. Fixes bug #1373785.
+
 1.3.4 - 20140806
 ================
 
 Broker:
-- Don't ask client for certificate when require_certificate is true.
+- Don't ask client for certificate when require_certificate is false.
 - Backout incomplete functionality that was incorrectly included in 1.3.2.
 
 1.3.3 - 20140801
@@ -11,7 +123,6 @@
 Broker:
 - Fix incorrect handling of anonymous bridges on the local broker.
 
-
 1.3.2 - 20140713
 ================
 
@@ -26,16 +137,17 @@
 - When a durable client reconnects, its queued messages are now checked
   against ACLs in case of a change in username/ACL state since it last
   connected.
+- Fix bug #1324411, which could have had unexpected consequences for delayed
+  messages in rare circumstances.
 - Anonymous clients are no longer accidently disconnected from the broker
   after a SIGHUP.
-- Fix bug #1324411, which could have had unexpected consequences for delayed
-  messages in rare circumstances.
 
 Client library:
 - Fix topic matching edge case.
 - Fix callback deadlocks after calling mosquitto_disconnect(), when using the
   threaded interfaces. Closes bug #1313725.
 - Fix SRV support when building with CMake.
+- Remove strict protocol #ifdefs.
 
 General:
 - Use $(STRIP) for stripping binaries when installing, to allow easier cross
@@ -58,6 +170,7 @@
 - Fix compilation for WITH_THREADING=no.
 - Break out of select() when calling mosquitto_loop_stop().
 - Reject invalid un/subscriptions e.g. foo/+bar #/bar.
+- Add mosquitto_threaded_set().
 
 Clients:
 - Fix keepalive value on mosquitto_pub.

=== removed file 'LICENSE-3rd-party.txt'
--- LICENSE-3rd-party.txt	2013-08-07 23:26:19 +0000
+++ LICENSE-3rd-party.txt	1970-01-01 00:00:00 +0000
@@ -1,666 +0,0 @@
-============================================================================
-uthash.h license
-============================================================================
-
-Copyright (c) 2005-2010, Troy D. Hanson    http://uthash.sourceforge.net
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-============================================================================
-OpenSSL license
-============================================================================
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact [e-mail].
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    [e-mail].
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * ([e-mail]).  This product includes software written by Tim
- * Hudson ([e-mail]).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young ([e-mail])
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young ([e-mail]).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson ([e-mail]).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young ([e-mail])"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson ([e-mail])"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-
-
-============================================================================
-pthreads-win32 license
-============================================================================
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-

-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-

=== modified file 'LICENSE.txt'
--- LICENSE.txt	2013-08-07 23:26:19 +0000
+++ LICENSE.txt	2015-02-18 20:26:49 +0000
@@ -1,54 +1,2 @@
-Copyright (c) 2009-2012 Roger Light <[e-mail]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-
-
-
-uthash.h license:
-
-Copyright (c) 2005-2010, Troy D. Hanson    http://uthash.sourceforge.net
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+This project is dual licensed under the Eclipse Public License 1.0 and the
+Eclipse Distribution License 1.0 as described in the epl-v10 and edl-v10 files.

=== modified file 'Makefile'
--- Makefile	2015-01-15 14:08:09 +0000
+++ Makefile	2015-02-18 20:26:49 +0000
@@ -6,7 +6,7 @@
 
 .PHONY : all mosquitto docs binary clean reallyclean test install uninstall dist sign copy
 
-all : mosquitto docs
+all : $(MAKE_ALL)
 
 docs :
 	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d}; done
@@ -14,6 +14,10 @@
 binary : mosquitto
 
 mosquitto :
+ifeq ($(UNAME),Darwin)
+	$(error Please compile using CMake on Mac OS X)
+endif
+
 	set -e; for d in ${DIRS}; do $(MAKE) -C $${d}; done
 
 clean :
@@ -38,8 +42,6 @@
 	$(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example
 	$(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example
 	$(INSTALL) -m 644 pskfile.example ${DESTDIR}/etc/mosquitto/pskfile.example
-	$(INSTALL) -d ${DESTDIR}/etc/apparmor.d
-	$(INSTALL) -m 644 security/mosquitto.apparmor ${DESTDIR}/etc/apparmor.d/usr.sbin.mosquitto
 
 uninstall :
 	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
@@ -51,9 +53,8 @@
 dist : reallyclean
 	set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
 	
-	echo $$(hg log -r . --template "{node}") > changeset
 	mkdir -p dist/mosquitto-${VERSION}
-	cp -r client changeset examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/
+	cp -r client examples installer lib logo man misc security service src test about.html aclfile.example ChangeLog.txt CMakeLists.txt compiling.txt config.h config.mk CONTRIBUTING.md edl-v10 epl-v10 LICENSE.txt Makefile mosquitto.conf notice.html pskfile.example pwfile.example readme.txt readme-windows.txt dist/mosquitto-${VERSION}/
 	cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
 	set -e; for m in man/*.xml; \
 		do \

=== added file 'about.html'
--- about.html	1970-01-01 00:00:00 +0000
+++ about.html	2015-02-18 20:26:49 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p><em>May 8, 2014</em></p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
+A copy of the EPL is available at 
+<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> 
+and a copy of the EDL is available at 
+<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>. 
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+		
+		<h3>Third Party Content</h3>
+		<p>The Content includes items that have been sourced from third parties as set out below. If you 
+		did not receive this Content directly from the Eclipse Foundation, the following is provided 
+		for informational purposes only, and you should look to the Redistributor's license for 
+		terms and conditions of use.</p>
+		<p><em>
+		<strong>None</strong> <br><br>
+		<br><br> 
+		</em></p>
+
+
+
+</body></html>

=== removed file 'changeset'
--- changeset	2014-08-06 00:43:39 +0000
+++ changeset	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-abbbb585edc5b6b9bb35f2563b957144e5368037

=== modified file 'client/CMakeLists.txt'
--- client/CMakeLists.txt	2014-08-06 00:43:39 +0000
+++ client/CMakeLists.txt	2015-02-18 20:26:49 +0000
@@ -2,12 +2,14 @@
 			${STDBOOL_H_PATH} ${STDINT_H_PATH})
 link_directories(${mosquitto_BINARY_DIR}/lib)
 
+set(shared_src client_shared.c client_shared.h)
+
 if (${WITH_SRV} STREQUAL ON)
 	add_definitions("-DWITH_SRV")
 endif (${WITH_SRV} STREQUAL ON)
 
-add_executable(mosquitto_pub pub_client.c)
-add_executable(mosquitto_sub sub_client.c)
+add_executable(mosquitto_pub pub_client.c ${shared_src})
+add_executable(mosquitto_sub sub_client.c ${shared_src})
 
 target_link_libraries(mosquitto_pub libmosquitto)
 target_link_libraries(mosquitto_sub libmosquitto)

=== modified file 'client/Makefile'
--- client/Makefile	2014-08-06 00:43:39 +0000
+++ client/Makefile	2015-02-18 20:26:49 +0000
@@ -4,25 +4,28 @@
 
 all : mosquitto_pub mosquitto_sub
 
-mosquitto_pub : pub_client.o ../lib/libmosquitto.so.${SOVERSION}
-	${CC} $< -o $@ ${CLIENT_LDFLAGS}
+mosquitto_pub : pub_client.o client_shared.o
+	${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS}
 
-mosquitto_sub : sub_client.o ../lib/libmosquitto.so.${SOVERSION}
-	${CC} $< -o $@ ${CLIENT_LDFLAGS}
+mosquitto_sub : sub_client.o client_shared.o
+	${CROSS_COMPILE}${CC} $^ -o $@ ${CLIENT_LDFLAGS}
 
 pub_client.o : pub_client.c ../lib/libmosquitto.so.${SOVERSION}
-	${CC} -c $< -o $@ ${CLIENT_CFLAGS}
+	${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS}
 
 sub_client.o : sub_client.c ../lib/libmosquitto.so.${SOVERSION}
-	${CC} -c $< -o $@ ${CLIENT_CFLAGS}
+	${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS}
+
+client_shared.o : client_shared.c client_shared.h
+	${CROSS_COMPILE}${CC} -c $< -o $@ ${CLIENT_CFLAGS}
 
 ../lib/libmosquitto.so.${SOVERSION} :
 	$(MAKE) -C ../lib
 
 install : all
 	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
-	$(INSTALL) mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
-	$(INSTALL) mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
+	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
+	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
 
 uninstall :
 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub

=== added file 'client/client_shared.c'
--- client/client_shared.c	1970-01-01 00:00:00 +0000
+++ client/client_shared.c	2015-02-18 20:26:49 +0000
@@ -0,0 +1,957 @@
+/*
+Copyright (c) 2014 Roger Light <[e-mail]>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+ 
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+Contributors:
+   Roger Light - initial implementation and documentation.
+*/
+
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <process.h>
+#include <winsock2.h>
+#define snprintf sprintf_s
+#endif
+
+#include <mosquitto.h>
+#include "client_shared.h"
+
+static int mosquitto__parse_socks_url(struct mosq_config *cfg, char *url);
+static int client_config_line_proc(struct mosq_config *cfg, int pub_or_sub, int argc, char *argv[]);
+
+void init_config(struct mosq_config *cfg)
+{
+	memset(cfg, 0, sizeof(*cfg));
+	cfg->port = 1883;
+	cfg->max_inflight = 20;
+	cfg->keepalive = 60;
+	cfg->clean_session = true;
+	cfg->eol = true;
+	cfg->protocol_version = MQTT_PROTOCOL_V31;
+}
+
+void client_config_cleanup(struct mosq_config *cfg)
+{
+	int i;
+	if(cfg->id) free(cfg->id);
+	if(cfg->id_prefix) free(cfg->id_prefix);
+	if(cfg->host) free(cfg->host);
+	if(cfg->file_input) free(cfg->file_input);
+	if(cfg->message) free(cfg->message);
+	if(cfg->topic) free(cfg->topic);
+	if(cfg->bind_address) free(cfg->bind_address);
+	if(cfg->username) free(cfg->username);
+	if(cfg->password) free(cfg->password);
+	if(cfg->will_topic) free(cfg->will_topic);
+	if(cfg->will_payload) free(cfg->will_payload);
+#ifdef WITH_TLS
+	if(cfg->cafile) free(cfg->cafile);
+	if(cfg->capath) free(cfg->capath);
+	if(cfg->certfile) free(cfg->certfile);
+	if(cfg->keyfile) free(cfg->keyfile);
+	if(cfg->ciphers) free(cfg->ciphers);
+	if(cfg->tls_version) free(cfg->tls_version);
+#  ifdef WITH_TLS_PSK
+	if(cfg->psk) free(cfg->psk);
+	if(cfg->psk_identity) free(cfg->psk_identity);
+#  endif
+#endif
+	if(cfg->topics){
+		for(i=0; i<cfg->topic_count; i++){
+			free(cfg->topics[i]);
+		}
+		free(cfg->topics);
+	}
+	if(cfg->filter_outs){
+		for(i=0; i<cfg->filter_out_count; i++){
+			free(cfg->filter_outs[i]);
+		}
+		free(cfg->filter_outs);
+	}
+#ifdef WITH_SOCKS
+	if(cfg->socks5_host) free(cfg->socks5_host);
+	if(cfg->socks5_username) free(cfg->socks5_username);
+	if(cfg->socks5_password) free(cfg->socks5_password);
+#endif
+}
+
+int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *argv[])
+{
+	int rc;
+	FILE *fptr;
+	char line[1024];
+	int count;
+	char *loc = NULL;
+	int len;
+	char *args[3];
+
+#ifndef WIN32
+	char *env;
+#else
+	char env[1024];
+#endif
+	args[0] = NULL;
+
+	init_config(cfg);
+
+	/* Default config file */
+#ifndef WIN32
+	env = getenv("XDG_CONFIG_HOME");
+	if(env){
+		len = strlen(env) + strlen("/mosquitto_pub") + 1;
+		loc = malloc(len);
+		if(pub_or_sub == CLIENT_PUB){
+			snprintf(loc, len, "%s/mosquitto_pub", env);
+		}else{
+			snprintf(loc, len, "%s/mosquitto_sub", env);
+		}
+		loc[len-1] = '\0';
+	}else{
+		env = getenv("HOME");
+		if(env){
+			len = strlen(env) + strlen("/.config/mosquitto_pub") + 1;
+			loc = malloc(len);
+			if(pub_or_sub == CLIENT_PUB){
+				snprintf(loc, len, "%s/.config/mosquitto_pub", env);
+			}else{
+				snprintf(loc, len, "%s/.config/mosquitto_sub", env);
+			}
+			loc[len-1] = '\0';
+		}else{
+			fprintf(stderr, "Warning: Unable to locate configuration directory, default config not loaded.\n");
+		}
+	}
+
+#else
+	rc = GetEnvironmentVariable("USERPROFILE", env, 1024);
+	if(rc > 0 && rc < 1024){
+		len = strlen(env) + strlen("\\mosquitto_pub.conf") + 1;
+		loc = malloc(len);
+		if(pub_or_sub == CLIENT_PUB){
+			snprintf(loc, len, "%s\\mosquitto_pub.conf", env);
+		}else{
+			snprintf(loc, len, "%s\\mosquitto_sub.conf", env);
+		}
+		loc[len-1] = '\0';
+	}else{
+		fprintf(stderr, "Warning: Unable to locate configuration directory, default config not loaded.\n");
+	}
+#endif
+
+	if(loc){
+		fptr = fopen(loc, "rt");
+		if(fptr){
+			while(fgets(line, 1024, fptr)){
+				if(line[0] == '#') continue; /* Comments */
+
+				while(line[strlen(line)-1] == 10 || line[strlen(line)-1] == 13){
+					line[strlen(line)-1] = 0;
+				}
+				/* All offset by one "args" here, because real argc/argv has
+				 * program name as the first entry. */
+				args[1] = strtok(line, " ");
+				if(args[1]){
+					args[2] = strtok(NULL, " ");
+					if(args[2]){
+						count = 3;
+					}else{
+						count = 2;
+					}
+					rc = client_config_line_proc(cfg, pub_or_sub, count, args);
+					if(rc){
+						fclose(fptr);
+						free(loc);
+						return rc;
+					}
+				}
+			}
+			fclose(fptr);
+		}
+		free(loc);
+	}
+
+	/* Deal with real argc/argv */
+	rc = client_config_line_proc(cfg, pub_or_sub, argc, argv);
+	if(rc) return rc;
+
+	if(cfg->will_payload && !cfg->will_topic){
+		fprintf(stderr, "Error: Will payload given, but no will topic given.\n");
+		return 1;
+	}
+	if(cfg->will_retain && !cfg->will_topic){
+		fprintf(stderr, "Error: Will retain given, but no will topic given.\n");
+		return 1;
+	}
+	if(cfg->password && !cfg->username){
+		if(!cfg->quiet) fprintf(stderr, "Warning: Not using password since username not set.\n");
+	}
+#ifdef WITH_TLS
+	if((cfg->certfile && !cfg->keyfile) || (cfg->keyfile && !cfg->certfile)){
+		fprintf(stderr, "Error: Both certfile and keyfile must be provided if one of them is.\n");
+		return 1;
+	}
+#endif
+#ifdef WITH_TLS_PSK
+	if((cfg->cafile || cfg->capath) && cfg->psk){
+		if(!cfg->quiet) fprintf(stderr, "Error: Only one of --psk or --cafile/--capath may be used at once.\n");
+		return 1;
+	}
+	if(cfg->psk && !cfg->psk_identity){
+		if(!cfg->quiet) fprintf(stderr, "Error: --psk-identity required if --psk used.\n");
+		return 1;
+	}
+#endif
+
+	if(pub_or_sub == CLIENT_SUB){
+		if(cfg->clean_session == false && (cfg->id_prefix || !cfg->id)){
+			if(!cfg->quiet) fprintf(stderr, "Error: You must provide a client id if you are using the -c option.\n");
+			return 1;
+		}
+		if(cfg->topic_count == 0){
+			if(!cfg->quiet) fprintf(stderr, "Error: You must specify a topic to subscribe to.\n");
+			return 1;
+		}
+	}
+
+	if(!cfg->host){
+		cfg->host = "localhost";
+	}
+	return MOSQ_ERR_SUCCESS;
+}
+
+/* Process a tokenised single line from a file or set of real argc/argv */
+int client_config_line_proc(struct mosq_config *cfg, int pub_or_sub, int argc, char *argv[])
+{
+	int i;
+
+	for(i=1; i<argc; i++){
+		if(!strcmp(argv[i], "-p") || !strcmp(argv[i], "--port")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -p argument given but no port specified.\n\n");
+				return 1;
+			}else{
+				cfg->port = atoi(argv[i+1]);
+				if(cfg->port<1 || cfg->port>65535){
+					fprintf(stderr, "Error: Invalid port given: %d\n", cfg->port);
+					return 1;
+				}
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-A")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -A argument given but no address specified.\n\n");
+				return 1;
+			}else{
+				cfg->bind_address = strdup(argv[i+1]);
+			}
+			i++;
+#ifdef WITH_TLS
+		}else if(!strcmp(argv[i], "--cafile")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --cafile argument given but no file specified.\n\n");
+				return 1;
+			}else{
+				cfg->cafile = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--capath")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --capath argument given but no directory specified.\n\n");
+				return 1;
+			}else{
+				cfg->capath = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--cert")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --cert argument given but no file specified.\n\n");
+				return 1;
+			}else{
+				cfg->certfile = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--ciphers")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --ciphers argument given but no ciphers specified.\n\n");
+				return 1;
+			}else{
+				cfg->ciphers = strdup(argv[i+1]);
+			}
+			i++;
+#endif
+		}else if(!strcmp(argv[i], "-C")){
+			if(pub_or_sub == CLIENT_PUB){
+				goto unknown_option;
+			}else{
+				if(i==argc-1){
+					fprintf(stderr, "Error: -C argument given but no count specified.\n\n");
+					return 1;
+				}else{
+					cfg->msg_count = atoi(argv[i+1]);
+					if(cfg->msg_count < 1){
+						fprintf(stderr, "Error: Invalid message count \"%d\".\n\n", cfg->msg_count);
+						return 1;
+					}
+				}
+				i++;
+			}
+		}else if(!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")){
+			cfg->debug = true;
+		}else if(!strcmp(argv[i], "-f") || !strcmp(argv[i], "--file")){
+			if(pub_or_sub == CLIENT_SUB){
+				goto unknown_option;
+			}
+			if(cfg->pub_mode != MSGMODE_NONE){
+				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
+				return 1;
+			}else if(i==argc-1){
+				fprintf(stderr, "Error: -f argument given but no file specified.\n\n");
+				return 1;
+			}else{
+				cfg->pub_mode = MSGMODE_FILE;
+				cfg->file_input = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--help")){
+			return 2;
+		}else if(!strcmp(argv[i], "-h") || !strcmp(argv[i], "--host")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -h argument given but no host specified.\n\n");
+				return 1;
+			}else{
+				cfg->host = strdup(argv[i+1]);
+			}
+			i++;
+#ifdef WITH_TLS
+		}else if(!strcmp(argv[i], "--insecure")){
+			cfg->insecure = true;
+#endif
+		}else if(!strcmp(argv[i], "-i") || !strcmp(argv[i], "--id")){
+			if(cfg->id_prefix){
+				fprintf(stderr, "Error: -i and -I argument cannot be used together.\n\n");
+				return 1;
+			}
+			if(i==argc-1){
+				fprintf(stderr, "Error: -i argument given but no id specified.\n\n");
+				return 1;
+			}else{
+				cfg->id = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-I") || !strcmp(argv[i], "--id-prefix")){
+			if(cfg->id){
+				fprintf(stderr, "Error: -i and -I argument cannot be used together.\n\n");
+				return 1;
+			}
+			if(i==argc-1){
+				fprintf(stderr, "Error: -I argument given but no id prefix specified.\n\n");
+				return 1;
+			}else{
+				cfg->id_prefix = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-k") || !strcmp(argv[i], "--keepalive")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -k argument given but no keepalive specified.\n\n");
+				return 1;
+			}else{
+				cfg->keepalive = atoi(argv[i+1]);
+				if(cfg->keepalive>65535){
+					fprintf(stderr, "Error: Invalid keepalive given: %d\n", cfg->keepalive);
+					return 1;
+				}
+			}
+			i++;
+#ifdef WITH_TLS
+		}else if(!strcmp(argv[i], "--key")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --key argument given but no file specified.\n\n");
+				return 1;
+			}else{
+				cfg->keyfile = strdup(argv[i+1]);
+			}
+			i++;
+#endif
+		}else if(!strcmp(argv[i], "-l") || !strcmp(argv[i], "--stdin-line")){
+			if(pub_or_sub == CLIENT_SUB){
+				goto unknown_option;
+			}
+			if(cfg->pub_mode != MSGMODE_NONE){
+				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
+				return 1;
+			}else{
+				cfg->pub_mode = MSGMODE_STDIN_LINE;
+			}
+		}else if(!strcmp(argv[i], "-m") || !strcmp(argv[i], "--message")){
+			if(pub_or_sub == CLIENT_SUB){
+				goto unknown_option;
+			}
+			if(cfg->pub_mode != MSGMODE_NONE){
+				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
+				return 1;
+			}else if(i==argc-1){
+				fprintf(stderr, "Error: -m argument given but no message specified.\n\n");
+				return 1;
+			}else{
+				cfg->message = strdup(argv[i+1]);
+				cfg->msglen = strlen(cfg->message);
+				cfg->pub_mode = MSGMODE_CMD;
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-M")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -M argument given but max_inflight not specified.\n\n");
+				return 1;
+			}else{
+				cfg->max_inflight = atoi(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-n") || !strcmp(argv[i], "--null-message")){
+			if(pub_or_sub == CLIENT_SUB){
+				goto unknown_option;
+			}
+			if(cfg->pub_mode != MSGMODE_NONE){
+				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
+				return 1;
+			}else{
+				cfg->pub_mode = MSGMODE_NULL;
+			}
+		}else if(!strcmp(argv[i], "-V") || !strcmp(argv[i], "--protocol-version")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --protocol-version argument given but no version specified.\n\n");
+				return 1;
+			}else{
+				if(!strcmp(argv[i+1], "mqttv31")){
+					cfg->protocol_version = MQTT_PROTOCOL_V31;
+				}else if(!strcmp(argv[i+1], "mqttv311")){
+					cfg->protocol_version = MQTT_PROTOCOL_V311;
+				}else{
+					fprintf(stderr, "Error: Invalid protocol version argument given.\n\n");
+					return 1;
+				}
+				i++;
+			}
+#ifdef WITH_SOCKS
+		}else if(!strcmp(argv[i], "--proxy")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --proxy argument given but no proxy url specified.\n\n");
+				return 1;
+			}else{
+				if(mosquitto__parse_socks_url(cfg, argv[i+1])){
+					return 1;
+				}
+				i++;
+			}
+#endif
+#ifdef WITH_TLS_PSK
+		}else if(!strcmp(argv[i], "--psk")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --psk argument given but no key specified.\n\n");
+				return 1;
+			}else{
+				cfg->psk = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--psk-identity")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --psk-identity argument given but no identity specified.\n\n");
+				return 1;
+			}else{
+				cfg->psk_identity = strdup(argv[i+1]);
+			}
+			i++;
+#endif
+		}else if(!strcmp(argv[i], "-q") || !strcmp(argv[i], "--qos")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -q argument given but no QoS specified.\n\n");
+				return 1;
+			}else{
+				cfg->qos = atoi(argv[i+1]);
+				if(cfg->qos<0 || cfg->qos>2){
+					fprintf(stderr, "Error: Invalid QoS given: %d\n", cfg->qos);
+					return 1;
+				}
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--quiet")){
+			cfg->quiet = true;
+		}else if(!strcmp(argv[i], "-r") || !strcmp(argv[i], "--retain")){
+			if(pub_or_sub == CLIENT_SUB){
+				goto unknown_option;
+			}
+			cfg->retain = 1;
+		}else if(!strcmp(argv[i], "-s") || !strcmp(argv[i], "--stdin-file")){
+			if(pub_or_sub == CLIENT_SUB){
+				goto unknown_option;
+			}
+			if(cfg->pub_mode != MSGMODE_NONE){
+				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
+				return 1;
+			}else{ 
+				cfg->pub_mode = MSGMODE_STDIN_FILE;
+			}
+#ifdef WITH_SRV
+		}else if(!strcmp(argv[i], "-S")){
+			cfg->use_srv = true;
+#endif
+		}else if(!strcmp(argv[i], "-t") || !strcmp(argv[i], "--topic")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -t argument given but no topic specified.\n\n");
+				return 1;
+			}else{
+				if(pub_or_sub == CLIENT_PUB){
+					if(mosquitto_pub_topic_check(argv[i+1]) == MOSQ_ERR_INVAL){
+						fprintf(stderr, "Error: Invalid publish topic '%s', does it contain '+' or '#'?\n", argv[i+1]);
+						return 1;
+					}
+					cfg->topic = strdup(argv[i+1]);
+				}else{
+					if(mosquitto_sub_topic_check(argv[i+1]) == MOSQ_ERR_INVAL){
+						fprintf(stderr, "Error: Invalid subscription topic '%s', are all '+' and '#' wildcards correct?\n", argv[i+1]);
+						return 1;
+					}
+					cfg->topic_count++;
+					cfg->topics = realloc(cfg->topics, cfg->topic_count*sizeof(char *));
+					cfg->topics[cfg->topic_count-1] = strdup(argv[i+1]);
+				}
+				i++;
+			}
+		}else if(!strcmp(argv[i], "-T") || !strcmp(argv[i], "--filter-out")){
+			if(pub_or_sub == CLIENT_PUB){
+				goto unknown_option;
+			}
+			if(i==argc-1){
+				fprintf(stderr, "Error: -T argument given but no topic filter specified.\n\n");
+				return 1;
+			}else{
+				if(mosquitto_sub_topic_check(argv[i+1]) == MOSQ_ERR_INVAL){
+					fprintf(stderr, "Error: Invalid filter topic '%s', are all '+' and '#' wildcards correct?\n", argv[i+1]);
+					return 1;
+				}
+				cfg->filter_out_count++;
+				cfg->filter_outs = realloc(cfg->filter_outs, cfg->filter_out_count*sizeof(char *));
+				cfg->filter_outs[cfg->filter_out_count-1] = strdup(argv[i+1]);
+			}
+			i++;
+#ifdef WITH_TLS
+		}else if(!strcmp(argv[i], "--tls-version")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --tls-version argument given but no version specified.\n\n");
+				return 1;
+			}else{
+				cfg->tls_version = strdup(argv[i+1]);
+			}
+			i++;
+#endif
+		}else if(!strcmp(argv[i], "-u") || !strcmp(argv[i], "--username")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -u argument given but no username specified.\n\n");
+				return 1;
+			}else{
+				cfg->username = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-P") || !strcmp(argv[i], "--pw")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -P argument given but no password specified.\n\n");
+				return 1;
+			}else{
+				cfg->password = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--will-payload")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --will-payload argument given but no will payload specified.\n\n");
+				return 1;
+			}else{
+				cfg->will_payload = strdup(argv[i+1]);
+				cfg->will_payloadlen = strlen(cfg->will_payload);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--will-qos")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --will-qos argument given but no will QoS specified.\n\n");
+				return 1;
+			}else{
+				cfg->will_qos = atoi(argv[i+1]);
+				if(cfg->will_qos < 0 || cfg->will_qos > 2){
+					fprintf(stderr, "Error: Invalid will QoS %d.\n\n", cfg->will_qos);
+					return 1;
+				}
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--will-retain")){
+			cfg->will_retain = true;
+		}else if(!strcmp(argv[i], "--will-topic")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --will-topic argument given but no will topic specified.\n\n");
+				return 1;
+			}else{
+				if(mosquitto_pub_topic_check(argv[i+1]) == MOSQ_ERR_INVAL){
+					fprintf(stderr, "Error: Invalid will topic '%s', does it contain '+' or '#'?\n", argv[i+1]);
+					return 1;
+				}
+				cfg->will_topic = strdup(argv[i+1]);
+			}
+			i++;
+		}else if(!strcmp(argv[i], "-c") || !strcmp(argv[i], "--disable-clean-session")){
+			if(pub_or_sub == CLIENT_PUB){
+				goto unknown_option;
+			}
+			cfg->clean_session = false;
+		}else if(!strcmp(argv[i], "-N")){
+			if(pub_or_sub == CLIENT_PUB){
+				goto unknown_option;
+			}
+			cfg->eol = false;
+		}else if(!strcmp(argv[i], "-R")){
+			if(pub_or_sub == CLIENT_PUB){
+				goto unknown_option;
+			}
+			cfg->no_retain = true;
+		}else if(!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose")){
+			if(pub_or_sub == CLIENT_PUB){
+				goto unknown_option;
+			}
+			cfg->verbose = 1;
+		}else{
+			goto unknown_option;
+		}
+	}
+
+	return MOSQ_ERR_SUCCESS;
+
+unknown_option:
+	fprintf(stderr, "Error: Unknown option '%s'.\n",argv[i]);
+	return 1;
+}
+
+int client_opts_set(struct mosquitto *mosq, struct mosq_config *cfg)
+{
+	int rc;
+
+	if(cfg->will_topic && mosquitto_will_set(mosq, cfg->will_topic,
+				cfg->will_payloadlen, cfg->will_payload, cfg->will_qos,
+				cfg->will_retain)){
+
+		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting will.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	if(cfg->username && mosquitto_username_pw_set(mosq, cfg->username, cfg->password)){
+		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting username and password.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+#ifdef WITH_TLS
+	if((cfg->cafile || cfg->capath)
+			&& mosquitto_tls_set(mosq, cfg->cafile, cfg->capath, cfg->certfile, cfg->keyfile, NULL)){
+
+		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	if(cfg->insecure && mosquitto_tls_insecure_set(mosq, true)){
+		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS insecure option.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+#  ifdef WITH_TLS_PSK
+	if(cfg->psk && mosquitto_tls_psk_set(mosq, cfg->psk, cfg->psk_identity, NULL)){
+		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS-PSK options.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+#  endif
+	if(cfg->tls_version && mosquitto_tls_opts_set(mosq, 1, cfg->tls_version, cfg->ciphers)){
+		if(!cfg->quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+#endif
+	mosquitto_max_inflight_messages_set(mosq, cfg->max_inflight);
+#ifdef WITH_SOCKS
+	if(cfg->socks5_host){
+		rc = mosquitto_socks5_set(mosq, cfg->socks5_host, cfg->socks5_port, cfg->socks5_username, cfg->socks5_password);
+		if(rc){
+			mosquitto_lib_cleanup();
+			return rc;
+		}
+	}
+#endif
+	mosquitto_opts_set(mosq, MOSQ_OPT_PROTOCOL_VERSION, &(cfg->protocol_version));
+	return MOSQ_ERR_SUCCESS;
+}
+
+int client_id_generate(struct mosq_config *cfg, const char *id_base)
+{
+	int len;
+	char hostname[256];
+
+	if(cfg->id_prefix){
+		cfg->id = malloc(strlen(cfg->id_prefix)+10);
+		if(!cfg->id){
+			if(!cfg->quiet) fprintf(stderr, "Error: Out of memory.\n");
+			mosquitto_lib_cleanup();
+			return 1;
+		}
+		snprintf(cfg->id, strlen(cfg->id_prefix)+10, "%s%d", cfg->id_prefix, getpid());
+	}else if(!cfg->id){
+		hostname[0] = '\0';
+		gethostname(hostname, 256);
+		hostname[255] = '\0';
+		len = strlen(id_base) + strlen("/-") + 6 + strlen(hostname);
+		cfg->id = malloc(len);
+		if(!cfg->id){
+			if(!cfg->quiet) fprintf(stderr, "Error: Out of memory.\n");
+			mosquitto_lib_cleanup();
+			return 1;
+		}
+		snprintf(cfg->id, len, "%s/%d-%s", id_base, getpid(), hostname);
+		if(strlen(cfg->id) > MOSQ_MQTT_ID_MAX_LENGTH){
+			/* Enforce maximum client id length of 23 characters */
+			cfg->id[MOSQ_MQTT_ID_MAX_LENGTH] = '\0';
+		}
+	}
+	return MOSQ_ERR_SUCCESS;
+}
+
+int client_connect(struct mosquitto *mosq, struct mosq_config *cfg)
+{
+	char err[1024];
+	int rc;
+
+#ifdef WITH_SRV
+	if(cfg->use_srv){
+		rc = mosquitto_connect_srv(mosq, cfg->host, cfg->keepalive, cfg->bind_address);
+	}else{
+		rc = mosquitto_connect_bind(mosq, cfg->host, cfg->port, cfg->keepalive, cfg->bind_address);
+	}
+#else
+	rc = mosquitto_connect_bind(mosq, cfg->host, cfg->port, cfg->keepalive, cfg->bind_address);
+#endif
+	if(rc){
+		if(!cfg->quiet){
+			if(rc == MOSQ_ERR_ERRNO){
+#ifndef WIN32
+				strerror_r(errno, err, 1024);
+#else
+				FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, errno, 0, (LPTSTR)&err, 1024, NULL);
+#endif
+				fprintf(stderr, "Error: %s\n", err);
+			}else{
+				fprintf(stderr, "Unable to connect (%d).\n", rc);
+			}
+		}
+		mosquitto_lib_cleanup();
+		return rc;
+	}
+	return MOSQ_ERR_SUCCESS;
+}
+
+#ifdef WITH_SOCKS
+/* Convert %25 -> %, %3a, %3A -> :, %40 -> @ */
+static int mosquitto__urldecode(char *str)
+{
+	int i, j;
+	int len;
+	if(!str) return 0;
+
+	if(!strchr(str, '%')) return 0;
+
+	len = strlen(str);
+	for(i=0; i<len; i++){
+		if(str[i] == '%'){
+			if(i+2 >= len){
+				return 1;
+			}
+			if(str[i+1] == '2' && str[i+2] == '5'){
+				str[i] = '%';
+				len -= 2;
+				for(j=i+1; j<len; j++){
+					str[j] = str[j+2];
+				}
+				str[j] = '\0';
+			}else if(str[i+1] == '3' && (str[i+2] == 'A' || str[i+2] == 'a')){
+				str[i] = ':';
+				len -= 2;
+				for(j=i+1; j<len; j++){
+					str[j] = str[j+2];
+				}
+				str[j] = '\0';
+			}else if(str[i+1] == '4' && str[i+2] == '0'){
+				str[i] = ':';
+				len -= 2;
+				for(j=i+1; j<len; j++){
+					str[j] = str[j+2];
+				}
+				str[j] = '\0';
+			}else{
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+static int mosquitto__parse_socks_url(struct mosq_config *cfg, char *url)
+{
+	char *str;
+	int i;
+	char *username = NULL, *password = NULL, *host = NULL, *port = NULL;
+	char *username_or_host = NULL;
+	int start;
+	int len;
+	bool have_auth = false;
+	int port_int;
+
+	if(!strncmp(url, "socks5h://", strlen("socks5h://"))){
+		str = url + strlen("socks5h://");
+	}else{
+		fprintf(stderr, "Error: Unsupported proxy protocol: %s\n", url);
+		return 1;
+	}
+
+	// socks5h://username:password@host:1883
+	// socks5h://username:password@host
+	// socks5h://username@host:1883
+	// socks5h://username@host
+	// socks5h://host:1883
+	// socks5h://host
+
+	start = 0;
+	for(i=0; i<strlen(str); i++){
+		if(str[i] == ':'){
+			if(i == start){
+				goto cleanup;
+			}
+			if(have_auth){
+				/* Have already seen a @ , so this must be of form
+				 * socks5h://username[:password]@host:port */
+				if(host){
+					/* Already seen a host, must be malformed. */
+					goto cleanup;
+				}
+				len = i-start;
+				host = malloc(len + 1);
+				memcpy(host, &(str[start]), len);
+				host[len] = '\0';
+				start = i+1;
+			}else if(!username_or_host){
+				/* Haven't seen a @ before, so must be of form
+				 * socks5h://host:port or
+				 * socks5h://username:password@host[:port] */
+				len = i-start;
+				username_or_host = malloc(len + 1);
+				memcpy(username_or_host, &(str[start]), len);
+				username_or_host[len] = '\0';
+				start = i+1;
+			}
+		}else if(str[i] == '@'){
+			if(i == start){
+				goto cleanup;
+			}
+			have_auth = true;
+			if(username_or_host){
+				/* Must be of form socks5h://username:password@... */
+				username = username_or_host;
+				username_or_host = NULL;
+
+				len = i-start;
+				password = malloc(len + 1);
+				memcpy(password, &(str[start]), len);
+				password[len] = '\0';
+				start = i+1;
+			}else{
+				/* Haven't seen a : yet, so must be of form
+				 * socks5h://username@... */
+				if(username){
+					/* Already got a username, must be malformed. */
+					goto cleanup;
+				}
+				len = i-start;
+				username = malloc(len + 1);
+				memcpy(username, &(str[start]), len);
+				username[len] = '\0';
+				start = i+1;
+			}
+		}
+	}
+
+	/* Deal with remainder */
+	if(i > start){
+		len = i-start;
+		if(host){
+			/* Have already seen a @ , so this must be of form
+			 * socks5h://username[:password]@host:port */
+			port = malloc(len + 1);
+			memcpy(port, &(str[start]), len);
+			port[len] = '\0';
+		}else if(username_or_host){
+			/* Haven't seen a @ before, so must be of form
+			 * socks5h://host:port */
+			host = username_or_host;
+			username_or_host = NULL;
+			port = malloc(len + 1);
+			memcpy(port, &(str[start]), len);
+			port[len] = '\0';
+		}else{
+			host = malloc(len + 1);
+			memcpy(host, &(str[start]), len);
+			host[len] = '\0';
+		}
+	}
+
+	if(!host){
+		fprintf(stderr, "Error: Invalid proxy.\n");
+		goto cleanup;
+	}
+
+	if(mosquitto__urldecode(username)){
+		goto cleanup;
+	}
+	if(mosquitto__urldecode(password)){
+		goto cleanup;
+	}
+	if(port){
+		port_int = atoi(port);
+		if(port_int < 1 || port_int > 65535){
+			fprintf(stderr, "Error: Invalid proxy port %d\n", port_int);
+			goto cleanup;
+		}
+		free(port);
+	}else{
+		port_int = 1080;
+	}
+
+	cfg->socks5_username = username;
+	cfg->socks5_password = password;
+	cfg->socks5_host = host;
+	cfg->socks5_port = port_int;
+
+	return 0;
+cleanup:
+	if(username_or_host) free(username_or_host);
+	if(username) free(username);
+	if(password) free(password);
+	if(host) free(host);
+	if(port) free(port);
+	return 1;
+}
+
+#endif

=== added file 'client/client_shared.h'
--- client/client_shared.h	1970-01-01 00:00:00 +0000
+++ client/client_shared.h	2015-02-18 20:26:49 +0000
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2014 Roger Light <[e-mail]>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+ 
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+Contributors:
+   Roger Light - initial implementation and documentation.
+*/
+
+#ifndef _CLIENT_CONFIG_H
+#define _CLIENT_CONFIG_H
+
+#include <stdio.h>
+
+/* pub_client.c modes */
+#define MSGMODE_NONE 0
+#define MSGMODE_CMD 1
+#define MSGMODE_STDIN_LINE 2
+#define MSGMODE_STDIN_FILE 3
+#define MSGMODE_FILE 4
+#define MSGMODE_NULL 5
+
+#define CLIENT_PUB 1
+#define CLIENT_SUB 2
+
+struct mosq_config {
+	char *id;
+	char *id_prefix;
+	int protocol_version;
+	int keepalive;
+	char *host;
+	int port;
+	int qos;
+	bool retain;
+	int pub_mode; /* pub */
+	char *file_input; /* pub */
+	char *message; /* pub */
+	long msglen; /* pub */
+	char *topic; /* pub */
+	char *bind_address;
+#ifdef WITH_SRV
+	bool use_srv;
+#endif
+	bool debug;
+	bool quiet;
+	unsigned int max_inflight;
+	char *username;
+	char *password;
+	char *will_topic;
+	char *will_payload;
+	long will_payloadlen;
+	int will_qos;
+	bool will_retain;
+#ifdef WITH_TLS
+	char *cafile;
+	char *capath;
+	char *certfile;
+	char *keyfile;
+	char *ciphers;
+	bool insecure;
+	char *tls_version;
+#  ifdef WITH_TLS_PSK
+	char *psk;
+	char *psk_identity;
+#  endif
+#endif
+	bool clean_session; /* sub */
+	char **topics; /* sub */
+	int topic_count; /* sub */
+	bool no_retain; /* sub */
+	char **filter_outs; /* sub */
+	int filter_out_count; /* sub */
+	bool verbose; /* sub */
+	bool eol; /* sub */
+	int msg_count; /* sub */
+#ifdef WITH_SOCKS
+	char *socks5_host;
+	int socks5_port;
+	char *socks5_username;
+	char *socks5_password;
+#endif
+};
+
+int client_config_load(struct mosq_config *config, int pub_or_sub, int argc, char *argv[]);
+void client_config_cleanup(struct mosq_config *cfg);
+int client_opts_set(struct mosquitto *mosq, struct mosq_config *cfg);
+int client_id_generate(struct mosq_config *cfg, const char *id_base);
+int client_connect(struct mosquitto *mosq, struct mosq_config *cfg);
+
+#endif

=== modified file 'client/pub_client.c'
--- client/pub_client.c	2014-08-06 00:43:39 +0000
+++ client/pub_client.c	2015-02-18 20:26:49 +0000
@@ -1,30 +1,17 @@
 /*
 Copyright (c) 2009-2014 Roger Light <[e-mail]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+ 
+The Eclipse Public License is available at
+   http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+Contributors:
+   Roger Light - initial implementation and documentation.
 */
 
 
@@ -42,13 +29,7 @@
 #endif
 
 #include <mosquitto.h>
-
-#define MSGMODE_NONE 0
-#define MSGMODE_CMD 1
-#define MSGMODE_STDIN_LINE 2
-#define MSGMODE_STDIN_FILE 3
-#define MSGMODE_FILE 4
-#define MSGMODE_NULL 5
+#include "client_shared.h"
 
 #define STATUS_CONNECTING 0
 #define STATUS_CONNACK_RECVD 1
@@ -219,7 +200,7 @@
 	mosquitto_lib_version(&major, &minor, &revision);
 	printf("mosquitto_pub is a simple mqtt client that will publish a message on a single topic and exit.\n");
 	printf("mosquitto_pub version %s running on libmosquitto %d.%d.%d.\n\n", VERSION, major, minor, revision);
-	printf("Usage: mosquitto_pub [-h host] [-p port] [-q qos] [-r] {-f file | -l | -n | -m message} -t topic\n");
+	printf("Usage: mosquitto_pub [-h host] [-k keepalive] [-p port] [-q qos] [-r] {-f file | -l | -n | -m message} -t topic\n");
 #ifdef WITH_SRV
 	printf("                     [-A bind_address] [-S]\n");
 #else
@@ -237,6 +218,9 @@
 	printf("                     [--psk hex-key --psk-identity identity [--ciphers ciphers]]\n");
 #endif
 #endif
+#ifdef WITH_SOCKS
+	printf("                     [--proxy socks-url]\n");
+#endif
 	printf("       mosquitto_pub --help\n\n");
 	printf(" -A : bind the outgoing socket to this host/ip address. Use to control which interface\n");
 	printf("      the client communicates over.\n");
@@ -246,11 +230,13 @@
 	printf(" -i : id to use for this client. Defaults to mosquitto_pub_ appended with the process id.\n");
 	printf(" -I : define the client id as id_prefix appended with the process id. Useful for when the\n");
 	printf("      broker is using the clientid_prefixes option.\n");
+	printf(" -k : keep alive in seconds for this client. Defaults to 60.\n");
 	printf(" -l : read messages from stdin, sending a separate message for each line.\n");
 	printf(" -m : message payload to send.\n");
 	printf(" -M : the maximum inflight messages for QoS 1/2..\n");
 	printf(" -n : send a null (zero length) message.\n");
 	printf(" -p : network port to connect to. Defaults to 1883.\n");
+	printf(" -P : provide a password (requires MQTT 3.1 broker)\n");
 	printf(" -q : quality of service level to use for all messages. Defaults to 0.\n");
 	printf(" -r : message should be retained.\n");
 	printf(" -s : read message from stdin, sending the entire input as a message.\n");
@@ -259,7 +245,8 @@
 #endif
 	printf(" -t : mqtt topic to publish to.\n");
 	printf(" -u : provide a username (requires MQTT 3.1 broker)\n");
-	printf(" -P : provide a password (requires MQTT 3.1 broker)\n");
+	printf(" -V : specify the version of the MQTT protocol to use when connecting.\n");
+	printf("      Can be mqttv31 or mqttv311. Defaults to mqttv31.\n");
 	printf(" --help : display this message.\n");
 	printf(" --quiet : don't print error messages.\n");
 	printf(" --will-payload : payload for the client Will, which is sent by the broker in case of\n");
@@ -282,340 +269,57 @@
 	printf("              hostname. Using this option means that you cannot be sure that the\n");
 	printf("              remote host is the server you wish to connect to and so is insecure.\n");
 	printf("              Do not use this option in a production environment.\n");
-#ifdef WITH_TLS_PSK
+#  ifdef WITH_TLS_PSK
 	printf(" --psk : pre-shared-key in hexadecimal (no leading 0x) to enable TLS-PSK mode.\n");
 	printf(" --psk-identity : client identity string for TLS-PSK mode.\n");
+#  endif
 #endif
+#ifdef WITH_SOCKS
+	printf(" --proxy : SOCKS5 proxy URL of the form:\n");
+	printf("           socks5h://[username[:password]@]hostname[:port]\n");
+	printf("           Only \"none\" and \"username\" authentication is supported.\n");
 #endif
 	printf("\nSee http://mosquitto.org/ for more information.\n\n");
 }
 
 int main(int argc, char *argv[])
 {
-	char *id = NULL;
-	char *id_prefix = NULL;
-	int i;
-	char *host = "localhost";
-	int port = 1883;
-	char *bind_address = NULL;
-	int keepalive = 60;
+	struct mosq_config cfg;
 	char buf[1024];
-	bool debug = false;
 	struct mosquitto *mosq = NULL;
 	int rc;
 	int rc2;
-	char hostname[256];
-	char err[1024];
-	int len;
-	unsigned int max_inflight = 20;
-
-	char *will_payload = NULL;
-	long will_payloadlen = 0;
-	int will_qos = 0;
-	bool will_retain = false;
-	char *will_topic = NULL;
-
-	bool insecure = false;
-	char *cafile = NULL;
-	char *capath = NULL;
-	char *certfile = NULL;
-	char *keyfile = NULL;
-	char *tls_version = NULL;
-
-	char *psk = NULL;
-	char *psk_identity = NULL;
-
-	char *ciphers = NULL;
-
-	bool use_srv = false;
-
-	for(i=1; i<argc; i++){
-		if(!strcmp(argv[i], "-p") || !strcmp(argv[i], "--port")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -p argument given but no port specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				port = atoi(argv[i+1]);
-				if(port<1 || port>65535){
-					fprintf(stderr, "Error: Invalid port given: %d\n", port);
-					print_usage();
-					return 1;
-				}
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-A")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -A argument given but no address specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				bind_address = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--cafile")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --cafile argument given but no file specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				cafile = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--capath")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --capath argument given but no directory specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				capath = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--cert")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --cert argument given but no file specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				certfile = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--ciphers")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --ciphers argument given but no ciphers specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				ciphers = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")){
-			debug = true;
-		}else if(!strcmp(argv[i], "-f") || !strcmp(argv[i], "--file")){
-			if(mode != MSGMODE_NONE){
-				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
-				print_usage();
-				return 1;
-			}else if(i==argc-1){
-				fprintf(stderr, "Error: -f argument given but no file specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				if(load_file(argv[i+1])) return 1;
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--help")){
+
+	rc = client_config_load(&cfg, CLIENT_PUB, argc, argv);
+	if(rc){
+		client_config_cleanup(&cfg);
+		if(rc == 2){
+			/* --help */
 			print_usage();
-			return 0;
-		}else if(!strcmp(argv[i], "-h") || !strcmp(argv[i], "--host")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -h argument given but no host specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				host = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--insecure")){
-			insecure = true;
-		}else if(!strcmp(argv[i], "-i") || !strcmp(argv[i], "--id")){
-			if(id_prefix){
-				fprintf(stderr, "Error: -i and -I argument cannot be used together.\n\n");
-				print_usage();
-				return 1;
-			}
-			if(i==argc-1){
-				fprintf(stderr, "Error: -i argument given but no id specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				id = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-I") || !strcmp(argv[i], "--id-prefix")){
-			if(id){
-				fprintf(stderr, "Error: -i and -I argument cannot be used together.\n\n");
-				print_usage();
-				return 1;
-			}
-			if(i==argc-1){
-				fprintf(stderr, "Error: -I argument given but no id prefix specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				id_prefix = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--key")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --key argument given but no file specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				keyfile = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-l") || !strcmp(argv[i], "--stdin-line")){
-			if(mode != MSGMODE_NONE){
-				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				mode = MSGMODE_STDIN_LINE;
-			}
-		}else if(!strcmp(argv[i], "-m") || !strcmp(argv[i], "--message")){
-			if(mode != MSGMODE_NONE){
-				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
-				print_usage();
-				return 1;
-			}else if(i==argc-1){
-				fprintf(stderr, "Error: -m argument given but no message specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				message = argv[i+1];
-				msglen = strlen(message);
-				mode = MSGMODE_CMD;
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-M")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -M argument given but max_inflight not specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				max_inflight = atoi(argv[i+1]);
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-n") || !strcmp(argv[i], "--null-message")){
-			if(mode != MSGMODE_NONE){
-				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				mode = MSGMODE_NULL;
-			}
-		}else if(!strcmp(argv[i], "--psk")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --psk argument given but no key specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				psk = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--psk-identity")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --psk-identity argument given but no identity specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				psk_identity = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-q") || !strcmp(argv[i], "--qos")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -q argument given but no QoS specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				qos = atoi(argv[i+1]);
-				if(qos<0 || qos>2){
-					fprintf(stderr, "Error: Invalid QoS given: %d\n", qos);
-					print_usage();
-					return 1;
-				}
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--quiet")){
-			quiet = true;
-		}else if(!strcmp(argv[i], "-r") || !strcmp(argv[i], "--retain")){
-			retain = 1;
-		}else if(!strcmp(argv[i], "-s") || !strcmp(argv[i], "--stdin-file")){
-			if(mode != MSGMODE_NONE){
-				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				if(load_stdin()) return 1;
-			}
-#ifdef WITH_SRV
-		}else if(!strcmp(argv[i], "-S")){
-			use_srv = true;
-#endif
-		}else if(!strcmp(argv[i], "-t") || !strcmp(argv[i], "--topic")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -t argument given but no topic specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				topic = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--tls-version")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --tls-version argument given but no version specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				tls_version = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-u") || !strcmp(argv[i], "--username")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -u argument given but no username specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				username = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-P") || !strcmp(argv[i], "--pw")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: -P argument given but no password specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				password = argv[i+1];
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--will-payload")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --will-payload argument given but no will payload specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				will_payload = argv[i+1];
-				will_payloadlen = strlen(will_payload);
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--will-qos")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --will-qos argument given but no will QoS specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				will_qos = atoi(argv[i+1]);
-				if(will_qos < 0 || will_qos > 2){
-					fprintf(stderr, "Error: Invalid will QoS %d.\n\n", will_qos);
-					return 1;
-				}
-			}
-			i++;
-		}else if(!strcmp(argv[i], "--will-retain")){
-			will_retain = true;
-		}else if(!strcmp(argv[i], "--will-topic")){
-			if(i==argc-1){
-				fprintf(stderr, "Error: --will-topic argument given but no will topic specified.\n\n");
-				print_usage();
-				return 1;
-			}else{
-				will_topic = argv[i+1];
-			}
-			i++;
 		}else{
-			fprintf(stderr, "Error: Unknown option '%s'.\n",argv[i]);
-			print_usage();
+			fprintf(stderr, "\nUse 'mosquitto_pub --help' to see usage.\n");
+		}
+		return 1;
+	}
+
+	topic = cfg.topic;
+	message = cfg.message;
+	msglen = cfg.msglen;
+	qos = cfg.qos;
+	retain = cfg.retain;
+	mode = cfg.pub_mode;
+	username = cfg.username;
+	password = cfg.password;
+	quiet = cfg.quiet;
+
+	if(cfg.pub_mode == MSGMODE_STDIN_FILE){
+		if(load_stdin()){
+			fprintf(stderr, "Error loading input from stdin.\n");
+			return 1;
+		}
+	}else if(cfg.file_input){
+		if(load_file(cfg.file_input)){
+			fprintf(stderr, "Error loading input file \"%s\".\n", cfg.file_input);
 			return 1;
 		}
 	}
@@ -626,62 +330,14 @@
 		return 1;
 	}
 
-	if(will_payload && !will_topic){
-		fprintf(stderr, "Error: Will payload given, but no will topic given.\n");
-		print_usage();
-		return 1;
-	}
-	if(will_retain && !will_topic){
-		fprintf(stderr, "Error: Will retain given, but no will topic given.\n");
-		print_usage();
-		return 1;
-	}
-	if(password && !username){
-		if(!quiet) fprintf(stderr, "Warning: Not using password since username not set.\n");
-	}
-	if((certfile && !keyfile) || (keyfile && !certfile)){
-		fprintf(stderr, "Error: Both certfile and keyfile must be provided if one of them is.\n");
-		print_usage();
-		return 1;
-	}
-	if((cafile || capath) && psk){
-		if(!quiet) fprintf(stderr, "Error: Only one of --psk or --cafile/--capath may be used at once.\n");
-		return 1;
-	}
-	if(psk && !psk_identity){
-		if(!quiet) fprintf(stderr, "Error: --psk-identity required if --psk used.\n");
-		return 1;
-	}
 
 	mosquitto_lib_init();
 
-	if(id_prefix){
-		id = malloc(strlen(id_prefix)+10);
-		if(!id){
-			if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
-			mosquitto_lib_cleanup();
-			return 1;
-		}
-		snprintf(id, strlen(id_prefix)+10, "%s%d", id_prefix, getpid());
-	}else if(!id){
-		hostname[0] = '\0';
-		gethostname(hostname, 256);
-		hostname[255] = '\0';
-		len = strlen("mosqpub/-") + 6 + strlen(hostname);
-		id = malloc(len);
-		if(!id){
-			if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
-			mosquitto_lib_cleanup();
-			return 1;
-		}
-		snprintf(id, len, "mosqpub/%d-%s", getpid(), hostname);
-		if(strlen(id) > MOSQ_MQTT_ID_MAX_LENGTH){
-			/* Enforce maximum client id length of 23 characters */
-			id[MOSQ_MQTT_ID_MAX_LENGTH] = '\0';
-		}
+	if(client_id_generate(&cfg, "mosqpub")){
+		return 1;
 	}
 
-	mosq = mosquitto_new(id, true, NULL);
+	mosq = mosquitto_new(cfg.id, true, NULL);
 	if(!mosq){
 		switch(errno){
 			case ENOMEM:
@@ -694,65 +350,18 @@
 		mosquitto_lib_cleanup();
 		return 1;
 	}
-	if(debug){
+	if(cfg.debug){
 		mosquitto_log_callback_set(mosq, my_log_callback);
 	}
-	if(will_topic && mosquitto_will_set(mosq, will_topic, will_payloadlen, will_payload, will_qos, will_retain)){
-		if(!quiet) fprintf(stderr, "Error: Problem setting will.\n");
-		mosquitto_lib_cleanup();
-		return 1;
-	}
-	if(username && mosquitto_username_pw_set(mosq, username, password)){
-		if(!quiet) fprintf(stderr, "Error: Problem setting username and password.\n");
-		mosquitto_lib_cleanup();
-		return 1;
-	}
-	if((cafile || capath) && mosquitto_tls_set(mosq, cafile, capath, certfile, keyfile, NULL)){
-		if(!quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
-		mosquitto_lib_cleanup();
-		return 1;
-	}
-	if(insecure && mosquitto_tls_insecure_set(mosq, true)){
-		if(!quiet) fprintf(stderr, "Error: Problem setting TLS insecure option.\n");
-		mosquitto_lib_cleanup();
-		return 1;
-	}
-	if(psk && mosquitto_tls_psk_set(mosq, psk, psk_identity, NULL)){
-		if(!quiet) fprintf(stderr, "Error: Problem setting TLS-PSK options.\n");
-		mosquitto_lib_cleanup();
-		return 1;
-	}
-	if(tls_version && mosquitto_tls_opts_set(mosq, 1, tls_version, ciphers)){
-		if(!quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
-		mosquitto_lib_cleanup();
-		return 1;
-	}
-	mosquitto_max_inflight_messages_set(mosq, max_inflight);
 	mosquitto_connect_callback_set(mosq, my_connect_callback);
 	mosquitto_disconnect_callback_set(mosq, my_disconnect_callback);
 	mosquitto_publish_callback_set(mosq, my_publish_callback);
 
-	if(use_srv){
-		rc = mosquitto_connect_srv(mosq, host, keepalive, bind_address);
-	}else{
-		rc = mosquitto_connect_bind(mosq, host, port, keepalive, bind_address);
-	}
-	if(rc){
-		if(!quiet){
-			if(rc == MOSQ_ERR_ERRNO){
-#ifndef WIN32
-				strerror_r(errno, err, 1024);
-#else
-				FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, errno, 0, (LPTSTR)&err, 1024, NULL);
-#endif
-				fprintf(stderr, "Error: %s\n", err);
-			}else{
-				fprintf(stderr, "Unable to connect (%d).\n", rc);
-			}
-		}
-		mosquitto_lib_cleanup();
-		return rc;
-	}
+	if(client_opts_set(mosq, &cfg)){
+		return 1;
+	}
+	rc = client_connect(mosq, &cfg);