Revision bump. Fixing build issues I encountered while compiling on uclibc.

Package-Manager: portage-2.1.1_pre4-r3

diff --git a/dev-libs/fcgi/ChangeLog b/dev-libs/fcgi/ChangeLog
index 1b3c3b02031f0644d6af4a4b72872036fd6e8259..5ea30978a0b88b1d5e939846735d823fe335127f 100644 (file)
--- a/dev-libs/fcgi/ChangeLog
+++ b/dev-libs/fcgi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/fcgi
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/ChangeLog,v 1.19 2006/07/13 01:22:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/ChangeLog,v 1.20 2006/08/05 15:54:49 phreak Exp $
+
+*fcgi-2.4.0-r1 (05 Aug 2006)
+
+  05 Aug 2006; Christian Heim <phreak@gentoo.org>
+  +files/fcgi-2.4.0-Makefile.patch,
+  +files/fcgi-2.4.0-clientdata-pointer.patch, +metadata.xml,
+  +fcgi-2.4.0-r1.ebuild:
+  Revision bump. Fixing build issues I encountered while compiling on uclibc.
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> fcgi-2.4.0.ebuild:
   Mark 2.4.0 stable on ia64. #138323

diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index f45e8459be3e115a5ded45b67e4fcdac3a869e0f..7ec5c5a87fea5cc5c5f1ea2818309917272e51a5 100644 (file)
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -1,12 +1,41 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fcgi-2.4.0-Makefile.patch 846 RMD160 dc3beead1d6431eca49e9635a05b4b62cfbf0cd9 SHA1 80dee3eb6f4b2b461083bc9607ac4d64bbbe1a5d SHA256 3d01cc53a4eb63d416ee6cdcd29e099d759947ae200c4062fcc3cfd823849f62
+MD5 d6a5c4fe2899fbcb564dca4feeee1f9f files/fcgi-2.4.0-Makefile.patch 846
+RMD160 dc3beead1d6431eca49e9635a05b4b62cfbf0cd9 files/fcgi-2.4.0-Makefile.patch 846
+SHA256 3d01cc53a4eb63d416ee6cdcd29e099d759947ae200c4062fcc3cfd823849f62 files/fcgi-2.4.0-Makefile.patch 846
+AUX fcgi-2.4.0-clientdata-pointer.patch 3203 RMD160 fb6e7341cd162640665c4c2b65784bff0889e1f1 SHA1 995b4f4046a3374ee7e75333193b5b1c72a69280 SHA256 27936406b5fcb13096bbdd80ee7eb0cf262e5c2b983e79e41d17a3cd17387683
+MD5 d2654525f06451c99b8cdd4cc00a963b files/fcgi-2.4.0-clientdata-pointer.patch 3203
+RMD160 fb6e7341cd162640665c4c2b65784bff0889e1f1 files/fcgi-2.4.0-clientdata-pointer.patch 3203
+SHA256 27936406b5fcb13096bbdd80ee7eb0cf262e5c2b983e79e41d17a3cd17387683 files/fcgi-2.4.0-clientdata-pointer.patch 3203
 DIST fcgi-2.4.0.tar.gz 468682 RMD160 df5c01b197bc72fca7abee184a34ec14253dd0f0 SHA1 2329404159e8b8315e524b9eaf1de763202c6e6a SHA256 66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9
