samba4 build failure

[Chavdar Ivanov <ci4ic4%gmail.com@localhost>]

Hi,

I just finished a three day pkg_rolling-replace saga, which passed
rather well (some manual intervention was required due to the
elimination of ncursesw, but that was easy; also some kf5 dependencies
required me to include bl3 for security/mit-krb5, I don't know why).

The main failure was samba 4.20.2 - even after I took away all the
options (save winbindd), I get:
..........
===> Building for samba-4.20.2
PYTHONHASHSEED=1 WAF_MAKE=1 /usr/pkg/bin/python3.10
/usr/pkgsrc/net/samba4/work/samba-4.20.2/buildtools/bin/waf build
Waf: Entering directory `/usr/pkgsrc/net/samba4/work/samba-4.20.2/bin/default'
        Selected embedded Heimdal build
[1837/3633] Compiling source3/librpc/crypto/gse.c
In file included from
../../third_party/heimdal/lib/gssapi/gssapi/gssapi_spnego.h:39,
                 from ../../lib/replace/system/gssapi.h:47,
                 from ../../lib/krb5_wrap/gss_samba.h:27,
                 from ../../auth/kerberos/pac_utils.h:27,
                 from ../../source3/librpc/crypto/gse.c:38:
../../third_party/heimdal/lib/gssapi/gssapi/gssapi.h:94:40: error:
conflicting types for 'gss_name_t'; have 'struct
gss_name_t_desc_struct *'
   94 | typedef struct gss_name_t_desc_struct *gss_name_t;
      |                                        ^~~~~~~~~~
In file included from ../../lib/replace/system/gssapi.h:35:
../../../../../../../pkg/include/gssapi/gssapi.h:79:34: note: previous
declaration of 'gss_name_t' with type 'gss_name_t' {aka 'struct
gss_name_struct *'}
   79 | typedef struct gss_name_struct * gss_name_t;
      |                                  ^~~~~~~~~~
../../third_party/heimdal/lib/gssapi/gssapi/gssapi.h:95:46: error:
conflicting types for 'gss_const_name_t'; have 'const struct
gss_name_t_desc_struct *'
   95 | typedef const struct gss_name_t_desc_struct *gss_const_name_t;
      |                                              ^~~~~~~~~~~~~~~~
../../../../../../../pkg/include/gssapi/gssapi.h:849:39: note:
previous declaration of 'gss_const_name_t' with type
'gss_const_name_t' {aka 'const struct gss_name_struct *'}
  849 | typedef const struct gss_name_struct *gss_const_name_t;
      |                                       ^~~~~~~~~~~~~~~~
../../third_party/heimdal/lib/gssapi/gssapi/gssapi.h:98:42: error:
conflicting types for 'gss_ctx_id_t'; have 'struct
gss_ctx_id_t_desc_struct *'
   98 | typedef struct gss_ctx_id_t_desc_struct *gss_ctx_id_t;
      |                                          ^~~~~~~~~~~
.......

&c.

This is on -current amd64 from a few days ago. The previous version,
samba 4.19.5, built on the 15th of April, continues to work without
problems, as far as I can see.

Chavdar

-- 
----