Patchwork [meta-webserver,v3] integrate fcgi-2.4.0 and add OML license file

login
register
mail settings
Submitter YangHaibo
Date Aug. 1, 2014, 2:50 a.m.
Message ID <1406861456-16786-1-git-send-email-b40869@freescale.com>
Download mbox | patch
Permalink /patch/77053/
State Superseded, archived
Headers show

Comments

YangHaibo - Aug. 1, 2014, 2:50 a.m.
---
 meta-oe/licenses/OML                               | 28 ++++++++++++++++++++++
 .../fcgi/fcgi/Fix_EOF_not_declared_issue.patch     | 17 +++++++++++++
 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb     | 16 +++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 meta-oe/licenses/OML
 create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
 create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb
Martin Jansa - Aug. 4, 2014, 4:11 p.m.
On Fri, Aug 01, 2014 at 10:50:56AM +0800, YangHaibo wrote:
> ---
>  meta-oe/licenses/OML                               | 28 ++++++++++++++++++++++
>  .../fcgi/fcgi/Fix_EOF_not_declared_issue.patch     | 17 +++++++++++++
>  meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb     | 16 +++++++++++++
>  3 files changed, 61 insertions(+)
>  create mode 100644 meta-oe/licenses/OML
>  create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
>  create mode 100644 meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb
> 
> diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML
> new file mode 100644
> index 0000000..7e6bdfd
> --- /dev/null
> +++ b/meta-oe/licenses/OML
> @@ -0,0 +1,28 @@
> +This FastCGI application library source and object code (the
> +"Software") and its documentation (the "Documentation") are
> +copyrighted by Open Market, Inc ("Open Market").  The following terms
> +apply to all files associated with the Software and Documentation
> +unless explicitly disclaimed in individual files.
> +
> +Open Market permits you to use, copy, modify, distribute, and license
> +this Software and the Documentation for any purpose, provided that
> +existing copyright notices are retained in all copies and that this
> +notice is included verbatim in any distributions.  No written
> +agreement, license, or royalty fee is required for any of the
> +authorized uses.  Modifications to this Software and Documentation may
> +be copyrighted by their authors and need not follow the licensing
> +terms described here.  If modifications to this Software and
> +Documentation have new licensing terms, the new terms must be clearly
> +indicated on the first page of each file where they apply.
> +
> +OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE
> +SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY
> +WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN
> +NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
> +DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE
> +DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR
> +CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR
> +LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF
> +SUCH DAMAGES.  THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS".
> +OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR
> +OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION.
> diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
> new file mode 100644
> index 0000000..b4cf080
> --- /dev/null
> +++ b/meta-webserver/recipes-fcgi/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/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb
> new file mode 100644
> index 0000000..ceb5909
> --- /dev/null
> +++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb
> @@ -0,0 +1,16 @@
> +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/fcgi-2.4.0.tar.gz \

fcgi-2.4.0 -> ${BP}

> +           file://Fix_EOF_not_declared_issue.patch \
> +"
> +SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e"
> +SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9"
> +
> +S = "${WORKDIR}/${BPN}-${PV}/"

This is default, you can drop it.

> +
> +inherit autotools
> +
> +PARALLEL_MAKE = ""

Fails in current master, you need to add foreign to AC_INIT_AUTOMAKE

| Makefile.am: installing './INSTALL'
| Makefile.am: error: required file './NEWS' not found
| Makefile.am: error: required file './AUTHORS' not found
| Makefile.am: error: required file './ChangeLog' not found
| Makefile.am: installing './COPYING' using GNU General Public License v3 file
| Makefile.am:     Consider adding the COPYING file to the version control system
| Makefile.am:     for your code, to avoid questions about which license your project uses
| automake: warning: autoconf input should be named 'configure.ac', not 'configure.in'
| cgi-fcgi/Makefile.am:5: warning: 'CPPFLAGS' is a user variable, you should not override it;
| cgi-fcgi/Makefile.am:5: use 'AM_CPPFLAGS' instead
| examples/Makefile.am:14: warning: 'CPPFLAGS' is a user variable, you should not override it;
| examples/Makefile.am:14: use 'AM_CPPFLAGS' instead
| libfcgi/Makefile.am:4: warning: 'CPPFLAGS' is a user variable, you should not override it;
| libfcgi/Makefile.am:4: use 'AM_CPPFLAGS' instead
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/world/shr-core/tmp-eglibc/work/i586-oe-linux/fcgi/2.4.0-r0/temp/log.do_configure.23481)
NOTE: recipe fcgi-2.4.0-r0: task do_configure: Failed
ERROR: Task 35 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb, do_configure) failed with exit code '1'


> -- 
> 1.9.2
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
YangHaibo - Aug. 5, 2014, 7:42 a.m.
Thank you, patch v4 is submitted. Test passed on master branch.

BR,
YangHaibo

Patch

diff --git a/meta-oe/licenses/OML b/meta-oe/licenses/OML
new file mode 100644
index 0000000..7e6bdfd
--- /dev/null
+++ b/meta-oe/licenses/OML
@@ -0,0 +1,28 @@ 
+This FastCGI application library source and object code (the
+"Software") and its documentation (the "Documentation") are
+copyrighted by Open Market, Inc ("Open Market").  The following terms
+apply to all files associated with the Software and Documentation
+unless explicitly disclaimed in individual files.
+
+Open Market permits you to use, copy, modify, distribute, and license
+this Software and the Documentation for any purpose, provided that
+existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions.  No written
+agreement, license, or royalty fee is required for any of the
+authorized uses.  Modifications to this Software and Documentation may
+be copyrighted by their authors and need not follow the licensing
+terms described here.  If modifications to this Software and
+Documentation have new licensing terms, the new terms must be clearly
+indicated on the first page of each file where they apply.
+
+OPEN MARKET MAKES NO EXPRESS OR IMPLIED WARRANTY WITH RESPECT TO THE
+SOFTWARE OR THE DOCUMENTATION, INCLUDING WITHOUT LIMITATION ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  IN
+NO EVENT SHALL OPEN MARKET BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
+DAMAGES ARISING FROM OR RELATING TO THIS SOFTWARE OR THE
+DOCUMENTATION, INCLUDING, WITHOUT LIMITATION, ANY INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES OR SIMILAR DAMAGES, INCLUDING LOST PROFITS OR
+LOST DATA, EVEN IF OPEN MARKET HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.  THE SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS".
+OPEN MARKET HAS NO LIABILITY IN CONTRACT, TORT, NEGLIGENCE OR
+OTHERWISE ARISING OUT OF THIS SOFTWARE OR THE DOCUMENTATION.
diff --git a/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-webserver/recipes-fcgi/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
new file mode 100644
index 0000000..b4cf080
--- /dev/null
+++ b/meta-webserver/recipes-fcgi/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/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb
new file mode 100644
index 0000000..ceb5909
--- /dev/null
+++ b/meta-webserver/recipes-fcgi/fcgi/fcgi_2.4.0.bb
@@ -0,0 +1,16 @@ 
+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/fcgi-2.4.0.tar.gz \
+           file://Fix_EOF_not_declared_issue.patch \
+"
+SRC_URI[md5sum] = "d15060a813b91383a9f3c66faf84867e"
+SRC_URI[sha256sum] = "66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9"
+
+S = "${WORKDIR}/${BPN}-${PV}/"
+
+inherit autotools
+
+PARALLEL_MAKE = ""