Re: [maintainer update] update to haproxy 1.6.2

2015-11-10 Thread Jérémie Courrèges-Anglas 
Daniel Jakots  writes:

> On Mon, 09 Nov 2015 13:33:58 +0100, j...@wxcvbn.org (Jérémie
> Courrèges-Anglas) wrote:
>
>> > Upstream removed a bunch of documentation files including the
>> > haproxy.cfg. I created a very simple one so a new user can easily
>> > test haproxy (or even to check an update is still working).  
>> 
>> The config file looks good as is.  You could also add a bunch of
>> SSL-related stuff later, for the same reasons.
>
> Yes, I thought about that but it would require at least a certificate
> and so on, so it would be less simple. Maybe for the next release of
> haproxy 1.6 :)

Fine.  I've just committed the update.  Thanks! :)

>> A time_t related issue appeared in dumpstats.c; below you'll find an
>> additional patch, are you fine with it?
>
> I saw the error but I wasn't sure it was new so I didn't care about it.
> Patch is right, thanks!

I don't think this is not the way to go wrt time_t warnings.

Seriously folks, this kind of problem is synonymous with runtime
breakage on 32 bits archs.  *please* at least report the issue here,
even if you don't provide a patch.  Thanks.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: [maintainer update] update to haproxy 1.6.2

2015-11-09 Thread Jérémie Courrèges-Anglas 
Daniel Jakots  writes:

> Hi,

Hi,

> So I finally succeed in updating haproxy to 1.6 branch. Thanks to
> sthen@ and jca@ for their help.

yw :)

> Upstream removed a bunch of documentation files including the
> haproxy.cfg. I created a very simple one so a new user can easily test
> haproxy (or even to check an update is still working).

The config file looks good as is.  You could also add a bunch of
SSL-related stuff later, for the same reasons.

A time_t related issue appeared in dumpstats.c; below you'll find an
additional patch, are you fine with it?

Index: Makefile
===
RCS file: /cvs/ports/net/haproxy/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile5 Nov 2015 20:00:24 -   1.25
+++ Makefile9 Nov 2015 12:30:01 -
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2015/11/05 20:00:24 jca Exp $
+# $OpenBSD: Makefile,v 1.20.4.1 2015/10/24 14:34:46 ajacoutot Exp $
 
 COMMENT =  reliable, high performance TCP/HTTP load balancer
 
-DISTNAME = haproxy-1.5.15
+DISTNAME = haproxy-1.6.2
 CATEGORIES =   net www
 HOMEPAGE = http://www.haproxy.org/
 MAINTAINER =   Daniel Jakots 
@@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB =  c crypto pcre pcreposix ssl
 
-MASTER_SITES = ${HOMEPAGE}/download/1.5/src/
+MASTER_SITES = ${HOMEPAGE}/download/1.6/src/
 
 HAPROXYCONF =  ${SYSCONFDIR}/haproxy
 HAPROXYSTATE = /var/haproxy
@@ -35,16 +35,15 @@ MAKE_FLAGS +=   USE_PRIVATE_CACHE=1
 NO_TEST =  Yes
 LIB_DEPENDS =  devel/pcre
 
-DOCS = architecture configuration gpl haproxy-en haproxy-fr lgpl
-EXAMPLES = acl-content-sw content-sw-sample haproxy \
-   option-http_proxy tarpit url-switching
+DOCS = architecture configuration gpl lgpl
+EXAMPLES = acl-content-sw content-sw-sample option-http_proxy 
 
 DOCSDIR =  ${PREFIX}/share/doc/haproxy
 EXAMPLESDIR =  ${PREFIX}/share/examples/haproxy
 
 
 pre-install:
-   ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1 ${WRKSRC}/examples/haproxy.cfg
+   ${SUBST_CMD} ${WRKSRC}/doc/haproxy.1
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin
@@ -57,6 +56,7 @@ do-install:
 .for file in ${EXAMPLES}
${INSTALL_DATA} ${WRKSRC}/examples/${file}.cfg ${EXAMPLESDIR}
 .endfor
+   ${INSTALL_DATA} ${FILESDIR}/haproxy.cfg ${EXAMPLESDIR}
 
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/haproxy/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo5 Nov 2015 20:00:24 -   1.13
+++ distinfo9 Nov 2015 12:30:01 -
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.5.15.tar.gz) = WvRuFDhgHQkZ9WKAgfZg+VMwh9iK89knTyRTlUdWY+E=
-SIZE (haproxy-1.5.15.tar.gz) = 1356790
+SHA256 (haproxy-1.6.2.tar.gz) = vUp+7nnhv9Ja9Z2Va7YOgqy7bxRvP7OzBjYDb0yVSNM=
+SIZE (haproxy-1.6.2.tar.gz) = 1538976
Index: files/haproxy.cfg
===
RCS file: files/haproxy.cfg
diff -N files/haproxy.cfg
--- /dev/null   1 Jan 1970 00:00:00 -
+++ files/haproxy.cfg   9 Nov 2015 12:30:01 -
@@ -0,0 +1,25 @@
+global
+   log 127.0.0.1   local0 debug
+   maxconn 1024
+   chroot /var/haproxy
+   uid 604
+   gid 604
+   daemon
+   pidfile /var/run/haproxy.pid
+
+defaults
+   log global
+   modehttp
+   option  httplog
+   option  dontlognull
+   option  redispatch
+   retries 3
+   maxconn 2000
+
+frontend haproxy
+   bind *:80
+   default_backend httpd
+
+backend httpd
+   option forwardfor
+   server www 127.0.0.1:8080 check
Index: patches/patch-examples_haproxy_cfg
===
RCS file: patches/patch-examples_haproxy_cfg
diff -N patches/patch-examples_haproxy_cfg
--- patches/patch-examples_haproxy_cfg  17 Jul 2008 04:31:45 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,63 +0,0 @@
-$OpenBSD: patch-examples_haproxy_cfg,v 1.1.1.1 2008/07/17 04:31:45 jdixon Exp $
 examples/haproxy.cfg.orig  Sat Jun 21 15:59:05 2008
-+++ examples/haproxy.cfg   Sun Jul 13 20:13:01 2008
-@@ -1,28 +1,30 @@
--# this config needs haproxy-1.1.28 or haproxy-1.2.1
- 
- global
-   log 127.0.0.1   local0
-   log 127.0.0.1   local1 notice
-   #log loghostlocal0 info
--  maxconn 4096
--  chroot /usr/share/haproxy
--  uid 99
--  gid 99
-+  maxconn 1024
-+  chroot ${HAPROXYSTATE}
-+  uid ${HAPROXYUID}
-+  gid ${HAPROXYGID}
-   daemon
-   #debug
-   #quiet
-+  pidfile /var/run/haproxy.pid
- 
- defaults
-   log global
-   modehttp
-   option  httplog
-   option  dontlognull
-+  option  redispatch
-   retries 3
--  redispatch
-   maxconn 2000
-   contimeout  5000
-   clitimeout  5
-