svn commit: r400565 - head/security/pam_krb5

[Cy Schubert]

In message <56377C39.5000401 at marino.st>, John Marino writes:
> 
> 
> 
> On 11/2/2015 4:01 PM, Cy Schubert wrote:
> > In message <5637766F.6000404 at marino.st>, John Marino writes:
> >> On 11/2/2015 3:37 PM, Cy Schubert wrote:
> >>>
> >>> Looks like the tarball (port) never supported heimdal in ports in the fir
> st
> >>  
> >>> place. From ./configure:
> >>
> >> Why did it build before then?
> >>
> >>
> >>>
> >>> 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.
> >>
> >> Heimdal ports is the only option that builds in dports, so removing it
> >> means removing it from dports.
> >>
> >> krb.h is there (poudriere testport -i) :
> >>
> >> # ls /usr/local/include/heimdal/krb5.h
> >> /usr/local/include/heimdal/krb5.h
> >>
> >> It should configure, right?
> > 
> > Nope. ls /usr/local/include/krb5.h /usr/local/include/krb5/krb5.h
> 
> 
> It is *already* using /usr/local/include/heimdal as it should be. It's
> just not getting used in configure:
> 
> 
> libtool: compile:  cc -DHAVE_CONFIG_H -I. -I/usr/local/include/heimdal
> -pipe -O2 -fno-strict-aliasing -MT portable/pam_vsyslog.lo -MD -MP -MF
> portable/.deps/pam_vsyslog.Tpo -c portable/pam_vsyslog.c  -fPIC -DPIC -o
> portable/.libs/pam_vsyslog.o
> libtool: compile:  cc -DHAVE_CONFIG_H -I. -I/usr/local/include/heimdal
> -pipe -O2 -fno-strict-aliasing -MT portable/reallocarray.lo -MD -MP -MF
> portable/.deps/reallocarray.Tpo -c portable/reallocarray.c  -fPIC -DPIC
> -o portable/.libs/reallocarray.o
> libtool: compile:  cc -DHAVE_CONFIG_H -I. -I/usr/local/include/heimdal
> -pipe -O2 -fno-strict-aliasing -MT portable/pam_syslog.lo -MD -MP -MF
> portable/.deps/pam_syslog.Tpo -c portable/pam_syslog.c  -fPIC -DPIC -o
> portable/.libs/pam_syslog.o
> libtool: compile:  cc -DHAVE_CONFIG_H -I. -I/usr/local/include/heimdal
> -pipe -O2 -fno-strict-aliasing -MT account.lo -MD -MP -MF
> .deps/account.Tpo -c account.c  -fPIC -DPIC -o .libs/account.o
> In file included from account.c:21:0:
> ./portable/krb5.h:48:24: fatal error: krb5/krb5.h: No such file or directory
> compilation terminated.
> 
> 
> 
> We don't have to settle for what it is.  We can control the build flags.
> 
> The bottom line is that a regression happened.  If the current makefile
> can't be fixed to operate as it was before, the change should be
> reverted, right?

Actually, it never worked in the first place. That is because the heimdal 
port puts its include files in ${LOCALBASE}/include/heimdal (take note of 
"heimdal" at the end of the path) and libraries in ${LOCALBASE}/lib/heimdal 
(same as above). Ldd ${LOCALBASE}/lib/security/pam_krb5.so makes that 
abundantly clear.

Having said that, it's still no reason or excuse for it not to work. Tested 
in a virgin jail, it's working now, and committed. Sorry about the 
confusion.


-- 
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.