Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2015-02-18 11:39:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-03 15:35:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2015-02-18 12:08:55.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 11 12:38:06 GMT 2015 - [email protected] + +- haproxy.init: fix reload and force-reload not to start a stopped + service + +------------------------------------------------------------------- +Fri Feb 6 18:47:17 UTC 2015 - [email protected] + +- pulled 2 patches from upstream: + 0001-BUG-MINOR-pattern-error-message-missing.patch + 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch + +------------------------------------------------------------------- New: ---- 0001-BUG-MINOR-pattern-error-message-missing.patch 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.GTKmz3/_old 2015-02-18 12:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.GTKmz3/_new 2015-02-18 12:08:56.000000000 +0100 @@ -61,6 +61,8 @@ Patch2: haproxy-makefile_lib.patch Patch3: sec-options.patch Patch4: haproxy-1.5.8-fix-bashisms.patch +Patch5: 0001-BUG-MINOR-pattern-error-message-missing.patch +Patch6: 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch # Source99: haproxy-rpmlintrc # @@ -95,6 +97,8 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build %{__make} \ ++++++ 0001-BUG-MINOR-pattern-error-message-missing.patch ++++++ >From e338a8741983acc9a4501a03ecd593d89e6fade3 Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER <[email protected]> Date: Fri, 6 Feb 2015 17:50:55 +0100 Subject: [PATCH 1/2] BUG/MINOR: pattern: error message missing This patch must be backported in 1.5 version. (cherry picked from commit 8aa8384e22dd0b66ded00c70a9c6034278b4bb69) --- src/pattern.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pattern.c b/src/pattern.c index 208e33a..a6fc52d 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -989,8 +989,10 @@ int pat_idx_list_ptr(struct pattern_expr *expr, struct pattern *pat, char **err) /* allocate pattern */ patl = calloc(1, sizeof(*patl)); - if (!patl) + if (!patl) { + memprintf(err, "out of memory while indexing pattern"); return 0; + } /* duplicate pattern */ memcpy(&patl->pat, pat, sizeof(*pat)); -- 2.1.4 ++++++ 0002-BUG-MEDIUM-pattern-some-entries-are-not-deleted-with.patch ++++++ >From 623401b983185c1e0f6507e96557de3bc46fd41b Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER <[email protected]> Date: Fri, 6 Feb 2015 17:53:54 +0100 Subject: [PATCH 2/2] BUG/MEDIUM: pattern: some entries are not deleted with case insensitive match ACL or map entries are not deleted with the command "del acl" or "del map" if the case insentive flag is set. This is because the the case insensitive string are stored in a list and the default delete function associated with string looks in a tree. I add a check of the case insensitive flag and execute the delete function for lists if it is set. This patch must be backported in 1.5 version. (cherry picked from commit 73bc285be194f443dc7eab9c949e87e1dbe8f70c) --- src/pattern.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pattern.c b/src/pattern.c index a6fc52d..b19ffe2 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -1308,6 +1308,10 @@ void pat_del_tree_str(struct pattern_expr *expr, struct pat_ref_elt *ref) struct ebmb_node *node, *next_node; struct pattern_tree *elt; + /* If the flag PAT_F_IGNORE_CASE is set, we cannot use trees */ + if (expr->mflags & PAT_MF_IGNORE_CASE) + return pat_del_list_ptr(expr, ref); + /* browse each node of the tree. */ for (node = ebmb_first(&expr->pattern_tree), next_node = node ? ebmb_next(node) : NULL; node; -- 2.1.4 ++++++ haproxy.init ++++++ --- /var/tmp/diff_new_pack.GTKmz3/_old 2015-02-18 12:08:56.000000000 +0100 +++ /var/tmp/diff_new_pack.GTKmz3/_new 2015-02-18 12:08:56.000000000 +0100 @@ -205,14 +205,12 @@ rc_status -v ;; reload|force-reload) - ## Like force-reload, but if daemon does not support - ## signaling, do nothing (!) - - haproxy_check - # If it supports signaling: - echo -n "Reload service haproxy " - $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID) - rc_status -v + if checkproc -p $HAPROXY_PID $HAPROXY_BIN; then + haproxy_check + echo -n "Reload service haproxy " + $HAPROXY_BIN -p $HAPROXY_PID -D -f $HAPROXY_CONF -sf $(cat $HAPROXY_PID) + rc_status -v + fi ;; status) echo -n "Checking for service haproxy " -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
