[csw-devel] SF.net SVN: gar:[13119] csw/mgar/pkg/apache2/branches/open-bug-squash

[bdwalton at users.sourceforge.net]

Revision: 13119
          http://gar.svn.sourceforge.net/gar/?rev=13119&view=rev
Author:   bdwalton
Date:     2011-01-30 14:52:09 +0000 (Sun, 30 Jan 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: make ap2_worker depend on ap2_prefork to force dependency ordering in pkg-get; add ap2_worker preinstall script to forcefully remove remanants from 2.2.13 update

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile

Added Paths:
-----------
    csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-01-30 08:39:26 UTC (rev 13118)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-01-30 14:52:09 UTC (rev 13119)
@@ -39,6 +39,7 @@
 
 DISTFILES += CSWapache2.preinstall CSWapache2.postinstall
 DISTFILES += CSWap2worker.postinstall CSWap2worker.postremove
+DISTFILES += CSWap2worker.preinstall
 
 # Configuration templates
 DISTFILES += update20to22
@@ -85,7 +86,7 @@
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2 CSWapr CSWexpat
+RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2 CSWapr CSWexpat CSWap2prefork
 RUNTIME_DEP_PKGS_CSWap2worker 	  += CSWbdb48 CSWapr-util CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
 
@@ -93,6 +94,7 @@
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives
+CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 
 # We need this to get bdb48/lib into the runpath

Added: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall	                        (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall	2011-01-30 14:52:09 UTC (rev 13119)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# The old apache2 packages could potentially leave a dangling
+# sbin/httpd file.  As this would prevent successful delivery of the
+# new packages (alternatives won't instantiate sbin/httpd as a symlink
+# since it exists already), we need to kill sbin/httpd if it exists
+# when CSWapache2 is installed.
+
+HTTPD=$PKG_INSTALL_ROOT/opt/csw/apache2/sbin/httpd
+
+if [ -f "$HTTPD" -a ! -L "$HTTPD" ]; then
+   rm -f "$HTTPD"
+fi
+
+exit 0


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