5 files changed, 9 insertions, 6 deletions

diff --git a/contrib/Makefile b/contrib/Makefile
index 8b34eb221..c6c48e78a 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,3 +1,5 @@
+PKG_CONFIG = pkg-config
+
 all:
         @echo "Valid targets: gnome-ssh-askpass1 gnome-ssh-askpass2"
 
@@ -7,9 +9,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
                 `gnome-config --libs gnome gnomeui`
 
 gnome-ssh-askpass2: gnome-ssh-askpass2.c
-        $(CC) `pkg-config --cflags gtk+-2.0` \
+        $(CC) `$(PKG_CONFIG) --cflags gtk+-2.0` \
                 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
-                `pkg-config --libs gtk+-2.0 x11`
+                `$(PKG_CONFIG) --libs gtk+-2.0 x11`
 
 clean:
         rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 90be57dac..9fd07953a 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -16,7 +16,7 @@
 
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
-%define version         6.0p1
+%define version         6.1p1
 %if %{use_stable}
   %define cvs           %{nil}
   %define release       1
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.77 2012/04/20 00:58:43 djm Exp $
+$Id: openssh.spec,v 1.78 2012/08/22 11:57:15 djm Exp $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 3ac39a621..3c9046f5f 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -493,6 +493,7 @@ install_service() {
                               -a "-D" -y tcpip "${cygwin_env[@]}" \
                               -u "${run_service_as}" -w "${password}"
         then
+          /usr/bin/editrights -u "${run_service_as}" -a SeServiceLogonRight
           echo
           csih_inform "The sshd service has been installed under the '${run_service_as}'"
           csih_inform "account.  To start the service now, call \`net start sshd' or"
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index d4e44d26d..f74ad4486 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 6.0p1
+%define ver 6.1p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 8d99fb5aa..3b8abecc8 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:        6.0p1
+Version:        6.1p1
 URL:            http://www.openssh.com/
 Release:        1
 Source0:        openssh-%{version}.tar.gz