summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
committerColin Watson <cjwatson@debian.org>2012-05-17 13:04:02 +0100
commitdd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch)
treec59b4dbcc610f10700945f885adf3bddc2542c26 /contrib
parent8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff)
parentb9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff)
merge 6.0p1
Diffstat (limited to 'contrib')
-rw-r--r--contrib/caldera/openssh.spec4
-rw-r--r--contrib/cygwin/Makefile29
-rw-r--r--contrib/redhat/openssh.spec4
-rw-r--r--[-rwxr-xr-x]contrib/solaris/README0
-rw-r--r--contrib/suse/openssh.spec2
5 files changed, 19 insertions, 20 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 73d441d0c..90be57dac 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.9p1 19%define version 6.0p1
20%if %{use_stable} 20%if %{use_stable}
21 %define cvs %{nil} 21 %define cvs %{nil}
22 %define release 1 22 %define release 1
@@ -363,4 +363,4 @@ fi
363* Mon Jan 01 1998 ... 363* Mon Jan 01 1998 ...
364Template Version: 1.31 364Template Version: 1.31
365 365
366$Id: openssh.spec,v 1.75.2.1 2011/09/05 00:28:11 djm Exp $ 366$Id: openssh.spec,v 1.77 2012/04/20 00:58:43 djm Exp $
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:
36 36
37install-sshdoc: 37install-sshdoc:
38 $(srcdir)/mkinstalldirs $(DESTDIR)$(sshdocdir) 38 $(srcdir)/mkinstalldirs $(DESTDIR)$(sshdocdir)
39 $(INSTALL) -m 644 $(srcdir)/CREDITS $(DESTDIR)$(sshdocdir)/CREDITS 39 -$(INSTALL) -m 644 $(srcdir)/CREDITS $(DESTDIR)$(sshdocdir)/CREDITS
40 $(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog 40 -$(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(sshdocdir)/ChangeLog
41 $(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE 41 -$(INSTALL) -m 644 $(srcdir)/LICENCE $(DESTDIR)$(sshdocdir)/LICENCE
42 $(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW 42 -$(INSTALL) -m 644 $(srcdir)/OVERVIEW $(DESTDIR)$(sshdocdir)/OVERVIEW
43 $(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL 43 -$(INSTALL) -m 644 $(srcdir)/PROTOCOL $(DESTDIR)$(sshdocdir)/PROTOCOL
44 $(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent 44 -$(INSTALL) -m 644 $(srcdir)/PROTOCOL.agent $(DESTDIR)$(sshdocdir)/PROTOCOL.agent
45 $(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.certkeys 45 -$(INSTALL) -m 644 $(srcdir)/PROTOCOL.certkeys $(DESTDIR)$(sshdocdir)/PROTOCOL.certkeys
46 $(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.mux 46 -$(INSTALL) -m 644 $(srcdir)/PROTOCOL.mux $(DESTDIR)$(sshdocdir)/PROTOCOL.mux
47 $(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README 47 -$(INSTALL) -m 644 $(srcdir)/README $(DESTDIR)$(sshdocdir)/README
48 $(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns 48 -$(INSTALL) -m 644 $(srcdir)/README.dns $(DESTDIR)$(sshdocdir)/README.dns
49 $(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform 49 -$(INSTALL) -m 644 $(srcdir)/README.platform $(DESTDIR)$(sshdocdir)/README.platform
50 $(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep 50 -$(INSTALL) -m 644 $(srcdir)/README.privsep $(DESTDIR)$(sshdocdir)/README.privsep
51 $(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.tun 51 -$(INSTALL) -m 644 $(srcdir)/README.tun $(DESTDIR)$(sshdocdir)/README.tun
52 $(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO 52 -$(INSTALL) -m 644 $(srcdir)/TODO $(DESTDIR)$(sshdocdir)/TODO
53 $(INSTALL) -m 644 $(srcdir)/WARNING.RNG $(DESTDIR)$(sshdocdir)/WARNING.RNG
54 53
55install-cygwindoc: README 54install-cygwindoc: README
56 $(srcdir)/mkinstalldirs $(DESTDIR)$(cygdocdir) 55 $(srcdir)/mkinstalldirs $(DESTDIR)$(cygdocdir)
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index be6de088c..d4e44d26d 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
1%define ver 5.9p1 1%define ver 6.0p1
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
@@ -335,7 +335,7 @@ fi
335 335
336%files 336%files
337%defattr(-,root,root) 337%defattr(-,root,root)
338%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO WARNING* 338%doc CREDITS ChangeLog INSTALL LICENCE OVERVIEW README* PROTOCOL* TODO
339%attr(0755,root,root) %{_bindir}/scp 339%attr(0755,root,root) %{_bindir}/scp
340%attr(0644,root,root) %{_mandir}/man1/scp.1* 340%attr(0644,root,root) %{_mandir}/man1/scp.1*
341%attr(0755,root,root) %dir %{_sysconfdir}/ssh 341%attr(0755,root,root) %dir %{_sysconfdir}/ssh
diff --git a/contrib/solaris/README b/contrib/solaris/README
index fefdd4b53..fefdd4b53 100755..100644
--- a/contrib/solaris/README
+++ b/contrib/solaris/README
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 @@
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.9p1 16Version: 6.0p1
17URL: http://www.openssh.com/ 17URL: http://www.openssh.com/
18Release: 1 18Release: 1
19Source0: openssh-%{version}.tar.gz 19Source0: openssh-%{version}.tar.gz
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-06 04:45:08 +0000