[ElectricFence] Fix hiding of default declaration of sys_nerr, sys_errlist

[Petr Machata]

commit f2b432cb7845b56f60ba1cef3cf3cdae3e95910a
Author: Petr Machata <pmachata at redhat.com>
Date:   Tue Jun 17 23:54:09 2014 +0200

    Fix hiding of default declaration of sys_nerr, sys_errlist

 ElectricFence-2.2.2-sys_errlist.patch |   15 +++++++++++++++
 ElectricFence.spec                    |   11 ++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/ElectricFence-2.2.2-sys_errlist.patch b/ElectricFence-2.2.2-sys_errlist.patch
new file mode 100644
index 0000000..0ea62c6
--- /dev/null
+++ b/ElectricFence-2.2.2-sys_errlist.patch
@@ -0,0 +1,15 @@
+diff -up ElectricFence-2.2.2/page.c\~ ElectricFence-2.2.2/page.c
+--- ElectricFence-2.2.2/page.c~	2012-04-27 16:20:04.316398124 +0200
++++ ElectricFence-2.2.2/page.c	2014-06-17 23:51:11.906847835 +0200
+@@ -29,7 +29,8 @@
+ 
+ static caddr_t	startAddr = (caddr_t) 0;
+ 
+-#if ( !defined(sgi) && !defined(_AIX) &&!defined(__USE_BSD))
++#if (!defined(sgi) && !defined(_AIX) \
++     && !defined(__USE_BSD) && !defined(__USE_MISC))
+ extern int	sys_nerr;
+ extern char *	sys_errlist[];
+ #endif
+
+Diff finished.  Tue Jun 17 23:51:40 2014
diff --git a/ElectricFence.spec b/ElectricFence.spec
index 2b3a78a..95d0adb 100644
--- a/ElectricFence.spec
+++ b/ElectricFence.spec
@@ -16,7 +16,7 @@
 Summary: A debugger which detects memory allocation violations
 Name: ElectricFence
 Version: 2.2.2
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://perens.com/FreeSoftware/ElectricFence/
@@ -39,6 +39,10 @@ Patch9: ElectricFence-2.2.2-sse.patch
 Patch10: ElectricFence-2.2.2-posix_memalign.patch
 Patch11: ElectricFence-2.2.2-malloc_usable_size.patch
 Patch12: ElectricFence-2.2.2-man-ef.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1105913
+Patch13: ElectricFence-2.2.2-sys_errlist.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -67,6 +71,7 @@ violations.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 make CFLAGS='${RPM_OPT_FLAGS} -DUSE_SEMAPHORE -fpic'
@@ -99,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue Jun 17 2014 Petr Machata <pmachata at redhat.com> - 2.2.2-40
+- Fix hiding of default declaration of sys_nerr, sys_errlist
+  (ElectricFence-2.2.2-sys_errlist.patch)
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild