- up to 1.3.7

Changed files:
    apr-disable-features.patch -> 1.3
    apr.spec -> 1.88

diff --git a/apr-disable-features.patch b/apr-disable-features.patch
index 2b04863e4a9bb6bebb46e91472d1d8e7a044fae7..f2d3db7cf4215e91199eb3cc65a941236ec32991 100644 (file)
--- a/apr-disable-features.patch
+++ b/apr-disable-features.patch
@@ -1,16 +1,43 @@
-diff -urN apr-1.3.6.org/configure.in apr-1.3.6/configure.in
---- apr-1.3.6.org/configure.in 2009-07-01 23:43:47.000000000 +0200
-+++ apr-1.3.6/configure.in     2009-07-25 22:49:20.170550136 +0200
-@@ -779,7 +779,7 @@
- fi
- 
- dnl ----------------------------- Checking for extended file descriptor handling
--AC_CHECK_FUNCS(dup3 accept4 epoll_create1)
-+dnl AC_CHECK_FUNCS(dup3 accept4 epoll_create1)
- 
- AC_CACHE_CHECK([for SOCK_CLOEXEC support], [apr_cv_sock_cloexec],
- [AC_TRY_RUN([
-@@ -788,7 +788,7 @@
+diff -urN apr-1.3.7.org/configure.in apr-1.3.7/configure.in
+--- apr-1.3.7.org/configure.in 2009-07-18 01:14:25.000000000 +0200
++++ apr-1.3.7/configure.in     2009-07-25 23:22:56.127016008 +0200
+@@ -787,7 +787,7 @@
+ 
+ int main()
+ {
+-    return epoll_create1(0) == -1;
++    return 1;
+ }], [apr_cv_epoll_create1=yes], [apr_cv_epoll_create1=no], [apr_cv_epoll_create1=no])])
+ 
+ if test "$apr_cv_epoll_create1" = "yes"; then
+@@ -801,7 +801,7 @@
+ 
+ int main()
+ {
+-    return dup3(STDOUT_FILENO, STDERR_FILENO, 0) == -1;
++    return 1;
+ }], [apr_cv_dup3=yes], [apr_cv_dup3=no], [apr_cv_dup3=no])])
+ 
+ if test "$apr_cv_dup3" = "yes"; then
+@@ -854,7 +854,7 @@
+             close(fd);
+             waitpid(pid, &status, 0);
+             unlink(A4_SOCK);
+-            return 0;
++            return 1;
+         }
+ 
+ cleanup_failure:
+@@ -878,7 +878,7 @@
+             ;
+ 
+         close(fd);
+-        return 0;
++        return 1;
+     }
+ }], [apr_cv_accept4=yes], [apr_cv_accept4=no], [apr_cv_accept4=no])])
+ 
+@@ -893,7 +893,7 @@
  
  int main()
  {

diff --git a/apr.spec b/apr.spec
index fd86bf4ccb6410c1c457766720639b461fc5db2b..dd748e0cfc036c5ffc88513296657c8c2b36eced 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -5,13 +5,13 @@
 Summary:       Apache Portable Runtime
 Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
-Version:       1.3.6
-Release:       2
+Version:       1.3.7
+Release:       1
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: 1893d54f8ef3981c33ad2ad5fdee1f8a
+# Source0-md5: 1414f695a236a2bf8e470ca624d6a2e8
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-libtool.patch
 # disable some things that require recent kernel