[arch-commits] Commit in mod_fastcgi/trunk (PKGBUILD lp381384.patch)

[Jan de Groot]

    Date: Tuesday, November 19, 2013 @ 11:28:17
  Author: jgc
Revision: 199926

upgpkg: mod_fastcgi 2.4.7-1

Update to snapshot. Label as 2.4.7. This should fix the internal server errors I get on the bugtracker now and then.

Modified:
  mod_fastcgi/trunk/PKGBUILD
Deleted:
  mod_fastcgi/trunk/lp381384.patch

----------------+
 PKGBUILD       |   22 ++++++++++++----------
 lp381384.patch |   34 ----------------------------------
 2 files changed, 12 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-19 10:00:28 UTC (rev 199925)
+++ PKGBUILD	2013-11-19 10:28:17 UTC (rev 199926)
@@ -3,27 +3,29 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=mod_fastcgi
-pkgver=2.4.6
-pkgrel=4
+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}-${pkgver}.tar.gz"
-        'lp381384.patch')
-md5sums=('a21a613dd5dacf4c8ad88c8550294fed'
-         '7dd09e6579cc9bf2f992bbd82d1d1537')
+source=(http://www.fastcgi.com/dist/${pkgname}-${_SNAP}.tar.gz)
+md5sums=('c23ee51d4f03afd3487bcfeea953db5a')
 
+prepare() {
+  cd $pkgname-$_SNAP
+  cp Makefile.AP2 Makefile
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/lp381384.patch"
-  cp Makefile.AP2 Makefile
+  cd $pkgname-$_SNAP
   make top_dir=/usr/lib/httpd
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$_SNAP
   make top_dir=/usr/lib/httpd DESTDIR="${pkgdir}" install
   install -Dm644 docs/LICENSE.TERMS \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

Deleted: lp381384.patch
===================================================================
--- lp381384.patch	2013-11-19 10:00:28 UTC (rev 199925)
+++ lp381384.patch	2013-11-19 10:28:17 UTC (rev 199926)
@@ -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.000000000 +0100
-+++ mod_fastcgi-2.4.6-lp381384/CHANGES	2009-05-28 21:02:31.000000000 +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.c	2007-11-13 00:00:10.000000000 +0100
-+++ mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c	2009-05-28 21:02:31.000000000 +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);