From 704acdfa88b3290393a5aadb300e5a6d5d7f6fb1 Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Tue, 30 Jun 2015 10:50:21 +0100 Subject: [PATCH 1/7] bump to 1.5.12 stable --- README.markdown | 4 ++-- spec/haproxy.spec | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.markdown b/README.markdown index f33c259..eb9e266 100644 --- a/README.markdown +++ b/README.markdown @@ -16,8 +16,8 @@ Install rpmdevtools from the [EPEL][epel] repository: ## Download haproxy - wget http://www.haproxy.org/download/1.5/src/haproxy-1.5.3.tar.gz - mv haproxy-1.5.3.tar.gz ~/rpmbuild/SOURCES/ + wget http://www.haproxy.org/download/1.5/src/haproxy-1.5.12.tar.gz + mv haproxy-1.5.12.tar.gz ~/rpmbuild/SOURCES/ ## Get Necessary System-specific Configs diff --git a/spec/haproxy.spec b/spec/haproxy.spec index d5d45a0..122952e 100644 --- a/spec/haproxy.spec +++ b/spec/haproxy.spec @@ -6,9 +6,7 @@ %define haproxy_confdir %{_sysconfdir}/haproxy %define haproxy_datadir %{_datadir}/haproxy -%define version 1.5.3 -#%define dev_rel dev25 -#%define release 1 +%define version 1.5.12 Name: haproxy Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments From 4ab407124280c032a26f4547db5b25255ad0c484 Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Tue, 30 Jun 2015 12:02:24 +0100 Subject: [PATCH 2/7] fix docs to build from this fork (When/if bluerail merges our PR we can lose this repo; this just fixes the docs in the meantime.) --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index eb9e266..1fdcbca 100644 --- a/README.markdown +++ b/README.markdown @@ -21,7 +21,7 @@ Install rpmdevtools from the [EPEL][epel] repository: ## Get Necessary System-specific Configs - git clone git://github.com/bluerail/haproxy-centos.git + git clone git://github.com/rasputnik/haproxy-centos.git cp haproxy-centos/conf/* ~/rpmbuild/SOURCES/ cp haproxy-centos/spec/* ~/rpmbuild/SPECS/ From 89007a6a27beb39547faec6f794825378605cfea Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Wed, 9 Sep 2015 10:49:12 +0100 Subject: [PATCH 3/7] update to 1.5.14 (fix CVE-2015-3281) --- README.markdown | 4 ++-- spec/haproxy.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 1fdcbca..7c6d68e 100644 --- a/README.markdown +++ b/README.markdown @@ -16,8 +16,8 @@ Install rpmdevtools from the [EPEL][epel] repository: ## Download haproxy - wget http://www.haproxy.org/download/1.5/src/haproxy-1.5.12.tar.gz - mv haproxy-1.5.12.tar.gz ~/rpmbuild/SOURCES/ + wget http://www.haproxy.org/download/1.5/src/haproxy-1.5.14.tar.gz + mv haproxy-1.5.14.tar.gz ~/rpmbuild/SOURCES/ ## Get Necessary System-specific Configs diff --git a/spec/haproxy.spec b/spec/haproxy.spec index 122952e..e108b8d 100644 --- a/spec/haproxy.spec +++ b/spec/haproxy.spec @@ -6,7 +6,7 @@ %define haproxy_confdir %{_sysconfdir}/haproxy %define haproxy_datadir %{_datadir}/haproxy -%define version 1.5.12 +%define version 1.5.14 Name: haproxy Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments @@ -119,6 +119,10 @@ fi %exclude %{_sbindir}/haproxy-systemd-wrapper %changelog + +* Wed Sep 09 2015 Dick Davies - 1.5.14 +- Update to 1.5.14 (fix for CVE-2015-3281) + * Wed Aug 20 2014 Alan Ivey - 1.5.3 - Update to haproxy 1.5.3 - Add %{dist} to Release From 774e67e9a685e509b128a7d1d00df41bd70dbb0c Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Wed, 9 Sep 2015 11:25:41 +0100 Subject: [PATCH 4/7] fix typo --- spec/haproxy.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/haproxy.spec b/spec/haproxy.spec index e108b8d..de7f4a5 100644 --- a/spec/haproxy.spec +++ b/spec/haproxy.spec @@ -7,6 +7,8 @@ %define haproxy_datadir %{_datadir}/haproxy %define version 1.5.14 +%define release 1:x + Name: haproxy Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments From 466249cc5d79b68e9c0aea6ed0500973f996fb44 Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Wed, 9 Sep 2015 11:26:14 +0100 Subject: [PATCH 5/7] Update haproxy.spec --- spec/haproxy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/haproxy.spec b/spec/haproxy.spec index de7f4a5..b676acb 100644 --- a/spec/haproxy.spec +++ b/spec/haproxy.spec @@ -7,7 +7,7 @@ %define haproxy_datadir %{_datadir}/haproxy %define version 1.5.14 -%define release 1:x +%define release 1 Name: haproxy From 5ad8e45f58e297077fbefcfc87da53e7ae268681 Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Tue, 20 Oct 2015 12:31:05 +0100 Subject: [PATCH 6/7] https not git url works better through proxies, and we've no need to push back up. --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 7c6d68e..320cea4 100644 --- a/README.markdown +++ b/README.markdown @@ -21,7 +21,7 @@ Install rpmdevtools from the [EPEL][epel] repository: ## Get Necessary System-specific Configs - git clone git://github.com/rasputnik/haproxy-centos.git + git clone https://github.com/rasputnik/haproxy-centos.git cp haproxy-centos/conf/* ~/rpmbuild/SOURCES/ cp haproxy-centos/spec/* ~/rpmbuild/SPECS/ From 80a41bec304fc68e05cf1abe6ccb1d8e8ba79bff Mon Sep 17 00:00:00 2001 From: Dick Davies Date: Thu, 29 Oct 2015 14:25:26 +0000 Subject: [PATCH 7/7] don't ship a config --- spec/haproxy.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/haproxy.spec b/spec/haproxy.spec index b676acb..4244ecf 100644 --- a/spec/haproxy.spec +++ b/spec/haproxy.spec @@ -7,7 +7,7 @@ %define haproxy_datadir %{_datadir}/haproxy %define version 1.5.14 -%define release 1 +%define release 2 Name: haproxy @@ -65,7 +65,6 @@ make install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} make install-man DESTDIR=%{buildroot} PREFIX=%{_prefix} %{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name} -%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg %{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -d -m 0755 %{buildroot}%{haproxy_home} %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}