diff --git a/0001-BUG-MEDIUM-systemd-set-KillMode-to-mixed.patch b/0001-BUG-MEDIUM-systemd-set-KillMode-to-mixed.patch deleted file mode 100644 index 0578177..0000000 --- a/0001-BUG-MEDIUM-systemd-set-KillMode-to-mixed.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1f24e3fee3aba83fb3338d17589d0ad0f34f6c73 Mon Sep 17 00:00:00 2001 -From: Apollon Oikonomopoulos -Date: Wed, 8 Oct 2014 15:14:41 +0300 -Subject: [PATCH] BUG/MEDIUM: systemd: set KillMode to 'mixed' - -By default systemd will send SIGTERM to all processes in the service's -control group. In our case, this includes the wrapper, the master -process and all worker processes. - -Since commit c54bdd2a the wrapper actually catches SIGTERM and survives -to see the master process getting killed by systemd and regard this as -an error, placing the unit in a failed state during "systemctl stop". - -Since the wrapper now handles SIGTERM by itself, we switch the kill mode -to 'mixed', which means that systemd will deliver the initial SIGTERM to -the wrapper only, and if the actual haproxy processes don't exit after a -given amount of time (default: 90s), a SIGKILL is sent to all remaining -processes in the control group. See systemd.kill(5) for more -information. - -This should also be backported to 1.5. -(cherry picked from commit 74f016985ab1fa7a6a5afa301d982e77eba9c96a) ---- - contrib/systemd/haproxy.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/contrib/systemd/haproxy.service.in b/contrib/systemd/haproxy.service.in -index 1a3d2c0..0bc5420 100644 ---- a/contrib/systemd/haproxy.service.in -+++ b/contrib/systemd/haproxy.service.in -@@ -5,6 +5,7 @@ After=network.target - [Service] - ExecStart=@SBINDIR@/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid - ExecReload=/bin/kill -USR2 $MAINPID -+KillMode=mixed - Restart=always - - [Install] --- -1.8.4.5 - diff --git a/haproxy-1.5.5.tar.gz b/haproxy-1.5.5.tar.gz deleted file mode 100644 index 384c25e..0000000 --- a/haproxy-1.5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8d014e99a025e7d7878d402d30e03666c6d205c630a0b3c25f53a09fff4827c -size 1337461 diff --git a/haproxy-1.5.6.tar.gz b/haproxy-1.5.6.tar.gz new file mode 100644 index 0000000..e22a813 --- /dev/null +++ b/haproxy-1.5.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:214ab89dad7e0a43cc0f1c46367ca6803cd869e1717a4fa6b99451713f91f717 +size 1337511 diff --git a/haproxy-1.5_check_config_before_start.patch b/haproxy-1.5_check_config_before_start.patch deleted file mode 100644 index 0f63125..0000000 --- a/haproxy-1.5_check_config_before_start.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/contrib/systemd/haproxy.service.in b/contrib/systemd/haproxy.service.in -index 0bc5420..85937e4 100644 ---- a/contrib/systemd/haproxy.service.in -+++ b/contrib/systemd/haproxy.service.in -@@ -3,6 +3,7 @@ Description=HAProxy Load Balancer - 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 diff --git a/haproxy.changes b/haproxy.changes index 1ddaeed..2468bab 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sat Oct 18 18:23:29 UTC 2014 - mrueckert@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 - kgronlund@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 - kgronlund@suse.com + +- BUG/MEDIUM: config: avoid skipping disabled proxies +- Add patch: 0001-BUG-MEDIUM-config-avoid-skipping-disabled-proxies.patch + ------------------------------------------------------------------- Thu Oct 9 14:24:45 UTC 2014 - kgronlund@suse.com diff --git a/haproxy.spec b/haproxy.spec index 48ab536..6467bc0 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -33,7 +33,7 @@ %bcond_without apparmor Name: haproxy -Version: 1.5.5 +Version: 1.5.6 Release: 0 # # @@ -60,10 +60,6 @@ Source4: local.usr.sbin.haproxy.apparmor 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 @@ the most work done from every CPU cycle. %patch1 %patch2 %patch3 -%patch5 -p1 -%patch4 -p1 %build %{__make} \