diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/caldera/openssh.spec | 6 | ||||
| -rw-r--r-- | contrib/cygwin/ssh-host-config | 24 | ||||
| -rw-r--r-- | contrib/gnome-ssh-askpass2.c | 1 | ||||
| -rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
| -rw-r--r-- | contrib/ssh-copy-id | 2 | ||||
| -rw-r--r-- | contrib/suse/openssh.spec | 2 |
6 files changed, 25 insertions, 12 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 9cb5cb4..294757d 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -17,11 +17,11 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 %if %{use_stable} - %define version 4.7p1 + %define version 4.9p1 %define cvs %{nil} %define release 1 %else - %define version 4.1p1 + %define version 4.9p1 %define cvs cvs20050315 %define release 0r1 %endif @@ -357,4 +357,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.61 2007/08/15 09:22:20 dtucker Exp $ +$Id: openssh.spec,v 1.62 2008/03/27 06:43:46 djm Exp $ diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index e2ad69f..f90af8d 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -131,7 +131,7 @@ fi if [ -e "${SYSCONFDIR}" -a ! -d "${SYSCONFDIR}" ] then echo - echo "${SYSCONFDIR} is existant but not a directory." + echo "${SYSCONFDIR} exists but is not a directory." echo "Cannot create global configuration files." echo exit 1 @@ -156,7 +156,7 @@ fi if [ -e ${LOCALSTATEDIR}/log -a ! -d ${LOCALSTATEDIR}/log ] then echo - echo "${LOCALSTATEDIR}/log is existant but not a directory." + echo "${LOCALSTATEDIR}/log exists but is not a directory." echo "Cannot create ssh host configuration." echo exit 1 @@ -181,11 +181,23 @@ then fi # Create /var/empty file used as chroot jail for privilege separation -if [ -f ${LOCALSTATEDIR}/empty ] +if [ -e ${LOCALSTATEDIR}/empty -a ! -d ${LOCALSTATEDIR}/empty ] then - echo "Creating ${LOCALSTATEDIR}/empty failed!" -else - mkdir -p ${LOCALSTATEDIR}/empty + echo + echo "${LOCALSTATEDIR}/empty exists but is not a directory." + echo "Cannot create ssh host configuration." + echo + exit 1 +if [ ! -e ${LOCALSTATEDIR}/empty ] +then + if ! mkdir -p ${LOCALSTATEDIR}/empty + then + echo + echo "Creating ${LOCALSTATEDIR}/empty directory failed." + echo "Cannot create ssh host configuration." + echo + exit 1 + fi if [ ${_nt} -gt 0 ] then chmod 755 ${LOCALSTATEDIR}/empty diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c index 0ce8dae..901176d 100644 --- a/contrib/gnome-ssh-askpass2.c +++ b/contrib/gnome-ssh-askpass2.c @@ -111,6 +111,7 @@ passphrase_dialog(char *message) gtk_window_set_title(GTK_WINDOW(dialog), "OpenSSH"); gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); + gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); gtk_label_set_line_wrap(GTK_LABEL((GTK_MESSAGE_DIALOG(dialog))->label), TRUE); diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 34ec6b7..d6bd31b 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 4.7p1 +%define ver 4.9p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 1555b5d..acd36d3 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -11,7 +11,7 @@ if [ "-i" = "$1" ]; then shift # check if we have 2 parameters left, if so the first is the new ID file if [ -n "$2" ]; then - if expr "$1" : ".*\.pub" ; then + if expr "$1" : ".*\.pub" > /dev/null ; then ID_FILE="$1" else ID_FILE="$1.pub" diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 1f52305..7819af4 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -13,7 +13,7 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 4.7p1 +Version: 4.9p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz |
