diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-12-12 22:56:47 +0800 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-12-12 22:56:47 +0800 |
| commit | 13792430bb02efa66bbec0d79463facf12461479 (patch) | |
| tree | 9a057207eabd2becdd00d8bd9ba997628b5c9b7f /security | |
| parent | 17307c4f6cd8e118874dfa98e0f54491d03971cc (diff) | |
| download | freebsd-ports-gnome-13792430bb02efa66bbec0d79463facf12461479.tar.gz freebsd-ports-gnome-13792430bb02efa66bbec0d79463facf12461479.tar.zst freebsd-ports-gnome-13792430bb02efa66bbec0d79463facf12461479.zip | |
devel/sssd: fix SMB option
- use Samba 4.12 instead of the removed Samba 4.10
- use ldb 2.1 instead of ldb 2.0
While here, recognize Kerberos 1.18
PR: 250864
Submitted by: joerg (patch by Richard Frewin)
Approved by: maintainer timeout (14 days)
Diffstat (limited to 'security')
| -rw-r--r-- | security/sssd/Makefile | 15 | ||||
| -rw-r--r-- | security/sssd/files/patch-src__external__pac_responder.m4 | 10 | ||||
| -rw-r--r-- | security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c | 29 |
3 files changed, 47 insertions, 7 deletions
diff --git a/security/sssd/Makefile b/security/sssd/Makefile index c33a04d6b232..480f9ab6c69b 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -3,6 +3,7 @@ PORTNAME= sssd PORTVERSION= 1.16.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ @@ -16,7 +17,7 @@ LIB_DEPENDS= libpopt.so:devel/popt \ libtalloc.so:devel/talloc \ libtevent.so:devel/tevent \ libtdb.so:databases/tdb \ - libldb.so:databases/ldb20 \ + libldb.so:databases/ldb21 \ libcares.so:dns/c-ares \ libdbus-1.so:devel/dbus \ libdhash.so:devel/ding-libs \ @@ -76,12 +77,12 @@ OPTIONS_SUB= yes SMB_DESC= Install IPA and AD providers (requires Samba4) SMB_USES= samba:lib SMB_CONFIGURE_WITH= samba smb-idmap-interface-version=6 -SMB_LIB_DEPENDS= libndr-nbt.so.0:net/samba410 \ - libndr-krb5pac.so.0:net/samba410 \ - libndr-standard.so.0:net/samba410 \ - libndr.so.0:net/samba410 \ - libsamba-util.so.0:net/samba410 \ - libsmbclient.so.0:net/samba410 +SMB_LIB_DEPENDS= libndr-nbt.so.0:net/samba412 \ + libndr-krb5pac.so.0:net/samba412 \ + libndr-standard.so.0:net/samba412 \ + libndr.so.1:net/samba412 \ + libsamba-util.so.0:net/samba412 \ + libsmbclient.so.0:net/samba412 post-patch: @${REINPLACE_CMD} -e 's|NSS_STATUS_NOTFOUND|NS_NOTFOUND|g' \ diff --git a/security/sssd/files/patch-src__external__pac_responder.m4 b/security/sssd/files/patch-src__external__pac_responder.m4 index d4fc8c4ee357..a870a179c34c 100644 --- a/security/sssd/files/patch-src__external__pac_responder.m4 +++ b/security/sssd/files/patch-src__external__pac_responder.m4 @@ -11,3 +11,13 @@ index dc986a1b8..09efdb139 100644 AC_MSG_CHECKING(for supported MIT krb5 version) KRB5_VERSION="`$KRB5_CONFIG --version`" case $KRB5_VERSION in +@@ -19,7 +19,8 @@ + Kerberos\ 5\ release\ 1.14* | \ + Kerberos\ 5\ release\ 1.15* | \ + Kerberos\ 5\ release\ 1.16* | \ +- Kerberos\ 5\ release\ 1.17*) ++ Kerberos\ 5\ release\ 1.17* | \ ++ Kerberos\ 5\ release\ 1.18*) + krb5_version_ok=yes + AC_MSG_RESULT([yes]) + ;; diff --git a/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c b/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c new file mode 100644 index 000000000000..7bb5a0c1f476 --- /dev/null +++ b/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c @@ -0,0 +1,29 @@ +--- src/providers/ad/ad_gpo_ndr.c-orig 2020-11-28 22:21:39.860006000 +0000 ++++ src/providers/ad/ad_gpo_ndr.c 2020-11-28 22:23:15.849602000 +0000 +@@ -105,7 +105,7 @@ + union security_ace_object_type *r) + { + uint32_t level; +- level = ndr_pull_get_switch_value(ndr, r); ++ level = ndr_token_peek(&ndr->switch_list, r); + NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_union_align(ndr, 4)); +@@ -135,7 +135,7 @@ + union security_ace_object_inherited_type *r) + { + uint32_t level; +- level = ndr_pull_get_switch_value(ndr, r); ++ level = ndr_token_peek(&ndr->switch_list, r); + NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_union_align(ndr, 4)); +@@ -198,7 +198,7 @@ + union security_ace_object_ctr *r) + { + uint32_t level; +- level = ndr_pull_get_switch_value(ndr, r); ++ level = ndr_token_peek(&ndr->switch_list, r); + NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); + if (ndr_flags & NDR_SCALARS) { + NDR_CHECK(ndr_pull_union_align(ndr, 4)); |