[arch-commits] Commit in mod_fastcgi/repos (6 files)
Date: Thursday, February 27, 2014 @ 07:18:29
Author: anatolik
Revision: 206463
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
mod_fastcgi/repos/staging-i686/
mod_fastcgi/repos/staging-i686/PKGBUILD
(from rev 206462, mod_fastcgi/trunk/PKGBUILD)
mod_fastcgi/repos/staging-i686/compile-against-apache24.diff
(from rev 206462, mod_fastcgi/trunk/compile-against-apache24.diff)
mod_fastcgi/repos/staging-x86_64/
mod_fastcgi/repos/staging-x86_64/PKGBUILD
(from rev 206462, mod_fastcgi/trunk/PKGBUILD)
mod_fastcgi/repos/staging-x86_64/compile-against-apache24.diff
(from rev 206462, mod_fastcgi/trunk/compile-against-apache24.diff)
--+
staging-i686/PKGBUILD| 37 ++
staging-i686/compile-against-apache24.diff | 137 +
staging-x86_64/PKGBUILD | 37 ++
staging-x86_64/compile-against-apache24.diff | 137 +
4 files changed, 348 insertions(+)
Copied: mod_fastcgi/repos/staging-i686/PKGBUILD (from rev 206462,
mod_fastcgi/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-02-27 06:18:29 UTC (rev 206463)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer:
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgname=mod_fastcgi
+pkgver=2.4.7
+pkgrel=2
+_SNAP=SNAP-0910052141
+pkgdesc=Apache module to support the FastCGI protocol
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://www.fastcgi.com/;
+depends=('apache')
+# mod_fastcgi upstream development is dead. There is a third-party patch that
+# adopts mod_fastcgi to apache 2.4
https://github.com/ByteInternet/libapache-mod-fastcgi
+source=(http://www.fastcgi.com/dist/${pkgname}-${_SNAP}.tar.gz
+compile-against-apache24.diff)
+sha256sums=('e6564ae206284806c781834e9e89aa4b0a4dd647b45c6da5cc389c65a984bdc7'
+'e405f365fac2d80c181a7ddefc9c6332cac7766cb9c67c464c272d595cde1800')
+
+prepare() {
+ cd $pkgname-$_SNAP
+ patch -p1 $srcdir/compile-against-apache24.diff
+ cp Makefile.AP2 Makefile
+}
+
+build() {
+ cd $pkgname-$_SNAP
+ make top_dir=/usr/lib/httpd
+}
+
+package() {
+ cd $pkgname-$_SNAP
+ make top_dir=/usr/lib/httpd DESTDIR=${pkgdir} install
+ install -Dm644 docs/LICENSE.TERMS \
+${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
Copied: mod_fastcgi/repos/staging-i686/compile-against-apache24.diff (from rev
206462, mod_fastcgi/trunk/compile-against-apache24.diff)
===
--- staging-i686/compile-against-apache24.diff (rev 0)
+++ staging-i686/compile-against-apache24.diff 2014-02-27 06:18:29 UTC (rev
206463)
@@ -0,0 +1,137 @@
+Index: libapache-mod-fastcgi/fcgi.h
+===
+--- libapache-mod-fastcgi.orig/fcgi.h 2012-03-07 14:29:04.005720240 +0100
libapache-mod-fastcgi/fcgi.h 2012-03-07 14:29:07.830566657 +0100
+@@ -34,6 +34,10 @@
+ #define APACHE2
+ #endif
+
++#ifdef AP_DECLARE_MODULE
++#define APACHE24
++#endif
++
+ #ifdef APACHE2
+
+ #include sys/stat.h
+@@ -57,10 +61,16 @@
+ #define XtOffsetOf APR_OFFSETOF
+ #define ap_select select
+
++#ifdef APACHE24
++#define unixd_config ap_unixd_config
++#endif
++
++#ifdef APACHE2
+ #define ap_user_idunixd_config.user_id
+ #define ap_group_id unixd_config.group_id
+ #define ap_user_name unixd_config.user_name
+ #define ap_suexec_enabled unixd_config.suexec_enabled
++#endif
+
+ #ifndef S_ISDIR
+ #define S_ISDIR(m) (((m)(S_IFMT)) == (S_IFDIR))
+@@ -365,42 +375,42 @@
+ #ifdef APACHE2
+
+ #ifdef WIN32
+-#define FCGI_LOG_EMERG
__FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ALERT
__FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_CRIT
__FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ERR
__FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_WARN
__FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_NOTICE
__FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_INFO
__FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_DEBUG
__FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_EMERG
APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ALERT
APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_CRIT
APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ERR
APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_WARN
[arch-commits] Commit in mod_fastcgi/repos (6 files)
Date: Tuesday, November 19, 2013 @ 11:28:25
Author: jgc
Revision: 199927
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mod_fastcgi/repos/extra-i686/PKGBUILD
(from rev 199926, mod_fastcgi/trunk/PKGBUILD)
mod_fastcgi/repos/extra-x86_64/PKGBUILD
(from rev 199926, mod_fastcgi/trunk/PKGBUILD)
Deleted:
mod_fastcgi/repos/extra-i686/PKGBUILD
mod_fastcgi/repos/extra-i686/lp381384.patch
mod_fastcgi/repos/extra-x86_64/PKGBUILD
mod_fastcgi/repos/extra-x86_64/lp381384.patch
-+
/PKGBUILD | 64 ++
extra-i686/PKGBUILD | 30 ---
extra-i686/lp381384.patch | 34 --
extra-x86_64/PKGBUILD | 30 ---
extra-x86_64/lp381384.patch | 34 --
5 files changed, 64 insertions(+), 128 deletions(-)
Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-11-19 10:28:17 UTC (rev 199926)
+++ extra-i686/PKGBUILD 2013-11-19 10:28:25 UTC (rev 199927)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Jan de Groot j...@archlinux.org
-
-pkgname=mod_fastcgi
-pkgver=2.4.6
-pkgrel=4
-pkgdesc=Apache module to support the FastCGI protocol
-arch=('i686' 'x86_64')
-license=('custom')
-url=http://www.fastcgi.com/;
-depends=('apache')
-source=(http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz;
-'lp381384.patch')
-md5sums=('a21a613dd5dacf4c8ad88c8550294fed'
- '7dd09e6579cc9bf2f992bbd82d1d1537')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/lp381384.patch
- cp Makefile.AP2 Makefile
- make top_dir=/usr/lib/httpd
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make top_dir=/usr/lib/httpd DESTDIR=${pkgdir} install
- install -Dm644 docs/LICENSE.TERMS \
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: mod_fastcgi/repos/extra-i686/PKGBUILD (from rev 199926,
mod_fastcgi/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-19 10:28:25 UTC (rev 199927)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer:
+# Contributor: Jan de Groot j...@archlinux.org
+
+pkgname=mod_fastcgi
+pkgver=2.4.7
+pkgrel=1
+_SNAP=SNAP-0910052141
+pkgdesc=Apache module to support the FastCGI protocol
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://www.fastcgi.com/;
+depends=('apache')
+source=(http://www.fastcgi.com/dist/${pkgname}-${_SNAP}.tar.gz)
+md5sums=('c23ee51d4f03afd3487bcfeea953db5a')
+
+prepare() {
+ cd $pkgname-$_SNAP
+ cp Makefile.AP2 Makefile
+}
+
+build() {
+ cd $pkgname-$_SNAP
+ make top_dir=/usr/lib/httpd
+}
+
+package() {
+ cd $pkgname-$_SNAP
+ make top_dir=/usr/lib/httpd DESTDIR=${pkgdir} install
+ install -Dm644 docs/LICENSE.TERMS \
+${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-i686/lp381384.patch
===
--- extra-i686/lp381384.patch 2013-11-19 10:28:17 UTC (rev 199926)
+++ extra-i686/lp381384.patch 2013-11-19 10:28:25 UTC (rev 199927)
@@ -1,34 +0,0 @@
-References:
-http://thread.gmane.org/gmane.comp.web.fastcgi.devel/2613
-http://article.gmane.org/gmane.comp.web.fastcgi.devel/1167
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=509116
-https://bugs.launchpad.net/ubuntu/+source/libapache-mod-fastcgi/+bug/381384
-
-Patch extracted from the SNAP-0811090952 snapshot tarball.
-2009-05-28 Martin von Gagern
-
-diff -ru mod_fastcgi-2.4.6/CHANGES mod_fastcgi-2.4.6-lp381384/CHANGES
mod_fastcgi-2.4.6/CHANGES 2007-11-13 13:26:35.0 +0100
-+++ mod_fastcgi-2.4.6-lp381384/CHANGES 2009-05-28 21:02:31.0 +0200
-@@ -1,3 +1,6 @@
-+ *) Don't let the Content-Length header propagate on errors or across
-+redirects. [Artur Zaprzala arturz ownmail.net]
-+
- 2.4.6
-
- *) Fix a bug I introduced in 2.4.4 that broke dynamic application
-diff -ru mod_fastcgi-2.4.6/mod_fastcgi.c
mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c
mod_fastcgi-2.4.6/mod_fastcgi.c2007-11-13 00:00:10.0 +0100
-+++ mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c 2009-05-28 21:02:31.0
+0200
-@@ -753,6 +753,11 @@
- ap_table_set(r-headers_out, Location, value);
- continue;
- }
-+
-+if (strcasecmp(name, Content-Length) == 0) {
-+ap_table_set(r-headers_out, name, value);
-+ continue;
-+}
-
- /* If the script wants them merged, it can do it */
- ap_table_add(r-err_headers_out, name, value);
Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2013-11-19 10:28:17 UTC (rev 199926)
+++ extra-x86_64/PKGBUILD 2013-11-19 10:28:25 UTC (rev 199927)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer:
-#
