diff options
author | Damien Miller <djm@mindrot.org> | 2009-02-21 18:03:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-02-21 18:03:04 +1100 |
commit | 7691e5fa44a54b193f00380634c3978a961480d2 (patch) | |
tree | 9a4a49d4bd7194da713e5eb60f8f6369b69b0c76 | |
parent | 25918381ad4375f71836a44e3cc2b6a653c8979c (diff) |
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Prepare for 5.2p1
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 8 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 4 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 4 |
4 files changed, 11 insertions, 9 deletions
@@ -7,6 +7,8 @@ | |||
7 | [schnorr.c] | 7 | [schnorr.c] |
8 | signature should hash over the entire group, not just the generator | 8 | signature should hash over the entire group, not just the generator |
9 | (this is still disabled code) | 9 | (this is still disabled code) |
10 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] | ||
11 | [contrib/suse/openssh.spec] Prepare for 5.2p1 | ||
10 | 12 | ||
11 | 20090216 | 13 | 20090216 |
12 | - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] | 14 | - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] |
@@ -5181,5 +5183,5 @@ | |||
5181 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5183 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5182 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5184 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5183 | 5185 | ||
5184 | $Id: ChangeLog,v 1.5199 2009/02/21 01:45:18 djm Exp $ | 5186 | $Id: ChangeLog,v 1.5200 2009/02/21 07:03:04 djm Exp $ |
5185 | 5187 | ||
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 32d175d4b..42dbcfeeb 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,11 +17,11 @@ | |||
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 | %if %{use_stable} | 19 | %if %{use_stable} |
20 | %define version 5.1p1 | 20 | %define version 5.2p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 5.1p1 | 24 | %define version 5.2p1 |
25 | %define cvs cvs20050315 | 25 | %define cvs cvs20050315 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
@@ -251,7 +251,7 @@ install -m 0755 contrib/caldera/ssh-host-keygen $SKG | |||
251 | # install remaining docs | 251 | # install remaining docs |
252 | DocD="%{buildroot}%{_defaultdocdir}/%{name}-%{version}" | 252 | DocD="%{buildroot}%{_defaultdocdir}/%{name}-%{version}" |
253 | mkdir -p $DocD/%{askpass} | 253 | mkdir -p $DocD/%{askpass} |
254 | cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO $DocD | 254 | cp -a CREDITS ChangeLog LICENCE OVERVIEW README* TODO PROTOCOL* $DocD |
255 | install -p -m 0444 %{SOURCE3} $DocD/faq.html | 255 | install -p -m 0444 %{SOURCE3} $DocD/faq.html |
256 | cp -a %{askpass}/{README,ChangeLog,TODO,SshAskpass*.ad} $DocD/%{askpass} | 256 | cp -a %{askpass}/{README,ChangeLog,TODO,SshAskpass*.ad} $DocD/%{askpass} |
257 | %if %{use_stable} | 257 | %if %{use_stable} |
@@ -358,4 +358,4 @@ fi | |||
358 | * Mon Jan 01 1998 ... | 358 | * Mon Jan 01 1998 ... |
359 | Template Version: 1.31 | 359 | Template Version: 1.31 |
360 | 360 | ||
361 | $Id: openssh.spec,v 1.65 2008/07/21 08:21:53 djm Exp $ | 361 | $Id: openssh.spec,v 1.66 2009/02/21 07:03:05 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index bb9e4d616..10bdc1989 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 5.1p1 | 1 | %define ver 5.2p1 |
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 |
@@ -333,7 +333,7 @@ fi | |||
333 | 333 | ||
334 | %files | 334 | %files |
335 | %defattr(-,root,root) | 335 | %defattr(-,root,root) |
336 | %doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* RFC* TODO WARNING* | 336 | %doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO WARNING* |
337 | %attr(0755,root,root) %{_bindir}/scp | 337 | %attr(0755,root,root) %{_bindir}/scp |
338 | %attr(0644,root,root) %{_mandir}/man1/scp.1* | 338 | %attr(0644,root,root) %{_mandir}/man1/scp.1* |
339 | %attr(0755,root,root) %dir %{_sysconfdir}/ssh | 339 | %attr(0755,root,root) %dir %{_sysconfdir}/ssh |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 7bd9e0569..62f43e137 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
15 | Name: openssh | 15 | Name: openssh |
16 | Version: 5.1p1 | 16 | Version: 5.2p1 |
17 | URL: http://www.openssh.com/ | 17 | URL: http://www.openssh.com/ |
18 | Release: 1 | 18 | Release: 1 |
19 | Source0: openssh-%{version}.tar.gz | 19 | Source0: openssh-%{version}.tar.gz |
@@ -200,7 +200,7 @@ fi | |||
200 | 200 | ||
201 | %files | 201 | %files |
202 | %defattr(-,root,root) | 202 | %defattr(-,root,root) |
203 | %doc ChangeLog OVERVIEW README* | 203 | %doc ChangeLog OVERVIEW README* PROTOCOL* |
204 | %doc TODO CREDITS LICENCE | 204 | %doc TODO CREDITS LICENCE |
205 | %attr(0755,root,root) %dir %{_sysconfdir}/ssh | 205 | %attr(0755,root,root) %dir %{_sysconfdir}/ssh |
206 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config | 206 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config |