Index: head/security/sssd/Makefile =================================================================== --- head/security/sssd/Makefile (revision 557828) +++ head/security/sssd/Makefile (revision 557829) @@ -1,116 +1,117 @@ # Created by: Lukas Slebodnik # $FreeBSD$ PORTNAME= sssd PORTVERSION= 1.16.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ MAINTAINER= lukas.slebodnik@intrak.sk COMMENT= System Security Services Daemon LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING 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 \ libpcre.so:devel/pcre \ libunistring.so:devel/libunistring \ libnss3.so:security/nss \ libsasl2.so:security/cyrus-sasl2 \ libinotify.so:devel/libinotify \ libplds4.so:devel/nspr BUILD_DEPENDS= xmlcatalog:textproc/libxml2 \ docbook-xsl>=1:textproc/docbook-xsl \ xsltproc:textproc/libxslt \ xmlcatmgr:textproc/xmlcatmgr \ krb5>=1.10:security/krb5 \ nsupdate:dns/bind-tools GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-selinux --without-semanage \ --without-libnl --without-nfsv4-idmapd-plugin \ --without-autofs --without-secrets --without-kcm \ --without-python2-bindings \ --with-init-dir=no \ --disable-cifs-idmap-plugin \ --with-unicode-lib=libunistring \ --with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \ --with-xml-catalog-path=${LOCALBASE}/share/xml/catalog \ --datadir=${DATADIR} --docdir=${DOCSDIR} --localstatedir=/var \ --with-db-path=/var/db/sss/db --with-mcache-path=/var/db/sss/mc \ --with-pubconf-path=/var/db/sss/pubconf \ --with-gpo-cache-path=/var/db/sss/gpo_cache \ --with-pid-path=/var/run --with-pipe-path=/var/run/sss/pipes \ --with-krb5-conf=/etc/krb5.conf \ --enable-pammoddir=${PREFIX}/lib CFLAGS+= -fstack-protector-all PLIST_SUB= PYTHON_VER=${PYTHON_VER} #DEBUG_FLAGS= -g MAKE_ENV+= LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW" SUB_FILES= pkg-message USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \ python:3.7 shebangfix gssapi:mit USE_LDCONFIG= yes USE_OPENLDAP= yes INSTALL_TARGET= install-strip CPE_VENDOR= fedoraproject BINARY_ALIAS= python3=python${PYTHON_VER} SHEBANG_FILES= src/tools/sss_obfuscate \ src/sbus/sbus_codegen USE_RC_SUBR= ${PORTNAME} PORTDATA= * OPTIONS_DEFINE= DOCS SMB 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' \ -e 's|NSS_STATUS_UNAVAIL|NS_UNAVAIL|g' \ -e 's|NSS_STATUS_TRYAGAIN|NS_TRYAGAIN|g' \ -e '/ETIME/d' \ -e 's|NSS_STATUS_SUCCESS|NS_SUCCESS|g' \ ${WRKSRC}/src/sss_client/common.c @${REINPLACE_CMD} \ -e 's|pam_modutil_getlogin(pamh)|getlogin()|g' \ ${WRKSRC}/src/sss_client/pam_sss.c @${REINPLACE_CMD} \ -e 's|install-data-hook install-dist_initSCRIPTS|install-dist_initSCRIPTS|g' \ -e 's|install-data-hook|notinstall-data-hook|g' \ ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \ -e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \ ${WRKSRC}/src/man/*xml @${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c @${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h post-install: ${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \ ${STAGEDIR}${ETCDIR}/sssd.conf.sample ${LN} -sf nss_sss.so ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1 # clean unused man dirs .for i in es/man1 nl/man1 nl/man5 pt/man1 pt/man5 sv/man1 @${RMDIR} ${STAGEDIR}${PREFIX}/man/${i} .endfor .include Index: head/security/sssd/files/patch-src__external__pac_responder.m4 =================================================================== --- head/security/sssd/files/patch-src__external__pac_responder.m4 (revision 557828) +++ head/security/sssd/files/patch-src__external__pac_responder.m4 (revision 557829) @@ -1,13 +1,23 @@ diff --git src/external/pac_responder.m4 src/external/pac_responder.m4 index dc986a1b8..09efdb139 100644 --- src/external/pac_responder.m4 +++ src/external/pac_responder.m4 @@ -7,7 +7,7 @@ AC_ARG_ENABLE([pac-responder], krb5_version_ok=no if test x$build_pac_responder = xyes then - AC_PATH_PROG(KRB5_CONFIG, krb5-config) + AC_PATH_TOOL(KRB5_CONFIG, krb5-config, [], [/usr/local/bin:$PATH]) 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]) + ;; Index: head/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c =================================================================== --- head/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c (nonexistent) +++ head/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c (revision 557829) @@ -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)); Property changes on: head/security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property