summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-03-08 09:41:02 +1100
committerDamien Miller <djm@mindrot.org>2010-03-08 09:41:02 +1100
commit6bf31786cfa4518f2c81088ddaa7c34de0b532bf (patch)
tree3cab2fc96372f815317fc3f564a51048244c30d1
parent3e1ee491f3fa4fa7e44a998799e251a3b08e66d2 (diff)
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
crank version numbers
-rw-r--r--ChangeLog3
-rw-r--r--README4
-rw-r--r--contrib/caldera/openssh.spec6
-rw-r--r--contrib/redhat/openssh.spec2
4 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 707be2dd6..ee1c3417f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - djm@cvs.openbsd.org 2010/03/07 22:01:32 7 - djm@cvs.openbsd.org 2010/03/07 22:01:32
8 [version.h] 8 [version.h]
9 openssh-5.4 9 openssh-5.4
10 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
11 crank version numbers
12
10 13
1120100307 1420100307
12 - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that 15 - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that
diff --git a/README b/README
index 16666518a..0ecb670b6 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1See http://www.openssh.com/txt/release-5.3 for the release notes. 1See http://www.openssh.com/txt/release-5.4 for the release notes.
2 2
3- A Japanese translation of this document and of the OpenSSH FAQ is 3- A Japanese translation of this document and of the OpenSSH FAQ is
4- available at http://www.unixuser.org/~haruyama/security/openssh/index.html 4- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
62[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 62[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
63[7] http://www.openssh.com/faq.html 63[7] http://www.openssh.com/faq.html
64 64
65$Id: README,v 1.71 2009/10/02 01:49:03 djm Exp $ 65$Id: README,v 1.72 2010/03/07 22:41:02 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index e6c030c0d..7c291a0eb 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.3p1 20 %define version 5.4p1
21 %define cvs %{nil} 21 %define cvs %{nil}
22 %define release 1 22 %define release 1
23%else 23%else
24 %define version 5.3p1 24 %define version 5.4p1
25 %define cvs cvs20050315 25 %define cvs cvs20050315
26 %define release 0r1 26 %define release 0r1
27%endif 27%endif
@@ -360,4 +360,4 @@ fi
360* Mon Jan 01 1998 ... 360* Mon Jan 01 1998 ...
361Template Version: 1.31 361Template Version: 1.31
362 362
363$Id: openssh.spec,v 1.68 2010/02/24 07:21:46 djm Exp $ 363$Id: openssh.spec,v 1.69 2010/03/07 22:41:03 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 4bec90078..de24f1c5d 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 5.3p1 1%define ver 5.4p1
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