SF.net SVN: gar:[22712] csw/mgar/pkg/mod_form/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22712
          http://sourceforge.net/p/gar/code/22712
Author:   dmichelsen
Date:     2013-12-19 16:10:58 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
mod_form/trunk: Add patch from mirrorbrain site

Modified Paths:
--------------
    csw/mgar/pkg/mod_form/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mod_form/trunk/files/formget.patch

Modified: csw/mgar/pkg/mod_form/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_form/trunk/Makefile	2013-12-19 14:35:00 UTC (rev 22711)
+++ csw/mgar/pkg/mod_form/trunk/Makefile	2013-12-19 16:10:58 UTC (rev 22712)
@@ -11,6 +11,10 @@
 DISTFILES += CSWap2-mod-form.postinstall
 DISTFILES += CSWap2-mod-form.preremove
 
+# Patch from http://mirrorbrain.org/docs/installation/source/
+PATCHFILES += formget.patch
+PATCHDIRLEVEL = 0
+
 VENDOR_URL = http://apache.webthing.com/mod_form/
 LICENSE = gpl.html
 
@@ -35,14 +39,18 @@
 
 include gar/category.mk
 
+post-extract:
+	ginstall -d $(WORKSRC)
+	cp $(WORKDIR)/mod_form.c $(WORKDIR)/mod_form.h $(WORKSRC)
+
 build-custom:
-	cd $(WORKDIR) && $(APXS) -c mod_form.c
+	cd $(WORKSRC) && $(APXS) -c mod_form.c
 	@$(MAKECOOKIE)
 
 install-custom:
 	mkdir -p $(AP2_LIBEXEC)
-	cd $(WORKDIR) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_form.la
+	cd $(WORKSRC) && $(APXS) -S LIBEXECDIR=$(AP2_LIBEXEC) -i mod_form.la
 	ginstall -d $(DESTDIR)$(prefix)/apache2/include
-	ginstall -m 0644 $(WORKDIR)/mod_form.h $(DESTDIR)$(prefix)/apache2/include/mod_form.h
+	ginstall -m 0644 $(WORKSRC)/mod_form.h $(DESTDIR)$(prefix)/apache2/include/mod_form.h
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/mod_form/trunk/files/formget.patch
===================================================================
--- csw/mgar/pkg/mod_form/trunk/files/formget.patch	                        (rev 0)
+++ csw/mgar/pkg/mod_form/trunk/files/formget.patch	2013-12-19 16:10:58 UTC (rev 22712)
@@ -0,0 +1,26 @@
+Tue Mar 13 15:16:30 CET 2007 - poeml at cmdline.net
+
+preserve r->args (apr_strtok is destructive in this regard). Makes
+mod_autoindex work again in conjunction with directories where FormGET is
+enabled.
+
+--- mod_form.c.old      2007-03-13 15:05:13.872945000 +0100
++++ mod_form.c  2007-03-13 15:06:26.378367000 +0100
+@@ -61,6 +61,7 @@
+   char* pair ;
+   char* last = NULL ;
+   char* eq ;
++  char* a ;
+   if ( ! ctx ) {
+     ctx = apr_pcalloc(r->pool, sizeof(form_ctx)) ;
+     ctx->delim = delim[0];
+@@ -69,7 +70,8 @@
+   if ( ! ctx->vars ) {
+     ctx->vars = apr_table_make(r->pool, 10) ;
+   }
+-  for ( pair = apr_strtok(args, delim, &last) ; pair ;
++  a = apr_pstrdup(r->pool, args);
++  for ( pair = apr_strtok(a, delim, &last) ; pair ;
+         pair = apr_strtok(NULL, delim, &last) ) {
+     for (eq = pair ; *eq ; ++eq)
+       if ( *eq == '+' )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.