Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked
in at 2014-10-25 08:46:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2014-10-11
19:27:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2014-10-25
11:11:35.000000000 +0200
@@ -1,0 +2,31 @@
+Sat Oct 18 18:23:29 UTC 2014 - mrueck...@suse.de
+
+- update to 1.5.6
+ - BUG/MEDIUM: systemd: set KillMode to 'mixed'
+ - MINOR: systemd: Check configuration before start
+ - BUG/MEDIUM: config: avoid skipping disabled proxies
+ - BUG/MINOR: config: do not accept more track-sc than configured
+ - BUG/MEDIUM: backend: fix URI hash when a query string is present
+- dropped patches that were pulled from upstream
+ 0001-BUG-MEDIUM-config-avoid-skipping-disabled-proxies.patch
+ 0001-BUG-MEDIUM-systemd-set-KillMode-to-mixed.patch
+ 0004-BUG-MINOR-config-do-not-accept-more-track-sc-than-co.patch
+ 0005-BUG-MEDIUM-backend-fix-URI-hash-when-a-query-string-.patch
+- dropped patch we sent upstream
+ haproxy-1.5_check_config_before_start.patch
+
+-------------------------------------------------------------------
+Fri Oct 17 16:03:39 UTC 2014 - kgronl...@suse.com
+
+- BUG/MINOR: config: do not accept more track-sc than configured
+- BUG/MEDIUM: backend: fix URI hash when a query string is present
+- Add patch: 0004-BUG-MINOR-config-do-not-accept-more-track-sc-than-co.patch
+- Add patch: 0005-BUG-MEDIUM-backend-fix-URI-hash-when-a-query-string-.patch
+
+-------------------------------------------------------------------
+Fri Oct 10 20:01:33 UTC 2014 - kgronl...@suse.com
+
+- BUG/MEDIUM: config: avoid skipping disabled proxies
+- Add patch: 0001-BUG-MEDIUM-config-avoid-skipping-disabled-proxies.patch
+
+-------------------------------------------------------------------
Old:
----
0001-BUG-MEDIUM-systemd-set-KillMode-to-mixed.patch
haproxy-1.5.5.tar.gz
haproxy-1.5_check_config_before_start.patch
New:
----
haproxy-1.5.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.Hncqxb/_old 2014-10-25 11:11:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Hncqxb/_new 2014-10-25 11:11:36.000000000 +0200
@@ -33,7 +33,7 @@
%bcond_without apparmor
Name: haproxy
-Version: 1.5.5
+Version: 1.5.6
Release: 0
#
#
@@ -60,10 +60,6 @@
Patch1: haproxy-1.2.16_config_haproxy_user.patch
Patch2: haproxy-makefile_lib.patch
Patch3: sec-options.patch
-Patch4: haproxy-1.5_check_config_before_start.patch
-# PATCH-FIX-UPSTREAM: BUG/MEDIUM: systemd: set KillMode to 'mixed'
-Patch5: 0001-BUG-MEDIUM-systemd-set-KillMode-to-mixed.patch
-
Source99: haproxy-rpmlintrc
#
Summary: The Reliable, High Performance TCP/HTTP Load Balancer
@@ -96,8 +92,6 @@
%patch1
%patch2
%patch3
-%patch5 -p1
-%patch4 -p1
%build
%{__make} \
++++++ haproxy-1.5.5.tar.gz -> haproxy-1.5.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/CHANGELOG new/haproxy-1.5.6/CHANGELOG
--- old/haproxy-1.5.5/CHANGELOG 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/CHANGELOG 2014-10-18 17:48:02.000000000 +0200
@@ -1,6 +1,13 @@
ChangeLog :
===========
+2014/10/18 : 1.5.6
+ - BUG/MEDIUM: systemd: set KillMode to 'mixed'
+ - MINOR: systemd: Check configuration before start
+ - BUG/MEDIUM: config: avoid skipping disabled proxies
+ - BUG/MINOR: config: do not accept more track-sc than configured
+ - BUG/MEDIUM: backend: fix URI hash when a query string is present
+
2014/10/08 : 1.5.5
- DOC: Address issue where documentation is excluded due to a gitignore
rule.
- MEDIUM: Improve signal handling in systemd wrapper.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/README new/haproxy-1.5.6/README
--- old/haproxy-1.5.5/README 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/README 2014-10-18 17:48:02.000000000 +0200
@@ -1,9 +1,9 @@
----------------------
HAProxy how-to
----------------------
- version 1.5.4
+ version 1.5.6
willy tarreau
- 2014/09/02
+ 2014/10/18
1) How to build it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/VERDATE new/haproxy-1.5.6/VERDATE
--- old/haproxy-1.5.5/VERDATE 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/VERDATE 2014-10-18 17:48:02.000000000 +0200
@@ -1,2 +1,2 @@
$Format:%ci$
-2014/10/07
+2014/10/18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/VERSION new/haproxy-1.5.6/VERSION
--- old/haproxy-1.5.5/VERSION 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/VERSION 2014-10-18 17:48:02.000000000 +0200
@@ -1 +1 @@
-1.5.5
+1.5.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/contrib/systemd/haproxy.service.in
new/haproxy-1.5.6/contrib/systemd/haproxy.service.in
--- old/haproxy-1.5.5/contrib/systemd/haproxy.service.in 2014-10-08
10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/contrib/systemd/haproxy.service.in 2014-10-18
17:48:02.000000000 +0200
@@ -3,8 +3,10 @@
After=network.target
[Service]
+ExecStartPre=@SBINDIR@/haproxy -f /etc/haproxy/haproxy.cfg -c -q
ExecStart=@SBINDIR@/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p
/run/haproxy.pid
ExecReload=/bin/kill -USR2 $MAINPID
+KillMode=mixed
Restart=always
[Install]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/doc/configuration.txt
new/haproxy-1.5.6/doc/configuration.txt
--- old/haproxy-1.5.5/doc/configuration.txt 2014-10-08 10:07:23.000000000
+0200
+++ new/haproxy-1.5.6/doc/configuration.txt 2014-10-18 17:48:02.000000000
+0200
@@ -2,9 +2,9 @@
HAProxy
Configuration Manual
----------------------
- version 1.5.4
+ version 1.5.6
willy tarreau
- 2014/09/02
+ 2014/10/18
This document covers the configuration language as implemented in the version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/examples/haproxy.spec
new/haproxy-1.5.6/examples/haproxy.spec
--- old/haproxy-1.5.5/examples/haproxy.spec 2014-10-08 10:07:23.000000000
+0200
+++ new/haproxy-1.5.6/examples/haproxy.spec 2014-10-18 17:48:02.000000000
+0200
@@ -1,6 +1,6 @@
Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability
environments
Name: haproxy
-Version: 1.5.5
+Version: 1.5.6
Release: 1
License: GPL
Group: System Environment/Daemons
@@ -76,6 +76,9 @@
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
%changelog
+* Sat Oct 18 2014 Willy Tarreau <w...@1wt.eu>
+- updated to 1.5.6
+
* Wed Oct 8 2014 Willy Tarreau <w...@1wt.eu>
- updated to 1.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/src/backend.c
new/haproxy-1.5.6/src/backend.c
--- old/haproxy-1.5.5/src/backend.c 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/src/backend.c 2014-10-18 17:48:02.000000000 +0200
@@ -200,7 +200,7 @@
start = end = uri;
while (uri_len--) {
- c = *end++;
+ c = *end;
if (c == '/') {
slashes++;
if (slashes == px->uri_dirs_depth1) /* depth+1 */
@@ -208,6 +208,7 @@
}
else if (c == '?' && !px->uri_whole)
break;
+ end++;
}
hash = gen_hash(px, start, (end - start));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/src/cfgparse.c
new/haproxy-1.5.6/src/cfgparse.c
--- old/haproxy-1.5.5/src/cfgparse.c 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/src/cfgparse.c 2014-10-18 17:48:02.000000000 +0200
@@ -6104,7 +6104,6 @@
if (curproxy->state == PR_STSTOPPED) {
/* ensure we don't keep listeners uselessly bound */
stop_proxy(curproxy);
- curproxy = curproxy->next;
continue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/haproxy-1.5.5/src/proto_tcp.c
new/haproxy-1.5.6/src/proto_tcp.c
--- old/haproxy-1.5.5/src/proto_tcp.c 2014-10-08 10:07:23.000000000 +0200
+++ new/haproxy-1.5.6/src/proto_tcp.c 2014-10-18 17:48:02.000000000 +0200
@@ -1427,7 +1427,7 @@
}
else if (strncmp(args[arg], "track-sc", 8) == 0 &&
args[arg][9] == '\0' && args[arg][8] >= '0' &&
- args[arg][8] <= '0' + MAX_SESS_STKCTR) { /* track-sc 0..9 */
+ args[arg][8] < '0' + MAX_SESS_STKCTR) { /* track-sc 0..9 */
struct sample_expr *expr;
int kw = arg;
@@ -1491,7 +1491,7 @@
memprintf(err,
"'%s %s' expects 'accept', 'reject', 'track-sc0' ...
'track-sc%d' "
" in %s '%s' (got '%s')",
- args[0], args[1], MAX_SESS_STKCTR,
proxy_type_str(curpx), curpx->id, args[arg]);
+ args[0], args[1], MAX_SESS_STKCTR-1,
proxy_type_str(curpx), curpx->id, args[arg]);
return -1;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
