From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch | 24 ++++++ .../fcgi/files/fcgi-2.4.0-clientdata-pointer.patch | 96 ++++++++++++++++++++++ dev-libs/fcgi/files/fcgi-2.4.0-html-updates.patch | 65 +++++++++++++++ .../files/fcgi-2.4.1_pre0311112127-gcc44.patch | 10 +++ .../fcgi/files/fcgi-2.4.1_pre0910052249-link.patch | 21 +++++ .../fcgi/files/fcgi-2.4.1_pre0910052249-poll.patch | 80 ++++++++++++++++++ 6 files changed, 296 insertions(+) create mode 100644 dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch create mode 100644 dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch create mode 100644 dev-libs/fcgi/files/fcgi-2.4.0-html-updates.patch create mode 100644 dev-libs/fcgi/files/fcgi-2.4.1_pre0311112127-gcc44.patch create mode 100644 dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-link.patch create mode 100644 dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-poll.patch (limited to 'dev-libs/fcgi/files') diff --git a/dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch b/dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch new file mode 100644 index 000000000000..dad4cd6e02dd --- /dev/null +++ b/dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch @@ -0,0 +1,24 @@ +Index: fcgi-2.4.0/cgi-fcgi/Makefile.am +=================================================================== +--- fcgi-2.4.0.orig/cgi-fcgi/Makefile.am ++++ fcgi-2.4.0/cgi-fcgi/Makefile.am +@@ -11,5 +11,5 @@ INCLUDE_FILES = $(INCLUDEDIR)/fastcgi. + LIBDIR = ../libfcgi + LIBFCGI = $(LIBDIR)/libfcgi.la + +-LDADD = $(LIBFCGI) ++LDADD = $(LIBFCGI) -lm + cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c +Index: fcgi-2.4.0/examples/Makefile.am +=================================================================== +--- fcgi-2.4.0.orig/examples/Makefile.am ++++ fcgi-2.4.0/examples/Makefile.am +@@ -21,7 +21,7 @@ INCLUDE_FILES = $(INCLUDEDIR)/fastcgi. + LIBDIR = ../libfcgi + LIBFCGI = $(LIBDIR)/libfcgi.la + +-LDADD = $(LIBFCGI) ++LDADD = $(LIBFCGI) -lm + + echo_SOURCES = $(INCLUDE_FILES) echo.c + echo_x_SOURCES = $(INCLUDE_FILES) echo-x.c diff --git a/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch b/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch new file mode 100644 index 000000000000..ba4793765d5e --- /dev/null +++ b/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch @@ -0,0 +1,96 @@ +Index: fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c +=================================================================== +--- fcgi-2.4.0.orig/cgi-fcgi/cgi-fcgi.c ++++ fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c +@@ -21,6 +21,7 @@ static const char rcsid[] = "$Id: cgi-fc + #include + #include + #include ++#include + + #include "fcgi_config.h" + +@@ -145,7 +146,7 @@ static FCGI_BeginRequestBody MakeBeginRe + + + static int bytesToRead; /* number of bytes to read from Web Server */ +-static int appServerSock = -1; /* Socket connected to FastCGI application, ++static size_t appServerSock = -1; /* Socket connected to FastCGI application, + * used by AppServerReadHandler and + * AppServerWriteHandler. */ + static Buffer fromAS; /* Bytes read from the FCGI application server. */ +@@ -640,7 +641,7 @@ static int ParseArgs(int argc, char *arg + } + if((av[ac] = (char *)malloc(strlen(tp1)+1)) == NULL) { + fprintf(stderr, "Cannot allocate %d bytes\n", +- strlen(tp1)+1); ++ (int)strlen(tp1)+1); + exit(-1); + } + strcpy(av[ac++], tp1); +Index: fcgi-2.4.0/examples/threaded.c +=================================================================== +--- fcgi-2.4.0.orig/examples/threaded.c ++++ fcgi-2.4.0/examples/threaded.c +@@ -24,7 +24,7 @@ static int counts[THREAD_COUNT]; + + static void *doit(void *a) + { +- int rc, i, thread_id = (int)a; ++ size_t rc, i, thread_id = (size_t)a; + pid_t pid = getpid(); + FCGX_Request request; + char *server_name; +@@ -53,7 +53,7 @@ static void *doit(void *a) + "

