diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-11-29 13:20:23 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-11-29 13:20:23 +0000 |
| commit | bfcc01820863323408a9931d953cb34e8dc60f67 (patch) | |
| tree | c6060d0d66a22ff058de04129ce2b5be5bc307b8 /net/samba4 | |
| parent | 846b37e443dd93304f8073d255cf62e822768ebd (diff) | |
| download | pkgsrc-bfcc01820863323408a9931d953cb34e8dc60f67.tar.gz | |
samba4: Build krb5.so module statically.
Avoids issues when building on systems that have a native libkrb5.so. Samba
libraries that try to link against krb5.so, which during the build phase is
named libgensec_module_krb5.so, end up with incorrect library dependencies,
likely due to wrapper interactions.
Diffstat (limited to 'net/samba4')
| -rw-r--r-- | net/samba4/PLIST | 3 | ||||
| -rw-r--r-- | net/samba4/distinfo | 3 | ||||
| -rw-r--r-- | net/samba4/patches/patch-source4_auth_gensec_wscript__build | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/net/samba4/PLIST b/net/samba4/PLIST index 0f25745a7b6..5d583487d73 100644 --- a/net/samba4/PLIST +++ b/net/samba4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.47 2022/10/25 07:46:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.48 2022/11/29 13:20:23 jperkin Exp $ bin/cifsdd bin/dbwrap_tool bin/dumpmscat @@ -625,7 +625,6 @@ ${PLIST.ads}lib/samba/bind9/dlz_bind9_12.${SOEXT} ${PLIST.ads}lib/samba/bind9/dlz_bind9_14.${SOEXT} ${PLIST.ads}lib/samba/bind9/dlz_bind9_16.${SOEXT} ${PLIST.ads}lib/samba/bind9/dlz_bind9_18.${SOEXT} -${PLIST.ads}lib/samba/gensec/krb5.${SOEXT} ${PLIST.ads}lib/samba/idmap/ad.${SOEXT} lib/samba/idmap/autorid.${SOEXT} lib/samba/idmap/hash.${SOEXT} diff --git a/net/samba4/distinfo b/net/samba4/distinfo index aa6740fd9c0..00d80197334 100644 --- a/net/samba4/distinfo +++ b/net/samba4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.86 2022/11/25 10:21:14 wiz Exp $ +$NetBSD: distinfo,v 1.87 2022/11/29 13:20:23 jperkin Exp $ BLAKE2s (samba-4.17.3.tar.gz) = c85427eb0dbd444f3e6b7478f70b45d874ce7dcdf2fbbe216c74a2ce73cbdb46 SHA512 (samba-4.17.3.tar.gz) = a5482bfe66f7f34fdf855e69b7b0fc2a4f9e756947357201651af70f3b10e236474c1b4ae4d9367b122e2d4565601659c373d3b17717a3c5c66aa9258eb58ff0 @@ -33,6 +33,7 @@ SHA1 (patch-source3_printing_samba-bgqd.c) = e9b83c35fbb24c702650d745b82fe6c9efb SHA1 (patch-source3_smbd_quotas.c) = 7f959964fac3ee435c57a115c8f5b6407e57b777 SHA1 (patch-source3_smbd_smb1__process.c) = ff59b9b4f4bdfff2761613ff84fbd669899ea540 SHA1 (patch-source3_utils_net__offlinejoin.c) = 773a4686d5e2a7eaebf9430529708e8318d45c77 +SHA1 (patch-source4_auth_gensec_wscript__build) = 01f3cdf787833e05f2e0b49ff0af7c8bbad2c161 SHA1 (patch-source4_dsdb_samdb_ldb__modules_wscript__build__server) = 47f55ec16b667a0a4d38de5ac89a117f2ac8f898 SHA1 (patch-source4_scripting_wscript__build) = 816d44f48b6cbc6d999995e00eaea1d2dc477159 SHA1 (patch-third__party_heimdal__build_roken.h) = 59d5523676fe8c0315e969247f26b4ea2f900402 diff --git a/net/samba4/patches/patch-source4_auth_gensec_wscript__build b/net/samba4/patches/patch-source4_auth_gensec_wscript__build new file mode 100644 index 00000000000..704ac32a3cb --- /dev/null +++ b/net/samba4/patches/patch-source4_auth_gensec_wscript__build @@ -0,0 +1,15 @@ +$NetBSD: patch-source4_auth_gensec_wscript__build,v 1.3 2022/11/29 13:20:23 jperkin Exp $ + +Build krb5 module statically. Avoids conflicts with native libkrb5.so. + +--- source4/auth/gensec/wscript_build.orig 2022-08-08 14:15:39.536193400 +0000 ++++ source4/auth/gensec/wscript_build +@@ -14,7 +14,7 @@ bld.SAMBA_MODULE('gensec_krb5', + subsystem='gensec', + init_function='gensec_krb5_init', + deps='samba-credentials authkrb5 com_err', +- internal_module=False, ++ internal_module=True, + enabled=bld.AD_DC_BUILD_IS_ENABLED() + ) + |