packages: secpanel/secpanel-data_location.patch, secpanel/secpanel-distkeys...

lisu lisu at pld-linux.org
Mon Feb 22 16:55:17 CET 2010 

Author: lisu                         Date: Mon Feb 22 15:55:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.6.0

---- Files affected:
packages/secpanel:
   secpanel-data_location.patch (1.2 -> 1.3) , secpanel-distkeys_with_port.patch (1.1 -> 1.2) , secpanel-title.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/secpanel/secpanel-data_location.patch
diff -u packages/secpanel/secpanel-data_location.patch:1.2 packages/secpanel/secpanel-data_location.patch:1.3
--- packages/secpanel/secpanel-data_location.patch:1.2	Fri Mar 14 01:15:14 2008
+++ packages/secpanel/secpanel-data_location.patch	Mon Feb 22 16:55:12 2010
@@ -1,13 +1,13 @@
---- ./usr/local/bin/secpanel.org	2005-10-08 22:04:18.000000000 +0000
-+++ ./usr/local/bin/secpanel	2005-10-08 22:24:01.000000000 +0000
-@@ -29,8 +29,8 @@
+--- secpanel-0.6.0/usr/local/bin/secpanel~	2010-02-19 13:44:06.000000000 +0100
++++ secpanel-0.6.0/usr/local/bin/secpanel	2010-02-22 16:37:12.112675822 +0100
+@@ -29,8 +29,9 @@
  
- set spversion 0.5.1
+ set spversion 0.6.0
  
 -set libdir "[file dirname [info script]]/../lib/secpanel"
--# set libdir "./lib"
-+#set libdir "[file dirname [info script]]/../lib/secpanel"
++# set libdir "[file dirname [info script]]/../lib/secpanel"
+ # set libdir "$env(HOME)/secpanel_devel/secpanel-0x/lib"
 +set libdir "/usr/share/secpanel"
  set sshdir "$env(HOME)/.ssh"
  
- set scpcode 0
+ global actdirsel;

================================================================
Index: packages/secpanel/secpanel-distkeys_with_port.patch
diff -u packages/secpanel/secpanel-distkeys_with_port.patch:1.1 packages/secpanel/secpanel-distkeys_with_port.patch:1.2
--- packages/secpanel/secpanel-distkeys_with_port.patch:1.1	Fri Apr 10 10:39:09 2009
+++ packages/secpanel/secpanel-distkeys_with_port.patch	Mon Feb 22 16:55:12 2010
@@ -1,25 +1,14 @@
---- ./usr/local/bin/secpanel.org	2009-04-10 10:34:38.274315429 +0200
-+++ ./usr/local/bin/secpanel	2009-04-10 10:33:00.667776587 +0200
-@@ -977,7 +977,7 @@ proc distkey {key connectionprofiles} {
- 	    }
- 	}
-     
--	set singleactstring "$libdir/secpanel.dist $host $user $key $configs(sshbin)"
-+	set singleactstring "$libdir/secpanel.dist $host $port $user $key $configs(sshbin)"
- 	set connstring "$connstring $singleactstring"
- 	set connstring "$connstring \n\n\necho ==============================================================\n\n"
- 
---- ./usr/local/lib/secpanel/secpanel.dist.org	2009-04-10 10:34:59.994672725 +0200
-+++ ./usr/local/lib/secpanel/secpanel.dist	2009-04-10 10:35:21.017525894 +0200
-@@ -8,23 +8,30 @@
- # Author: Steffen Leich <steffen.leich _at_ gmail.com>
+--- secpanel-0.6.0/usr/local/lib/secpanel/spdistkey~	2010-02-19 11:50:57.000000000 +0100
++++ secpanel-0.6.0/usr/local/lib/secpanel/spdistkey	2010-02-22 16:47:16.979259946 +0100
+@@ -8,8 +8,14 @@
+ # Author: Steffen Leich-Nienhaus <steffen.leich _at_ gmail.com>
  ##########################################################################
  
 +function do_exit {
-+	echo
-+	echo -e "Key-Distribution finished\nPress <Return> to continue"
-+	read
-+	exit
++       echo
++       echo -e "Key-Distribution finished\nPress <Return> to continue"
++       read
++       exit
 +}
  
 -if [ -z $4 ]
