From dee331d52d5df5b8b282eb8cfa7cbbc39ea77a62 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 2 Oct 2016 21:30:17 -0400
Subject: [PATCH] Fixed Travis CI build process

---
 .travis.yml         | 26 +++++++++++++++++---------
 README.md           |  5 +++--
 src/http/Server.cpp | 22 +++++++---------------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 550518aa..cd2eb406 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,32 @@
-os:
-  - linux
-  - osx
-compiler:
-  - gcc
-  - clang
 language: cpp
 sudo: required
 dist: trusty
-install:
+
+os:
+  - linux
+#  - osx
+
+compiler:
+  - gcc
+#  - clang
+
+git:
+  depth: 3
+  
+before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libmicrohttpd10 libmicrohttpd-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb;  fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq cmake || brew install cmake; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq libgcrypt || brew install libgcrypt; fi
+  
 before_script:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then CMAKE_ARGS="-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5"; fi
   - mkdir build && pushd build
+  
 script:
-  - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_GUI_TESTS=ON $CMAKE_ARGS ..
+  - cmake -DCMAKE_BUILD_TYPE=Release -DWITH_GUI_TESTS=ON $CMAKE_ARGS ..
   - make
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi
diff --git a/README.md b/README.md
index d791123b..baa6ba27 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # KeePassX v2.0.2 + keepasshttp
 
+![alt text](https://travis-ci.org/keepassxreboot/keepassx.svg?branch=master "Travis-CI Badge")
+
 ## About
 
 Fork of [KeePassX](https://www.keepassx.org/) with keepasshttp support for use with [PassIFox](https://addons.mozilla.org/en-us/firefox/addon/passifox/) for Mozilla Firefox and [chromeIPass](https://chrome.google.com/webstore/detail/chromeipass/ompiailgknfdndiefoaoiligalphfdae) for Google Chrome.
@@ -22,13 +24,12 @@ The following libraries are required:
 * libgcrypt (>= 1.6)
 * zlib
 * libmicrohttpd
-* libxtst (optional for auto-type on X11)
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
 
 On Debian you can install them with:
 
 ```bash
-sudo apt-get install build-essential cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev
+sudo apt-get install build-essential cmake libmicrohttpd-dev libxi-dev qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev
 ```
 
 #### Build Steps
diff --git a/src/http/Server.cpp b/src/http/Server.cpp
index 2cd97045..94559e23 100644
--- a/src/http/Server.cpp
+++ b/src/http/Server.cpp
@@ -342,22 +342,14 @@ void Server::start(void)
             addr->sin_port = htons(HttpSettings::httpPort());
             addr->sin_addr.s_addr = htonl(address.toIPv4Address());
             nohost = false;
-            //qWarning("HTTPPlugin: IPv4 host configured");
         } else {
-            if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_IPv6)) {
-                struct sockaddr_in6 *addr = static_cast<struct sockaddr_in6*>(calloc(1, sizeof(struct sockaddr_in6)));
-                addrx = static_cast<void*>(addr);
-                addr->sin6_family = AF_INET6;
-                addr->sin6_port = htons(HttpSettings::httpPort());
-                memcpy(&addr->sin6_addr, address.toIPv6Address().c, 16);
-                nohost = false;
-                flags |= MHD_USE_IPv6;
-            /*
-                qWarning("HTTPPlugin: IPv6 host configured and IPv6 enabled");
-            } else {
-                qWarning("HTTPPlugin: IPv6 host configured but IPv6 support disabled!");
-            */
-            }
+            struct sockaddr_in6 *addr = static_cast<struct sockaddr_in6*>(calloc(1, sizeof(struct sockaddr_in6)));
+            addrx = static_cast<void*>(addr);
+            addr->sin6_family = AF_INET6;
+            addr->sin6_port = htons(HttpSettings::httpPort());
+            memcpy(&addr->sin6_addr, address.toIPv6Address().c, 16);
+            nohost = false;
+            flags |= MHD_USE_IPv6;
         }
 
         if (nohost) {