summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
commit0970072c89b079b022538e3c366fbfa2c53fc821 (patch)
treeb7024712d74234bb5a8b036ccbc9109e2e211296 /contrib
parent4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff)
parent478ff799463ca926a8dfbabf058f4e84aaffc65a (diff)
merge 5.7p1
Diffstat (limited to 'contrib')
-rw-r--r--contrib/caldera/openssh.spec12
-rw-r--r--contrib/redhat/openssh.spec2
-rwxr-xr-xcontrib/redhat/sshd.init2
-rw-r--r--contrib/suse/openssh.spec2
4 files changed, 11 insertions, 7 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 515fe334d..23397b04d 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -16,7 +16,7 @@
16 16
17#old cvs stuff. please update before use. may be deprecated. 17#old cvs stuff. please update before use. may be deprecated.
18%define use_stable 1 18%define use_stable 1
19%define version 5.6p1 19%define version 5.7p1
20%if %{use_stable} 20%if %{use_stable}
21 %define cvs %{nil} 21 %define cvs %{nil}
22 %define release 1 22 %define release 1
@@ -57,7 +57,7 @@ BuildRequires : XFree86-imake
57# %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs 57# %{use_stable}==0: :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs
58Source0: see-above:/.../openssh-%{version}.tar.gz 58Source0: see-above:/.../openssh-%{version}.tar.gz
59%if %{use_stable} 59%if %{use_stable}
60Source1: see-above:/.../openssh-%{version}.tar.gz.sig 60Source1: see-above:/.../openssh-%{version}.tar.gz.asc
61%endif 61%endif
62Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz 62Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz
63Source3: http://www.openssh.com/faq.html 63Source3: http://www.openssh.com/faq.html
@@ -182,7 +182,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
182 --with-privsep-path=%{_var}/empty/sshd \ 182 --with-privsep-path=%{_var}/empty/sshd \
183 #leave this line for easy edits. 183 #leave this line for easy edits.
184 184
185%__make CFLAGS="$RPM_OPT_FLAGS" 185%__make
186 186
187cd %{askpass} 187cd %{askpass}
188%configure \ 188%configure \
@@ -356,7 +356,11 @@ fi
356 356
357 357
358%ChangeLog 358%ChangeLog
359* Tue Jan 18 2011 Tim Rice <tim@multitalents.net>
360- Use CFLAGS from Makefile instead of RPM so build completes.
361- Signatures were changed to .asc since 4.1p1.
362
359* Mon Jan 01 1998 ... 363* Mon Jan 01 1998 ...
360Template Version: 1.31 364Template Version: 1.31
361 365
362$Id: openssh.spec,v 1.71 2010/08/08 16:32:09 djm Exp $ 366$Id: openssh.spec,v 1.73 2011/01/22 09:23:33 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 77e66252e..8fc76b625 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 5.6p1 1%define ver 5.7p1
2%define rel 1 2%define rel 1
3 3
4# OpenSSH privilege separation requires a user & group ID 4# OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index e5d837cbc..854aff665 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -104,7 +104,7 @@ start()
104 do_dsa_keygen 104 do_dsa_keygen
105 105
106 echo -n $"Starting $prog:" 106 echo -n $"Starting $prog:"
107 initlog -c "$SSHD $OPTIONS" && success || failure 107 $SSHD $OPTIONS && success || failure
108 RETVAL=$? 108 RETVAL=$?
109 [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd 109 [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd
110 echo 110 echo
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index f099746f2..4573c52fd 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
13 13
14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation 14Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
15Name: openssh 15Name: openssh
16Version: 5.6p1 16Version: 5.7p1
17URL: http://www.openssh.com/ 17URL: http://www.openssh.com/
18Release: 1 18Release: 1
19Source0: openssh-%{version}.tar.gz 19Source0: openssh-%{version}.tar.gz