diff --git a/apr-1.2.2-locktimeout.patch b/apr-1.2.2-locktimeout.patch new file mode 100644 index 0000000..73f3994 --- /dev/null +++ b/apr-1.2.2-locktimeout.patch @@ -0,0 +1,11 @@ +--- apr-1.2.2/test/testlock.c.locktimeout ++++ apr-1.2.2/test/testlock.c +@@ -295,7 +295,7 @@ + continue; + } + ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(s)); +- ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 100000); ++ ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 500000); + break; + } + ABTS_ASSERT(tc, "Too many retries", i < MAX_RETRY); diff --git a/apr.spec b/apr.spec index 1fdc6d2..bda500e 100644 --- a/apr.spec +++ b/apr.spec @@ -13,6 +13,7 @@ Patch2: apr-0.9.6-procexit.patch Patch3: apr-0.9.7-deepbind.patch Patch4: apr-1.2.2-chdirwarn.patch Patch5: apr-1.2.2-reuseaddr.patch +Patch6: apr-1.2.2-locktimeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildPrereq: autoconf, libtool, doxygen Conflicts: subversion < 0.20.1-2 @@ -43,6 +44,7 @@ C data structures and routines. %patch3 -p1 -b .deepbind %patch4 -p1 -b .chdirwarn %patch5 -p1 -b .reuseaddr +%patch6 -p1 -b .locktimeout %build # regenerate configure script etc.