Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2015-04-22 01:19:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-04-07 09:29:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2015-04-22 01:19:29.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 20 10:52:12 UTC 2015 - [email protected] + +- pull 3 patches from upstream: + 0010-BUG-MINOR-ssl-Display-correct-filename-in-error-mess.patch + 0011-BUG-MEDIUM-listener-don-t-report-an-error-when-resum.patch + 0012-BUG-MEDIUM-init-don-t-limit-cpu-map-to-the-first-32-.patch + +------------------------------------------------------------------- New: ---- 0010-BUG-MINOR-ssl-Display-correct-filename-in-error-mess.patch 0011-BUG-MEDIUM-listener-don-t-report-an-error-when-resum.patch 0012-BUG-MEDIUM-init-don-t-limit-cpu-map-to-the-first-32-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.22exr3/_old 2015-04-22 01:19:30.000000000 +0200 +++ /var/tmp/diff_new_pack.22exr3/_new 2015-04-22 01:19:30.000000000 +0200 @@ -70,6 +70,9 @@ Patch11: 0007-BUG-MEDIUM-http-the-function-req-res-replace-value-d.patch Patch12: 0008-BUG-MINOR-compression-consider-the-expansion-factor-.patch Patch13: 0009-BUG-MEDIUM-http-hdr_cnt-would-not-count-any-header-w.patch +Patch14: 0010-BUG-MINOR-ssl-Display-correct-filename-in-error-mess.patch +Patch15: 0011-BUG-MEDIUM-listener-don-t-report-an-error-when-resum.patch +Patch16: 0012-BUG-MEDIUM-init-don-t-limit-cpu-map-to-the-first-32-.patch # Source99: haproxy-rpmlintrc # @@ -113,6 +116,9 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build %{__make} \ ++++++ 0010-BUG-MINOR-ssl-Display-correct-filename-in-error-mess.patch ++++++ >From 37dc94cde496e83e00af0580c1a7bfb06e98aafe Mon Sep 17 00:00:00 2001 From: Alexander Rigbo <[email protected]> Date: Tue, 7 Apr 2015 14:02:16 +0200 Subject: [PATCH 10/12] BUG/MINOR: ssl: Display correct filename in error message This patch should be backported to 1.5. (cherry picked from commit fc65af0c6180d1682f6bf76cf804cd003541b3e9) --- src/ssl_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 2614dd6..d0f4d01 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -1569,7 +1569,7 @@ int ssl_sock_prepare_ctx(struct bind_conf *bind_conf, SSL_CTX *ctx, struct proxy if (!store || !X509_STORE_load_locations(store, bind_conf->crl_file, NULL)) { Alert("Proxy '%s': unable to configure CRL file '%s' for bind '%s' at [%s:%d].\n", - curproxy->id, bind_conf->ca_file, bind_conf->arg, bind_conf->file, bind_conf->line); + curproxy->id, bind_conf->crl_file, bind_conf->arg, bind_conf->file, bind_conf->line); cfgerr++; } else { -- 2.1.4 ++++++ 0011-BUG-MEDIUM-listener-don-t-report-an-error-when-resum.patch ++++++ >From 06f823d50473c3dc31732b38c81a6010587f01a4 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <[email protected]> Date: Tue, 14 Apr 2015 12:07:16 +0200 Subject: [PATCH 11/12] BUG/MEDIUM: listener: don't report an error when resuming unbound listeners Pavlos Parissis reported that a sequence of disable/enable on a frontend performed on the CLI can result in an error if the frontend has several "bind" lines each bound to different processes. This is because the resume_listener() function returns a failure for frontends not part of the current process instead of returning a success to pretend there was no failure. This fix should be backported to 1.5. (cherry picked from commit af2fd584f32ec72b3d6d27a915f15df8041b56e7) --- src/listener.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/listener.c b/src/listener.c index 11df69f..21eba52 100644 --- a/src/listener.c +++ b/src/listener.c @@ -120,9 +120,10 @@ int pause_listener(struct listener *l) * may replace enable_listener(). The resulting state will either be LI_READY * or LI_FULL. 0 is returned in case of failure to resume (eg: dead socket). * Listeners bound to a different process are not woken up unless we're in - * foreground mode. If the listener was only in the assigned state, it's totally - * rebound. This can happen if a pause() has completely stopped it. If the - * resume fails, 0 is returned and an error might be displayed. + * foreground mode, and are ignored. If the listener was only in the assigned + * state, it's totally rebound. This can happen if a pause() has completely + * stopped it. If the resume fails, 0 is returned and an error might be + * displayed. */ int resume_listener(struct listener *l) { @@ -146,7 +147,7 @@ int resume_listener(struct listener *l) if ((global.mode & (MODE_DAEMON | MODE_SYSTEMD)) && l->bind_conf->bind_proc && !(l->bind_conf->bind_proc & (1UL << (relative_pid - 1)))) - return 0; + return 1; if (l->proto->sock_prot == IPPROTO_TCP && l->state == LI_PAUSED && -- 2.1.4 ++++++ 0012-BUG-MEDIUM-init-don-t-limit-cpu-map-to-the-first-32-.patch ++++++ >From b34c00cd92deec0db473ffcf2c1da093c9337870 Mon Sep 17 00:00:00 2001 From: Willy Tarreau <[email protected]> Date: Mon, 20 Apr 2015 11:36:57 +0200 Subject: [PATCH 12/12] BUG/MEDIUM: init: don't limit cpu-map to the first 32 processes only We have to allow 32 or 64 processes depending on the machine's word size, and on 64-bit machines only the first 32 processes were properly bound. This fix should be backported to 1.5. (cherry picked from commit e759749b50417895632c4e4481434f947176f28c) --- src/haproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/haproxy.c b/src/haproxy.c index 7ec596c..0dddd53 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -1579,7 +1579,7 @@ int main(int argc, char **argv) #ifdef USE_CPU_AFFINITY if (proc < global.nbproc && /* child */ - proc < 32 && /* only the first 32 processes may be pinned */ + proc < LONGBITS && /* only the first 32/64 processes may be pinned */ global.cpu_map[proc]) /* only do this if the process has a CPU map */ sched_setaffinity(0, sizeof(unsigned long), (void *)&global.cpu_map[proc]); #endif -- 2.1.4