+EBUILD fcgi-2.4.0-r1.ebuild 856 RMD160 3323f64cedf179936f5c95b39e4ff6302397d024 SHA1 76b4776c738c7d737413d23ad7069b06e7ee13ab SHA256 0e9ed6fe0b9cbf5b57eeecbf9bbd8233c8ddd46e858bbb95314a08a181097356
+MD5 fa4c544bfd7bd94caa7652805bd6d448 fcgi-2.4.0-r1.ebuild 856
+RMD160 3323f64cedf179936f5c95b39e4ff6302397d024 fcgi-2.4.0-r1.ebuild 856
+SHA256 0e9ed6fe0b9cbf5b57eeecbf9bbd8233c8ddd46e858bbb95314a08a181097356 fcgi-2.4.0-r1.ebuild 856
 EBUILD fcgi-2.4.0.ebuild 812 RMD160 1e7386cd66cb1ca0831f7fdaa2c8f42a080ea112 SHA1 837dad4c3a8f035bed913a6ee5fa962a0c7466da SHA256 63a8c81385bf80591e4e74800a1cc3fb1cb04ad49c897486a781bc90c80035fc
 MD5 c7dcf8850edfdd65f7800b3d1c12af56 fcgi-2.4.0.ebuild 812
 RMD160 1e7386cd66cb1ca0831f7fdaa2c8f42a080ea112 fcgi-2.4.0.ebuild 812
 SHA256 63a8c81385bf80591e4e74800a1cc3fb1cb04ad49c897486a781bc90c80035fc fcgi-2.4.0.ebuild 812
-MISC ChangeLog 2041 RMD160 91ab7f35b38bd4c94b9c1fb97f9d52ddf6e6f818 SHA1 fd51544cbf639cded04bc8f9ff1b55f34eb5a356 SHA256 0bbaacb3c99eab81897f482659475935c2224cc329c85932e008b9c34aeba64c
-MD5 c84361bbe91b16cae1b1a6b728c30d9f ChangeLog 2041
-RMD160 91ab7f35b38bd4c94b9c1fb97f9d52ddf6e6f818 ChangeLog 2041
-SHA256 0bbaacb3c99eab81897f482659475935c2224cc329c85932e008b9c34aeba64c ChangeLog 2041
+MISC ChangeLog 2320 RMD160 b35d74b82cf8106d1b4556f9bbf661c6e184258a SHA1 4fe2749c0256c85166f76dbccb8d3ac51be351e1 SHA256 c8afedfc1f9a93ccec33d571b84b706645bff2ed1ff89eabb31993e75d83d129
+MD5 de503bcf8e17f3fbd34c85ec2d9b5c77 ChangeLog 2320
+RMD160 b35d74b82cf8106d1b4556f9bbf661c6e184258a ChangeLog 2320
+SHA256 c8afedfc1f9a93ccec33d571b84b706645bff2ed1ff89eabb31993e75d83d129 ChangeLog 2320
+MISC metadata.xml 233 RMD160 11bb0852d206051fed6e23c210fdcd2ee2cdbad5 SHA1 58f27fdf3ed652085e12776fc3c6302b50da5119 SHA256 05454ef42a9bf27fd9f98807e292bbb7a5bc1d3163d91f95bd4ec1f4ec7df69b
+MD5 a2fa038f003aeb0aea65f845a7c332dc metadata.xml 233
+RMD160 11bb0852d206051fed6e23c210fdcd2ee2cdbad5 metadata.xml 233
+SHA256 05454ef42a9bf27fd9f98807e292bbb7a5bc1d3163d91f95bd4ec1f4ec7df69b metadata.xml 233
 MD5 14b9f075aa8a46f6b93d7baee240544d files/digest-fcgi-2.4.0 232
 RMD160 f40f8e4021c8dbf2e291d3dee9b857e1685b26c2 files/digest-fcgi-2.4.0 232
 SHA256 3798424d8c4985dbc3becf55352ae00fbd239f633c36910c90a5fb3853c85a70 files/digest-fcgi-2.4.0 232
+MD5 14b9f075aa8a46f6b93d7baee240544d files/digest-fcgi-2.4.0-r1 232
+RMD160 f40f8e4021c8dbf2e291d3dee9b857e1685b26c2 files/digest-fcgi-2.4.0-r1 232
+SHA256 3798424d8c4985dbc3becf55352ae00fbd239f633c36910c90a5fb3853c85a70 files/digest-fcgi-2.4.0-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE1L9OyuNVb5qfaOYRAiIbAJ45PboH5Uu3ZrZKRLVN0yyLYUtyAACgtqiw
+Y/E26yIJ29rgjbvw7zFPzto=
+=T5t0
+-----END PGP SIGNATURE-----

