diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 15:04:38 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:32 +0000 |
commit | b48b7b4109868a8c0ddda090992e936e821c7ea6 (patch) | |
tree | 696be8ea782f2548c0f63bb0188f4c8d3eeed681 /import-layers/meta-openembedded/meta-webserver/recipes-support | |
parent | d849ec78de728ef9a2d383b92ccfeabf40f8f1d0 (diff) | |
download | talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.tar.gz talos-openbmc-b48b7b4109868a8c0ddda090992e936e821c7ea6.zip |
Squashed 'import-layers/meta-openembedded/' content from commit 247b126
Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-openembedded/meta-webserver/recipes-support')
5 files changed, 101 insertions, 0 deletions
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch new file mode 100644 index 000000000..51ddeaac2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch @@ -0,0 +1,17 @@ +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/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch b/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch new file mode 100644 index 000000000..eca694adc --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch @@ -0,0 +1,18 @@ +Upstream-Status: Pending + +use automake options "foreign" to set the strictness as appropriate + +Signed-off-by: Yang Haibo <b40869@freescale.com> +--- fcgi-ori/configure.in 2014-08-05 14:58:35.000000000 +0800 ++++ fcgi-2.4.0/configure.in 2014-08-05 14:59:08.000000000 +0800 +@@ -4,8 +4,8 @@ + 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([foreign]) + + AM_CONFIG_HEADER(fcgi_config.h) + diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb b/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb new file mode 100644 index 000000000..48c594483 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb @@ -0,0 +1,15 @@ +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/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch b/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch new file mode 100644 index 000000000..9409dd2b1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch @@ -0,0 +1,35 @@ +Testing for IPv6 support got broken by configure.ac changes in 1.6.4 +As a temp workaround, revert back to the 1.6.3 version. + +Upstream-Status: Pending + +--- spawn-fcgi-1.6.4/configure.ac ++++ spawn-fcgi-1.6.3/configure.ac +@@ -66,8 +47,8 @@ + # Check for IPv6 support + + AC_ARG_ENABLE(ipv6, +- AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), +- [case "${enableval}" in ++ AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), ++ [case "${enableval}" in + yes) ipv6=true ;; + no) ipv6=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-ipv6) ;; +@@ -75,13 +56,10 @@ + + if test x$ipv6 = xtrue; then + AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, +- [AC_TRY_LINK([[ +-#include <sys/types.h> ++ [AC_TRY_LINK([ #include <sys/types.h> + #include <sys/socket.h> +-#include <netinet/in.h> +- ]], [[ +-struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; +- ]], [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) ++#include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ], ++ [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) + + if test "$ac_cv_ipv6_support" = yes; then + AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb b/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb new file mode 100644 index 000000000..99e58bd8b --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb @@ -0,0 +1,16 @@ +SUMMARRY = "spawn-fcgi is used to spawn FastCGI applications" +HOMEPAGE = "http://redmine.lighttpd.net/projects/spawn-fcgi" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" + +SRC_URI = "http://download.lighttpd.net/spawn-fcgi/releases-1.6.x/spawn-fcgi-${PV}.tar.gz \ + file://fix_configure_ipv6_test.patch" + +SRC_URI[md5sum] = "e970de4efe8045c01dd76280f39901aa" +SRC_URI[sha256sum] = "ab327462cb99894a3699f874425a421d934f957cb24221f00bb888108d9dd09e" + +inherit autotools + +PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |