[csw-devel] SF.net SVN: gar:[11123] csw/mgar/pkg/apache2/trunk

[bdwalton at users.sourceforge.net]

Revision: 11123
          http://gar.svn.sourceforge.net/gar/?rev=11123&view=rev
Author:   bdwalton
Date:     2010-10-02 01:09:05 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
apache2: we need ap2_worker again to preserve behaviour of mpm preference; deliver a readme and a postinstall script

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

Added Paths:
-----------
    csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall
    csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-10-02 01:02:27 UTC (rev 11122)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-10-02 01:09:05 UTC (rev 11123)
@@ -45,6 +45,8 @@
 DISTFILES += update20to22
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
 DISTFILES += README.CSW.apache2rt
+DISTFILES += README.CSW.ap2worker CSWap2worker.postinstall
+
 DISTFILES += i.cswap2mod r.cswap2mod
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Added: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall	2010-10-02 01:09:05 UTC (rev 11123)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Although CSWap2worker is a dummy package, shipping no real files
+# now, we still need to use it to trigger a call to alternatives at
+# install time to mimick the behaviour of the old packages...mostly,
+# this will allow us to preserve the proper httpd upon upgrades.  At
+# some point in the future, we can drop this package again with the
+# assumption that everyone will have upgraded and thus have an
+# alternatives set httpd symlink.
+
+
+exec chroot $PKG_INSTALL_ROOT /opt/csw/sbin/altneratives --set httpd /opt/csw/apache2/sbin/httpd.worker

Added: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	                        (rev 0)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	2010-10-02 01:09:05 UTC (rev 11123)
@@ -0,0 +1,21 @@
+Hello CSW User/Sysadmin,
+
+This package (CSWap2worker) is only a stub package now.  The httpd
+worker mpm is now delivered via the CSWapache2 package.
+
+The purpose of this package going forward is to do nothing other
+deliver a postinstall script that triggers a call to:
+
+alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker
+
+This allows us to preserve the behaviour of the old packages.
+
+Once you've installed it (presumably during an update from the
+previous packages), it is safe to remove completely.  There is no
+*remove script, and as httpd.worker is in CSWapache2, you still have
+the worker mpm installed and activated.  See:
+
+/opt/csw/sbin/altneratives --display httpd
+
+Thanks
+-The OpenCSW apache2 team.


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