@@ -27,44 +16,7 @@
  then
  cat <<EOF
  
- 	SecPanel
- 	Shellscript for distributing public keys to remote hosts
--	Usage: secpanel_distkey.sh <host> <user> <keyfile> <sshbin>
-+	Usage: secpanel_distkey.sh <host> <port> <user> <keyfile> <sshbin>
- 
- EOF
-     exit 2
- fi
- 
- HOST=$1
--USER=$2
--IDENTITY=$3
--SSHBIN=$4
-+PORT=$2
-+USER=$3
-+IDENTITY=$4
-+SSHBIN=$5
- 
- if [ ! -s $IDENTITY ]
- then
-@@ -38,14 +45,14 @@ cat <<EOF
-     SecPanel - Distribution of public keys to remote hosts
-     ------------------------------------------------------
- 
--    Connecting to $HOST as $USER
-+    Connecting to $HOST:$PORT as $USER
-     with key $IDENTITY
- 
-     First we try to check if the key is already on the target host.
- 
- EOF
- 
--$SSHBIN -l $USER $HOST "mkdir \$HOME/.ssh 2>/dev/null; grep '$(cat $IDENTITY)' \$HOME/.ssh/authorized_keys > /dev/null 2>&1"
-+$SSHBIN -l $USER -p $PORT $HOST "mkdir \$HOME/.ssh 2>/dev/null; grep '$(cat $IDENTITY)' \$HOME/.ssh/authorized_keys > /dev/null 2>&1"
- 
- DISTRET=$?
- 
-@@ -58,7 +65,7 @@ elif [ $DISTRET = 255 ]
+@@ -59,7 +65,7 @@
  then
      echo
      echo "There was an error connecting to the remote site"
@@ -73,7 +25,7 @@
      echo
      echo "Canceling the key-transfer"
      do_exit
-@@ -67,6 +74,6 @@ else
+@@ -68,6 +74,6 @@
      echo "    The key could not be found on this host"
      echo "    -> Transfering your public key to remote host"
      echo

================================================================
Index: packages/secpanel/secpanel-title.patch
diff -u packages/secpanel/secpanel-title.patch:1.3 packages/secpanel/secpanel-title.patch:1.4
--- packages/secpanel/secpanel-title.patch:1.3	Fri Apr 10 10:15:06 2009
+++ packages/secpanel/secpanel-title.patch	Mon Feb 22 16:55:12 2010
@@ -1,11 +1,11 @@
---- ./usr/local/bin/secpanel.org	2009-04-10 10:09:06.363971463 +0200
-+++ ./usr/local/bin/secpanel	2009-04-10 10:11:13.963967397 +0200
-@@ -1420,7 +1420,7 @@ proc connect {{cm ""}} {
- 	    $fork_tag $gateway_tag $compress_tag $compressval_tag \
- 	    $lf_tag $rf_tag $host $command_tag"
+--- secpanel-0.6.0/usr/local/bin/secpanel~	2010-02-22 16:37:50.420179394 +0100
++++ secpanel-0.6.0/usr/local/bin/secpanel	2010-02-22 16:39:30.760145987 +0100
+@@ -1403,7 +1403,7 @@
+ 			$fork_tag $gateway_tag $compress_tag $compressval_tag \
+ 			$lf_tag $rf_tag $host $command_tag"
  
--	set runstring "exec $configs(xtermbin) $icontag $titlepar \"SSH Connection - $title\" \
-+	set runstring "exec $configs(xtermbin) $icontag $titlepar \"SSH - $title\" \
- 	    $execpar $quotepar $waittag $woption <CONNFILE> $woption $quotepar"
+-		set runstring "exec $configs(xtermbin) $icontag $titlepar \"SSH Connection - $title\" \
++		set runstring "exec $configs(xtermbin) $icontag $titlepar \"SSH - $title\" \
+ 			$execpar $quotepar $waittag $woption <CONNFILE> $woption $quotepar"
  
- 	provrunfile term bg $connstring $runstring
+ 		provrunfile term bg $connstring $runstring
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/secpanel/secpanel-data_location.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/secpanel/secpanel-distkeys_with_port.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/secpanel/secpanel-title.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list