From 2b9286edcaeedc47898fbbb6f0721c6aeac68e0051be3ad613017b4b57fe5ee3 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 2 Nov 2016 17:11:57 +0000 Subject: [PATCH 1/3] Accepting request 438382 from home:KGronlund:branches:server:http - Update to version 1.6.9+git.1477940904.ab45181 (fate#321723) * BUILD: poll: remove unused hap_fd_isset() which causes a warning with clang * MINOR: cfgparse: few memory leaks fixes. * MINOR: build: Allow linking to device-atlas library file * DOC: Fix typo in description of `-st` parameter in man page * BUG/MEDIUM: peers: on shutdown, wake up the appctx, not the stream * BUG/MEDIUM: peers: fix use after free in peer_session_create() * BUG/MEDIUM: systemd: let the wrapper know that haproxy has completed or failed * MINOR: systemd: report it when execve() fails * BUG/MINOR: systemd: check return value of calloc() * BUG/MINOR: systemd: always restore signals before execve() * BUG/MINOR: systemd: make the wrapper return a non-null status code on error * BUG/MINOR: ssl: prevent multiple entries for the same certificate * BUG/MINOR: ssl: Check malloc return code * BUG/MINOR: vars: smp_fetch_var() doesn't depend on HTTP but on the session * BUG/MINOR: vars: make smp_fetch_var() more robust against misuses * BUG/MINOR: vars: use sess and not s->sess in action_store() * MEDIUM: make SO_REUSEPORT configurable * MINOR: Add fe_req_rate sample fetch * MINOR: show Running on zlib version * MINOR: show Built with PCRE version * BUG/MINOR: displayed PCRE version is running release OBS-URL: https://build.opensuse.org/request/show/438382 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=135 --- _service | 19 +++++++++++++++ _servicedata | 4 ++++ haproxy-1.6.9+git.1477940904.ab45181.tar.gz | 3 +++ haproxy-1.6.9.tar.gz | 3 --- haproxy.changes | 26 +++++++++++++++++++++ haproxy.spec | 2 +- 6 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 haproxy-1.6.9+git.1477940904.ab45181.tar.gz delete mode 100644 haproxy-1.6.9.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..05f0d1a --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + http://git.haproxy.org/git/haproxy-1.6.git + git + haproxy + 1.6.9+git.%ct.%h + master + enable + + + + haproxy*.tar + gz + + + + haproxy + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..318c1b8 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + http://git.haproxy.org/git/haproxy-1.6.git + ab45181e36b6c4f7d31c5284035937c2d0be37eb \ No newline at end of file diff --git a/haproxy-1.6.9+git.1477940904.ab45181.tar.gz b/haproxy-1.6.9+git.1477940904.ab45181.tar.gz new file mode 100644 index 0000000..9a37548 --- /dev/null +++ b/haproxy-1.6.9+git.1477940904.ab45181.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17c0f7265944bcaa7e3aa84edc366ce4ee38e2747a2d051f87f85826674915d7 +size 1611327 diff --git a/haproxy-1.6.9.tar.gz b/haproxy-1.6.9.tar.gz deleted file mode 100644 index a520087..0000000 --- a/haproxy-1.6.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf7d2fa891d2ae4aa6489fc43a9cadf68c42f9cb0de4801afad45d32e7dda133 -size 1566715 diff --git a/haproxy.changes b/haproxy.changes index 2d5a6e7..ebbae2e 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Nov 02 16:56:57 UTC 2016 - kgronlund@suse.com + +- Update to version 1.6.9+git.1477940904.ab45181 (fate#321723) + * BUILD: poll: remove unused hap_fd_isset() which causes a warning with clang + * MINOR: cfgparse: few memory leaks fixes. + * MINOR: build: Allow linking to device-atlas library file + * DOC: Fix typo in description of `-st` parameter in man page + * BUG/MEDIUM: peers: on shutdown, wake up the appctx, not the stream + * BUG/MEDIUM: peers: fix use after free in peer_session_create() + * BUG/MEDIUM: systemd: let the wrapper know that haproxy has completed or failed + * MINOR: systemd: report it when execve() fails + * BUG/MINOR: systemd: check return value of calloc() + * BUG/MINOR: systemd: always restore signals before execve() + * BUG/MINOR: systemd: make the wrapper return a non-null status code on error + * BUG/MINOR: ssl: prevent multiple entries for the same certificate + * BUG/MINOR: ssl: Check malloc return code + * BUG/MINOR: vars: smp_fetch_var() doesn't depend on HTTP but on the session + * BUG/MINOR: vars: make smp_fetch_var() more robust against misuses + * BUG/MINOR: vars: use sess and not s->sess in action_store() + * MEDIUM: make SO_REUSEPORT configurable + * MINOR: Add fe_req_rate sample fetch + * MINOR: show Running on zlib version + * MINOR: show Built with PCRE version + * BUG/MINOR: displayed PCRE version is running release + ------------------------------------------------------------------- Thu Sep 1 07:16:13 UTC 2016 - kgronlund@suse.com diff --git a/haproxy.spec b/haproxy.spec index e587e22..731a55a 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -41,7 +41,7 @@ %bcond_without apparmor Name: haproxy -Version: 1.6.9 +Version: 1.6.9+git.1477940904.ab45181 Release: 0 # # From 54bdf6f42de6002f7dab31e99f6fab7ca15426b4fb6210828a649a226b69e5ba Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 2 Nov 2016 17:49:54 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=136 --- haproxy.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/haproxy.spec b/haproxy.spec index 731a55a..0f7166f 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -40,6 +40,8 @@ %endif %bcond_without apparmor +%define source_version 1.6.9 + Name: haproxy Version: 1.6.9+git.1477940904.ab45181 Release: 0 @@ -66,7 +68,7 @@ BuildRequires: vim %define pkg_home /var/lib/%{pkg_name} # Url: http://www.haproxy.org/ -Source: http://www.haproxy.org/download/1.6/src/haproxy-%{version}.tar.gz +Source: http://www.haproxy.org/download/1.6/src/haproxy-%{source_version}.tar.gz Source1: %{pkg_name}.init Source2: usr.sbin.haproxy.apparmor Source3: local.usr.sbin.haproxy.apparmor From 0fce6398748154b6df19b1e98fcd4103b2c4d5c03519b9a99fcdde3f2be60c90 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 2 Nov 2016 17:54:13 +0000 Subject: [PATCH 3/3] Source as URL is not compatible with source as git repo. OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=137 --- _service | 2 +- haproxy-1.6.9+git.1477940904.ab45181.tar.gz | 3 --- haproxy-1.6.9.tar.gz | 3 +++ haproxy.spec | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 haproxy-1.6.9+git.1477940904.ab45181.tar.gz create mode 100644 haproxy-1.6.9.tar.gz diff --git a/_service b/_service index 05f0d1a..86982b1 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ http://git.haproxy.org/git/haproxy-1.6.git git haproxy - 1.6.9+git.%ct.%h + 1.6.9 master enable diff --git a/haproxy-1.6.9+git.1477940904.ab45181.tar.gz b/haproxy-1.6.9+git.1477940904.ab45181.tar.gz deleted file mode 100644 index 9a37548..0000000 --- a/haproxy-1.6.9+git.1477940904.ab45181.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17c0f7265944bcaa7e3aa84edc366ce4ee38e2747a2d051f87f85826674915d7 -size 1611327 diff --git a/haproxy-1.6.9.tar.gz b/haproxy-1.6.9.tar.gz new file mode 100644 index 0000000..a520087 --- /dev/null +++ b/haproxy-1.6.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf7d2fa891d2ae4aa6489fc43a9cadf68c42f9cb0de4801afad45d32e7dda133 +size 1566715 diff --git a/haproxy.spec b/haproxy.spec index 0f7166f..e587e22 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -40,10 +40,8 @@ %endif %bcond_without apparmor -%define source_version 1.6.9 - Name: haproxy -Version: 1.6.9+git.1477940904.ab45181 +Version: 1.6.9 Release: 0 # # @@ -68,7 +66,7 @@ BuildRequires: vim %define pkg_home /var/lib/%{pkg_name} # Url: http://www.haproxy.org/ -Source: http://www.haproxy.org/download/1.6/src/haproxy-%{source_version}.tar.gz +Source: http://www.haproxy.org/download/1.6/src/haproxy-%{version}.tar.gz Source1: %{pkg_name}.init Source2: usr.sbin.haproxy.apparmor Source3: local.usr.sbin.haproxy.apparmor