[csw-devel] SF.net SVN: gar:[13557] csw/mgar/pkg/apache2/branches/open-bug-squash
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Fri Mar 4 04:26:50 CET 2011
Revision: 13557
http://gar.svn.sourceforge.net/gar/?rev=13557&view=rev
Author: bdwalton
Date: 2011-03-04 03:26:49 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
apache2/branches/open-bug-squash: rename scripts and correct a few more items due to the renaming
Modified Paths:
--------------
csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
Added 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
Removed 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
Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:24:20 UTC (rev 13556)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile 2011-03-04 03:26:49 UTC (rev 13557)
@@ -38,8 +38,8 @@
DISTFILES += CSWapache2.killproc cswapache2
DISTFILES += CSWapache2.preinstall CSWapache2.postinstall
-DISTFILES += CSWap2worker.postinstall CSWap2worker.postremove
-DISTFILES += CSWap2worker.preinstall
+DISTFILES += CSWap2-worker.postinstall CSWap2worker.postremove
+DISTFILES += CSWap2-worker.preinstall
DISTFILES += CSWapache2-devel.cswreleasenotes
@@ -66,7 +66,7 @@
OBSOLETES_CSWap2-worker = CSWap2worker
ARCHALL_CSWapache2-manual = 1
-ARCHALL_CSWap2prefork = 1
+ARCHALL_CSWap2-prefork = 1
ARCHALL_CSWapache2rt = 1
OBSOLETES_CSWapache2 = CSWapache2c
Copied: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall)
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postinstall 2011-03-04 03:26:49 UTC (rev 13557)
@@ -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/CSWap2-worker.postremove (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove)
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.postremove 2011-03-04 03:26:49 UTC (rev 13557)
@@ -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/CSWap2-worker.preinstall (from rev 13546, csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall)
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2-worker.preinstall 2011-03-04 03:26:49 UTC (rev 13557)
@@ -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
Deleted: csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall 2011-03-04 03:24:20 UTC (rev 13556)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postinstall 2011-03-04 03:26:49 UTC (rev 13557)
@@ -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/CSWap2worker.postremove
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove 2011-03-04 03:24:20 UTC (rev 13556)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.postremove 2011-03-04 03:26:49 UTC (rev 13557)
@@ -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/CSWap2worker.preinstall
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall 2011-03-04 03:24:20 UTC (rev 13556)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/CSWap2worker.preinstall 2011-03-04 03:26:49 UTC (rev 13557)
@@ -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
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