Attachment #220051 for bug #250864

View | Details | Raw Unified | Return to bug 250864
Collapse All | Expand All





PORTNAME=	sssd
PORTVERSION=	1.16.5
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	https://releases.pagure.org/SSSD/${PORTNAME}/


		libtalloc.so:devel/talloc \
		libtevent.so:devel/tevent \
		libtdb.so:databases/tdb \
		libldb.so:databases/ldb21 \
		libcares.so:dns/c-ares \
		libdbus-1.so:devel/dbus \
		libdhash.so:devel/ding-libs \

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/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' \




     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])
             ;;




--- 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));

Return to bug 250864

Lines 3-8 Link Here

(-)security/sssd/Makefile (-7 / +8 lines)
3		3
4	PORTNAME= sssd	4	PORTNAME= sssd
5	PORTVERSION= 1.16.5	5	PORTVERSION= 1.16.5
		6	PORTREVISION= 1
6	CATEGORIES= security	7	CATEGORIES= security
7	MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/	8	MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/
8		9
Lines 16-22 Link Here
16	libtalloc.so:devel/talloc \	17	libtalloc.so:devel/talloc \
17	libtevent.so:devel/tevent \	18	libtevent.so:devel/tevent \
18	libtdb.so:databases/tdb \	19	libtdb.so:databases/tdb \
19	libldb.so:databases/ldb20 \	20	libldb.so:databases/ldb21 \
20	libcares.so:dns/c-ares \	21	libcares.so:dns/c-ares \
21	libdbus-1.so:devel/dbus \	22	libdbus-1.so:devel/dbus \
22	libdhash.so:devel/ding-libs \	23	libdhash.so:devel/ding-libs \
Lines 76-87 Link Here
76	SMB_DESC= Install IPA and AD providers (requires Samba4)	77	SMB_DESC= Install IPA and AD providers (requires Samba4)
77	SMB_USES= samba:lib	78	SMB_USES= samba:lib
78	SMB_CONFIGURE_WITH= samba smb-idmap-interface-version=6	79	SMB_CONFIGURE_WITH= samba smb-idmap-interface-version=6
79	SMB_LIB_DEPENDS= libndr-nbt.so.0:net/samba410 \	80	SMB_LIB_DEPENDS= libndr-nbt.so.0:net/samba412 \
80	libndr-krb5pac.so.0:net/samba410 \	81	libndr-krb5pac.so.0:net/samba412 \
81	libndr-standard.so.0:net/samba410 \	82	libndr-standard.so.0:net/samba412 \
82	libndr.so.0:net/samba410 \	83	libndr.so.1:net/samba412 \
83	libsamba-util.so.0:net/samba410 \	84	libsamba-util.so.0:net/samba412 \
84	libsmbclient.so.0:net/samba410	85	libsmbclient.so.0:net/samba412
85		86
86	post-patch:	87	post-patch:
87	@${REINPLACE_CMD} -e 's\|NSS_STATUS_NOTFOUND\|NS_NOTFOUND\|g' \	88	@${REINPLACE_CMD} -e 's\|NSS_STATUS_NOTFOUND\|NS_NOTFOUND\|g' \

Lines 11-13 Link Here

(-)security/sssd/files/patch-src__external__pac_responder.m4 (+10 lines)
11	AC_MSG_CHECKING(for supported MIT krb5 version)	11	AC_MSG_CHECKING(for supported MIT krb5 version)
12	KRB5_VERSION="`$KRB5_CONFIG --version`"	12	KRB5_VERSION="`$KRB5_CONFIG --version`"
13	case $KRB5_VERSION in	13	case $KRB5_VERSION in
		14	@@ -19,7 +19,8 @@
		15	Kerberos\ 5\ release\ 1.14* \| \
		16	Kerberos\ 5\ release\ 1.15* \| \
		17	Kerberos\ 5\ release\ 1.16* \| \
		18	- Kerberos\ 5\ release\ 1.17*)
		19	+ Kerberos\ 5\ release\ 1.17* \| \
		20	+ Kerberos\ 5\ release\ 1.18*)
		21	krb5_version_ok=yes
		22	AC_MSG_RESULT([yes])
		23	;;

Line 0 Link Here

(-)security/sssd/files/patch-src__providers__ad__ad_gpo_ndr.c (+29 lines)
	1	--- src/providers/ad/ad_gpo_ndr.c-orig 2020-11-28 22:21:39.860006000 +0000
	2	+++ src/providers/ad/ad_gpo_ndr.c 2020-11-28 22:23:15.849602000 +0000
	3	@@ -105,7 +105,7 @@
	4	union security_ace_object_type *r)
	5	{
	6	uint32_t level;
	7	- level = ndr_pull_get_switch_value(ndr, r);
	8	+ level = ndr_token_peek(&ndr->switch_list, r);
	9	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
	10	if (ndr_flags & NDR_SCALARS) {
	11	NDR_CHECK(ndr_pull_union_align(ndr, 4));
	12	@@ -135,7 +135,7 @@
	13	union security_ace_object_inherited_type *r)
	14	{
	15	uint32_t level;
	16	- level = ndr_pull_get_switch_value(ndr, r);
	17	+ level = ndr_token_peek(&ndr->switch_list, r);
	18	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
	19	if (ndr_flags & NDR_SCALARS) {
	20	NDR_CHECK(ndr_pull_union_align(ndr, 4));
	21	@@ -198,7 +198,7 @@
	22	union security_ace_object_ctr *r)
	23	{
	24	uint32_t level;
	25	- level = ndr_pull_get_switch_value(ndr, r);
	26	+ level = ndr_token_peek(&ndr->switch_list, r);
	27	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
	28	if (ndr_flags & NDR_SCALARS) {
	29	NDR_CHECK(ndr_pull_union_align(ndr, 4));