From a156afdffa7547a43e7c93c445e3b8cd30cf5d79 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 17 Oct 2022 03:35:37 +0100 Subject: www-apache/mod_fastcgi_handler: fix build w/ Clang 16 Closes: https://bugs.gentoo.org/875701 Signed-off-by: Sam James --- ...astcgi_handler-0.6-implicit-function-decl.patch | 30 ++++++++++++++++++++ .../mod_fastcgi_handler-0.6-r2.ebuild | 28 ------------------- .../mod_fastcgi_handler-0.6-r3.ebuild | 32 ++++++++++++++++++++++ 3 files changed, 62 insertions(+), 28 deletions(-) create mode 100644 www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch delete mode 100644 www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild create mode 100644 www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r3.ebuild (limited to 'www-apache') diff --git a/www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch b/www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch new file mode 100644 index 000000000000..602590fb3ed5 --- /dev/null +++ b/www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/875701 +--- a/fcgi_request.c ++++ b/fcgi_request.c +@@ -10,6 +10,7 @@ + + #include "fcgi_header.h" + #include "fcgi_request.h" ++#include "fcgi_server.h" + + #include "mod_fastcgi_handler.h" + +--- a/fcgi_server.c ++++ b/fcgi_server.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -424,6 +425,8 @@ int fcgi_server_parse_headers(fcgi_request_t *fr, uint16_t request_id, + */ + return HTTP_MOVED_TEMPORARILY; + } ++ ++ return ret; + } + + int fcgi_server_recv_stdout_stderr_record(fcgi_request_t *fr, diff --git a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild deleted file mode 100644 index fb9676278d0d..000000000000 --- a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit apache-module - -DESCRIPTION="A simple FastCGI handler module" -HOMEPAGE="https://github.com/hollow/mod_fastcgi_handler" -SRC_URI="https://github.com/hollow/mod_fastcgi_handler/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -APACHE2_MOD_CONF="20_${PN}" -APACHE2_MOD_DEFINE="FASTCGI_HANDLER" - -APXS2_ARGS="-o ${PN}.so -c *.c" - -need_apache2 - -pkg_setup() { - # bug #653606 - # but true cause seems to be bug #616612 - _init_apache2 - _init_apache2_late -} diff --git a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r3.ebuild b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r3.ebuild new file mode 100644 index 000000000000..2f1bc9162ce7 --- /dev/null +++ b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit apache-module + +DESCRIPTION="A simple FastCGI handler module" +HOMEPAGE="https://github.com/hollow/mod_fastcgi_handler" +SRC_URI="https://github.com/hollow/mod_fastcgi_handler/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +APACHE2_MOD_CONF="20_${PN}" +APACHE2_MOD_DEFINE="FASTCGI_HANDLER" + +APXS2_ARGS="-o ${PN}.so -c *.c" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6-implicit-function-decl.patch +) + +need_apache2 + +pkg_setup() { + # bug #653606 + # but true cause seems to be bug #616612 + _init_apache2 + _init_apache2_late +} -- cgit v1.2.3-65-gdbad