[csw-devel] SF.net SVN: gar:[19374] csw/mgar/pkg/apache2/branches/apache24

[bdwalton at users.sourceforge.net]

Revision: 19374
          http://gar.svn.sourceforge.net/gar/?rev=19374&view=rev
Author:   bdwalton
Date:     2012-10-04 08:51:14 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
apache2/branches/apache24: patch out a usr/local reference and hack out a few others

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/apache24/Makefile

Added Paths:
-----------
    csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch

Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-04 08:42:32 UTC (rev 19373)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile	2012-10-04 08:51:14 UTC (rev 19374)
@@ -52,6 +52,7 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2
+CHECKPKG_OVERRIDES_CSWapache24 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/htdbm.1
 
 PACKAGES += CSWapache24-manual
 ARCHALL_CSWapache24-manual = 1
@@ -65,6 +66,7 @@
 PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL)
 
 PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
+PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
 
 BUILD_DEP_PKGS += CSWlibaprutil-dev
 
@@ -100,3 +102,8 @@
 
 CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS)
 
+post-merge:
+	@(cd $(PKGROOT)/$(sysconfdir)/apache24; \
+		rm -rf original; \
+		perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf )
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch	                        (rev 0)
+++ csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch	2012-10-04 08:51:14 UTC (rev 19374)
@@ -0,0 +1,29 @@
+From 4565f79569130fc4ec0bae99fd3829785394f937 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Mon, 28 Feb 2011 01:23:44 +0100
+Subject: [PATCH] Switch usr/local for opt/csw in default cgi path
+
+Modify the default PATH for cgi scripts to use /opt/csw/bin as the
+final element instead of /usr/local/bin.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ include/httpd.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/httpd.h b/include/httpd.h
+index 40351b7..0fff717 100644
+--- a/include/httpd.h
++++ b/include/httpd.h
+@@ -150,7 +150,7 @@ extern "C" {
+ 
+ /** The default path for CGI scripts if none is currently set */
+ #ifndef DEFAULT_PATH
+-#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin"
++#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/opt/csw/bin"
+ #endif
+ 
+ /** The path to the suExec wrapper, can be overridden in Configuration */
+-- 
+1.7.3.2
+

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