[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/openssh/ openssh.spec ssh-keyman ssh-keyman...
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2003-12-31 19:13:10
Message-ID: 20031231191310.DDAFD300530 () mail ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src openpkg-web          Date:   31-Dec-2003 20:13:10
  Branch: HEAD                             Handle: 2003123119130802

  Modified files:
    openpkg-src/openssh     openssh.spec ssh-keyman ssh-keyman.pod
    openpkg-web             news.txt

  Log:
    add a convinience option to install the ssh-agent loaded public keys
    into a remote account's ~/.ssh/authorized_keys

  Summary:
    Revision    Changes     Path
    1.119       +1  -1      openpkg-src/openssh/openssh.spec
    1.5         +18 -3      openpkg-src/openssh/ssh-keyman
    1.3         +6  -0      openpkg-src/openssh/ssh-keyman.pod
    1.7931      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/openssh.spec
  ============================================================================
  $ cvs diff -u -r1.118 -r1.119 openssh.spec
  --- openpkg-src/openssh/openssh.spec	23 Dec 2003 20:48:40 -0000	1.118
  +++ openpkg-src/openssh/openssh.spec	31 Dec 2003 19:13:10 -0000	1.119
  @@ -41,7 +41,7 @@
   Group:        Security
   License:      BSD
   Version:      %{V_base}%{V_portable}
  -Release:      20031223
  +Release:      20031231
   
   #   package options
   %option       with_fsl      yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/ssh-keyman
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 ssh-keyman
  --- openpkg-src/openssh/ssh-keyman	30 Dec 2002 22:05:38 -0000	1.4
  +++ openpkg-src/openssh/ssh-keyman	31 Dec 2003 19:13:10 -0000	1.5
  @@ -32,6 +32,7 @@
   #   OpenSSH programs
   ssh_agent="@l_prefix@/bin/ssh-agent"
   ssh_add="@l_prefix@/bin/ssh-add"
  +ssh="@l_prefix@/bin/ssh"
   
   #   parse command line options
   opt_q=no; alias_quiet=q
  @@ -42,6 +43,7 @@
   opt_a=no; alias_add=a
   opt_d=no; alias_delete=d
   opt_l=no; alias_list=l
  +opt_i=no; alias_install=i
   opt_h=no; alias_help=h
   opt_v=no; alias_version=v
   if [ $# -eq 0 ]; then
  @@ -58,7 +60,7 @@
               eval "name=\$alias_${name}"
               eval "opt_${name}=yes"
               ;;
  -        -[qceskadlhv] )
  +        -[qceskadlihv] )
               name=`echo x$1 | sed -e 's;^x-;;'`
               eval "opt_${name}=yes"
               ;;
  @@ -75,7 +77,7 @@
   
   #   stand-alone operation: display help information
   if [ ".$opt_h" = .yes ]; then
  -    echo "Usage: $prog_name [-h] [-v] [-q] [-c] [-e] [-s] [-k] [-a] [-d] [-l] \
[keyfile ...]"  +    echo "Usage: $prog_name [-h] [-v] [-q] [-c] [-e] [-s] [-k] [-a] \
[-d] [-l] [-i] [keyfile ...]"  exit 0
   fi
   
  @@ -108,7 +110,7 @@
           if [ ! -r $SSH_AUTH_SOCK ]; then
               invalid1="agent socket $SSH_AUTH_SOCK no longer exists"
           else
  -            ssh-add -l >/dev/null 2>&1
  +            $ssh_add -l >/dev/null 2>&1
               if [ $? -eq 2 ]; then
                   invalid1="agent socket $SSH_AUTH_SOCK no longer valid"
               fi
  @@ -285,6 +287,19 @@
           echo "$prog_name:WARNING: agent not available" 1>&2
       else
           $ssh_add -l
  +    fi
  +fi
  +
  +#   install key(s) into remote account
  +if [ ".$opt_i" = .yes ]; then
  +    if [ ".$SSH_AUTH_SOCK" = . ]; then
  +        echo "$prog_name:WARNING: agent not available" 1>&2
  +    else
  +        for remote in "$@"; do
  +            echo "$prog_name: installing public keys into $remote"
  +            $ssh_add -L |\
  +            $ssh $remote "umask 077; test -d ~/.ssh || mkdir ~/.ssh; cat \
>>~/.ssh/authorized_keys"  +        done
       fi
   fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/ssh-keyman.pod
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 ssh-keyman.pod
  --- openpkg-src/openssh/ssh-keyman.pod	30 Dec 2002 22:05:38 -0000	1.2
  +++ openpkg-src/openssh/ssh-keyman.pod	31 Dec 2003 19:13:10 -0000	1.3
  @@ -40,6 +40,7 @@
   [B<-d>]
   [B<-a>]
   [B<-l>]
  +[B<-i>]
   [I<keyfile> ...]
   
   B<ssh-keyman> 
  @@ -105,6 +106,11 @@
   
   List keys. This lists the currently available keys in the B<ssh-agent>
   process.
  +
  +=item B<-i>, B<--install>
  +
  +Install public keys into remote account. This extracts the currently available \
public keys in the B<ssh-agent>  +process and installs them into \
"C<~/.ssh/authorized_keys>" on a specified remote account.  
   =item B<-h>, B<--help>
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7930 -r1.7931 news.txt
  --- openpkg-web/news.txt	31 Dec 2003 11:55:09 -0000	1.7930
  +++ openpkg-web/news.txt	31 Dec 2003 19:13:08 -0000	1.7931
  @@ -1,3 +1,4 @@
  +31-Dec-2003: Upgraded package: P<openssh-3.7.1p2-20031231>
   31-Dec-2003: Upgraded package: P<apt-0.5.15.5-20031231>
   31-Dec-2003: Upgraded package: P<apache-1.3.29-20031231>
   31-Dec-2003: Upgraded package: P<openldap-2.2.4-20031231>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]