[apr] 02/04: adjust for 1.5.0
Stefan Fritsch
sf at moszumanska.debian.org
Wed Nov 20 22:13:21 UTC 2013
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apr.
commit 674a086d4d8e79e3b059642640e29e05ba3382c7
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Sat Nov 16 18:36:20 2013 +0100
adjust for 1.5.0
Remove patches included upstream:
* configure-O_NONBLOCK
* configure-accept4-hurd
---
debian/changelog | 6 ++
debian/patches/configure-O_NONBLOCK | 36 ----------
debian/patches/configure-accept4-hurd | 118 ---------------------------------
debian/patches/series | 2 -
4 files changed, 6 insertions(+), 156 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 60bcc79..e6e75af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apr (1.5.0-1) UNRELEASED; urgency=low
+
+ * New upstream version
+
+ -- Stefan Fritsch <sf at debian.org> Sat, 16 Nov 2013 18:31:00 +0100
+
apr (1.4.8-2) unstable; urgency=low
* Merge some changes from Ubuntu's 1.4.8-1ubuntu1:
diff --git a/debian/patches/configure-O_NONBLOCK b/debian/patches/configure-O_NONBLOCK
deleted file mode 100644
index 46f6162..0000000
--- a/debian/patches/configure-O_NONBLOCK
+++ /dev/null
@@ -1,36 +0,0 @@
-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/configure-accept4-hurd b/debian/patches/configure-accept4-hurd
deleted file mode 100644
index 9cf45dd..0000000
--- a/debian/patches/configure-accept4-hurd
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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
-# http://svn.apache.org/viewvc?view=revision&revision=r1539389
-Index: apr/configure.in
-===================================================================
---- apr.orig/configure.in
-+++ apr/configure.in
-@@ -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))
-- ;
-+ flags = fcntl(fd, F_GETFL);
-+ if (flags == -1 || fcntl(fd, F_SETFL, flags|O_NONBLOCK) == -1)
-+ return 5;
-+
-+ 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 dfdeef9..a1ac0d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,4 @@ hurd_path_max.patch
fix_doxygen.patch
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
More information about the Pkg-apache-commits
mailing list