diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /contrib/redhat/openssh.spec | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'contrib/redhat/openssh.spec')
-rw-r--r-- | contrib/redhat/openssh.spec | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index e99e33d0f..be6de088c 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 5.8p1 | 1 | %define ver 5.9p1 |
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 |
@@ -84,24 +84,24 @@ Obsoletes: ssh | |||
84 | %if %{build6x} | 84 | %if %{build6x} |
85 | PreReq: initscripts >= 5.00 | 85 | PreReq: initscripts >= 5.00 |
86 | %else | 86 | %else |
87 | PreReq: initscripts >= 5.20 | 87 | Requires: initscripts >= 5.20 |
88 | %endif | 88 | %endif |
89 | BuildPreReq: perl, openssl-devel, tcp_wrappers | 89 | BuildRequires: perl, openssl-devel, tcp_wrappers |
90 | BuildPreReq: /bin/login | 90 | BuildRequires: /bin/login |
91 | %if ! %{build6x} | 91 | %if ! %{build6x} |
92 | BuildPreReq: glibc-devel, pam | 92 | BuildPreReq: glibc-devel, pam |
93 | %else | 93 | %else |
94 | BuildPreReq: /usr/include/security/pam_appl.h | 94 | BuildRequires: /usr/include/security/pam_appl.h |
95 | %endif | 95 | %endif |
96 | %if ! %{no_x11_askpass} | 96 | %if ! %{no_x11_askpass} |
97 | BuildPreReq: /usr/include/X11/Xlib.h | 97 | BuildRequires: /usr/include/X11/Xlib.h |
98 | %endif | 98 | %endif |
99 | %if ! %{no_gnome_askpass} | 99 | %if ! %{no_gnome_askpass} |
100 | BuildPreReq: pkgconfig | 100 | BuildRequires: pkgconfig |
101 | %endif | 101 | %endif |
102 | %if %{kerberos5} | 102 | %if %{kerberos5} |
103 | BuildPreReq: krb5-devel | 103 | BuildRequires: krb5-devel |
104 | BuildPreReq: krb5-libs | 104 | BuildRequires: krb5-libs |
105 | %endif | 105 | %endif |
106 | 106 | ||
107 | %package clients | 107 | %package clients |
@@ -114,7 +114,7 @@ Obsoletes: ssh-clients | |||
114 | Summary: The OpenSSH server daemon. | 114 | Summary: The OpenSSH server daemon. |
115 | Group: System Environment/Daemons | 115 | Group: System Environment/Daemons |
116 | Obsoletes: ssh-server | 116 | Obsoletes: ssh-server |
117 | PreReq: openssh = %{version}-%{release}, chkconfig >= 0.9 | 117 | Requires: openssh = %{version}-%{release}, chkconfig >= 0.9 |
118 | %if ! %{build6x} | 118 | %if ! %{build6x} |
119 | Requires: /etc/pam.d/system-auth | 119 | Requires: /etc/pam.d/system-auth |
120 | %endif | 120 | %endif |
@@ -712,7 +712,7 @@ fi | |||
712 | it generates. | 712 | it generates. |
713 | 713 | ||
714 | * Thu Oct 5 2000 Nalin Dahyabhai <nalin@redhat.com> | 714 | * Thu Oct 5 2000 Nalin Dahyabhai <nalin@redhat.com> |
715 | - Add BuildPreReq on /usr/include/security/pam_appl.h to be sure we always | 715 | - Add BuildRequires on /usr/include/security/pam_appl.h to be sure we always |
716 | build PAM authentication in. | 716 | build PAM authentication in. |
717 | - Try setting SSH_ASKPASS if gnome-ssh-askpass is installed. | 717 | - Try setting SSH_ASKPASS if gnome-ssh-askpass is installed. |
718 | - Clean out no-longer-used patches. | 718 | - Clean out no-longer-used patches. |
@@ -721,7 +721,7 @@ fi | |||
721 | 721 | ||
722 | * Mon Oct 2 2000 Nalin Dahyabhai <nalin@redhat.com> | 722 | * Mon Oct 2 2000 Nalin Dahyabhai <nalin@redhat.com> |
723 | - Update x11-askpass to 1.0.2. (#17835) | 723 | - Update x11-askpass to 1.0.2. (#17835) |
724 | - Add BuildPreReqs for /bin/login and /usr/bin/rsh so that configure will | 724 | - Add BuildRequiress for /bin/login and /usr/bin/rsh so that configure will |
725 | always find them in the right place. (#17909) | 725 | always find them in the right place. (#17909) |
726 | - Set the default path to be the same as the one supplied by /bin/login, but | 726 | - Set the default path to be the same as the one supplied by /bin/login, but |
727 | add /usr/X11R6/bin. (#17909) | 727 | add /usr/X11R6/bin. (#17909) |