summaryrefslogtreecommitdiff
path: root/www/fcgi
diff options
context:
space:
mode:
Diffstat (limited to 'www/fcgi')
-rw-r--r--www/fcgi/Makefile21
-rw-r--r--www/fcgi/distinfo5
-rw-r--r--www/fcgi/files/patch-CVE-2012-6687-pool79
-rw-r--r--www/fcgi/files/patch-examples__Makefile.in11
-rw-r--r--www/fcgi/files/patch-include__fcgio.h10
-rw-r--r--www/fcgi/pkg-plist12
6 files changed, 21 insertions, 117 deletions
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 684541a00489..1a5cb4a32715 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,35 +1,36 @@
PORTNAME= fcgi
-PORTVERSION= 2.4.0
-PORTREVISION= 6
+DISTVERSION= 2.4.6
CATEGORIES= www
-MASTER_SITES= LOCAL/adamw
PKGNAMESUFFIX= -devkit
MAINTAINER= john@essenz.com
COMMENT= FastCGI Development Kit
-WWW= http://www.fastcgi.com/
+WWW= https://fastcgi-archives.github.io/
LICENSE= Open_Market_FastCGI_license
LICENSE_NAME= Open Market FastCGI license
-LICENSE_FILE= ${WRKSRC}/LICENSE.TERMS
+LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= cpe libtool
+USES= autoreconf cpe libtool pathfix
CPE_VENDOR= fastcgi
+USE_GITHUB= yes
+GH_ACCOUNT= FastCGI-Archives
+GH_PROJECT= fcgi2
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= DOCS
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfcgi.so.0.0.0
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfcgi++.so.0.0.0
-
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/share/man/man3
+
+post-install-DOCS-on:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc && \
${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name *\.[13]")
diff --git a/www/fcgi/distinfo b/www/fcgi/distinfo
index 819fefe67f6f..f5be4d390608 100644
--- a/www/fcgi/distinfo
+++ b/www/fcgi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fcgi-2.4.0.tar.gz) = 66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9
-SIZE (fcgi-2.4.0.tar.gz) = 468682
+TIMESTAMP = 1746401419
+SHA256 (FastCGI-Archives-fcgi2-2.4.6_GH0.tar.gz) = 39af4fb21a6d695a5f0b1c4fa95776d2725f6bc6c77680943a2ab314acd505c1
+SIZE (FastCGI-Archives-fcgi2-2.4.6_GH0.tar.gz) = 263941
diff --git a/www/fcgi/files/patch-CVE-2012-6687-pool b/www/fcgi/files/patch-CVE-2012-6687-pool
deleted file mode 100644
index 381cb7f024ba..000000000000
--- a/www/fcgi/files/patch-CVE-2012-6687-pool
+++ /dev/null
@@ -1,79 +0,0 @@
---- libfcgi/os_unix.c.orig 2002-03-05 19:14:49 UTC
-+++ libfcgi/os_unix.c
-@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_uni
- #include <sys/time.h>
- #include <sys/un.h>
- #include <signal.h>
-+#include <poll.h>
-
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
-@@ -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 (c
- */
- 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/www/fcgi/files/patch-examples__Makefile.in b/www/fcgi/files/patch-examples__Makefile.in
deleted file mode 100644
index cbf55472784b..000000000000
--- a/www/fcgi/files/patch-examples__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig 2003-01-19 17:21:17 UTC
-+++ examples/Makefile.in
-@@ -125,7 +125,7 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@
- 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 $(LIBFCGI)
- subdir = examples
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/fcgi_config.h
diff --git a/www/fcgi/files/patch-include__fcgio.h b/www/fcgi/files/patch-include__fcgio.h
deleted file mode 100644
index c4588a940e85..000000000000
--- a/www/fcgi/files/patch-include__fcgio.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/fcgio.h.orig 2002-02-25 13:16:11 UTC
-+++ include/fcgio.h
-@@ -31,6 +31,7 @@
- #define FCGIO_H
-
- #include <iostream>
-+#include <cstdio>
-
- #include "fcgiapp.h"
-
diff --git a/www/fcgi/pkg-plist b/www/fcgi/pkg-plist
index 7f9e6d050af2..df41e4cfc7d1 100644
--- a/www/fcgi/pkg-plist
+++ b/www/fcgi/pkg-plist
@@ -14,11 +14,8 @@ lib/libfcgi.a
lib/libfcgi.so
lib/libfcgi.so.0
lib/libfcgi.so.0.0.0
-share/man/man1/cgi-fcgi.1.gz
-share/man/man3/FCGI_Accept.3.gz
-share/man/man3/FCGI_Finish.3.gz
-share/man/man3/FCGI_SetExitStatus.3.gz
-share/man/man3/FCGI_StartFilterData.3.gz
+libdata/pkgconfig/fcgi++.pc
+libdata/pkgconfig/fcgi.pc
%%PORTDOCS%%%%DOCSDIR%%/fastcgi-prog-guide/ap_guida.htm
%%PORTDOCS%%%%DOCSDIR%%/fastcgi-prog-guide/ap_guide.htm
%%PORTDOCS%%%%DOCSDIR%%/fastcgi-prog-guide/apaman.htm
@@ -43,3 +40,8 @@ share/man/man3/FCGI_StartFilterData.3.gz
%%PORTDOCS%%%%DOCSDIR%%/omi-logo.gif
%%PORTDOCS%%%%DOCSDIR%%/overview.html
%%PORTDOCS%%%%DOCSDIR%%/www5-api-workshop.html
+share/man/man1/cgi-fcgi.1.gz
+share/man/man3/FCGI_Accept.3.gz
+share/man/man3/FCGI_Finish.3.gz
+share/man/man3/FCGI_SetExitStatus.3.gz
+share/man/man3/FCGI_StartFilterData.3.gz
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-13 11:06:21 +0000