[haproxy/f18] Update to 1.4.22 (CVE-2012-2942, #824544)
cheeselee
cheeselee at fedoraproject.org
Fri Oct 12 08:34:52 UTC 2012
commit 2cdc70437916be048b900130684b24a54ef7d25c
Author: Robin Lee <cheeselee at fedoraproject.org>
Date: Fri Oct 12 16:32:45 2012 +0800
Update to 1.4.22 (CVE-2012-2942, #824544)
- Use linux2628 build target
- No separate x86_64 build target for halog
- halog build honors rpmbuild optflags
- Specfile cleanup
.gitignore | 1 +
haproxy.spec | 37 +++++++++++++++----------------------
sources | 2 +-
3 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbd94ed..afa658f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ haproxy-1.4.8.tar.gz
/haproxy-1.4.18.tar.gz
/haproxy-1.4.19.tar.gz
/haproxy-1.4.20.tar.gz
+/haproxy-1.4.22.tar.gz
diff --git a/haproxy.spec b/haproxy.spec
index eb1c563..d7e31f7 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -5,8 +5,8 @@
%define haproxy_datadir %{_datadir}/haproxy
Name: haproxy
-Version: 1.4.20
-Release: 3%{?dist}
+Version: 1.4.22
+Release: 1%{?dist}
Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
Group: System Environment/Daemons
@@ -18,7 +18,6 @@ Source1: %{name}.service
Source2: %{name}.cfg
Source3: %{name}.logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre-devel
BuildRequires: systemd-units
@@ -47,7 +46,8 @@ availability environments. Indeed, it can:
%build
# No configure script is present, it is all done via make flags
-# FC 7 and up is linux 2.6 so using linux26 as target.
+# Kernels of Fedora 11 and up and EL 6 and up are newer than 2.6.28,
+# so using linux2628 as target.
# Recommended optimization option for x86 builds
regparm_opts=
@@ -55,23 +55,14 @@ regparm_opts=
regparm_opts="USE_REGPARM=1"
%endif
-make %{?_smp_mflags} CPU="generic" TARGET="linux26" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1
-
-# build the halog contrib program. It has 2 version halog64 and halog. Make
-# sure it is installed as 'halog' no matter what.
-halog="halog"
-%ifarch x86_64
-halog="halog64"
-%endif
+make %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1
+# build the halog contrib program.
pushd contrib/halog
-make ${halog}
-mv ${halog} halog.tmp
-mv halog.tmp halog
+make ${halog} OPTIMIZE="%{optflags}"
popd
%install
-rm -rf %{buildroot}
make install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix}
make install-man DESTDIR=%{buildroot} PREFIX=%{_prefix}
@@ -94,11 +85,7 @@ do
mv $textfile $textfile.old
iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
rm -f $textfile.old
-done
-
-
-%clean
-rm -rf %{buildroot}
+done
%pre
@@ -121,7 +108,6 @@ exit 0
%files
-%defattr(-,root,root,-)
%doc doc/*
%doc examples/url-switching.cfg
%doc examples/acl-content-sw.cfg
@@ -143,6 +129,13 @@ exit 0
%changelog
+* Fri Oct 12 2012 Robin Lee <cheeselee at fedoraproject.org> - 1.4.22-1
+- Update to 1.4.22 (CVE-2012-2942, #824544)
+- Use linux2628 build target
+- No separate x86_64 build target for halog
+- halog build honors rpmbuild optflags
+- Specfile cleanup
+
* Mon Sep 17 2012 Václav Pavlín <vpavlin at redhat.com> - 1.4.20-3
- Scriptlets replaced with new systemd macros (#850143)
diff --git a/sources b/sources
index 7269660..122f7ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cd3b91812ff31ae09ec4ace6355e29e haproxy-1.4.20.tar.gz
+a0b007c76f6a78524f3b3dd5e704979c haproxy-1.4.22.tar.gz
More information about the scm-commits
mailing list