Accepting request 672770 from Apache

- increase timeout to fix random failure of testsuite + apr-test-sendfile-timeout.patch - fix build for SLE11 again - linux version is now checked correctly, drop - apr-1.4.5-linux3.patch (see change log from Sun Aug 7 01:21:44 UTC 2011) OBS-URL: https://build.opensuse.org/request/show/672770 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apr?expand=0&rev=10
2019-02-11 20:16:13 +00:00 · 2019-02-11 20:16:13 +00:00 · 8fd9679ae2
commit 8fd9679ae2
parent fe1b204bb9 082e632cf9
4 changed files with 38 additions and 89 deletions
--- a/apr-1.4.5-linux3.patch
+++ b/apr-1.4.5-linux3.patch
@ -1,85 +0,0 @@
-Index: configure.in
-===================================================================
--- configure.in.orig
-+++ configure.in
-@@ -181,7 +181,7 @@ dnl Do the various CC checks *before* pr
- dnl may need to use compiler characteristics to make decisions. This macro
- dnl can only be used once within a configure script, so this prevents a
- dnl preload section from invoking the macro to get compiler info.
-AC_PROG_CC
-+AC_PROG_CC_STDC
- 
- dnl AC_PROG_SED is only avaliable in recent autoconf versions.
- dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
-@@ -211,14 +211,7 @@ AC_CHECK_PROG(ASCPP, cpp, cpp)
- AC_CHECK_TOOL(AR, ar, ar)
- 
- dnl Various OS checks that apparently set required flags
-ifdef([AC_USE_SYSTEM_EXTENSIONS], [
- AC_USE_SYSTEM_EXTENSIONS
-], [
-AC_AIX
-AC_MINIX
-])
-
-AC_ISC_POSIX
- APR_EBCDIC
- 
- dnl this is our library name
-@@ -692,15 +685,7 @@ case $host in
-         fi
-         ;;
-     *linux*)
-        os_major=[`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'`]
-        os_minor=[`uname -r | sed -e 's/[1-9][0-9]*\.\([0-9]\+\)\..*/\1/'`]
-        if test $os_major -lt 2 -o \( $os_major -eq 2 -a $os_minor -lt 4 \); then
-            AC_MSG_WARN([Configured for pre-2.4 Linux $os_major.$os_minor])
-            os_pre24linux=1
-        else
-             os_pre24linux=0
-            AC_MSG_NOTICE([Configured for Linux $os_major.$os_minor])
-        fi
-         ;;
-     *os390)
-         os_version=`uname -r | sed -e 's/\.//g'`
-@@ -2148,6 +2133,8 @@ fi
- 
- AC_SUBST(have_proc_invoked)
- 
-+AC_C_VARARRAYS
-+
- AC_MSG_CHECKING(for Variable Length Arrays)
- APR_TRY_COMPILE_NO_WARNING([],
- [
-@@ -2314,6 +2301,9 @@ APR_IFALLYES(header:OS.h func:create_sem
- if test "x$apr_lock_method" != "x"; then
-     APR_DECISION_FORCE($apr_lock_method)
- fi
-+
-+APR_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [cross-process pthread mutexes])
-+
- APR_END_DECISION
- AC_DEFINE_UNQUOTED($ac_decision)
- 
-Index: poll/unix/poll.c
-===================================================================
--- poll/unix/poll.c.orig
-+++ poll/unix/poll.c
-@@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_poll(apr_p
-                                    apr_interval_time_t timeout)
- {
-     int i, num_to_poll;
-#ifdef HAVE_VLA
-+#ifdef HAVE_C_VARARRAYS
-     /* XXX: I trust that this is a segv when insufficient stack exists? */
-     struct pollfd pollset[num];
- #elif defined(HAVE_ALLOCA)
-@@ -129,7 +129,7 @@ APR_DECLARE(apr_status_t) apr_poll(apr_p
-         }
-     }
-     
-#if !defined(HAVE_VLA) && !defined(HAVE_ALLOCA)
-+#if !defined(HAVE_C_VARARRAYS) && !defined(HAVE_ALLOCA)
-     if (num > SMALL_POLLSET_LIMIT) {
-         free(pollset);
-     }
--- a/apr-test-sendfile-timeout.patch
+++ b/apr-test-sendfile-timeout.patch
@ -0,0 +1,13 @@
+Index: apr-1.6.5/test/sendfile.c
+===================================================================
+--- apr-1.6.5.orig/test/sendfile.c	2013-10-14 15:45:05.000000000 +0200
+++ apr-1.6.5/test/sendfile.c	2019-02-08 10:58:50.731588817 +0100
+@@ -463,7 +463,7 @@ static int client(apr_pool_t *p, client_
+     /* in case this is the non-blocking test, set socket timeout;
+      * we're just waiting for EOF */
+ 
+-    rv = apr_socket_timeout_set(sock, apr_time_from_sec(3));
+    rv = apr_socket_timeout_set(sock, apr_time_from_sec(10));
+     if (rv != APR_SUCCESS) {
+         aprerr("apr_socket_timeout_set()", rv);
+     }
--- a/apr.changes
+++ b/apr.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Feb  8 07:58:34 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
+
+- increase timeout to fix random failure of testsuite
+  + apr-test-sendfile-timeout.patch
+- fix build for SLE11 again
+
+-------------------------------------------------------------------
+Thu Feb  7 11:31:27 UTC 2019 - Petr Gajdos <pgajdos@suse.com>
+
+- linux version is now checked correctly, drop
+  - apr-1.4.5-linux3.patch
+    (see change log from Sun Aug  7 01:21:44 UTC 2011)
+
 -------------------------------------------------------------------
 Wed Jan 16 09:10:11 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

--- a/apr.spec
+++ b/apr.spec
@ -30,10 +30,11 @@ URL:            https://apr.apache.org/
 Source0:        https://www.apache.org/dist/apr/apr-%{version}.tar.bz2
 Source1:        https://www.apache.org/dist/apr/apr-%{version}.tar.bz2.asc
 Source2:        %{name}.keyring
-Patch4:         apr-1.4.5-linux3.patch
 Patch5:         apr-visibility.patch
 Patch6:         apr-use-getrandom.patch
 Patch9:         apr-proc-mutex-map-anon.patch
+# prevent random failures of the testsuite (sendfile test)
+Patch10:        apr-test-sendfile-timeout.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  libtool
@ -42,6 +43,7 @@ BuildRequires:  lksctp-tools-devel
 # for the testsuite
 BuildRequires:  netcfg
 BuildRequires:  pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
 APR is Apache's Portable Runtime Library, designed to be a support
@ -82,10 +84,10 @@ that want to make use of APR.

 %prep
 %setup -q
-%patch4
 %patch5 -p1
 %patch6 -p1
 %patch9 -p1
+%patch10 -p1

 # Do not put date to doxy content
 sed -i \
@ -94,7 +96,6 @@ sed -i \

 %build
 autoreconf -fiv
-export apr_lock_method=USE_PROC_PTHREAD_SERIALIZE
 %configure \
 	--enable-other-child \
 	--with-installbuilddir=%{installbuilddir} \
@ -110,7 +111,7 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -DREADDIR_IS_THREAD_SAFE -fvisibility=h
 make dox %{?_smp_mflags}

 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags}
 # Move docs to more convenient location
 mv docs/dox/html html
 # Unpackaged files:
@ -138,14 +139,20 @@ make check -j1
 %postun -n %{libname} -p /sbin/ldconfig

 %files -n %{libname}
+%defattr(-,root,root,-)
 %doc CHANGES
+%if 0%{?suse_version} > 1315
 %license LICENSE
+%else
+%doc LICENSE
+%endif
 %doc NOTICE
 %{_libdir}/libapr-%{aprver}.so.*
 # Do NOT move to devel as this is utilized by Tomcat
 %{_libdir}/libapr-%{aprver}.so

 %files devel
+%defattr(-,root,root,-)
 %doc docs/APRDesign.html
 %doc docs/canonical_filenames.html
 %doc docs/incomplete_types