svn commit: r400565 - head/security/pam_krb5

[Cy Schubert]

In message <56373735.2060906 at marino.st>, John Marino writes:
> On 10/31/2015 6:58 AM, Cy Schubert wrote:
> > Author: cy
> > Date: Sat Oct 31 05:58:27 2015
> > New Revision: 400565
> > URL: https://svnweb.freebsd.org/changeset/ports/400565
> > 
> > Log:
> >   Fix Kerberos selection option and USES.
> > 
> > Modified:
> >   head/security/pam_krb5/Makefile
> > 
> 
> Hi Cy,
> 
> This port is still broken.  It won't build with heimdal-in-ports and it
> did before.  I double-checked by building in poudriere on FreeBSD with
> that option selected.  The krb5/krb5.h headers aren't found during
> configuration and later it fails because of this.
> 
> Can you either check that each options builds or revert the change the
> broke the build?

Looks like the tarball (port) never supported heimdal in ports in the first 
place. From ./configure:

ac_fn_c_check_member "$LINENO" "krb5_creds" "session" 
"ac_cv_member_krb5_creds_s
ession" "
#if HAVE_KRB5_H
# include <krb5.h>
#else
# include <krb5/krb5.h>
#endif

./portable/krb5.h has the same code.

Hiemdal in ports installs krb5.h ${LOCALBASE}/include/heimdal/krb5. I can 
remove the option for now or (better) we can symlink 
${LOCALBASE}/include/heimdal to ${LOCALBASE}/include/krb5 in the heimdal 
port. See attached patch.



-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 400198)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	1.5.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
@@ -103,6 +103,9 @@
 	${INSTALL_DATA} ${FILESDIR}/kpasswdd-Makefile \
 	    ${WRKSRC}/kpasswdd-cracklib/Makefile
 
+post-install:
+	cd ${STAGEDIR}${LOCALBASE}/include && ${LN} -s heimdal krb5
+
 .if ${PORT_OPTIONS:MCRACKLIB}
 post-build:
 	cd ${WRKSRC}/kpasswdd-cracklib && \
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 400198)
+++ pkg-plist	(working copy)
@@ -101,6 +101,7 @@
 include/heimdal/wind.h
 include/heimdal/wind_err.h
 include/heimdal/xdbm.h
+include/krb5
 %%CRACKLIB%%lib/heimdal/kpasswdd-cracklib.so
 lib/heimdal/libasn1.a
 lib/heimdal/libasn1.so
-------------- next part --------------
Cheers,
Cy Schubert <Cy.Schubert at komquats.com> or <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.