FastCGI Hello! (multi-threaded C, fcgiapp library)

" + "Thread %d, Process %ld

" + "Request counts for %d threads running on host %s

", +- thread_id, pid, THREAD_COUNT, server_name ? server_name : "?"); ++ (int)thread_id, pid, THREAD_COUNT, server_name ? server_name : "?"); + + sleep(2); + +@@ -71,7 +71,7 @@ static void *doit(void *a) + + int main(void) + { +- int i; ++ size_t i; + pthread_t id[THREAD_COUNT]; + + FCGX_Init(); +Index: fcgi-2.4.0/include/fcgios.h +=================================================================== +--- fcgi-2.4.0.orig/include/fcgios.h ++++ fcgi-2.4.0/include/fcgios.h +@@ -93,7 +93,7 @@ extern "C" { + # if defined(__STDC__) || defined(__cplusplus) + typedef void *ClientData; + # else +- typedef int *ClientData; ++ typedef size_t *ClientData; + # endif /* __STDC__ */ + #define _CLIENTDATA + #endif +Index: fcgi-2.4.0/libfcgi/os_unix.c +=================================================================== +--- fcgi-2.4.0.orig/libfcgi/os_unix.c ++++ fcgi-2.4.0/libfcgi/os_unix.c +@@ -1155,7 +1155,7 @@ int OS_Accept(int listen_sock, int fail_ + + for (;;) { + do { +-#ifdef HAVE_SOCKLEN ++#ifdef HAVE_SYS_SOCKET_H + socklen_t len = sizeof(sa); + #else + int len = sizeof(sa); +@@ -1255,7 +1255,7 @@ int OS_IsFcgi(int sock) + struct sockaddr_in in; + struct sockaddr_un un; + } sa; +-#ifdef HAVE_SOCKLEN ++#ifdef HAVE_SYS_SOCKET_H + socklen_t len = sizeof(sa); + #else + int len = sizeof(sa); diff --git a/dev-libs/fcgi/files/fcgi-2.4.0-html-updates.patch b/dev-libs/fcgi/files/fcgi-2.4.0-html-updates.patch new file mode 100644 index 000000000000..ca10a6a6039b --- /dev/null +++ b/dev-libs/fcgi/files/fcgi-2.4.0-html-updates.patch @@ -0,0 +1,65 @@ +Index: fcgi-2.4.0/doc/fcgi-devel-kit.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-devel-kit.htm ++++ fcgi-2.4.0/doc/fcgi-devel-kit.htm +@@ -19,7 +19,7 @@ + + +

+- [[FastCGI]]
++ [[FastCGI]]
+

+

