[csw-devel] SF.net SVN: gar:[10907] csw/mgar/pkg/openssh/trunk/files

[chninkel at users.sourceforge.net]

Revision: 10907
          http://gar.svn.sourceforge.net/gar/?rev=10907&view=rev
Author:   chninkel
Date:     2010-09-02 14:28:35 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: removed obsolete preinstall code

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
    csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall

Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall	2010-09-02 14:27:22 UTC (rev 10906)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.preinstall	2010-09-02 14:28:35 UTC (rev 10907)
@@ -20,25 +20,5 @@
 	chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
 fi
 
-# Configuration file are now under /opt/csw/etc/ssh 
-# instead of /opt/csw/etc
-MOVE_CONF_FILE=0
-for FILE in ssh_config sshd_config moduli ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub; do
-	if [ -f "$PKG_ROOT_DIR/opt/csw/etc/$FILE" ]; then
-		if [ "$MOVE_CONF_FILE" -eq 0 ]; then
-			echo "WARNING: Openssh configuration files location has been changed !"
-			echo "         sshd_config and ssh_config files are now under /opt/csw/etc/ssh."
-			mkdir -p "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			chown root:bin "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			MOVE_CONF_FILE=1
-		fi
-		echo "Moving file /opt/csw/etc/$FILE -> /opt/csw/etc/ssh/$FILE ..."
-		mv "$PKG_ROOT_DIR/opt/csw/etc/$FILE" "$PKG_ROOT_DIR/opt/csw/etc/ssh/$FILE"
-	fi
-done
-
-# previous openssh package (< 4.6p1) doesn't stop openssh so we do it ourself
-pkill -15 -P 1 -f "^/opt/csw/sbin/sshd$"
-
 true
 

Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall	2010-09-02 14:27:22 UTC (rev 10906)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.preinstall	2010-09-02 14:28:35 UTC (rev 10907)
@@ -20,25 +20,5 @@
 	chroot $PKG_ROOT_DIR /usr/sbin/useradd -d /var/run -c 'sshd nonpriv userid' -s /bin/false sshd
 fi
 
-# Configuration file are now under /opt/csw/etc/ssh 
-# instead of /opt/csw/etc
-MOVE_CONF_FILE=0
-for FILE in ssh_config sshd_config moduli ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub; do
-	if [ -f "$PKG_ROOT_DIR/opt/csw/etc/$FILE" ]; then
-		if [ "$MOVE_CONF_FILE" -eq 0 ]; then
-			echo "WARNING: Openssh configuration files location has been changed !"
-			echo "         sshd_config and ssh_config files are now under /opt/csw/etc/ssh."
-			mkdir -p "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			chown root:bin "$PKG_ROOT_DIR/opt/csw/etc/ssh"
-			MOVE_CONF_FILE=1
-		fi
-		echo "Moving file /opt/csw/etc/$FILE -> /opt/csw/etc/ssh/$FILE ..."
-		mv "$PKG_ROOT_DIR/opt/csw/etc/$FILE" "$PKG_ROOT_DIR/opt/csw/etc/ssh/$FILE"
-	fi
-done
-
-# previous openssh package (< 4.6p1) doesn't stop openssh so we do it ourself
-pkill -15 -P 1 -f "^/opt/csw/sbin/sshd$"
-
 true
 


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