diff --git a/packages/fcgi/build.sh b/packages/fcgi/build.sh index 9ba28dc61..c07d3d2af 100644 --- a/packages/fcgi/build.sh +++ b/packages/fcgi/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://www.fastcgi.com/ TERMUX_PKG_DESCRIPTION="A language independent, high performant extension to CGI" TERMUX_PKG_LICENSE="custom" TERMUX_PKG_LICENSE_FILE="LICENSE.TERMS" -TERMUX_PKG_VERSION=2.4.0 -TERMUX_PKG_REVISION=1 -TERMUX_PKG_SRCURL=https://sources.archlinux.org/other/packages/fcgi/fcgi-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9 +TERMUX_PKG_VERSION=2.4.2 +TERMUX_PKG_SRCURL=https://github.com/FastCGI-Archives/fcgi2/archive/${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc TERMUX_PKG_BREAKS="fcgi-dev" TERMUX_PKG_REPLACES="fcgi-dev" diff --git a/packages/fcgi/fcgi-2.4.0-Makefile.am-CPPFLAGS.patch b/packages/fcgi/fcgi-2.4.0-Makefile.am-CPPFLAGS.patch deleted file mode 100644 index 7dfe0f98f..000000000 --- a/packages/fcgi/fcgi-2.4.0-Makefile.am-CPPFLAGS.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru fcgi-2.4.0-orig/cgi-fcgi/Makefile.am fcgi-2.4.0/cgi-fcgi/Makefile.am ---- fcgi-2.4.0-orig/cgi-fcgi/Makefile.am 2007-03-05 18:09:31.000000000 +0100 -+++ fcgi-2.4.0/cgi-fcgi/Makefile.am 2007-03-05 19:38:14.000000000 +0100 -@@ -2,7 +2,7 @@ - bin_PROGRAMS = cgi-fcgi - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -diff -ru fcgi-2.4.0-orig/examples/Makefile.am fcgi-2.4.0/examples/Makefile.am ---- fcgi-2.4.0-orig/examples/Makefile.am 2007-03-05 18:09:31.000000000 +0100 -+++ fcgi-2.4.0/examples/Makefile.am 2007-03-05 19:38:34.000000000 +0100 -@@ -11,7 +11,7 @@ - EXTRA_PROGRAMS = threaded echo-cpp - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -diff -ru fcgi-2.4.0-orig/libfcgi/Makefile.am fcgi-2.4.0/libfcgi/Makefile.am ---- fcgi-2.4.0-orig/libfcgi/Makefile.am 2007-03-05 18:09:31.000000000 +0100 -+++ fcgi-2.4.0/libfcgi/Makefile.am 2007-03-05 19:38:03.000000000 +0100 -@@ -1,7 +1,7 @@ - # $Id: fcgi-2.4.0-Makefile.am-CPPFLAGS.patch,v 1.1 2007/06/28 23:15:26 till Exp $ - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ diff --git a/packages/fcgi/fcgi-2.4.0-configure.in.patch b/packages/fcgi/fcgi-2.4.0-configure.in.patch deleted file mode 100644 index 34cab2c7d..000000000 --- a/packages/fcgi/fcgi-2.4.0-configure.in.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru fcgi-2.4.0-orig/configure.in fcgi-2.4.0/configure.in ---- fcgi-2.4.0-orig/configure.in 2003-01-19 18:19:41.000000000 +0100 -+++ fcgi-2.4.0/configure.in 2007-03-05 20:48:14.000000000 +0100 -@@ -4,11 +4,13 @@ - dnl generate the file "configure", which is run during the build - dnl to configure the system for the local environment. - --AC_INIT --AM_INIT_AUTOMAKE(fcgi, 2.4.0) -+AC_INIT(fcgi, 2.4.0) -+AM_INIT_AUTOMAKE(1.9 foreign) - - AM_CONFIG_HEADER(fcgi_config.h) - -+AM_MAINTAINER_MODE -+ - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL diff --git a/packages/fcgi/fcgi-2.4.0-gcc44_fixes.patch b/packages/fcgi/fcgi-2.4.0-gcc44_fixes.patch deleted file mode 100644 index 6c5cfe2f9..000000000 --- a/packages/fcgi/fcgi-2.4.0-gcc44_fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up fcgi-2.4.0/libfcgi/fcgio.cpp.gcc44_fixes fcgi-2.4.0/libfcgi/fcgio.cpp ---- fcgi-2.4.0/libfcgi/fcgio.cpp.gcc44_fixes 2002-02-24 21:12:22.000000000 +0100 -+++ fcgi-2.4.0/libfcgi/fcgio.cpp 2009-02-15 11:35:18.000000000 +0100 -@@ -23,6 +23,7 @@ - #endif - - #include -+#include - #include "fcgio.h" - - using std::streambuf; diff --git a/packages/fcgi/fcgi-2.4.0-poll.patch b/packages/fcgi/fcgi-2.4.0-poll.patch deleted file mode 100644 index d4bc2400e..000000000 --- a/packages/fcgi/fcgi-2.4.0-poll.patch +++ /dev/null @@ -1,86 +0,0 @@ -Author: Anton Kortunov -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417 -Description: use poll in os_unix.c instead of select to avoid problem with > 1024 connections -Forwarded: yes, fastcgi-developers@mailman.fastcgi.com - -diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c -index 73e6a7f..af35aee 100755 ---- a/libfcgi/os_unix.c -+++ b/libfcgi/os_unix.c -@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp - #include - #include - #include -+#include - - #ifdef HAVE_NETDB_H - #include -@@ -103,6 +104,9 @@ static int volatile maxFd = -1; - static int shutdownPending = FALSE; - static int shutdownNow = FALSE; - -+static int libfcgiOsClosePollTimeout = 2000; -+static int libfcgiIsAfUnixKeeperPollTimeout = 2000; -+ - void OS_ShutdownPending() - { - shutdownPending = TRUE; -@@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3]) - 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; -@@ -755,19 +769,16 @@ int OS_Close(int fd) - - 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); - } -@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error) - */ - 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); - } - - /* diff --git a/packages/fcgi/fix-libs.patch b/packages/fcgi/fix-libs.patch deleted file mode 100644 index 780d21053..000000000 --- a/packages/fcgi/fix-libs.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -uNr fcgi-2.4.0/examples/Makefile.am fcgi-2.4.0.mod/examples/Makefile.am ---- fcgi-2.4.0/examples/Makefile.am 2001-12-22 05:16:21.000000000 +0200 -+++ fcgi-2.4.0.mod/examples/Makefile.am 2019-07-04 16:40:24.533575048 +0300 -@@ -34,5 +34,5 @@ - threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - - echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp --echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la -+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la - -diff -uNr fcgi-2.4.0/examples/Makefile.in fcgi-2.4.0.mod/examples/Makefile.in ---- fcgi-2.4.0/examples/Makefile.in 2003-01-19 19:21:17.000000000 +0200 -+++ fcgi-2.4.0.mod/examples/Makefile.in 2019-07-04 16:41:22.990620386 +0300 -@@ -147,7 +147,7 @@ - echo_LDFLAGS = - am_echo_cpp_OBJECTS = echo-cpp.$(OBJEXT) - echo_cpp_OBJECTS = $(am_echo_cpp_OBJECTS) --echo_cpp_DEPENDENCIES = $(LIBDIR)/libfcgi++.la -+echo_cpp_DEPENDENCIES = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la - echo_cpp_LDFLAGS = - am_echo_x_OBJECTS = echo-x.$(OBJEXT) - echo_x_OBJECTS = $(am_echo_x_OBJECTS)