aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian <adrian.freihofer@gmail.com>2018-05-21 22:44:31 +0200
committerKhem Raj <raj.khem@gmail.com>2018-05-26 21:10:55 -0700
commitd194fe97242dede5dd7b1963a677797d913e75c3 (patch)
treea88e89f4b479659c0b028213c94e6f533df7b24c
parent4e19b562b229ec8bde624a786792249b6270c2ea (diff)
downloadmeta-openembedded-contrib-d194fe97242dede5dd7b1963a677797d913e75c3.tar.gz
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 <adrian.freihofer@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch17
-rw-r--r--meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch4
-rw-r--r--meta-webserver/recipes-support/fcgi/fcgi_git.bb (renamed from meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb)10
3 files changed, 8 insertions, 23 deletions
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 <b40869@freescale.com>
---- 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 <stdio.h>
- #include <limits.h>
- #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 <b40869@freescale.com>
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_git.bb
index 48c594483a..a17e70f09e 100644
--- a/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb
+++ b/meta-webserver/recipes-support/fcgi/fcgi_git.bb
@@ -3,12 +3,14 @@ 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 \
+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 \
"
-SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e"
-SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9"
+
+S = "${WORKDIR}/git"
inherit autotools