4 files changed, 11 insertions, 7 deletions
diff --git a/network/haproxy/README b/network/haproxy/README
index dc8ef4672852e..271fffc62cecf 100644
--- a/network/haproxy/README
+++ b/network/haproxy/README
@@ -1,3 +1,7 @@
 HAProxy is a free, very fast and reliable solution offering high
 availability, load balancing, and proxying for TCP and HTTP-based
 applications. It is particularly suited for very high traffic web sites.
+
+Note that a default configuration file is no longer provided at
+/etc/haproxy/haproxy.cfg. See /usr/doc/haproxy-*/examples for some
+sample configuration files.
diff --git a/network/haproxy/doinst.sh b/network/haproxy/doinst.sh
index 0b42c374681d7..fd839dfb11ff3 100644
--- a/network/haproxy/doinst.sh
+++ b/network/haproxy/doinst.sh
@@ -23,4 +23,3 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.haproxy.new
-config etc/haproxy/haproxy.cfg.new
diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index f866940f10789..743564e879e61 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haproxy
-VERSION=${VERSION:-1.5.14}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -80,6 +80,7 @@ make \
     USE_PCRE=1 \
     USE_OPENSSL=1 \
     USE_ZLIB=1 \
+    USE_NS=1 \
     EXTRA=""
 make install-man \
     PREFIX=/usr \
@@ -96,11 +97,11 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-install -D -m 0644 examples/$PRGNAM.cfg $PKG/etc/haproxy/$PRGNAM.cfg.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG LICENSE README ROADMAP SUBVERS VERDATE VERSION doc examples \
+cp -a CHANGELOG CONTRIBUTING LICENSE MAINTAINERS README ROADMAP SUBVERS VERDATE VERSION doc examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/etc/haproxy
 mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/errorfiles $PKG/etc/haproxy/errors
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/haproxy/haproxy.info b/network/haproxy/haproxy.info
index c6f48ab87fd9f..5b36c7182956f 100644
--- a/network/haproxy/haproxy.info
+++ b/network/haproxy/haproxy.info
@@ -1,8 +1,8 @@
 PRGNAM="haproxy"
-VERSION="1.5.14"
+VERSION="1.6.1"
 HOMEPAGE="http://www.haproxy.org/"
-DOWNLOAD="http://www.haproxy.org/download/1.5/src/haproxy-1.5.14.tar.gz"
-MD5SUM="ad9d7262b96ba85a0f8c6acc6cb9edde"
+DOWNLOAD="http://www.haproxy.org/download/1.6/src/haproxy-1.6.1.tar.gz"
+MD5SUM="7343def2af8556ebc8972a9748176094"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""