diff options
| author | Damien Miller <djm@mindrot.org> | 2004-01-23 16:30:03 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-01-23 16:30:03 +1100 |
| commit | 84938141d4efb3b00496f1e819192ee3377dad70 (patch) | |
| tree | fbc099b3702b55467a1f77e40e3b22e59e5c612d | |
| parent | d352636553bf85e21c697eca2e6873e78862576e (diff) | |
- (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect
Kerberos location (and thus work with Fedora Core 1);
from jason AT devrandom.org
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | contrib/redhat/openssh.spec | 9 |
2 files changed, 11 insertions, 3 deletions
@@ -1,6 +1,9 @@ 20040123 - (djm) Do pam_session processing for systems with HAVE_LOGIN_CAP; from ralf.hack AT pipex.net; ok dtucker@ + - (djm) Bug #776: Update contrib/redhat/openssh.spec to dynamically detect + Kerberos location (and thus work with Fedora Core 1); + from jason AT devrandom.org 20040122 - (dtucker) [configure.ac] Use krb5-config where available for Kerberos/ @@ -1713,4 +1716,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3181 2004/01/23 03:16:26 djm Exp $ +$Id: ChangeLog,v 1.3182 2004/01/23 05:30:03 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index a4d49f61..30d02635 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,5 +1,5 @@ %define ver 3.7.1p2 -%define rel 1 +%define rel 0.2004012300 # OpenSSH privilege separation requires a user & group ID %define sshd_uid 74 @@ -181,6 +181,11 @@ environment. CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS %endif +%if %{kerberos5} +K5DIR=`rpm -ql krb5-devel | grep include/krb5.h | sed 's,\/include\/krb5.h,,'` +echo K5DIR=$K5DIR +%endif + %configure \ --sysconfdir=%{_sysconfdir}/ssh \ --libexecdir=%{_libexecdir}/openssh \ @@ -200,7 +205,7 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS --with-pam \ %endif %if %{kerberos5} - --with-kerberos5=/usr/kerberos \ + --with-kerberos5=$K5DIR \ %endif |