[csw-devel] SF.net SVN: gar:[13889] csw/mgar/pkg/apache2/branches/open-bug-squash
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Mon Mar 21 02:53:27 CET 2011
Revision: 13889
http://gar.svn.sourceforge.net/gar/?rev=13889&view=rev
Author: bdwalton
Date: 2011-03-21 01:53:27 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
apache2/branches/open-bug-squash: revert all renames except for -dev to keep things simpler until all issues resolved
Modified Paths:
--------------
csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
Added Paths:
-----------
csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall
csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove
csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall
Removed Paths:
-------------
csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall
csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove
csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall
Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 00:12:04 UTC (rev 13888)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-21 01:53:27 UTC (rev 13889)
@@ -38,8 +38,8 @@
DISTFILES += CSWapache2.killproc cswapache2
DISTFILES += CSWapache2.preinstall CSWapache2.postinstall
-DISTFILES += CSWap2-worker.postinstall CSWap2-worker.postremove
-DISTFILES += CSWap2-worker.preinstall
+DISTFILES += CSWap2worker.postinstall CSWap2worker.postremove
+DISTFILES += CSWap2worker.preinstall
DISTFILES += CSWapache2-dev.cswreleasenotes
@@ -55,36 +55,33 @@
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
# The PACKAGES variable tell GAR which packages to build
-PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2-suexec
-PACKAGES += CSWap2-worker
+PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec
+PACKAGES += CSWap2worker
# These packages are dummy versions to make dependencies nicer
# as various things depend on them currently
-PACKAGES += CSWap2-prefork CSWapache2rt CSWapache2c
+PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c
-OBSOLETES_CSWap2-suexec = CSWap2suexec
-OBSOLETES_CSWap2-prefork = CSWap2prefork
-OBSOLETES_CSWap2-worker = CSWap2worker
OBSOLETES_CSWapache2-dev = CSWapache2-devel
ARCHALL_CSWapache2-manual = 1
-ARCHALL_CSWap2-prefork = 1
+ARCHALL_CSWap2prefork = 1
ARCHALL_CSWapache2rt = 1
ARCHALL_CSWapache2c = 1
CATALOGNAME_CSWapache2 = apache2
CATALOGNAME_CSWapache2-dev = apache2_dev
CATALOGNAME_CSWapache2-manual = apache2_manual
-CATALOGNAME_CSWap2-suexec = ap2_suexec
-CATALOGNAME_CSWap2-prefork = ap2_prefork
-CATALOGNAME_CSWap2-worker = ap2_worker
+CATALOGNAME_CSWap2suexec = ap2_suexec
+CATALOGNAME_CSWap2prefork = ap2_prefork
+CATALOGNAME_CSWap2worker = ap2_worker
CATALOGNAME_CSWapache2rt = apache2rt
SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
SPKG_DESC_CSWapache2-dev = The development files for Apache2.
SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
-SPKG_DESC_CSWap2-suexec = The standard suEXEC binary for Apache2.
-SPKG_DESC_CSWap2-worker = The apache worker mpm.
-SPKG_DESC_CSWap2-prefork = A stub for the old prefork mpm package.
+SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
+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.
SPKG_DESC_CSWapache2c = A stub for the old apache2c package.
@@ -94,18 +91,18 @@
RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c
RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2-suexec = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2-prefork = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2-worker = CSWapache2 CSWapr CSWexpat CSWap2-prefork
-RUNTIME_DEP_PKGS_CSWap2-worker += CSWbdb48 CSWapr-util CSWiconv
+RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2
+RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWapr CSWexpat CSWap2prefork
+RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWapr-util CSWiconv
RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2
CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWalternatives
CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils
CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c
-CHECKPKG_OVERRIDES_CSWap2-prefork += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWap2-prefork
-CHECKPKG_OVERRIDES_CSWap2-worker += surplus-dependency|CSWalternatives
+CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork
+CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWalternatives
CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h
@@ -125,7 +122,7 @@
AP2_MODFILES = *suexec*\.so
ALTERNATIVES_CSWapache2 = prefork
-ALTERNATIVES_CSWap2-worker = worker
+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
@@ -209,12 +206,12 @@
LIBTOOL_LADIR = $(APACHE_ROOT)/lib
STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
-PKGFILES_CSWap2-suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
-PKGFILES_CSWap2-suexec += .*ap2mod/suexec
+PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
+PKGFILES_CSWap2suexec += .*ap2mod/suexec
PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la)
PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
-PKGFILES_CSWap2-prefork = .*share/doc/ap2_prefork.*
-PKGFILES_CSWap2-worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
+PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
+PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
PKGFILES_CSWapache2c = .*share/doc/apache2c.*
Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall 2011-03-21 00:12:04 UTC (rev 13888)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall 2011-03-21 01:53:27 UTC (rev 13889)
@@ -1,41 +0,0 @@
-#!/bin/sh
-
- # Source csw.conf, if it exists
-if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
-fi
-if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
-fi
-
-# Determine if service should be started or not
-daemon=yes
-if [ "$autoenable_daemons" = "no" ]; then
- daemon=no
-fi
-
-if [ "$autoenable_cswapache2" = "no" ]; then
-
- daemon=no
-elif [ "$autoenable_cswapache2" = "yes" ]; then
- daemon=yes
-fi
-
-if [ "$daemon" = "yes" ]; then
- # Determine if SMF should be used or not
- smf=no
-
- if [ "$use_smf" = "no" ]; then
- smf=no
- else
- if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then
- smf=yes
- fi
- fi
-
- if [ "$smf" = "yes" ]; then
- svcadm restart cswapache2
- else
- /etc/init.d/cswapache2 restart
- fi
-fi
Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove 2011-03-21 00:12:04 UTC (rev 13888)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove 2011-03-21 01:53:27 UTC (rev 13889)
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# Source csw.conf, if it exists
-if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
-fi
-if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
- . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
-fi
-
-# On removal of the worker mpm, restart apache to use the prefork (default)
-# mpm...only if it's currently running though
-if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then
- # Determine if SMF should be used or not
- smf=no
-
- if [ "$use_smf" = "no" ]; then
- smf=no
- else
- if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then
- smf=yes
- fi
- fi
-
- if [ "$smf" = "yes" ]; then
- svcadm restart cswapache2
- else
- /etc/init.d/cswapache2 restart
- fi
-fi
Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall 2011-03-21 00:12:04 UTC (rev 13888)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall 2011-03-21 01:53:27 UTC (rev 13889)
@@ -1,15 +0,0 @@
-#!/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
Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall (from rev 13557, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall)
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall 2011-03-21 01:53:27 UTC (rev 13889)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+ # Source csw.conf, if it exists
+if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
+ . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
+fi
+if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
+ . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
+fi
+
+# Determine if service should be started or not
+daemon=yes
+if [ "$autoenable_daemons" = "no" ]; then
+ daemon=no
+fi
+
+if [ "$autoenable_cswapache2" = "no" ]; then
+
+ daemon=no
+elif [ "$autoenable_cswapache2" = "yes" ]; then
+ daemon=yes
+fi
+
+if [ "$daemon" = "yes" ]; then
+ # Determine if SMF should be used or not
+ smf=no
+
+ if [ "$use_smf" = "no" ]; then
+ smf=no
+ else
+ if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then
+ smf=yes
+ fi
+ fi
+
+ if [ "$smf" = "yes" ]; then
+ svcadm restart cswapache2
+ else
+ /etc/init.d/cswapache2 restart
+ fi
+fi
Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove (from rev 13557, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove)
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove 2011-03-21 01:53:27 UTC (rev 13889)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Source csw.conf, if it exists
+if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
+ . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
+fi
+if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
+ . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
+fi
+
+# On removal of the worker mpm, restart apache to use the prefork (default)
+# mpm...only if it's currently running though
+if [ -n "`pgrep -f apache2/sbin/httpd`" ]; then
+ # Determine if SMF should be used or not
+ smf=no
+
+ if [ "$use_smf" = "no" ]; then
+ smf=no
+ else
+ if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ]; then
+ smf=yes
+ fi
+ fi
+
+ if [ "$smf" = "yes" ]; then
+ svcadm restart cswapache2
+ else
+ /etc/init.d/cswapache2 restart
+ fi
+fi
Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall (from rev 13557, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.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-03-21 01:53:27 UTC (rev 13889)
@@ -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.
More information about the devel
mailing list