CVS commit: pkgsrc/mail/fetchmail

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Mon Dec 14 00:41:03 UTC 2020

Modified Files:
        pkgsrc/mail/fetchmail: distinfo options.mk
Added Files:
        pkgsrc/mail/fetchmail/patches: patch-configure patch-configure.ac

Log Message:
mail/fetchmail: fix build on Darwin with gssapi or kerberos options

Darwin doesn't install include files in ${KRB5BASE}
(They are in the SDK instead)
therefore let fetchmail use krb5-config to determine how to
link against kerberos


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mail/fetchmail/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/fetchmail/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/fetchmail/patches/patch-configure \
    pkgsrc/mail/fetchmail/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/fetchmail/distinfo
diff -u pkgsrc/mail/fetchmail/distinfo:1.55 pkgsrc/mail/fetchmail/distinfo:1.56
--- pkgsrc/mail/fetchmail/distinfo:1.55 Fri Oct  2 08:20:27 2020
+++ pkgsrc/mail/fetchmail/distinfo      Mon Dec 14 00:41:03 2020
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.55 2020/10/02 08:20:27 triaxx Exp $
+$NetBSD: distinfo,v 1.56 2020/12/14 00:41:03 dbj Exp $
 
 SHA1 (fetchmail-6.4.12.tar.xz) = e8705405ae944ac976f3972722158a7cf11735ad
 RMD160 (fetchmail-6.4.12.tar.xz) = 343bc036a10b0a4bdb0fe090c9cac0db387d029d
 SHA512 (fetchmail-6.4.12.tar.xz) = 277c324bab528a036f2896909b63baaa68d986b79baa24e2ee5cd8ca1d86082d4cd41ca371114fc8ae150eb0f97af50fd5238e88485ad5c701699b69964fe256
 Size (fetchmail-6.4.12.tar.xz) = 1303532 bytes
 SHA1 (patch-Makefile.in) = 9cd2053a7c8bbbf6f71fcee03e33c0d29d235c4e
+SHA1 (patch-configure) = f5db59db380755d8b9fc8f75e723fd729ca06c30
+SHA1 (patch-configure.ac) = 9ff885f7d40a749f628d35a8408b1860f8017362

Index: pkgsrc/mail/fetchmail/options.mk
diff -u pkgsrc/mail/fetchmail/options.mk:1.20 pkgsrc/mail/fetchmail/options.mk:1.21
--- pkgsrc/mail/fetchmail/options.mk:1.20       Fri Oct  2 08:20:27 2020
+++ pkgsrc/mail/fetchmail/options.mk    Mon Dec 14 00:41:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2020/10/02 08:20:27 triaxx Exp $
+# $NetBSD: options.mk,v 1.21 2020/12/14 00:41:03 dbj Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.fetchmail
 PKG_SUPPORTED_OPTIONS=         kerberos4 kerberos gssapi ssl
@@ -13,7 +13,13 @@ PKG_SUGGESTED_OPTIONS=       ssl
 ### Authentication via GSSAPI (currently only over Kerberos V) support.
 ###
 .if !empty(PKG_OPTIONS:Mgssapi)
+.  if ${OPSYS} == "Darwin"
+# Darwin doesn't have include files in ${KRB5BASE}/include
+# so let configure use krb5-config to find kerberos
+CONFIGURE_ARGS+=       --with-gssapi=yes
+.  else
 CONFIGURE_ARGS+=       --with-gssapi=${KRB5BASE:Q}
+.  endif
 .else
 CONFIGURE_ARGS+=       --with-gssapi=no
 .endif
@@ -34,7 +40,13 @@ CONFIGURE_ARGS+=     --with-kerberos=no
 .if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"
 PKG_USE_KERBEROS=      yes
+.  if ${OPSYS} == "Darwin"
+# Darwin doesn't have include files in ${KRB5BASE}/include
+# so let configure use krb5-config to find kerberos
+CONFIGURE_ARGS+=        --with-kerberos5=yes
+.  else
 CONFIGURE_ARGS+=        --with-kerberos5=${KRB5BASE:Q}
+.  endif
 .else
 CONFIGURE_ARGS+=        --with-kerberos5=no
 .endif

Added files:

Index: pkgsrc/mail/fetchmail/patches/patch-configure
diff -u /dev/null pkgsrc/mail/fetchmail/patches/patch-configure:1.1
--- /dev/null   Mon Dec 14 00:41:03 2020
+++ pkgsrc/mail/fetchmail/patches/patch-configure       Mon Dec 14 00:41:03 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2020/12/14 00:41:03 dbj Exp $
+
+krb5-config errors out unless you give it a library to look for
+
+--- configure.orig     2020-09-04 08:19:51.000000000 +0000
++++ configure
+@@ -10797,7 +10797,7 @@ $as_echo "#define KERBEROS_V5 1" >>confd
+ 
+   CFLAGS="$CFLAGS -I/usr/include/kerberosV"
+   LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb5 2> /dev/null >/dev/null ; then
+   krb5_prefix=`krb5-config --prefix krb5`
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config points to kerberosV under $krb5_prefix" >&5
+ $as_echo "krb5-config points to kerberosV under $krb5_prefix" >&6; }
+@@ -11145,7 +11145,7 @@ $as_echo "krb4-config points to kerberos
+   CFLAGS="$CFLAGS `krb4-config --cflags`"
+   LIBS="$LIBS `krb4-config --libs`"
+   KERBEROS_V4=1
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb4 2> /dev/null >/dev/null ; then
+   krb4_prefix=`krb5-config --prefix krb4`
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config points to kerberosIV under $krb4_prefix" >&5
+ $as_echo "krb5-config points to kerberosIV under $krb4_prefix" >&6; }
Index: pkgsrc/mail/fetchmail/patches/patch-configure.ac
diff -u /dev/null pkgsrc/mail/fetchmail/patches/patch-configure.ac:1.1
--- /dev/null   Mon Dec 14 00:41:03 2020
+++ pkgsrc/mail/fetchmail/patches/patch-configure.ac    Mon Dec 14 00:41:03 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure.ac,v 1.1 2020/12/14 00:41:03 dbj Exp $
+
+krb5-config errors out unless you give it a library to look for
+
+--- configure.ac.orig  2020-09-04 08:03:28.000000000 +0000
++++ configure.ac
+@@ -551,7 +551,7 @@ then
+   AC_DEFINE(KERBEROS_V5,1,Define if you have Kerberos V5)
+   CFLAGS="$CFLAGS -I/usr/include/kerberosV"
+   LIBS="$LIBS -lasn1 -lkrb5 -lcom_err -lkafs"
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb5 2> /dev/null >/dev/null ; then
+   krb5_prefix=`krb5-config --prefix krb5`
+   AC_MSG_RESULT([krb5-config points to kerberosV under $krb5_prefix])
+   if test -f ${krb5_prefix}/include/et/com_err.h && \
+@@ -649,7 +649,7 @@ elif krb4-config 2> /dev/null >/dev/null
+   CFLAGS="$CFLAGS `krb4-config --cflags`"
+   LIBS="$LIBS `krb4-config --libs`"
+   KERBEROS_V4=1
+-elif krb5-config 2> /dev/null >/dev/null ; then
++elif krb5-config krb4 2> /dev/null >/dev/null ; then
+   krb4_prefix=`krb5-config --prefix krb4`
+   AC_MSG_RESULT([krb5-config points to kerberosIV under $krb4_prefix])
+   if test -f ${krb4_prefix}/include/kerberosIV/krb.h ; then