diff --git a/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild b/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild
new file mode 100644 (file)
index 0000000..cf6066f
--- /dev/null
+++ b/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.0-r1.ebuild,v 1.1 2006/08/05 15:54:49 phreak Exp $
+
+inherit autotools
+
+DESCRIPTION="FastCGI Developer's Kit"
+HOMEPAGE="http://www.fastcgi.com/"
+SRC_URI="http://www.fastcgi.com/dist/${P}.tar.gz"
+LICENSE="FastCGI"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-*.patch
+       eautoreconf
+}
+
+src_install() {
+       make DESTDIR="${D}" install LIBRARY_PATH="${D}"/usr/lib || die
+       dodoc LICENSE.TERMS README
+       mv doc/*.[13] . && doman *.[13]
+       dohtml doc/*
+       insinto /usr/share/doc/${P}/examples
+       doins examples/*.c
+       insinto /usr/share/doc/${P}/images
+       doins images/*
+}

diff --git a/dev-libs/fcgi/files/digest-fcgi-2.4.0-r1 b/dev-libs/fcgi/files/digest-fcgi-2.4.0-r1
new file mode 100644 (file)
index 0000000..199240e
--- /dev/null
+++ b/dev-libs/fcgi/files/digest-fcgi-2.4.0-r1
@@ -0,0 +1,3 @@
+MD5 d15060a813b91383a9f3c66faf84867e fcgi-2.4.0.tar.gz 468682
+RMD160 df5c01b197bc72fca7abee184a34ec14253dd0f0 fcgi-2.4.0.tar.gz 468682
+SHA256 66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9 fcgi-2.4.0.tar.gz 468682

diff --git a/dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch b/dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch
new file mode 100644 (file)
index 0000000..dad4cd6
--- /dev/null
+++ b/dev-libs/fcgi/files/fcgi-2.4.0-Makefile.patch
@@ -0,0 +1,24 @@
+Index: fcgi-2.4.0/cgi-fcgi/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/cgi-fcgi/Makefile.am
++++ fcgi-2.4.0/cgi-fcgi/Makefile.am
+@@ -11,5 +11,5 @@ INCLUDE_FILES   = $(INCLUDEDIR)/fastcgi.
+ LIBDIR      = ../libfcgi
+ LIBFCGI     = $(LIBDIR)/libfcgi.la
+ 
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c
+Index: fcgi-2.4.0/examples/Makefile.am
+===================================================================
+--- fcgi-2.4.0.orig/examples/Makefile.am
++++ fcgi-2.4.0/examples/Makefile.am
+@@ -21,7 +21,7 @@ INCLUDE_FILES   = $(INCLUDEDIR)/fastcgi.
+ LIBDIR      = ../libfcgi
+ LIBFCGI     = $(LIBDIR)/libfcgi.la
+ 
+-LDADD = $(LIBFCGI)
++LDADD = $(LIBFCGI) -lm
+ 
+ echo_SOURCES       = $(INCLUDE_FILES) echo.c
+ echo_x_SOURCES     = $(INCLUDE_FILES) echo-x.c

diff --git a/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch b/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch
new file mode 100644 (file)
index 0000000..ba47937
--- /dev/null
+++ b/dev-libs/fcgi/files/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
+ 
+ \f
+ 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/dev-libs/fcgi/metadata.xml b/dev-libs/fcgi/metadata.xml
new file mode 100644 (file)
index 0000000..e98eac3
--- /dev/null
+++ b/dev-libs/fcgi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <maintainer>
+               <email>phreak@gentoo.org</email>
+               <name>Christian Heim</name>
+       </maintainer>
+</pkgmetadata>