[ElectricFence/f14/master] Use the same formula as glibc uses to align memory - Also add a test case by Yann Droneaud for the s

[Petr Machata]

commit 2ffd5a5afb1bfbbca07a1655274fd0d2165c4ea9
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Jan 19 20:17:50 2011 +0100

    Use the same formula as glibc uses to align memory
    - Also add a test case by Yann Droneaud for the same
    - Resolves: #662085

 ElectricFence-2.2.2-sse.patch |   14 ++++++++++++++
 ElectricFence.spec            |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/ElectricFence-2.2.2-sse.patch b/ElectricFence-2.2.2-sse.patch
new file mode 100644
index 0000000..e5260eb
--- /dev/null
+++ b/ElectricFence-2.2.2-sse.patch
@@ -0,0 +1,14 @@
+diff -up ElectricFence-2.2.2/efence.c\~ ElectricFence-2.2.2/efence.c
+--- ElectricFence-2.2.2/efence.c~	2010-09-10 13:37:58.000000000 +0200
++++ ElectricFence-2.2.2/efence.c	2011-01-19 15:00:16.000000000 +0100
+@@ -327,7 +327,7 @@ initialize(void)
+ 		if ( (string = getenv("EF_ALIGNMENT")) != 0 )
+ 			EF_ALIGNMENT = (size_t)atoi(string);
+ 		else
+-			EF_ALIGNMENT = sizeof(int);
++			EF_ALIGNMENT = 2 * sizeof (size_t);
+ 	}
+ 
+ 	/*
+
+Diff finished.  Wed Jan 19 15:00:26 2011
diff --git a/ElectricFence.spec b/ElectricFence.spec
index 6d41f72..1b6e178 100644
--- a/ElectricFence.spec
+++ b/ElectricFence.spec
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations
 Name: ElectricFence
 Version: 2.2.2
-Release: 29%{?dist}
+Release: 30%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://perens.com/FreeSoftware/ElectricFence/
@@ -17,6 +17,7 @@ Patch5: ElectricFence-mmap-size.patch
 Patch6: ElectricFence-2.2.2-banner.patch
 Patch7: ElectricFence-2.2.2-ef.patch
 Patch8: ElectricFence-2.2.2-builtins.patch
+Patch9: ElectricFence-2.2.2-sse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -41,6 +42,7 @@ violations.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 make CFLAGS='${RPM_OPT_FLAGS} -DUSE_SEMAPHORE -fpic'
@@ -73,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Jan 19 2011 Petr Machata <pmachata at redhat.com> - 2.2.2-30
+- Use the same formula as glibc uses to align memory
+- Resolves: #662085
+
 * Fri Sep 10 2010 Petr Machata <pmachata at redhat.com> - 2.2.2-29
 - Tell GCC not to recognize builtins when compiling efence.c.
 - Resolves: #631316