Import of pkgsrc-2016Q3

net/haproxy/Makefile

@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2015/07/04 13:13:53 morr Exp $
+# $NetBSD: Makefile,v 1.28 2016/07/03 14:06:45 morr Exp $
 
-DISTNAME=	haproxy-1.5.14
+DISTNAME=	haproxy-1.6.6
 CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.5/src/
+MASTER_SITES=	http://www.haproxy.org/download/1.6/src/
 
 MAINTAINER=	morr@NetBSD.org
-HOMEPAGE=	http://haproxy.1wt.eu/
+HOMEPAGE=	http://haproxy.org/
 COMMENT=	Reliable, high performance TCP/HTTP load balancer
 LICENSE=	gnu-gpl-v2
 
@@ -20,6 +20,7 @@ INSTALL_MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 RCD_SCRIPTS=		haproxy
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
@@ -51,7 +52,9 @@ TARGET=generic
 LIBS.SunOS+=		-lxnet
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${DESTDIR}${EGDIR}/
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

net/haproxy/PLIST

@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2014/07/14 15:30:10 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/03/14 09:23:31 fhajny Exp $
 man/man1/haproxy.1
 sbin/haproxy
-sbin/haproxy-systemd-wrapper
 share/doc/haproxy/architecture.txt
 share/doc/haproxy/configuration.txt
-share/doc/haproxy/haproxy-en.txt
-share/doc/haproxy/haproxy-fr.txt
-share/examples/haproxy/haproxy.cfg
+share/examples/haproxy/acl-content-sw.cfg
+share/examples/haproxy/auth.cfg
+share/examples/haproxy/content-sw-sample.cfg
+share/examples/haproxy/option-http_proxy.cfg
+share/examples/haproxy/ssl.cfg
+share/examples/haproxy/transparent_proxy.cfg

net/haproxy/PLIST.Linux

@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2016/06/03 12:07:20 jperkin Exp $
+sbin/haproxy-systemd-wrapper

net/haproxy/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2015/07/04 13:13:53 morr Exp $
+$NetBSD: distinfo,v 1.23 2016/07/03 14:06:45 morr Exp $
 
-SHA1 (haproxy-1.5.14.tar.gz) = 159f5beb8fdc6b8059ae51b53dc935d91c0fb51f
-RMD160 (haproxy-1.5.14.tar.gz) = 76577b9bf86390582bf43ae7649ed30761267d5d
-Size (haproxy-1.5.14.tar.gz) = 1345345 bytes
-SHA1 (patch-aa) = be43fca3478d170620607cfe7f4b9ed30f341651
+SHA1 (haproxy-1.6.6.tar.gz) = 51deaf978218518afe74240bbc800a28c5a37644
+RMD160 (haproxy-1.6.6.tar.gz) = 48c9bfa2d531e81f3d13686655b2e6c8b959785b
+SHA512 (haproxy-1.6.6.tar.gz) = 66503bb9bb33bf345d5e9351fa8a0aea2ef8c3c2870d35ee2f1e4f8e79ed66b3936e7410ce79571901a9936a2eec3695ce3080bb664200fb55040b1ef1f7f888
+Size (haproxy-1.6.6.tar.gz) = 1565046 bytes
+SHA1 (patch-Makefile) = f635093d547270603ffea8837a42a8cca2e03bdf

net/haproxy/files/haproxy.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: haproxy.sh,v 1.2 2014/04/27 01:28:01 rodent Exp $
+# $NetBSD: haproxy.sh,v 1.3 2016/02/16 21:59:45 morr Exp $
 #
 
 # PROVIDE: haproxy
@@ -16,6 +16,7 @@ required_files="${conf_file}"
 command_args="-f ${conf_file}"
 extra_commands="configtest"
 configtest_cmd="haproxy_configtest"
+haproxy_fdlimit=${haproxy_fdlimit-"1024"}
 
 haproxy_configtest()
 {
@@ -26,5 +27,17 @@ haproxy_configtest()
 	${command} -c -f ${conf_file}
 }
 
