From a3220d93e3479636e259ed60a96b8d543cada309 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu, 5 Feb 2015 17:04:07 +0000
Subject: [PATCH 1/7] Update comments and version number to 1.0.3

---
 Makefile  | 3 ++-
 build.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4bd59059..8016d145 100755
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#  Copyright (c) 2009, 2014 IBM Corp.
+#  Copyright (c) 2009, 2015 IBM Corp.
 # 
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -15,6 +15,7 @@
 #     Allan Stockdill-Mander - SSL updates
 #     Andy Piper - various fixes
 #     Ian Craggs - OSX build
+#     Rainer Poisel - support for multi-core builds and cross-compilation
 #*******************************************************************************/
 
 # Note: on OS X you should install XCode and the associated command-line tools
diff --git a/build.xml b/build.xml
index 27d89a0b..5e6fe878 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <!--*******************************************************************************
-  Copyright (c) 2012, 2014 IBM Corp.
+  Copyright (c) 2012, 2015 IBM Corp.
  
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
@@ -24,7 +24,7 @@
   </taskdef>
 
   <property name="output.folder" value="build/output" /> 
-  <property name="release.version" value="1.0.2" />
+  <property name="release.version" value="1.0.3" />
 
   <property name="libname" value="mqttv3c" />
   <property name="libname.ssl" value="mqttv3cs" />

From fe50860ff2714ea43da3f7f8128f490b9f4e6b01 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed, 24 Feb 2016 12:58:19 +0000
Subject: [PATCH 2/7] Add OpenSSL directory on Windows build

---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 5e6fe878..19a9dd11 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <!--*******************************************************************************
-  Copyright (c) 2012, 2015 IBM Corp.
+  Copyright (c) 2012, 2016 IBM Corp.
  
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
@@ -31,6 +31,7 @@
   <property name="libname.async" value="mqttv3a" />
   <property name="libname.async.ssl" value="mqttv3as" />
   <property name="ssl" value="yes" />
+  <property name="windows.openssl.folder" value="c:\openssl\bin" />
   <property name="test.hostname" value="iot.eclipse.org"/>
   <property name="test.port" value="18883"/>
   <if>
@@ -118,7 +119,7 @@
         <arg value="${aTest}.exe" />
         <arg value="--hostname" />
         <arg value="${test.hostname}" />
-        <env key="PATH" path="${output.folder}" />
+        <env key="PATH" path="${output.folder};${windows.openssl.folder}" />
       </exec>
     </then>
     <else> 

From 382f9a404f15b89d047034f53201b6dbeebc09dc Mon Sep 17 00:00:00 2001
From: James Sutton <james.sutton@uk.ibm.com>
Date: Mon, 29 Feb 2016 13:51:03 +0000
Subject: [PATCH 3/7] Updating GitHub Issues URL

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
---
 CONTRIBUTING.md | 85 +++++++++++++++++++------------------------------
 1 file changed, 32 insertions(+), 53 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a830aafd..1ebe9d1c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,87 +1,66 @@
-Contributing to Paho
-====================
+# Contributing to Paho
 
-Thanks for your interest in this project.
+Thanks for your interest in this project!
 
-Project description:
---------------------
+You can contribute bugfixes and new features by sending pull requests through GitHub.
 
-The Paho project has been created to provide scalable open-source implementations of open and standard messaging protocols aimed at new, existing, and emerging applications for Machine-to-Machine (M2M) and Internet of Things (IoT).
-Paho reflects the inherent physical and cost constraints of device connectivity. Its objectives include effective levels of decoupling between devices and applications, designed to keep markets open and encourage the rapid growth of scalable Web and Enterprise middleware and applications. Paho is being kicked off with MQTT publish/subscribe client implementations for use on embedded platforms, along with corresponding server support as determined by the community.
+## Legal
 
