From 86dcd3e45aa476aa751101c98990b20f431044dd Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 5 Sep 2011 10:29:04 +1000 Subject: - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Update version numbers. --- contrib/caldera/openssh.spec | 4 ++-- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index e6f5a9333..291299179 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -16,7 +16,7 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 -%define version 5.8p2 +%define version 5.9p1 %if %{use_stable} %define cvs %{nil} %define release 1 @@ -363,4 +363,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.75 2011/06/03 00:35:26 dtucker Exp $ +$Id: openssh.spec,v 1.76 2011/09/05 00:29:06 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 2b927f177..be6de088c 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.8p2 +%define ver 5.9p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 4621f548c..3a4dfea37 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.8p2 +Version: 5.9p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3 From 022ee24197ba115b41d7914daabfb231befdfa70 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 7 Sep 2011 09:15:02 +1000 Subject: - (djm) [contrib/redhat/openssh.spec] Correct restorcon => restorecon --- ChangeLog | 3 ++- contrib/redhat/sshd.init | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 1021f94c1..ee6460d4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ 20110906 - (djm) [README version.h] Correct version + - (djm) [contrib/redhat/openssh.spec] Correct restorcon => restorecon + - (djm) Respin OpenSSH-5.9p1 release 20110905 - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Update version numbers. - - (djm) Release OpenSSH-5.9 20110904 - (djm) [regress/connect-privsep.sh regress/test-exec.sh] demote fatal diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init index 2334d8142..e9a751796 100755 --- a/contrib/redhat/sshd.init +++ b/contrib/redhat/sshd.init @@ -40,10 +40,10 @@ start() # Create keys if necessary /usr/bin/ssh-keygen -A if [ -x /sbin/restorecon ]; then - /sbin/restorcon /etc/ssh/ssh_host_key.pub - /sbin/restorcon /etc/ssh/ssh_host_rsa_key.pub - /sbin/restorcon /etc/ssh/ssh_host_dsa_key.pub - /sbin/restorcon /etc/ssh/ssh_host_ecdsa_key.pub + /sbin/restorecon /etc/ssh/ssh_host_key.pub + /sbin/restorecon /etc/ssh/ssh_host_rsa_key.pub + /sbin/restorecon /etc/ssh/ssh_host_dsa_key.pub + /sbin/restorecon /etc/ssh/ssh_host_ecdsa_key.pub fi echo -n $"Starting $prog:" -- cgit v1.2.3 From 9f157abbb64a252a8751bc78b8acb2857447225e Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 25 Oct 2011 09:37:57 +1100 Subject: - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file fails. Patch from Corinna Vinschen. --- ChangeLog | 4 ++++ contrib/cygwin/Makefile | 29 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 1ff341719..1d7d44666 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20111025 + - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file + fails. Patch from Corinna Vinschen. + 20111018 - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2011/10/04 14:17:32 diff --git a/contrib/cygwin/Makefile b/contrib/cygwin/Makefile index dc857f2ed..a0261f48d 100644 --- a/contrib/cygwin/Makefile +++ b/contrib/cygwin/Makefile @@ -36,21 +36,20 @@ install-inetd-config: install-sshdoc: $(srcdir)/mkinstalldirs $(DESTDIR)$(sshdocdir) - $(INSTALL) -m 644 $(srcdir)/CREDITS $(DESTDIR)$(sshdocdir)/CREDITS - $(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog - $(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE - $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW - $(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL - $(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent - $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.certkeys - $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.mux - $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README - $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns - $(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform - $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep - $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.tun - $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO - $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG + -$(INSTALL) -m 644 $(srcdir)/CREDITS $(DESTDIR)$(sshdocdir)/CREDITS + -$(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog + -$(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE + -$(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW + -$(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL + -$(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent + -$(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.certkeys + -$(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.mux + -$(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README + -$(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns + -$(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform + -$(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep + -$(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.tun + -$(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO install-cygwindoc: README $(srcdir)/mkinstalldirs $(DESTDIR)$(cygdocdir) -- cgit v1.2.3 From 67ccc86506212c12e60bffd9a0e924a84800cf00 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 30 Mar 2012 10:19:56 +1100 Subject: - (dtucker) [contrib/redhat/openssh.spec] Bug #1992: remove now-gone WARNING file from spec file. From crighter at nuclioss com. --- ChangeLog | 4 ++++ contrib/redhat/openssh.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index 03c2674f3..ac8fd70b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20120330 + - (dtucker) [contrib/redhat/openssh.spec] Bug #1992: remove now-gone WARNING + file from spec file. From crighter at nuclioss com. + 20120309 - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux systems where sshd is run in te wrong context. Patch from Sven diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index be6de088c..87c375620 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -335,7 +335,7 @@ fi %files %defattr(-,root,root) -%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO WARNING* +%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO %attr(0755,root,root) %{_bindir}/scp %attr(0644,root,root) %{_mandir}/man1/scp.1* %attr(0755,root,root) %dir %{_sysconfdir}/ssh -- cgit v1.2.3 From 8beb3203907248b688e366c2621d359f156af853 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 20 Apr 2012 10:58:34 +1000 Subject: - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] [contrib/suse/openssh.spec] Update for release 6.0 --- ChangeLog | 4 ++++ contrib/caldera/openssh.spec | 4 ++-- contrib/redhat/openssh.spec | 2 +- contrib/suse/openssh.spec | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/ChangeLog b/ChangeLog index fc7fad995..ce7c50ed4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20120420 + - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] + [contrib/suse/openssh.spec] Update for release 6.0 + 20120419 - (djm) [configure.ac] Fix compilation error on FreeBSD, whose libutil contains openpty() but not login() diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 291299179..90be57dac 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -16,7 +16,7 @@ #old cvs stuff. please update before use. may be deprecated. %define use_stable 1 -%define version 5.9p1 +%define version 6.0p1 %if %{use_stable} %define cvs %{nil} %define release 1 @@ -363,4 +363,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.76 2011/09/05 00:29:06 djm Exp $ +$Id: openssh.spec,v 1.77 2012/04/20 00:58:43 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 87c375620..d4e44d26d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,4 +1,4 @@ -%define ver 5.9p1 +%define ver 6.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 3a4dfea37..8d99fb5aa 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.9p1 +Version: 6.0p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz -- cgit v1.2.3