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

Mon Oct 4 03:23:42 CEST 2010

Revision: 11137
          http://gar.svn.sourceforge.net/gar/?rev=11137&view=rev
Author:   bdwalton
Date:     2010-10-04 01:23:41 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
apache2: work around bug in alternatives, put httpd.worker in separate package again

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

Removed 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-03 16:42:47 UTC (rev 11136)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-10-04 01:23:41 UTC (rev 11137)
@@ -43,7 +43,6 @@
 DISTFILES += update20to22
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
 DISTFILES += README.CSW.apache2rt
-DISTFILES += README.CSW.ap2_worker CSWap2worker.postinstall
 
 DISTFILES += i.cswap2mod r.cswap2mod
 
@@ -58,7 +57,6 @@
 ARCHALL_CSWapache2-manual = 1
 ARCHALL_CSWap2prefork = 1
 ARCHALL_CSWapache2rt = 1
-ARCHALL_CSWap2worker = 1
 
 CATALOGNAME_CSWapache2 = apache2
 CATALOGNAME_CSWapache2-devel = apache2_devel
@@ -72,9 +70,9 @@
 SPKG_DESC_CSWapache2-devel = The development files for Apache2.
 SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
 SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
-SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package
-SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package
-SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package
+SPKG_DESC_CSWap2worker = The apache worker mpm.
+SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package.
+SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package.
 
 INCOMPATIBLE_PKGS_CSWapache2  = CSWapache2c
 
@@ -85,7 +83,8 @@
 RUNTIME_DEP_PKGS_CSWapache2-devel  = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2suexec	   = CSWapache2
 RUNTIME_DEP_PKGS_CSWap2prefork     = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2worker      = CSWapache2 CSWosslrt CSWapr CSWexpat
+RUNTIME_DEP_PKGS_CSWap2worker 	  += CSWbdb48 CSWapr-util CSWiconv
 RUNTIME_DEP_PKGS_CSWapache2rt	   = CSWapache2
 
 CHECKPKG_OVERRIDES_CSWap2suexec  += surplus-dependency|CSWapache2
@@ -94,6 +93,7 @@
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives
 CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
 
 # We need this to get bdb48/lib into the runpath
@@ -106,14 +106,14 @@
 INITSMF = /etc/opt/csw/init.d/cswapache2
 
 POSTMSG = /opt/csw/share/doc/apache2/README.CSW
-POSTMSG += /opt/csw/share/doc/ap2_worker/README.CSW
 
 AP2_MODS = 1
 AP2_MODFILES = /opt/csw/apache2/libexec/.*suexec.*\.so
 
-ALTERNATIVES_CSWapache2 = prefork worker
-ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 100
-ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 50
+ALTERNATIVES_CSWapache2 = prefork
+ALTERNATIVES_CSWap2worker = worker
+ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50
+ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100
 
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
@@ -170,7 +170,7 @@
 PKGFILES_CSWapache2-devel = $(PKGFILES_DEVEL)
 PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
 PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
-PKGFILES_CSWap2worker = .*share/doc/ap2_worker.*
+PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
 
 PROTOTYPE_FILTER  = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }'

Deleted: csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall	2010-10-03 16:42:47 UTC (rev 11136)
+++ csw/mgar/pkg/apache2/trunk/files/CSWap2worker.postinstall	2010-10-04 01:23:41 UTC (rev 11137)
@@ -1,12 +0,0 @@
-#!/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/alternatives --set httpd /opt/csw/apache2/sbin/httpd.worker

Deleted: csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker
===================================================================
--- csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	2010-10-03 16:42:47 UTC (rev 11136)
+++ csw/mgar/pkg/apache2/trunk/files/README.CSW.ap2_worker	2010-10-04 01:23:41 UTC (rev 11137)
@@ -1,21 +0,0 @@
-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.
