From d194fe97242dede5dd7b1963a677797d913e75c3 Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 21 May 2018 22:44:31 +0200 Subject: fcgi: Update to 2.4.1+ Update to latest from upstream. This adds pkg-config support. Fix_EOF_not_declared_issue.patch is obsolete, fix is upstream. Signed-off-by: Adrian Freihofer Signed-off-by: Khem Raj --- .../fcgi/fcgi/Fix_EOF_not_declared_issue.patch | 17 ----------------- .../fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch | 4 ++-- meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb | 15 --------------- meta-webserver/recipes-support/fcgi/fcgi_git.bb | 17 +++++++++++++++++ 4 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch delete mode 100644 meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb create mode 100644 meta-webserver/recipes-support/fcgi/fcgi_git.bb diff --git a/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch deleted file mode 100644 index 51ddeaac22..0000000000 --- a/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Fix EOF not declared issue, following is the error log. -fcgio.cpp:70:72: error: 'EOF' was not declared in this scope - if (FCGX_PutStr(pbase(), plen, this->fcgx) != plen) return EOF; - -Signed-off-by: Yang Haibo ---- fcgi-ori/libfcgi/fcgio.cpp 2014-07-28 18:01:00.000000000 +0800 -+++ fcgi-2.4.0/libfcgi/fcgio.cpp 2014-07-28 18:01:22.000000000 +0800 -@@ -22,6 +22,7 @@ - #define DLLAPI __declspec(dllexport) - #endif - -+#include - #include - #include "fcgio.h" - diff --git a/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch index eca694adc9..eec9dd7ce0 100644 --- a/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch +++ b/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch @@ -10,8 +10,8 @@ Signed-off-by: Yang Haibo 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(fcgi, 2.4.1-SNAP-0910052249) ++AC_INIT([fcgi], [2.4.1-SNAP-0910052249]) +AM_INIT_AUTOMAKE([foreign]) AM_CONFIG_HEADER(fcgi_config.h) diff --git a/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb deleted file mode 100644 index 48c594483a..0000000000 --- a/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs with a web server." -HOMEPAGE = "http://www.fastcgi.com" -LICENSE = "OML" -LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" - -SRC_URI = "http://fossies.org/linux/www/old/${BP}.tar.gz \ - file://Fix_EOF_not_declared_issue.patch \ - file://add_foreign_to_AM_INIT_AUTOMAKE.patch \ -" -SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e" -SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9" - -inherit autotools - -PARALLEL_MAKE = "" diff --git a/meta-webserver/recipes-support/fcgi/fcgi_git.bb b/meta-webserver/recipes-support/fcgi/fcgi_git.bb new file mode 100644 index 0000000000..a17e70f09e --- /dev/null +++ b/meta-webserver/recipes-support/fcgi/fcgi_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "FastCGI is a protocol for interfacing interactive programs with a web server." +HOMEPAGE = "http://www.fastcgi.com" +LICENSE = "OML" +LIC_FILES_CHKSUM = "file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a" + +SRCREV = "68100b5b8cb26f04b784778ed19ccef4fe389f57" +PV = "2.4.1+git${SRCPV}" + +SRC_URI = "git://github.com/FastCGI-Archives/fcgi2.git;protocol=https \ + file://add_foreign_to_AM_INIT_AUTOMAKE.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools + +PARALLEL_MAKE = "" -- cgit 1.2.3-korg