[apr] 01/01: Fix accept4() configure test to work on Hurd

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr.

commit 02995b51c2ef7e6c86167de34aaa19677798fdf4
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Wed Nov 6 17:04:47 2013 +0100

    Fix accept4() configure test to work on Hurd
---
 debian/changelog                      |    1 +
 debian/patches/configure-accept4-hurd |  117 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 119 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bc4e67c..5db7f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ apr (1.4.8-2) UNRELEASED; urgency=low
   * Enable sctp support on Linux.
   * Change apr_rules.mk to not force CFLAGS, etc. to the values used during
     apr's compilation.
+  * Fix accept4() configure test to work on Hurd. Closes: #715028
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 14 Jul 2013 23:25:55 +0200
 
diff --git a/debian/patches/configure-accept4-hurd b/debian/patches/configure-accept4-hurd
new file mode 100644
index 0000000..36398a9
--- /dev/null
+++ b/debian/patches/configure-accept4-hurd
@@ -0,0 +1,117 @@
+# Simplify and fix accept4() configure check to work on Hurd
+# 
+# http://svn.apache.org/viewvc?view=revision&revision=r832904
+# http://svn.apache.org/viewvc?view=revision&revision=r1539374
+Index: apr/configure.in
+===================================================================
+--- apr.orig/configure.in	2013-11-06 17:00:59.854003705 +0100
++++ apr/configure.in	2013-11-06 17:01:26.606002611 +0100
+@@ -872,78 +872,47 @@
+    AC_DEFINE([HAVE_DUP3], 1, [Define if dup3 function is supported])
+ fi
+ 
+-# test for accept4
++# Test for accept4().  Create a non-blocking socket, bind it to
++# an unspecified port & address (kernel picks), and attempt to
++# call accept4() on it.  If the syscall is wired up (i.e. the
++# kernel is new enough), it should return EAGAIN.
+ AC_CACHE_CHECK([for accept4 support], [apr_cv_accept4],
+ [AC_TRY_RUN([
+-#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-#include <sys/un.h>
+ #include <sys/wait.h>
+-#include <signal.h>
++#include <netinet/in.h>
++#include <netinet/tcp.h>
+ #include <errno.h>
++#include <string.h>
++#include <unistd.h>
++#include <fcntl.h>
+ 
+-#define A4_SOCK "./apr_accept4_test_socket"
+-
+-int main()
++int main(int argc, char **argv)
+ {
+-    pid_t pid;
+-    int fd;
+-    struct sockaddr_un loc, rem;
+-    socklen_t rem_sz;
+-
+-    if ((pid = fork())) {
+-        int status;
+-
+-        unlink(A4_SOCK);
+-
+-        if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+-            goto cleanup_failure2;
+-
+-        loc.sun_family = AF_UNIX;
+-        strncpy(loc.sun_path, A4_SOCK, sizeof(loc.sun_path) - 1);
+-
+-        if (bind(fd, (struct sockaddr *) &loc,
+-                 sizeof(struct sockaddr_un)) == -1)
+-            goto cleanup_failure;
+-
+-        if (listen(fd, 5) == -1)
+-            goto cleanup_failure;
+-
+-        rem_sz = sizeof(struct sockaddr_un);
+-        if (accept4(fd, (struct sockaddr *) &rem, &rem_sz, 0) == -1) {
+-            goto cleanup_failure;
+-        }
+-        else {
+-            close(fd);
+-            waitpid(pid, &status, 0);
+-            unlink(A4_SOCK);
+-            return 0;
+-        }
+-
+-cleanup_failure:
+-        close(fd);
+-cleanup_failure2:
+-        kill(pid, SIGKILL);
+-        waitpid(pid, &status, 0);
+-        unlink(A4_SOCK);
++    int fd, flags;
++    struct sockaddr_in sin;
++
++    if ((fd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+         return 1;
+-    }
+-    else {
+-        if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+-            return 1; /* this will be bad: we'll hang */
+-
+-        loc.sun_family = AF_UNIX;
+-        strncpy(loc.sun_path, A4_SOCK, sizeof(loc.sun_path) - 1);
+-
+-        while(connect(fd, (struct sockaddr *) &loc,
+-                      sizeof(struct sockaddr_un)) == -1 &&
+-              (errno==ENOENT || errno==ECONNREFUSED))
+-            ;
++    if (fcntl(fd, F_GETFL, &flags) == -1 ||
++        fcntl(fd, F_SETFL, flags|O_NONBLOCK) == -1)
++        return 1;
++
++    memset(&sin, 0, sizeof sin);
++    sin.sin_family = AF_INET;
++    
++    if (bind(fd, (struct sockaddr *) &sin, sizeof sin) == -1)
++        return 2;
++    
++    if (listen(fd, 5) == -1)
++        return 3;
+ 
+-        close(fd);
++    if (accept4(fd, NULL, 0, SOCK_NONBLOCK) == 0
++        || errno == EAGAIN || errno == EWOULDBLOCK)
+         return 0;
+-    }
++
++    return 4;
+ }], [apr_cv_accept4=yes], [apr_cv_accept4=no], [apr_cv_accept4=no])])
+ 
+ if test "$apr_cv_accept4" = "yes"; then
diff --git a/debian/patches/series b/debian/patches/series
index 46d4129..dfdeef9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ omit_extra_libs.patch
 hurd_shm_flock.patch
 configure-O_NONBLOCK
 dont_override_external_buildflags
+configure-accept4-hurd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git