-- [Project web site](https://www.eclipse.org/paho)
-- [Project information](https://projects.eclipse.org/projects/iot.paho)
+In order for your contribution to be accepted, it must comply with the Eclipse Foundation IP policy.
 
-Source
-------
+Please read the [Eclipse Foundation policy on accepting contributions via Git](http://wiki.eclipse.org/Development_Resources/Contributing_via_Git).
 
-The Paho C client is stored in a git repository. The URLs to access it are:
+1. Sign the [Eclipse CLA](http://www.eclipse.org/legal/CLA.php)
+  1. Register for an Eclipse Foundation User ID. You can register [here](https://dev.eclipse.org/site_login/createaccount.php).
+  2. Log into the [Projects Portal](https://projects.eclipse.org/), and click on the '[Eclipse CLA](https://projects.eclipse.org/user/sign/cla)' link.
+2. Go to your [account settings](https://dev.eclipse.org/site_login/myaccount.php#open_tab_accountsettings) and add your GitHub username to your account.
+3. Make sure that you _sign-off_ your Git commits in the following format:
+  ``` Signed-off-by: John Smith <johnsmith@nowhere.com> ``` This is usually at the bottom of the commit message. You can automate this by adding the '-s' flag when you make the commits. e.g.   ```git commit -s -m "Adding a cool feature"```
+4. Ensure that the email address that you make your commits with is the same one you used to sign up to the Eclipse Foundation website with.
 
-ssh://<username>@git.eclipse.org:29418/paho/org.eclipse.paho.mqtt.c
-https://<username>@git.eclipse.org/r/paho/org.eclipse.paho.mqtt.c
+## Contributing a change
 
-A [web browsable repository](http://git.eclipse.org/c/paho/org.eclipse.paho.mqtt.c.git) is available.
+1. [Fork the repository on GitHub](https://github.com/eclipse/paho.mqtt.c/fork)
+2. Clone the forked repository onto your computer: ``` git clone https://github.com/<your username>/paho.mqtt.c.git ```
+3. Create a new branch from the latest ```develop``` branch with ```git checkout -b YOUR_BRANCH_NAME origin/develop```
+4. Make your changes
+5. If developing a new feature, make sure to include JUnit tests.
+6. Ensure that all new and existing tests pass.
+7. Commit the changes into the branch: ``` git commit -s ``` Make sure that your commit message is meaningful and describes your changes correctly.
+8. If you have a lot of commits for the change, squash them into a single / few commits.
+9. Push the changes in your branch to your forked repository.
+10. Finally, go to [https://github.com/eclipse/paho.mqtt.c](https://github.com/eclipse/paho.mqtt.c) and create a pull request from your "YOUR_BRANCH_NAME" branch to the ```develop``` one to request review and merge of the commits in your pushed branch.
 
-Contributing a patch
---------------------
-
-The Paho 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
-
-- [Contributing via git](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
-
-- [Handling Git Contributions](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 
+project), then it can be pulled into 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:
---------------------
+
+## Developer resources:
+
 
 Information regarding source code management, builds, coding standards, and more.
 
 - [https://projects.eclipse.org/projects/iot.paho/developer](https://projects.eclipse.org/projects/iot.paho/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 development 
+Contact the project developers via the project's development
 [mailing list](https://dev.eclipse.org/mailman/listinfo/paho-dev).
 
 Search for bugs:
 ----------------
 
-This project uses [Bugzilla](https://bugs.eclipse.org/bugs/buglist.cgi?product=Paho) to track ongoing development and issues.
+This project uses GitHub Issues here: [github.com/eclipse/paho.mqtt.c/issues](https://github.com/eclipse/paho.mqtt.c/issues) to track ongoing development and issues.
 
 Create a new bug:
 -----------------
 
 Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
 
-- [Create new Paho bug](https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Paho)
+- [Create new Paho bug](https://github.com/eclipse/paho.mqtt.c/issues/new)

From 575a975ff8edf8d42a9e7512d477919d2bb57f1c Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu, 26 May 2016 21:45:39 +0100
Subject: [PATCH 4/7] Fix for IPv6 support - issue
 https://github.com/eclipse/paho.mqtt.c/issues/7

Bug: 484496
---
 src/MQTTPersistenceDefault.c |  5 +++--
 src/Socket.c                 | 12 +++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/MQTTPersistenceDefault.c b/src/MQTTPersistenceDefault.c
index 90e1c8b8..fda54c29 100644
--- a/src/MQTTPersistenceDefault.c
+++ b/src/MQTTPersistenceDefault.c
@@ -13,6 +13,7 @@
  * Contributors:
  *    Ian Craggs - initial API and implementation and/or initial documentation
  *    Ian Craggs - async client updates
+ *    Ian Craggs - fix for bug 484496
  *******************************************************************************/
 
 /**
@@ -73,8 +74,8 @@ int pstopen(void **handle, const char* clientID, const char* serverURI, void* co
 	/* Note that serverURI=address:port, but ":" not allowed in Windows directories */
 	perserverURI = malloc(strlen(serverURI) + 1);
 	strcpy(perserverURI, serverURI);
-	ptraux = strstr(perserverURI, ":");
-	*ptraux = '-' ;
+	while ((ptraux = strstr(perserverURI, ":")) != NULL)
+		*ptraux = '-' ;
 
 	/* consider '/'  +  '-'  +  '\0' */
 	clientDir = malloc(strlen(dataDir) + strlen(clientID) + strlen(perserverURI) + 3);
diff --git a/src/Socket.c b/src/Socket.c
index 8475ae2b..6bd40972 100644
--- a/src/Socket.c
+++ b/src/Socket.c
@@ -13,6 +13,7 @@
  * Contributors:
  *    Ian Craggs - initial implementation and documentation
  *    Ian Craggs - async client updates
+ *    Ian Craggs - fix for bug 484496
  *******************************************************************************/
 
 /**
@@ -600,6 +601,7 @@ int Socket_new(char* addr, int port, int* sock)
 
 	FUNC_ENTRY;
 	*sock = -1;
+	memset(&address6, '\0', sizeof(address6));
 
 	if (addr[0] == '[')
 	  ++addr;
@@ -608,14 +610,10 @@ int Socket_new(char* addr, int port, int* sock)
 	{
 		struct addrinfo* res = result;
 
-		/* prefer ip4 addresses */
 		while (res)
-		{
-			if (res->ai_family == AF_INET)
-			{
-				result = res;
+		{	/* prefer ip4 addresses */
+			if (res->ai_family == AF_INET || res->ai_next == NULL)
 				break;
-			}
 			res = res->ai_next;
 		}
 
@@ -627,7 +625,7 @@ int Socket_new(char* addr, int port, int* sock)
 		{
 			address6.sin6_port = htons(port);
 			address6.sin6_family = family = AF_INET6;
-			address6.sin6_addr = ((struct sockaddr_in6*)(result->ai_addr))->sin6_addr;
+			memcpy(&address6.sin6_addr, &((struct sockaddr_in6*)(res->ai_addr))->sin6_addr, sizeof(address6.sin6_addr));
 		}
 		else
 #endif

From c147834cae65f004a923f2d14b165ffa0540c556 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu, 26 May 2016 22:03:57 +0100
Subject: [PATCH 5/7] Add .travis.yml

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..5fb651c5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: c
+compiler:
+  - gcc
+  - clang
+
+os:
+  - linux
+  - osx

From 1344a541ec84b78b21bf935b0f8483713cc23c18 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu, 26 May 2016 23:05:45 +0100
Subject: [PATCH 6/7] Update travis configuration file

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5fb651c5..d94addc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,3 +6,6 @@ compiler:
 os:
   - linux
   - osx
+  
+script:
+  - make  

From 89d2c5fc66f2aa76e766dcf9f0f566c4bd02e584 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Fri, 27 May 2016 11:20:24 +0100
Subject: [PATCH 7/7] Try ant instead of make

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d94addc3..dbc295d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: c
+
 compiler:
   - gcc
   - clang
@@ -8,4 +9,4 @@ os:
   - osx
   
 script:
-  - make  
+  - ant