diff options
-rw-r--r-- | libraries/fcgi/README | 1 | ||||
-rw-r--r-- | libraries/fcgi/fcgi-2.4.0-clientdata-pointer.patch | 96 | ||||
-rw-r--r-- | libraries/fcgi/fcgi-2.4.0-gcc44-fix-include.patch | 28 | ||||
-rw-r--r-- | libraries/fcgi/fcgi-2.4.0-html-updates.patch | 65 | ||||
-rw-r--r-- | libraries/fcgi/fcgi.SlackBuild | 119 | ||||
-rw-r--r-- | libraries/fcgi/fcgi.info | 10 | ||||
-rw-r--r-- | libraries/fcgi/slack-desc | 19 |
7 files changed, 338 insertions, 0 deletions
diff --git a/libraries/fcgi/README b/libraries/fcgi/README new file mode 100644 index 0000000000000..8b8f261dbc836 --- /dev/null +++ b/libraries/fcgi/README @@ -0,0 +1 @@ +fcgi is a library implementing Fast CGI. A simple server is also included. diff --git a/libraries/fcgi/fcgi-2.4.0-clientdata-pointer.patch b/libraries/fcgi/fcgi-2.4.0-clientdata-pointer.patch new file mode 100644 index 0000000000000..ba4793765d5e0 --- /dev/null +++ b/libraries/fcgi/fcgi-2.4.0-clientdata-pointer.patch @@ -0,0 +1,96 @@ +Index: fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c +=================================================================== +--- fcgi-2.4.0.orig/cgi-fcgi/cgi-fcgi.c ++++ fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c +@@ -21,6 +21,7 @@ static const char rcsid[] = "$Id: cgi-fc + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/types.h> + + #include "fcgi_config.h" + +@@ -145,7 +146,7 @@ static FCGI_BeginRequestBody MakeBeginRe + + + static int bytesToRead; /* number of bytes to read from Web Server */ +-static int appServerSock = -1; /* Socket connected to FastCGI application, ++static size_t appServerSock = -1; /* Socket connected to FastCGI application, + * used by AppServerReadHandler and + * AppServerWriteHandler. */ + static Buffer fromAS; /* Bytes read from the FCGI application server. */ +@@ -640,7 +641,7 @@ static int ParseArgs(int argc, char *arg + } + if((av[ac] = (char *)malloc(strlen(tp1)+1)) == NULL) { + fprintf(stderr, "Cannot allocate %d bytes\n", +- strlen(tp1)+1); ++ (int)strlen(tp1)+1); + exit(-1); + } + strcpy(av[ac++], tp1); +Index: fcgi-2.4.0/examples/threaded.c +=================================================================== +--- fcgi-2.4.0.orig/examples/threaded.c ++++ fcgi-2.4.0/examples/threaded.c +@@ -24,7 +24,7 @@ static int counts[THREAD_COUNT]; + + static void *doit(void *a) + { +- int rc, i, thread_id = (int)a; ++ size_t rc, i, thread_id = (size_t)a; + pid_t pid = getpid(); + FCGX_Request request; + char *server_name; +@@ -53,7 +53,7 @@ static void *doit(void *a) + "<h1>FastCGI Hello! (multi-threaded C, fcgiapp library)</h1>" + "Thread %d, Process %ld<p>" + "Request counts for %d threads running on host <i>%s</i><p><code>", +- thread_id, pid, THREAD_COUNT, server_name ? server_name : "?"); ++ (int)thread_id, pid, THREAD_COUNT, server_name ? server_name : "?"); + + sleep(2); + +@@ -71,7 +71,7 @@ static void *doit(void *a) + + int main(void) + { +- int i; ++ size_t i; + pthread_t id[THREAD_COUNT]; + + FCGX_Init(); +Index: fcgi-2.4.0/include/fcgios.h +=================================================================== +--- fcgi-2.4.0.orig/include/fcgios.h ++++ fcgi-2.4.0/include/fcgios.h +@@ -93,7 +93,7 @@ extern "C" { + # if defined(__STDC__) || defined(__cplusplus) + typedef void *ClientData; + # else +- typedef int *ClientData; ++ typedef size_t *ClientData; + # endif /* __STDC__ */ + #define _CLIENTDATA + #endif +Index: fcgi-2.4.0/libfcgi/os_unix.c +=================================================================== +--- fcgi-2.4.0.orig/libfcgi/os_unix.c ++++ fcgi-2.4.0/libfcgi/os_unix.c +@@ -1155,7 +1155,7 @@ int OS_Accept(int listen_sock, int fail_ + + for (;;) { + do { +-#ifdef HAVE_SOCKLEN ++#ifdef HAVE_SYS_SOCKET_H + socklen_t len = sizeof(sa); + #else + int len = sizeof(sa); +@@ -1255,7 +1255,7 @@ int OS_IsFcgi(int sock) + struct sockaddr_in in; + struct sockaddr_un un; + } sa; +-#ifdef HAVE_SOCKLEN ++#ifdef HAVE_SYS_SOCKET_H + socklen_t len = sizeof(sa); + #else + int len = sizeof(sa); diff --git a/libraries/fcgi/fcgi-2.4.0-gcc44-fix-include.patch b/libraries/fcgi/fcgi-2.4.0-gcc44-fix-include.patch new file mode 100644 index 0000000000000..8a846cf27afdd --- /dev/null +++ b/libraries/fcgi/fcgi-2.4.0-gcc44-fix-include.patch @@ -0,0 +1,28 @@ +Description: Upstream changes introduced in version 2.4.0-8 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + libfcgi (2.4.0-8) unstable; urgency=low + . + * Switch to dpkg-source 3.0 (quilt) format + . + The person named in the Author field signed this changelog entry. +Author: Tatsuki Sugiura <sugi@nemui.org> +Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504963 +Bug-Debian: http://bugs.debian.org/504963 +Forwarded: no +Last-Update: 2010-02-08 + +Index: libfcgi/libfcgi/fcgio.cpp +=================================================================== +--- libfcgi.orig/libfcgi/fcgio.cpp 2010-01-23 19:13:53.000000000 +0900 ++++ libfcgi/libfcgi/fcgio.cpp 2010-01-23 19:13:55.000000000 +0900 +@@ -22,6 +22,7 @@ + #define DLLAPI __declspec(dllexport) + #endif + ++#include <cstdio> + #include <limits.h> + #include "fcgio.h" + diff --git a/libraries/fcgi/fcgi-2.4.0-html-updates.patch b/libraries/fcgi/fcgi-2.4.0-html-updates.patch new file mode 100644 index 0000000000000..ca10a6a6039b4 --- /dev/null +++ b/libraries/fcgi/fcgi-2.4.0-html-updates.patch @@ -0,0 +1,65 @@ +Index: fcgi-2.4.0/doc/fcgi-devel-kit.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-devel-kit.htm ++++ fcgi-2.4.0/doc/fcgi-devel-kit.htm +@@ -19,7 +19,7 @@ + </HEAD> + <BODY> + <P CLASS="c1"> +- <IMG BORDER="0" SRC="../images/fcgi-hd.gif" ALT="[[FastCGI]]"><BR CLEAR="all"> ++ <IMG BORDER="0" SRC="images/fcgi-hd.gif" ALT="[[FastCGI]]"><BR CLEAR="all"> + </P> + <H3 CLASS="c2"> + FastCGI Developer's Kit +Index: fcgi-2.4.0/doc/fcgi-java.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-java.htm ++++ fcgi-2.4.0/doc/fcgi-java.htm +@@ -20,7 +20,7 @@ + </HEAD> + <BODY> + <DIV CLASS="c1"> +- <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="../images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> ++ <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> + </DIV> + <BR CLEAR="all"> + <DIV CLASS="c1"> +Index: fcgi-2.4.0/doc/fcgi-perf.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-perf.htm ++++ fcgi-2.4.0/doc/fcgi-perf.htm +@@ -19,7 +19,7 @@ + </HEAD> + <BODY> + <DIV CLASS="c1"> +- <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="../images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> ++ <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> + </DIV> + <BR CLEAR="all"> + <DIV CLASS="c1"> +Index: fcgi-2.4.0/doc/fcgi-perl.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-perl.htm ++++ fcgi-2.4.0/doc/fcgi-perl.htm +@@ -19,7 +19,7 @@ + </HEAD> + <BODY> + <DIV CLASS="c1"> +- <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="../images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> ++ <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> + </DIV> + <BR CLEAR="all"> + +Index: fcgi-2.4.0/doc/fcgi-tcl.htm +=================================================================== +--- fcgi-2.4.0.orig/doc/fcgi-tcl.htm ++++ fcgi-2.4.0/doc/fcgi-tcl.htm +@@ -19,7 +19,7 @@ + </HEAD> + <BODY> + <DIV CLASS="c1"> +- <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="../images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> ++ <A HREF="http://fastcgi.com"><IMG BORDER="0" SRC="images/fcgi-hd.gif" ALT="[[FastCGI]]"></A> + </DIV> + <BR CLEAR="all"> + <DIV CLASS="c1"> diff --git a/libraries/fcgi/fcgi.SlackBuild b/libraries/fcgi/fcgi.SlackBuild new file mode 100644 index 0000000000000..959247c4fe298 --- /dev/null +++ b/libraries/fcgi/fcgi.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/sh + +# Slackware build script for fcgi +# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K. +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=fcgi +VERSION=${VERSION:-2.4.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Fix compilation by recent gcc (thanks to Debian) +cat $CWD/fcgi-2.4.0-gcc44-fix-include.patch | patch -p1 +# Fix type of socket ClientData (thanks to Gentoo) +cat $CWD/fcgi-2.4.0-clientdata-pointer.patch | patch -p1 +# Fix image paths in html docs (thanks to Gentoo) +cat $CWD/fcgi-2.4.0-html-updates.patch | patch -p1 + +libtoolize --copy --force +# Create some empty files to make autoreconf happy +touch INSTALL NEWS AUTHORS ChangeLog COPYING +autoreconf -vf + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/man/man{1,3} +cp -a doc/*.1 $PKG/usr/man/man1/ +cp -a doc/*.3 $PKG/usr/man/man3/ +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + LICENSE.TERMS \ + doc/*.html doc/*.htm images/ \ + doc/fastcgi-prog-guide/ doc/fastcgi-whitepaper/ \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/fcgi/fcgi.info b/libraries/fcgi/fcgi.info new file mode 100644 index 0000000000000..fe33b613193f0 --- /dev/null +++ b/libraries/fcgi/fcgi.info @@ -0,0 +1,10 @@ +PRGNAM="fcgi" +VERSION="2.4.0" +HOMEPAGE="http://www.fastcgi.com/drupal/" +DOWNLOAD="http://www.fastcgi.com/dist/fcgi-2.4.0.tar.gz" +MD5SUM="d15060a813b91383a9f3c66faf84867e" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" +APPROVED="Niels Horn" diff --git a/libraries/fcgi/slack-desc b/libraries/fcgi/slack-desc new file mode 100644 index 0000000000000..badad09a6d4c2 --- /dev/null +++ b/libraries/fcgi/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +fcgi: fcgi (Fast CGI library) +fcgi: +fcgi: fcgi is a library implementing Fast CGI. A simple server is also +fcgi: included. +fcgi: +fcgi: Homepage: http://www.fastcgi.com/drupal/ +fcgi: +fcgi: +fcgi: +fcgi: +fcgi: |