+ FastCGI Developer's Kit +Index: fcgi-2.4.0/doc/fcgi-java.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-java.htm ++++ fcgi-2.4.0/doc/fcgi-java.htm +@@ -20,7 +20,7 @@ + + +
+- [[FastCGI]] ++ [[FastCGI]] +
+
+
+Index: fcgi-2.4.0/doc/fcgi-perf.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-perf.htm ++++ fcgi-2.4.0/doc/fcgi-perf.htm +@@ -19,7 +19,7 @@ + + +
+- [[FastCGI]] ++ [[FastCGI]] +
+
+
+Index: fcgi-2.4.0/doc/fcgi-perl.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-perl.htm ++++ fcgi-2.4.0/doc/fcgi-perl.htm +@@ -19,7 +19,7 @@ + + +
+- [[FastCGI]] ++ [[FastCGI]] +
+
+ +Index: fcgi-2.4.0/doc/fcgi-tcl.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-tcl.htm ++++ fcgi-2.4.0/doc/fcgi-tcl.htm +@@ -19,7 +19,7 @@ + + +
+- [[FastCGI]] ++ [[FastCGI]] +
+
+
diff --git a/dev-libs/fcgi/files/fcgi-2.4.1_pre0311112127-gcc44.patch b/dev-libs/fcgi/files/fcgi-2.4.1_pre0311112127-gcc44.patch new file mode 100644 index 000000000000..a0b59f766a89 --- /dev/null +++ b/dev-libs/fcgi/files/fcgi-2.4.1_pre0311112127-gcc44.patch @@ -0,0 +1,10 @@ +--- fcgi-2.4.1-SNAP-0311112127-orig/include/fcgio.h ++++ fcgi-2.4.1-SNAP-0311112127/include/fcgio.h +@@ -31,6 +31,7 @@ + #define FCGIO_H + + #include ++#include + + #include "fcgiapp.h" + diff --git a/dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-link.patch b/dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-link.patch new file mode 100644 index 000000000000..e53c7e9d550b --- /dev/null +++ b/dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-link.patch @@ -0,0 +1,21 @@ +Index: fcgi-2.4.1-SNAP-0910052249/libfcgi/Makefile.am +=================================================================== +--- fcgi-2.4.1-SNAP-0910052249.orig/libfcgi/Makefile.am ++++ fcgi-2.4.1-SNAP-0910052249/libfcgi/Makefile.am +@@ -9,8 +9,7 @@ INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h + $(INCLUDEDIR)/fcgi_stdio.h \ + $(INCLUDEDIR)/fcgios.h + +-lib_LTLIBRARIES = libfcgi.la @LIBFCGIXX@ +-EXTRA_LTLIBRARIES = libfcgi++.la ++lib_LTLIBRARIES = libfcgi.la libfcgi++.la + + libfcgi_la_SOURCES = $(INCLUDE_FILES) \ + fcgiapp.c \ +@@ -23,5 +22,5 @@ libfcgi___la_SOURCES = $(INCLUDE_FILES) + $(INCLUDEDIR)/fcgio.h \ + fcgio.cpp + libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ +-libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ ++libfcgi___la_LIBADD = libfcgi.la + diff --git a/dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-poll.patch b/dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-poll.patch new file mode 100644 index 000000000000..82b9f15a846c --- /dev/null +++ b/dev-libs/fcgi/files/fcgi-2.4.1_pre0910052249-poll.patch @@ -0,0 +1,80 @@ +diff -uNr fcgi-2.4.1-SNAP-0910052249.orig/libfcgi/os_unix.c fcgi-2.4.1-SNAP-0910052249/libfcgi/os_unix.c +--- fcgi-2.4.1-SNAP-0910052249.orig/libfcgi/os_unix.c 2015-02-06 21:49:40.677082591 -0200 ++++ fcgi-2.4.1-SNAP-0910052249/libfcgi/os_unix.c 2015-02-06 21:54:23.147097903 -0200 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_NETDB_H + #include +@@ -103,6 +104,9 @@ + static int shutdownPending = FALSE; + static int shutdownNow = FALSE; + ++static int libfcgiOsClosePollTimeout = 2000; ++static int libfcgiIsAfUnixKeeperPollTimeout = 2000; ++ + void OS_ShutdownPending() + { + shutdownPending = TRUE; +@@ -169,6 +173,16 @@ + if(libInitialized) + return 0; + ++ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" ); ++ if(libfcgiOsClosePollTimeoutStr) { ++ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr); ++ } ++ ++ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" ); ++ if(libfcgiIsAfUnixKeeperPollTimeoutStr) { ++ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr); ++ } ++ + asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo)); + if(asyncIoTable == NULL) { + errno = ENOMEM; +@@ -780,19 +794,16 @@ + { + if (shutdown(fd, 1) == 0) + { +- struct timeval tv; +- fd_set rfds; ++ struct pollfd pfd; + int rv; + char trash[1024]; + +- FD_ZERO(&rfds); ++ pfd.fd = fd; ++ pfd.events = POLLIN; + + do + { +- FD_SET(fd, &rfds); +- tv.tv_sec = 2; +- tv.tv_usec = 0; +- rv = select(fd + 1, &rfds, NULL, NULL, &tv); ++ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout); + } + while (rv > 0 && read(fd, trash, sizeof(trash)) > 0); + } +@@ -1142,13 +1153,11 @@ + */ + static int is_af_unix_keeper(const int fd) + { +- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL }; +- fd_set read_fds; +- +- FD_ZERO(&read_fds); +- FD_SET(fd, &read_fds); ++ struct pollfd pfd; ++ pfd.fd = fd; ++ pfd.events = POLLIN; + +- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds); ++ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN); + } + + /* -- cgit v1.2.3