From a21380b70e0a72ce20ec8ebd4f9bb1e03134ca22 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 13 Mar 2005 21:20:18 +1100 Subject: - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the localized name of the local administrators group more reliable. From vinschen at redhat.com. --- contrib/cygwin/ssh-host-config | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index c7164f610..b41a2e49b 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -449,12 +449,10 @@ then echo "Should this script create a new local account 'sshd_server' which has" if request "the required privileges?" then - _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group` + _admingroup=`mkgroup -l | awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ` if [ -z "${_admingroup}" ] then - echo "There's no group with SID S-1-5-32-544 (Local administrators group) in" - echo "your ${SYSCONFDIR}/group file. Please regenerate this entry using 'mkgroup -l'" - echo "and restart this script." + echo "mkgroup -l produces no group with SID S-1-5-32-544 (Local administrators group)." exit 1 fi dos_var_empty=`cygpath -w ${LOCALSTATEDIR}/empty` -- cgit v1.2.3 From c3939e22fdcc9c22102b8d3d894f5885105a1a04 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Mon, 14 Mar 2005 17:24:51 -0800 Subject: - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed with a rpm -F --- ChangeLog | 4 +++- contrib/caldera/openssh.spec | 12 +++--------- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 7d004007b..4095d6071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ - markus@cvs.openbsd.org 2005/03/14 11:46:56 [buffer.c buffer.h channels.c] limit input buffer size for channels; bugzilla #896; with and ok dtucker@ + - (tim) [contrib/caldera/openssh.spec] links in rc?.d were getting trashed + with a rpm -F 20050313 - (dtucker) [contrib/cygwin/ssh-host-config] Makes the query for the @@ -2362,4 +2364,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3719 2005/03/14 12:24:43 dtucker Exp $ +$Id: ChangeLog,v 1.3720 2005/03/15 01:24:51 tim Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 67d8e6ff4..b04562dc8 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -21,8 +21,8 @@ %define cvs %{nil} %define release 1 %else - %define version 3.9p1 - %define cvs cvs20011009 + %define version 4.0p1 + %define cvs cvs20050315 %define release 0r1 %endif %define xsa x11-ssh-askpass @@ -297,12 +297,7 @@ fi %PreUn server [ "$1" = 0 ] || exit 0 - ! %{SVIdir}/sshd status || %{SVIdir}/sshd stop -: # to protect the rpm database - - -%PostUn server if [ -x %{LSBinit}-remove ]; then %{LSBinit}-remove sshd else @@ -310,7 +305,6 @@ else fi : # to protect the rpm database - %Files %defattr(-,root,root) %dir %{_sysconfdir} @@ -363,4 +357,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.52 2005/03/09 00:02:42 djm Exp $ +$Id: openssh.spec,v 1.53 2005/03/15 01:24:51 tim Exp $ -- cgit v1.2.3 From 6e1defdc5a597902f6899b71e635e718ffa8a2b6 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 29 Mar 2005 23:24:12 +1000 Subject: - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're interested in which is much faster in large (eg LDAP or NIS) environments. Patch from dleonard at vintela.com. --- ChangeLog | 7 ++++++- contrib/aix/buildbff.sh | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index ef5602e34..5bb4788ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20050329 + - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're + interested in which is much faster in large (eg LDAP or NIS) environments. + Patch from dleonard at vintela.com. + 20050321 - (dtucker) [configure.ac] Prevent configure --with-zlib from adding -Iyes and -Lyes to CFLAGS and LIBS. Pointed out by peter at slagheap.net, @@ -2382,4 +2387,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3727 2005/03/21 11:46:34 dtucker Exp $ +$Id: ChangeLog,v 1.3728 2005/03/29 13:24:12 dtucker Exp $ diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh index 4a5c32b0e..09b9c118c 100755 --- a/contrib/aix/buildbff.sh +++ b/contrib/aix/buildbff.sh @@ -1,7 +1,7 @@ #!/bin/sh # # buildbff.sh: Create AIX SMIT-installable OpenSSH packages -# $Id: buildbff.sh,v 1.7 2003/11/21 12:48:56 djm Exp $ +# $Id: buildbff.sh,v 1.8 2005/03/29 13:24:12 dtucker Exp $ # # Author: Darren Tucker (dtucker at zip dot com dot au) # This file is placed in the public domain and comes with absolutely @@ -219,7 +219,7 @@ else fi # Create user if required - if lsuser ALL | cut -f1 -d: | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null + if lsuser "$SSH_PRIVSEP_USER" >/dev/null then echo "PrivSep user $SSH_PRIVSEP_USER already exists." else -- cgit v1.2.3 From fa2211d93d3ad66ec16e4d23a14e5730a105c559 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 9 May 2005 23:48:17 +1000 Subject: - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning for a user-mode mounts in Cygwin installation. Patch from vinschen at redhat.com. --- ChangeLog | 6 +++++- contrib/cygwin/ssh-host-config | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index bee07796c..a84435296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20050509 + - (dtucker) [contrib/cygwin/ssh-host-config] Add a test and warning for a + user-mode mounts in Cygwin installation. Patch from vinschen at redhat.com. + 20050504 - (djm) [ssh.c] some systems return EADDRINUSE on a bind to an already-used unix domain socket, so catch that too; from jakob@ ok dtucker@ @@ -2474,4 +2478,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3753 2005/05/04 05:33:09 djm Exp $ +$Id: ChangeLog,v 1.3754 2005/05/09 13:48:17 dtucker Exp $ diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index b41a2e49b..fbfb5c195 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -583,6 +583,16 @@ then chown "${_user}".544 ${LOCALSTATEDIR}/log/sshd.log fi fi + if ! ( mount | egrep -q 'on /(|usr/(bin|lib)) type system' ) + then + echo + echo "Warning: It appears that you have user mode mounts (\"Just me\"" + echo "chosen during install.) Any daemons installed as services will" + echo "fail to function unless system mounts are used. To change this," + echo "re-run setup.exe and choose \"All users\"." + echo + echo "For more information, see http://cygwin.com/faq/faq0.html#TOC33" + fi fi fi -- cgit v1.2.3 From 4d8f560c398530d652c72e9d91c1a0cb8ff19a6c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 25 May 2005 14:43:47 +1000 Subject: - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Update spec file versions to 4.1p1 --- ChangeLog | 8 ++++++-- contrib/caldera/openssh.spec | 6 +++--- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 0978c43ef..2cfcd9596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -20050512 +20050524 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update spec file versions to 4.1p1 + +20050524 - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz; "looks ok" dtucker@ @@ -2487,4 +2491,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3756 2005/05/24 05:54:27 djm Exp $ +$Id: ChangeLog,v 1.3757 2005/05/25 04:43:47 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index b04562dc8..355663ed4 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.0p1 + %define version 4.1p1 %define cvs %{nil} %define release 1 %else - %define version 4.0p1 + %define version 4.1p1 %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.53 2005/03/15 01:24:51 tim Exp $ +$Id: openssh.spec,v 1.54 2005/05/25 04:43:48 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 8fbc4c02a..430c4d323 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 4.0p1 +%define ver 4.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 449613db6..a574d3f2f 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -1,6 +1,6 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 4.0p1 +Version: 4.1p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3