+# A default limit of 64 (at least on NetBSD) may be too low for many people
+SOFT_FDLIMIT=`ulimit -S -n`
+HARD_FDLIMIT=`ulimit -H -n`
+
+if [ ${haproxy_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
+  if [ ${haproxy_fdlimit} -le ${HARD_FDLIMIT} ]; then
+    ulimit -S -n ${haproxy_fdlimit}
+  else
+    ulimit -S -n ${HARD_FDLIMIT}
+  fi
+fi
+
 load_rc_config $name
 run_rc_command "$1"

net/haproxy/files/smf/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
@@ -19,7 +19,6 @@
     <property_group name="application" type="application">
       <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/haproxy.cfg" />
     </property_group>
-    <stability value="Evolving" />
     <template>
       <common_name>
         <loctext xml:lang="C">HAProxy</loctext>

net/haproxy/options.mk

@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2015/03/14 20:36:23 rodent Exp $
+# $NetBSD: options.mk,v 1.4 2016/01/03 17:13:40 morr Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.haproxy
-PKG_SUPPORTED_OPTIONS=	pcre ssl
+PKG_SUPPORTED_OPTIONS=	pcre ssl deviceatlas
 PKG_SUGGESTED_OPTIONS=	pcre ssl
 
 .include "../../mk/bsd.options.mk"
@@ -14,6 +14,25 @@ PKG_SUGGESTED_OPTIONS=	pcre ssl
 BUILD_MAKE_FLAGS+=	USE_PCRE=1
 .endif
 
+###
+### Support DeviceAtlas detection.
+###
+.if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas)
+DEVICEATLAS_VERSION=	2.1
+DEVICEATLAS_DISTFILE=	deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
+DISTFILES=		${DISTNAME}.tar.gz ${DEVICEATLAS_DISTFILE}.zip
+DEVICEATLAS_HOMEPAGE=	https://www.deviceatlas.com/deviceatlas-haproxy-module
+
+BUILD_MAKE_FLAGS+=	USE_DEVICEATLAS=1 DEVICEATLAS_SRC=../${DEVICEATLAS_DISTFILE}
+
+.if !exists(${DISTDIR}/${DEVICEATLAS_DISTFILE}.zip)
+FETCH_MESSAGE= 		"Please fetch ${DEVICEATLAS_DISTFILE}.zip manually from"
+FETCH_MESSAGE+=		"${DEVICEATLAS_HOMEPAGE}"
+FETCH_MESSAGE+= 	"and put into"
+FETCH_MESSAGE+= 	"${DISTDIR}"
+.endif
+.endif
+
 ###
 ### Support OpenSSL for termination.
 ###

net/haproxy/patches/patch-Makefile

@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.2 2016/07/03 14:06:45 morr Exp $
+
+Skip installing unnecessary documentation.
+
+--- Makefile.orig	2016-06-26 17:41:01.000000000 +0000
++++ Makefile
+@@ -812,9 +812,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D
+ 
+ install-doc:
+ 	install -d "$(DESTDIR)$(DOCDIR)"
+-	for x in $(DOCUMENTATION); do \
+-		install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
+-	done
+ 
+ install-bin:
+ 	@for i in haproxy $(EXTRA); do \

net/haproxy/patches/patch-aa

@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2014/07/14 15:30:10 fhajny Exp $
-
-Add support for NetBSD.
-Remove -fomit-frame-pointer on SunOS.
-
---- Makefile.orig	2014-07-12 14:40:52.000000000 +0000
-+++ Makefile
-@@ -89,7 +89,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
- # Use TARGET=<target_name> to optimize for a specifc target OS among the
- # following list (use the default "generic" if uncertain) :
- #    generic, linux22, linux24, linux24e, linux26, solaris,
--#    freebsd, openbsd, cygwin, custom, aix51, aix52
-+#    freebsd, netbsd, openbsd, cygwin, custom, aix51, aix52
- TARGET =
- 
- #### TARGET CPU
-@@ -107,7 +107,6 @@ ARCH =
- 
- #### Toolchain options.
- # GCC is normally used both for compiling and linking.
--CC = gcc
- LD = $(CC)
- 
- #### Debug flags (typically "-g").
-@@ -267,7 +266,7 @@ ifeq ($(TARGET),solaris)
-   # This is for Solaris 8
-   # We also enable getaddrinfo() which works since solaris 8.
-   USE_POLL       = implicit
--  TARGET_CFLAGS  = -fomit-frame-pointer -DFD_SETSIZE=65536 -D_REENTRANT
-+  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT
-   TARGET_LDFLAGS = -lnsl -lsocket
-   USE_TPROXY     = implicit
-   USE_LIBCRYPT    = implicit
-@@ -288,6 +287,12 @@ ifeq ($(TARGET),osx)
-   USE_TPROXY     = implicit
-   USE_LIBCRYPT   = implicit
- else
-+ifeq ($(TARGET),netbsd)
-+  # This is for NetBSD
-+  USE_POLL       = implicit
-+  USE_KQUEUE     = implicit
-+  USE_TPROXY     = implicit
-+else
- ifeq ($(TARGET),openbsd)
-   # This is for OpenBSD >= 3.0
-   USE_POLL       = implicit
-@@ -318,6 +323,7 @@ endif # cygwin
- endif # aix52
- endif # aix51
- endif # openbsd
-+endif # netbsd
- endif # osx
- endif # freebsd
- endif # solaris
-@@ -634,7 +640,7 @@ all:
- 	@echo "Please choose the target among the following supported list :"
- 	@echo
- 	@echo "   linux2628, linux26, linux24, linux24e, linux22, solaris"
--	@echo "   freebsd, openbsd, cygwin, custom, generic"
-+	@echo "   freebsd, netbsd, openbsd, cygwin, custom, generic, aix52"
- 	@echo
- 	@echo "Use \"generic\" if you don't want any optimization, \"custom\" if you"
- 	@echo "want to precisely tweak every option, or choose the target which"