[csw-devel] SF.net SVN: gar:[4060] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sun Mar 29 19:35:24 CEST 2009
Revision: 4060
http://gar.svn.sourceforge.net/gar/?rev=4060&view=rev
Author: chninkel
Date: 2009-03-29 17:35:24 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
openssh: suppression of restart workaround
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/checksums
csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
Removed Paths:
-------------
csw/mgar/pkg/openssh/trunk/files/CSWossh.postinstall
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.postinstall
csw/mgar/pkg/openssh/trunk/files/openssh_restart_workaround.sh
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2009-03-29 17:35:24 UTC (rev 4060)
@@ -43,7 +43,7 @@
REQUIRED_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib
-###### Upstream and opencsw files information #######
+###### Upstream and OpenCSW files information #######
MASTER_SITES = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ http://www.sxw.org.uk/computing/patches/
@@ -63,10 +63,6 @@
LICENSE = LICENCE
-# Script created to workaround a upgrade bug between
-# package = 4.6,REV=2007.07.30_rev=p1 and later package
-DISTFILES += openssh_restart_workaround.sh
-
# The GSSAPI key exchange patch
PATCHFILES = openssh-$(GSSKEX_PATCH_VERSION)-gsskex-$(GSSKEX_PATCH_DATE).patch
@@ -134,7 +130,6 @@
ginstall $(WORKDIR_FIRSTMOD)/*.conf $(WORKROOTDIR)/build-global/
ginstall -D $(DOWNLOADDIR)/openssh $(PKGROOT)/etc/init.d/openssh
ginstall -D $(DOWNLOADDIR)/sshd_config $(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW
- ginstall -D $(DOWNLOADDIR)/openssh_restart_workaround.sh $(PKGROOT)/$(sharedstatedir)/openssh/openssh_restart_workaround.sh
for DOCDIR in $(DOCDIRS); do \
ginstall -d $(PKGROOT)/$(docdir)/$(DOCDIR); \
Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/checksums 2009-03-29 17:35:24 UTC (rev 4060)
@@ -7,7 +7,6 @@
8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh
547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml
fd50a65230ec1ead7949e8500844b0bf download/openssh
-bd0f690fbb3abcbffe7924ae3016c8c3 download/openssh_restart_workaround.sh
2768c47277b19c556403ea652cf8ceb3 download/openssh_dyngspec.fakespec
bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch
4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWossh.postinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.postinstall 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.postinstall 2009-03-29 17:35:24 UTC (rev 4060)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Dirty hack to avoid openssh not being restarted under Solaris 10
-# because of a bug in the previous package (<= 4.6,REV=2007.07.30_rev=p1)
-#
-# we launch a script which will wait for openssh to quit the 'online*'
-# state and then will clear its service state if it is in maintenance
-#
-# we must use ctrun to run this script so it is started under a new
-# contract id and hence is not killed when the ssh service is disabled
-# even if pkg-get/pkgadd was started from an ssh connection
-#
-if [ -f "$BASEDIR/usr/sbin/svccfg" -a -f "$BASEDIR/usr/sbin/svcadm" ]; then
- /bin/ctrun /opt/csw/share/openssh/openssh_restart_workaround.sh &
-fi
-
-
Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-29 17:35:24 UTC (rev 4060)
@@ -27,5 +27,4 @@
f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
f none /opt/csw/share/man/man8/sshd.8 0644 root bin
d none /opt/csw/share/openssh 0755 root bin
-f none /opt/csw/share/openssh/openssh_restart_workaround.sh 0755 root bin
d none /var/empty
Deleted: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.postinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.postinstall 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.postinstall 2009-03-29 17:35:24 UTC (rev 4060)
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Dirty hack to avoid openssh not being restarted under Solaris 10
-# because of a bug in the previous package (<= 4.6,REV=2007.07.30_rev=p1)
-#
-# we launch a script which will wait for openssh to quit the 'online*'
-# state and then will clear its service state if it is in maintenance
-#
-# we must use ctrun to run this script so it is started under a new
-# contract id and hence is not killed when the ssh service is disabled
-# even if pkg-get/pkgadd was started from an ssh connection
-#
-if [ -f "$BASEDIR/usr/sbin/svccfg" -a -f "$BASEDIR/usr/sbin/svcadm" ]; then
- /bin/ctrun /opt/csw/share/openssh/openssh_restart_workaround.sh &
-fi
-
-
Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2009-03-29 17:35:24 UTC (rev 4060)
@@ -30,5 +30,4 @@
f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
f none /opt/csw/share/man/man8/sshd.8 0644 root bin
d none /opt/csw/share/openssh 0755 root bin
-f none /opt/csw/share/openssh/openssh_restart_workaround.sh 0755 root bin
d none /var/empty
Deleted: csw/mgar/pkg/openssh/trunk/files/openssh_restart_workaround.sh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/openssh_restart_workaround.sh 2009-03-29 17:29:36 UTC (rev 4059)
+++ csw/mgar/pkg/openssh/trunk/files/openssh_restart_workaround.sh 2009-03-29 17:35:24 UTC (rev 4060)
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# openssh_restart_workaround.sh
-#
-# This script's task is to workaround a openssh upgrade
-# restart bug which result in the openssh service staying in
-# maintenance mode.
-#
-# This script first wait for the service to enter the maintenance
-# state, then it clear the service state so the service goes
-# properly into the disabled or enabled state.
-#
-STATE="`/bin/svcs -H svc:/network/cswopenssh:default 2>/dev/null | /usr/bin/awk '{ print $1 }'`"
-if [ "$STATE" = 'online*' ]; then
- while [ "$STATE" = 'online*' ]; do
- sleep 1
- STATE="`/bin/svcs -H svc:/network/cswopenssh:default | /usr/bin/awk '{ print $1 }'`"
- done
-fi
-if [ "$STATE" = "maintenance" ]; then
- # we clear the service state so it can be properly enabled on postinstall
- /usr/sbin/svcadm clear svc:/network/cswopenssh:default 2>/dev/null
-fi
-
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