From owner-freebsd-ports@FreeBSD.ORG  Tue Sep  9 08:25:57 2003
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2C27C16A4C4
	for <freebsd-ports@freebsd.org>; Tue,  9 Sep 2003 08:25:57 -0700 (PDT)
Received: from web40709.mail.yahoo.com (web40709.mail.yahoo.com
	[66.218.78.166])	by mx1.FreeBSD.org (Postfix) with SMTP id 2EF6643FBF
	for <freebsd-ports@freebsd.org>;
	Tue,  9 Sep 2003 08:25:56 -0700 (PDT)	(envelope-from cykyc@yahoo.com)
Message-ID: <20030909152555.19611.qmail@web40709.mail.yahoo.com>
Received: from [209.98.4.50] by web40709.mail.yahoo.com via HTTP;
	Tue, 09 Sep 2003 08:25:55 PDT
Date: Tue, 9 Sep 2003 08:25:55 -0700 (PDT)
From: Jon Passki <cykyc@yahoo.com>
To: Sergey Matveychuk <sem@ciam.ru>, freebsd-ports@freebsd.org
In-Reply-To: <3F5D0BA5.8040003@ciam.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
cc: cy@FreeBSD.org
Subject: PATCH (kind of :-) Re: pam_krb5 port question
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: cykyc@yahoo.com
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Sep 2003 15:25:57 -0000


--- Sergey Matveychuk <sem@ciam.ru> wrote:
> Jon Passki wrote:
> > Is there any reason why the port is mainly focused for MIT
> Kerberos
> > and not Heimdal?
> 
> KRB5_IMPL=heimdail didn't help? If so, it'll be great if you fix
> this 
> and send a patch to the port maintainer.

--) One fix is easy:

diff -u Makefile.orig Makefile
@@ -24,7 +24,7 @@
 .endif

 .if defined(KRB5_IMPL) && ${KRB5_IMPL} == heimdal
-LIB_DEPENDS=           krb5.18:${PORTSDIR}/security/heimdal
+LIB_DEPENDS=           krb5.19:${PORTSDIR}/security/heimdal
 .if defined(HEIMDAL_HOME)
 KRB5_DIR?=             ${HEIMDAL_HOME}
 .endif


I don't know the best fix for the other issue.  In
work/pam_krb5-1.0.3/configure there is a conditional around line
1675:

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  egrep "krb5_free_data_contents" >/dev/null 2>&1; then
  rm -rf conftest*
  COMPAT_SRCS=compat_mit.c COMPAT_OBJS=compat_mit.o
else
  rm -rf conftest*
  COMPAT_SRCS=compat_heimdal.c COMPAT_OBJS=compat_heimdal.o
fi


I ran `script make.out make KRB5_IMPL=heimdal` and noticed the
following:

...
checking which implementation of Kerberos we have... looks like
heimdal
checking for krb5_init_context in -lkrb5... yes
checking for krb5.h... yes
checking for krb5_string_to_deltat... yes
checking for krb5_free_data_contents... yes
...

So maybe the logic in that conditional needs to be bypassed?  My
very rough hack was to patch the work/pam_krb5-1.0.3/Makefile.in
around line 37:

diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig        Tue Sep  9 10:15:26 2003
+++ Makefile.in     Tue Sep  9 10:16:59 2003
@@ -34,8 +34,9 @@

 LIBS = $(KRB5LIBS) $(OSLIBS)

-COMPAT_SRCS = @COMPAT_SRCS@
-COMPAT_OBJS = @COMPAT_OBJS@
+# We were told what implementation to use in KRB5_IMPL
+COMPAT_SRCS = compat_${KRB5_IMPL}.c
+COMPAT_OBJS = compat_${KRB5_IMPL}.o

 PAM_KRB5_H = pam_krb5.h option_flags.h option_strings.h


It at least compiles for me :-)

Take care,

Jon Passki


__________________________________
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com