[SCM] Debian packaging for apr branch, master, updated. 80f3166ef1c6f4b53d41b1b1c831d2f8ae271057

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 80f3166ef1c6f4b53d41b1b1c831d2f8ae271057
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Jul 14 23:27:01 2013 +0200

    Cherry-pick fix for O_NONBLOCK configure check

diff --git a/debian/changelog b/debian/changelog
index 67a7b86..7b2dc93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ apr (1.4.8-2) UNRELEASED; urgency=low
     - Fix the confusion between HOST and BUILD variables in rules.
     - Add a set of autoconf preseeds that are only used when cross-building.
   * Change cross-building preseeds to only apply on linux.
+  * Cherry-pick fix for O_NONBLOCK configure check from upstream 1.4.x
+    branch.
 
- -- Stefan Fritsch <sf at debian.org>  Sun, 14 Jul 2013 23:15:36 +0200
+ -- Stefan Fritsch <sf at debian.org>  Sun, 14 Jul 2013 23:25:55 +0200
 
 apr (1.4.8-1) unstable; urgency=low
 
diff --git a/debian/patches/configure-O_NONBLOCK b/debian/patches/configure-O_NONBLOCK
new file mode 100644
index 0000000..46f6162
--- /dev/null
+++ b/debian/patches/configure-O_NONBLOCK
@@ -0,0 +1,36 @@
+commit 7e5dff8f2e1d38e5a93b18eda854356f194fcff8 (origin/1.4.x)
+Author: Rainer Jung <rjung at apache.org>
+Date:   Sat Jul 13 15:54:54 2013 +0000
+
+    Fix broken test for O_NONBLOCK inheritance.
+    
+    Followup to r1449570 resp. r1449569 (1.5.x)
+    resp. r1449568 (trunk) which miss the variable
+    declaration.
+    
+    Backport of r1502804 from trunk resp. r1502805
+    (1.5.x).
+    
+Index: apr/build/apr_network.m4
+===================================================================
+--- apr.orig/build/apr_network.m4
++++ apr/build/apr_network.m4
+@@ -570,6 +570,9 @@
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+@@ -590,6 +593,8 @@
+     int listen_port, rc;
+     struct sockaddr_in sa;
+     socklen_t sa_len;
++    fd_set fds;
++    struct timeval tv;
+ 
+     listen_s = socket(AF_INET, SOCK_STREAM, 0);
+     if (listen_s < 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 4d208bf..8143552 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ hurd_path_max.patch
 fix_doxygen.patch
 omit_extra_libs.patch
 hurd_shm_flock.patch
+configure-O_NONBLOCK

-- 
Debian packaging for apr