Date: Wed, 04 Nov 2015 08:36:41 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: Cy.Schubert@komquats.com Cc: marino@freebsd.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r400565 - head/security/pam_krb5 Message-ID: <20151104.083641.2117830857202894349.hrs@allbsd.org> In-Reply-To: <201511030457.tA34vkf5040066@slippy.cwsent.com> References: <freebsd.contact@marino.st> <201511030457.tA34vkf5040066@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart0(Wed_Nov__4_08_36_41_2015_953)--
Content-Type: Multipart/Mixed;
boundary="--Next_Part(Wed_Nov__4_08_36_41_2015_381)--"
Content-Transfer-Encoding: 7bit
----Next_Part(Wed_Nov__4_08_36_41_2015_381)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cy Schubert <Cy.Schubert@komquats.com> wrote
in <201511030457.tA34vkf5040066@slippy.cwsent.com>:
Cy> In message <56377C39.5000401@marino.st>, John Marino writes:
Cy> > We don't have to settle for what it is. We can control the build flags.
Cy> >
Cy> > The bottom line is that a regression happened. If the current makefile
Cy> > can't be fixed to operate as it was before, the change should be
Cy> > reverted, right?
Cy>
Cy> Actually, it never worked in the first place. That is because the heimdal
Cy> port puts its include files in ${LOCALBASE}/include/heimdal (take note of
Cy> "heimdal" at the end of the path) and libraries in ${LOCALBASE}/lib/heimdal
Cy> (same as above). Ldd ${LOCALBASE}/lib/security/pam_krb5.so makes that
Cy> abundantly clear.
Cy>
Cy> Having said that, it's still no reason or excuse for it not to work. Tested
Cy> in a virgin jail, it's working now, and committed. Sorry about the
Cy> confusion.
Can you please use the pre-defined variables for them instead of
hardcoded pathnames? Pathnames for headers and libraries are defined
as GSSAPIINCDIR and GSSAPILIBDIR in gssapi.mk in an
implementation-neutral way (and "flags" modifier like
"gssapi:heimdal,flags" imports them into CFLAGS and LDFLAGS if
necessary). Tests for KRB5_HOME and HEIMDAL_HOME should also be
replaced with GSSAPIBASEDIR. I confirmed that the attached patch
worked fine.
-- Hiroki
----Next_Part(Wed_Nov__4_08_36_41_2015_381)--
Content-Type: Text/X-Patch; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="pam_krb5.diff"
Index: Makefile
===================================================================
--- Makefile (revision 400700)
+++ Makefile (working copy)
@@ -23,37 +23,17 @@
OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT
OPTIONS_DEFAULT= MIT
MIT_DESC= Link against MIT Kerberos
+MIT_USES= gssapi:mit
HEIMDAL_PORT_DESC= Link against Heimdal in ports Kerberos
+HEIMDAL_PORT_USES= gssapi:heimdal
HEIMDAL_BASE_DESC= Link against Heimdal in base Kerberos
+HEIMDAL_BASE_USES= gssapi:base
-.include <bsd.port.options.mk>
+CONFIGURE_ARGS+= --with-krb5="${GSSAPIBASEDIR}" \
+ --with-krb5-include="${GSSAPIINCDIR}" \
+ --with-krb5-lib="${GSSAPILIBDIR}"
+CONFIGURE_ENV= PATH_KRB5_CONFIG="${KRB5CONFIG}"
-.if ${PORT_OPTIONS:MHEIMDAL_BASE}
-USES+= gssapi:base
-.elif ${PORT_OPTIONS:MHEIMDAL_PORT}
-USES+= gssapi:heimdal
-.if defined(HEIMDAL_HOME)
-KRB5_DIR?= ${HEIMDAL_HOME}
-.else
-KRB5_DIR?= ${LOCALBASE}
-.endif
-CONFIGURE_ARGS+= --with-krb5="${KRB5_DIR}" \
- --with-krb5-include="${KRB5_DIR}/include/heimdal" \
- --with-krb5-lib="${KRB5_DIR}/lib/heimdal"
-CONFIGURE_ENV= PATH_KRB5_CONFIG=${KRB5_DIR}/bin/krb5-config
-.elif ${PORT_OPTIONS:MMIT}
-USES+= gssapi:mit
-LIB_DEPENDS= libkrb5.so.3:${PORTSDIR}/security/krb5
-.if defined(KRB5_HOME)
-KRB5_DIR?= ${KRB5_HOME}
-.else
-KRB5_DIR?= ${LOCALBASE}
-.endif
-CONFIGURE_ARGS+= --with-krb5="${KRB5_DIR}"
-.else
-IGNORE= KRB5_IMPL option must be set
-.endif
-
MANDIR= ${STAGEDIR}${MANPREFIX}/man
post-install:
----Next_Part(Wed_Nov__4_08_36_41_2015_381)----
----Security_Multipart0(Wed_Nov__4_08_36_41_2015_953)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlY5RQkACgkQTyzT2CeTzy1lVACgt+P/Zh3/5vEt0/4Za3EQ3RlQ
KN4AoLs9rgXUVpyzKtzeuuUc56S4dnMK
=1Zhm
-----END PGP SIGNATURE-----
----Security_Multipart0(Wed_Nov__4_08_36_41_2015_953)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151104.083641.2117830857202894349.hrs>