diff options
author | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-05-01 11:41:25 +0000 |
commit | 915bfea2af69a3bb352a9b4e98e3434b8425124d (patch) | |
tree | ef732498a75f2e13a7a9827edc833dc58bc2a2af /contrib | |
parent | 89e7a2dfe6044f3980098911a7470d401ff70eb1 (diff) | |
parent | 16f1d21ea191deaaeeba719d01c0ad82aa044653 (diff) |
Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/caldera/openssh.spec | 6 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
-rw-r--r-- | contrib/redhat/sshd.pam | 14 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 599244b5d..e690f102f 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 3.8p1 | 20 | %define version 3.8.1p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 3.8p1 | 24 | %define version 3.8.1p1 |
25 | %define cvs cvs20011009 | 25 | %define cvs cvs20011009 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
@@ -363,4 +363,4 @@ fi | |||
363 | * Mon Jan 01 1998 ... | 363 | * Mon Jan 01 1998 ... |
364 | Template Version: 1.31 | 364 | Template Version: 1.31 |
365 | 365 | ||
366 | $Id: openssh.spec,v 1.48 2004/02/24 05:00:04 djm Exp $ | 366 | $Id: openssh.spec,v 1.49 2004/03/21 22:40:04 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 05750e3a9..b7470092b 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 3.8p1 | 1 | %define ver 3.8.1p1 |
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 |
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam index d2ab073fc..24f3b4651 100644 --- a/contrib/redhat/sshd.pam +++ b/contrib/redhat/sshd.pam | |||
@@ -1,8 +1,8 @@ | |||
1 | #%PAM-1.0 | 1 | #%PAM-1.0 |
2 | auth required /lib/security/pam_stack.so service=system-auth | 2 | auth required pam_stack.so service=system-auth |
3 | auth required /lib/security/pam_nologin.so | 3 | auth required pam_nologin.so |
4 | account required /lib/security/pam_stack.so service=system-auth | 4 | account required pam_stack.so service=system-auth |
5 | password required /lib/security/pam_stack.so service=system-auth | 5 | password required pam_stack.so service=system-auth |
6 | session required /lib/security/pam_stack.so service=system-auth | 6 | session required pam_stack.so service=system-auth |
7 | session required /lib/security/pam_limits.so | 7 | session required pam_limits.so |
8 | session optional /lib/security/pam_console.so | 8 | session optional pam_console.so |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 7eb71adf4..2b43d0368 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -1,6 +1,6 @@ | |||
1 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 1 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
2 | Name: openssh | 2 | Name: openssh |
3 | Version: 3.8p1 | 3 | Version: 3.8.1p1 |
4 | URL: http://www.openssh.com/ | 4 | URL: http://www.openssh.com/ |
5 | Release: 1 | 5 | Release: 1 |
6 | Source0: openssh-%{version}.tar.gz | 6 | Source0: openssh-%{version}.tar.gz |