Fix tst-aiod2 and tst-aiod3 test failures (#970865)

This commit is contained in:
Siddhesh Poyarekar 2013-08-22 15:08:00 +05:30
parent 735547c10e
commit 25e270de7c
2 changed files with 27 additions and 0 deletions

24
glibc-rh970865.patch Normal file
View File

@ -0,0 +1,24 @@
diff -pruN glibc-2.18/rtkaio/tst-aiod2.c glibc-2.18.new/rtkaio/tst-aiod2.c
--- glibc-2.18/rtkaio/tst-aiod2.c 2013-08-22 14:53:31.326806349 +0530
+++ glibc-2.18.new/rtkaio/tst-aiod2.c 2013-08-22 14:53:05.474807462 +0530
@@ -25,7 +25,7 @@
#include <unistd.h>
#include <errno.h>
#include "tst-aiod.h"
-
+#include <pthread.h>
static pthread_barrier_t b;
diff -pruN glibc-2.18/rtkaio/tst-aiod3.c glibc-2.18.new/rtkaio/tst-aiod3.c
--- glibc-2.18/rtkaio/tst-aiod3.c 2013-08-22 14:53:31.326806349 +0530
+++ glibc-2.18.new/rtkaio/tst-aiod3.c 2013-08-22 14:53:12.796807147 +0530
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <errno.h>
#include "tst-aiod.h"
-
+#include <pthread.h>
static pthread_barrier_t b;

View File

@ -178,6 +178,7 @@ Patch0039: %{name}-c_stubs.patch
# Remove non-ELF support in rtkaio # Remove non-ELF support in rtkaio
Patch0040: %{name}-rh731833-rtkaio.patch Patch0040: %{name}-rh731833-rtkaio.patch
Patch0041: %{name}-rh731833-rtkaio-2.patch Patch0041: %{name}-rh731833-rtkaio-2.patch
Patch0042: %{name}-rh970865.patch
# #
# Patches from upstream # Patches from upstream
@ -532,6 +533,7 @@ package or when debugging this package.
%patch1001 -p1 %patch1001 -p1
%patch0040 -p1 %patch0040 -p1
%patch0041 -p1 %patch0041 -p1
%patch0042 -p1
############################################################################## ##############################################################################
# %%prep - Additional prep required... # %%prep - Additional prep required...
@ -1621,6 +1623,7 @@ rm -f *.filelist*
- Remove non-ELF support in rtkaio. - Remove non-ELF support in rtkaio.
- Avoid inlining of cleanup function for kaio_suspend. - Avoid inlining of cleanup function for kaio_suspend.
- Expand sizes of some types in strcoll (#855399, CVE-2012-4424). - Expand sizes of some types in strcoll (#855399, CVE-2012-4424).
- Fix tst-aiod2 and tst-aiod3 test failures (#970865).
* Mon Aug 19 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.18-2 * Mon Aug 19 2013 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.18-2
- Fix buffer overflow in readdir_r (#995841, CVE-2013-4237). - Fix buffer overflow in readdir_r (#995841, CVE-2013-4237).