From e4707d93a4390ca6359ec8fd13388a4be03602841d88e48e3de7c9c365356f24 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Mon, 27 Nov 2017 15:03:06 +0000 Subject: [PATCH 1/4] Accepting request 546033 from home:darix:branches:server:http - [apparmor]: allow haproxy to restart itself. needed for seamless restart. also reload the apparmor profile on update. - enable network namespaces on 42.3 - Enabled systemd notify mode: new BR: pkgconfig(libsystemd) This fixes problems with starting 1.8 on 42.3. - apply build option changes as adviced by upstream - Update to version 1.8.0: https://www.mail-archive.com/haproxy@formilux.org/msg28004.html OBS-URL: https://build.opensuse.org/request/show/546033 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=150 --- _service | 6 ++--- _servicedata | 4 +++- haproxy-1.7.9.tar.gz | 3 --- haproxy-1.8.0.tar.gz | 3 +++ haproxy.changes | 20 +++++++++++++++++ haproxy.spec | 46 +++++++++++++++++++-------------------- usr.sbin.haproxy.apparmor | 5 ++++- 7 files changed, 56 insertions(+), 31 deletions(-) delete mode 100644 haproxy-1.7.9.tar.gz create mode 100644 haproxy-1.8.0.tar.gz diff --git a/_service b/_service index f7660c6..836494c 100644 --- a/_service +++ b/_service @@ -1,10 +1,10 @@ - http://git.haproxy.org/git/haproxy-1.7.git + http://git.haproxy.org/git/haproxy-1.8.git git haproxy - 1.7.9 - v1.7.9 + 1.8.0 + v1.8.0 enable diff --git a/_servicedata b/_servicedata index e2d7f2a..85f84be 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,6 @@ http://git.haproxy.org/git/haproxy-1.6.git 864bf78c3b6898eb12ece5f0a44032090f26f57f http://git.haproxy.org/git/haproxy-1.7.git - 640d526f8cdad00f7f5043b51f6a34f3f6ebb49f \ No newline at end of file + 640d526f8cdad00f7f5043b51f6a34f3f6ebb49f + http://git.haproxy.org/git/haproxy-1.8.git + 0b78792bbe61fec420e4e7298d145ec7d498f8f2 \ No newline at end of file diff --git a/haproxy-1.7.9.tar.gz b/haproxy-1.7.9.tar.gz deleted file mode 100644 index c79e4bb..0000000 --- a/haproxy-1.7.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e -size 1748159 diff --git a/haproxy-1.8.0.tar.gz b/haproxy-1.8.0.tar.gz new file mode 100644 index 0000000..a6ce27d --- /dev/null +++ b/haproxy-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5511b4698afcb405fb1c08625d1d98afc2283da6aad5772381af781b33c497b +size 2095128 diff --git a/haproxy.changes b/haproxy.changes index 9d9be99..815c101 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Nov 27 13:40:32 UTC 2017 - mrueckert@suse.de + +- [apparmor]: allow haproxy to restart itself. needed for seamless + restart. also reload the apparmor profile on update. + +------------------------------------------------------------------- +Mon Nov 27 13:31:07 UTC 2017 - mrueckert@suse.de + +- enable network namespaces on 42.3 +- Enabled systemd notify mode: new BR: pkgconfig(libsystemd) + This fixes problems with starting 1.8 on 42.3. +- apply build option changes as adviced by upstream + +------------------------------------------------------------------- +Mon Nov 27 13:30:30 UTC 2017 - mrueckert@suse.de + +- Update to version 1.8.0: + https://www.mail-archive.com/haproxy@formilux.org/msg28004.html + ------------------------------------------------------------------- Wed Aug 23 06:52:05 UTC 2017 - kgronlund@suse.com diff --git a/haproxy.spec b/haproxy.spec index 6e0a885..22e8c81 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -19,12 +19,11 @@ %bcond_with tcp_fast_open %endif +%bcond_without network_namespace %if 0%{?suse_version} > 1320 %bcond_without lua -%bcond_without network_namespace %else -%bcond_with lua -%bcond_with network_namespace +%bcond_with lua %endif %if 0%{?suse_version} >= 1310 @@ -41,13 +40,16 @@ %bcond_without apparmor Name: haproxy -Version: 1.7.9 +Version: 1.8.0 Release: 0 # # BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with apparmor} BuildRequires: apparmor-profiles +%if 0%{?suse_version} >= 1315 +BuildRequires: apparmor-rpm-macros +%endif %endif BuildRequires: libgcrypt-devel %if %{with lua} @@ -60,13 +62,14 @@ BuildRequires: pkg-config BuildRequires: udev %if %{with systemd} BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(libsystemd) %endif BuildRequires: vim %define pkg_name haproxy %define pkg_home /var/lib/%{pkg_name} # Url: http://www.haproxy.org/ -Source: http://www.haproxy.org/download/1.7/src/haproxy-%{version}.tar.gz +Source: http://www.haproxy.org/download/1.8/src/haproxy-%{version}.tar.gz Source1: %{pkg_name}.init Source2: usr.sbin.haproxy.apparmor Source3: local.usr.sbin.haproxy.apparmor @@ -110,39 +113,32 @@ the most work done from every CPU cycle. %build %{__make} \ - TARGET=linux26 \ + TARGET=linux2628 \ CPU="%{_target_cpu}" \ USE_PCRE=1 \ %if %{with pcre_jit} USE_PCRE_JIT=1 \ %endif - USE_LIBCRYPT=1 \ - USE_OPENSSL=1 \ - USE_ZLIB=1 \ - USE_NETFILTER=1 \ + USE_PTHREAD_PSHARED=1 \ %ifarch %ix86 USE_REGPARM=1 \ %endif - USE_PTHREAD_PSHARED=1 \ + USE_GETADDRINFO=1 \ + USE_OPENSSL=1 \ %if %{with lua} USE_LUA=1 \ %endif - USE_TPROXY=1 \ - USE_LINUX_TPROXY=1 \ - USE_LINUX_SPLICE=1 \ - USE_ACCEPT4=1 \ - USE_CPU_AFFINITY=1 \ - USE_GETADDRINFO=1 \ - USE_GETSOCKNAME=1 \ - USE_PIE=1 \ - USE_STACKPROTECTOR=1 \ - USE_RELRO_NOW=1 \ + USE_ZLIB=1 \ %if %{with tcp_fast_open} USE_TFO=1 \ %endif %if %{with network_namespace} USE_NS=1 \ %endif + USE_SYSTEMD=1 \ + USE_PIE=1 \ + USE_STACKPROTECTOR=1 \ + USE_RELRO_NOW=1 \ LIB="%{_lib}" \ PREFIX="%{_prefix}" \ DEBUG_CFLAGS="%{optflags}" @@ -158,7 +154,6 @@ install -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/%{pkg_name}/%{ install -D -m 0755 contrib/halog/halog %{buildroot}%{_sbindir}/haproxy-halog %if %{with systemd} -install -D -m 0755 haproxy-systemd-wrapper %{buildroot}%{_sbindir}/haproxy-systemd-wrapper install -D -m 0644 contrib/systemd/%{pkg_name}.service %{buildroot}%{_unitdir}/%{pkg_name}.service ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name} %else @@ -189,6 +184,9 @@ rm examples/haproxy.spec examples/*init* examples/haproxy.vim %service_add_pre %{pkg_name}.service %post +%if %{with apparmor} && (0%{?suse_version} >= 1315) +%apparmor_reload /etc/apparmor.d/usr.sbin.haproxy +%endif %service_add_post %{pkg_name}.service %preun @@ -201,6 +199,9 @@ rm examples/haproxy.spec examples/*init* examples/haproxy.vim %post %fillup_and_insserv %{pkg_name} +%if %{with apparmor} && (0%{?suse_version} >= 1315) +%apparmor_reload /etc/apparmor.d/usr.sbin.haproxy +%endif %preun %stop_on_removal %{pkg_name} @@ -220,7 +221,6 @@ rm examples/haproxy.spec examples/*init* examples/haproxy.vim %config(noreplace) %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}/* %if %{with systemd} %{_unitdir}/%{pkg_name}.service -%{_sbindir}/haproxy-systemd-wrapper %else %config(noreplace) %{_sysconfdir}/init.d/%{pkg_name} %endif diff --git a/usr.sbin.haproxy.apparmor b/usr.sbin.haproxy.apparmor index 1e15a7e..1153819 100644 --- a/usr.sbin.haproxy.apparmor +++ b/usr.sbin.haproxy.apparmor @@ -15,10 +15,13 @@ capability fowner, capability fsetid, - network tcp, + network inet tcp, + network inet6 tcp, /etc/haproxy/* r, + /usr/sbin/haproxy rmix, + /var/lib/haproxy/stats rwl, /var/lib/haproxy/stats.*.bak rwl, /var/lib/haproxy/stats.*.tmp rwl, From ee6d71b81e2099f778895a149ec9ffccde14ee2371f9c606d255d59563c192ef Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Mon, 27 Nov 2017 15:34:17 +0000 Subject: [PATCH 2/4] Accepting request 546048 from home:KGronlund:branches:server:http Replacing the tarball OBS-URL: https://build.opensuse.org/request/show/546048 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=151 --- haproxy-1.8.0.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haproxy-1.8.0.tar.gz b/haproxy-1.8.0.tar.gz index a6ce27d..4ae4c98 100644 --- a/haproxy-1.8.0.tar.gz +++ b/haproxy-1.8.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5511b4698afcb405fb1c08625d1d98afc2283da6aad5772381af781b33c497b -size 2095128 +oid sha256:07b6e041b477c01543fd365cb7e7fc1b7219e0f86d810828eedd593ae98b6ca0 +size 2036854 From 0642ef5274c364e1f9798070372cd78d87726228047f0d5ccd6ab32b743311d0 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Tue, 28 Nov 2017 09:34:06 +0000 Subject: [PATCH 3/4] Accepting request 546181 from home:KGronlund:branches:server:http Add bugzilla reference - Update to version 1.8.0 (bsc#1069954): OBS-URL: https://build.opensuse.org/request/show/546181 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=152 --- haproxy.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haproxy.changes b/haproxy.changes index 815c101..b519b19 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -15,7 +15,7 @@ Mon Nov 27 13:31:07 UTC 2017 - mrueckert@suse.de ------------------------------------------------------------------- Mon Nov 27 13:30:30 UTC 2017 - mrueckert@suse.de -- Update to version 1.8.0: +- Update to version 1.8.0 (bsc#1069954): https://www.mail-archive.com/haproxy@formilux.org/msg28004.html ------------------------------------------------------------------- From e713981734b962bfcee00952acd1929d687b720f99774083d42ddc579d811a89 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Tue, 28 Nov 2017 13:55:11 +0000 Subject: [PATCH 4/4] Accepting request 546231 from home:KGronlund:branches:server:http - License is now GPL-3.0+ and LGPL-2.1+ OBS-URL: https://build.opensuse.org/request/show/546231 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=153 --- haproxy.changes | 5 +++++ haproxy.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/haproxy.changes b/haproxy.changes index b519b19..58f6b3a 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 28 13:54:07 UTC 2017 - kgronlund@suse.com + +- License is now GPL-3.0+ and LGPL-2.1+ + ------------------------------------------------------------------- Mon Nov 27 13:40:32 UTC 2017 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 22e8c81..1c138b1 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -81,7 +81,7 @@ Patch3: haproxy-1.6.0-sec-options.patch Source99: haproxy-rpmlintrc # Summary: The Reliable, High Performance TCP/HTTP Load Balancer -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-3.0+ and LGPL-2.1+ Group: Productivity/Networking/Web/Proxy Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version}