From 949fb9033cad1b556ba2eb9b2d9f4d94c5680b8e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 27 Mar 2008 17:43:45 +1100
Subject:  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]  
  [contrib/suse/openssh.spec] Crank version numbers in RPM spec files

---
 contrib/caldera/openssh.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'contrib/caldera/openssh.spec')

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 9cb5cb464..294757d6a 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.7p1
+  %define version 	4.9p1
   %define cvs		%{nil}
   %define release 	1
 %else
-  %define version 	4.1p1
+  %define version 	4.9p1
   %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.61 2007/08/15 09:22:20 dtucker Exp $
+$Id: openssh.spec,v 1.62 2008/03/27 06:43:46 djm Exp $
-- 
cgit v1.2.3


From 5a4b6468dee92c1be4e004c86093d1e30192bf20 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 3 Apr 2008 20:55:44 +1100
Subject:  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]  
  [contrib/suse/openssh.spec] Crank version numbers in RPM spec files

---
 ChangeLog                    | 13 ++++++++++++-
 contrib/caldera/openssh.spec |  6 +++---
 contrib/redhat/openssh.spec  |  2 +-
 contrib/suse/openssh.spec    |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'contrib/caldera/openssh.spec')

diff --git a/ChangeLog b/ChangeLog
index f50cfa38c..3f1334a0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,17 @@
    - djm@cvs.openbsd.org 2008/04/03 09:50:14
      [version.h]
      openssh-5.0
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Crank version numbers in RPM spec files
+
+20080315
+ - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
+   empty; report and patch from Peter Stuge
+ - (djm) [regress/test-exec.sh] Silence noise from detection of putty
+   commands; report from Peter Stuge
+ - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
+   crashes when used with ChrootDirectory
+
 
 20080327
  - (dtucker) Cache selinux status earlier so we know if it's enabled after a
@@ -3838,4 +3849,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4900 2008/04/03 09:53:08 djm Exp $
+$Id: ChangeLog,v 1.4901 2008/04/03 09:55:44 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 294757d6a..34c3b8be9 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.9p1
+  %define version 	5.0p1
   %define cvs		%{nil}
   %define release 	1
 %else
-  %define version 	4.9p1
+  %define version 	5.0p1
   %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.62 2008/03/27 06:43:46 djm Exp $
+$Id: openssh.spec,v 1.63 2008/04/03 09:55:46 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index d6bd31b95..28f3fdada 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 4.9p1
+%define ver 5.0p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 7819af4e8..4e8c1e332 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:	4.9p1
+Version:	5.0p1
 URL:		http://www.openssh.com/
 Release:	1
 Source0:	openssh-%{version}.tar.gz
-- 
cgit v1.2.3


From f299ff8c1f412570080192c77845fa1dd40ac945 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 26 Jun 2008 16:01:56 +1000
Subject:  - (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 
   [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files.

---
 ChangeLog                    | 4 +++-
 contrib/caldera/openssh.spec | 3 ++-
 contrib/redhat/openssh.spec  | 1 +
 contrib/suse/openssh.spec    | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'contrib/caldera/openssh.spec')

diff --git a/ChangeLog b/ChangeLog
index 2dff5eaea..51a22b64a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20080626
  - (djm) [Makefile.in moduli.5] Include moduli(5) manpage from OpenBSD.
    (bz#1372)
+ - (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files.
 
 20080616
  - (dtucker) OpenBSD CVS Sync
@@ -4411,4 +4413,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5022 2008/06/26 05:59:32 djm Exp $
+$Id: ChangeLog,v 1.5023 2008/06/26 06:01:56 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 34c3b8be9..6f3c706ae 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -342,6 +342,7 @@ fi
 %config %{SVIcdir}/sshd
 %{_libexecdir}/sftp-server
 %{_sbindir}/sshd
+%{_mandir}/man5/moduli.5.gz
 %{_mandir}/man5/sshd_config.5.gz
 %{_mandir}/man8/sftp-server.8.gz
 %{_mandir}/man8/sshd.8.gz
@@ -357,4 +358,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.63 2008/04/03 09:55:46 djm Exp $
+$Id: openssh.spec,v 1.64 2008/06/26 06:02:04 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 28f3fdada..8b5ac47b4 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -376,6 +376,7 @@ fi
 %attr(0755,root,root) %{_sbindir}/sshd
 %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server
 %attr(0644,root,root) %{_mandir}/man8/sshd.8*
+%attr(0644,root,root) %{_mandir}/man5/moduli.5*
 %attr(0644,root,root) %{_mandir}/man5/sshd_config.5*
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 4e8c1e332..535381491 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -228,6 +228,7 @@ fi
 %attr(0644,root,root) %doc %{_mandir}/man1/ssh-agent.1*
 %attr(0644,root,root) %doc %{_mandir}/man1/ssh-keygen.1*
 %attr(0644,root,root) %doc %{_mandir}/man1/ssh-keyscan.1*
+%attr(0644,root,root) %doc %{_mandir}/man5/moduli.5*
 %attr(0644,root,root) %doc %{_mandir}/man5/ssh_config.5*
 %attr(0644,root,root) %doc %{_mandir}/man5/sshd_config.5*
 %attr(0644,root,root) %doc %{_mandir}/man8/sftp-server.8*
-- 
cgit v1.2.3


From 1f8909c2c270ebd8a1c949452b9222300b2ffda1 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 21 Jul 2008 18:21:52 +1000
Subject:  - (djm) [README contrib/caldera/openssh.spec
 contrib/redhat/openssh.spec]    [contrib/suse/openssh.spec] Update version
 number in README and RPM specs

---
 ChangeLog                    | 4 +++-
 README                       | 4 ++--
 contrib/caldera/openssh.spec | 6 +++---
 contrib/redhat/openssh.spec  | 2 +-
 contrib/suse/openssh.spec    | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'contrib/caldera/openssh.spec')

diff --git a/ChangeLog b/ChangeLog
index cd1d7380d..c5fe1162d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    - djm@cvs.openbsd.org 2008/07/21 08:19:07
      [version.h]
      openssh-5.1
+ - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Update version number in README and RPM specs
 
 20080717
  - (djm) OpenBSD CVS Sync
@@ -4707,4 +4709,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5093 2008/07/21 08:21:05 djm Exp $
+$Id: ChangeLog,v 1.5094 2008/07/21 08:21:52 djm Exp $
diff --git a/README b/README
index d99ceb6a7..183d92f70 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.0 for the release notes.
+See http://www.openssh.com/txt/release-5.1 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.68 2008/04/03 09:56:38 djm Exp $
+$Id: README,v 1.69 2008/07/21 08:21:52 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 6f3c706ae..32d175d4b 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 	5.0p1
+  %define version 	5.1p1
   %define cvs		%{nil}
   %define release 	1
 %else
-  %define version 	5.0p1
+  %define version 	5.1p1
   %define cvs		cvs20050315
   %define release 	0r1
 %endif
@@ -358,4 +358,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.64 2008/06/26 06:02:04 djm Exp $
+$Id: openssh.spec,v 1.65 2008/07/21 08:21:53 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 8b5ac47b4..bb9e4d616 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 5.0p1
+%define ver 5.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 1d7377229..7bd9e0569 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:	5.0p1
+Version:	5.1p1
 URL:		http://www.openssh.com/
 Release:	1
 Source0:	openssh-%{version}.tar.gz
-- 
cgit v1.2.3