Date: Wednesday, May 20, 2020 @ 07:49:40 Author: mtorromeo Revision: 630375
upgpkg: sssd 2.3.0-1 Modified: sssd/trunk/PKGBUILD Deleted: sssd/trunk/kerberos-1.18-fix.patch sssd/trunk/samba-4.12-fix.patch -------------------------+ PKGBUILD | 21 +++----- kerberos-1.18-fix.patch | 14 ----- samba-4.12-fix.patch | 120 ---------------------------------------------- 3 files changed, 10 insertions(+), 145 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-20 07:49:22 UTC (rev 630374) +++ PKGBUILD 2020-05-20 07:49:40 UTC (rev 630375) @@ -2,11 +2,11 @@ # Maintainer: Mantas M. <[email protected]> pkgname=sssd -pkgver=2.2.3 -pkgrel=7 +pkgver=2.3.0 +pkgrel=1 pkgdesc="System Security Services Daemon" arch=('x86_64') -url="https://pagure.io/SSSD/sssd"; +url="https://github.com/SSSD/sssd"; license=('GPL3') depends=( 'bind' # for nsupdate @@ -36,16 +36,14 @@ 'cmocka' 'libfaketime' 'openssh' + 'softhsm' ) -source=("https://releases.pagure.org/SSSD/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc} - samba-4.12-fix.patch - kerberos-1.18-fix.patch) -sha512sums=('b61d52a53e26e8efa9cb799fc6efc2314bf9d174d3cacfe591a4ca77530637591eacc0dc70c0555252e04a9617e8b134b1ab2d9b0f7351b4228e7b61499e6a10' - 'SKIP' - '34c8161176e8012c27b9f19e6f0b1b008d4c2accd3d6a9229df995726f5bad10cca5ae2b3684d86d28e9b77d9a780a156ab4a24a649ad1f0499f6f976895414b' - '8adec825e4c159f1eb6aec77113fa01fefaa3f7c73a21f5823c6187e6be067c34659d9e78a8a8c00d4cb7452c4ff983bc081a3fd6194812c9e451b4c92eb8cef') +source=("https://github.com/SSSD/$pkgname/releases/download/$pkgname-${pkgver//./_}/$pkgname-$pkgver.tar.gz"{,.asc}) +sha512sums=('72fc69018c4b8a71198f4a82e89d49d7a5c513e9291deff2f8e0e132cbd67341a8fa89598d28fcc1d785497526c9eeffe9b261c751524ee0e553badf0f748d59' + 'SKIP') validpgpkeys=('E4E366758CA0716AAB8048671EC6AB7532E7BC25' - '16F24229488E736048952737BA88000FE6398272') + '16F24229488E736048952737BA88000FE6398272' + '1A41DC67505F89A330828B66AFFE75DDE8508E12') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -83,6 +81,7 @@ --without-selinux \ --without-semanage \ --with-systemdunitdir=/usr/lib/systemd/system \ + --with-crypto=nss \ ; sed -i '/\<HAVE_KRB5_SET_TRACE_CALLBACK\>/d' config.h make Deleted: kerberos-1.18-fix.patch =================================================================== --- kerberos-1.18-fix.patch 2020-05-20 07:49:22 UTC (rev 630374) +++ kerberos-1.18-fix.patch 2020-05-20 07:49:40 UTC (rev 630375) @@ -1,14 +0,0 @@ -diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4 -index dc986a1..114d847 100644 ---- a/src/external/pac_responder.m4 -+++ b/src/external/pac_responder.m4 -@@ -19,7 +19,8 @@ then - 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]) - ;; Deleted: samba-4.12-fix.patch =================================================================== --- samba-4.12-fix.patch 2020-05-20 07:49:22 UTC (rev 630374) +++ samba-4.12-fix.patch 2020-05-20 07:49:40 UTC (rev 630375) @@ -1,120 +0,0 @@ -diff --git a/src/external/samba.m4 b/src/external/samba.m4 -index 65947fa..a0cfd27 100644 ---- a/src/external/samba.m4 -+++ b/src/external/samba.m4 -@@ -130,10 +130,17 @@ int main(void) - AC_DEFINE_UNQUOTED(SMB_IDMAP_DOMAIN_HAS_DOM_SID, 1, - [Samba's struct idmap_domain has dom_sid member]) - AC_MSG_NOTICE([Samba's struct idmap_domain has dom_sid member]) -+ if test $samba_minor_version -ge 12 ; then -+ AC_DEFINE_UNQUOTED(SMB_HAS_NEW_NDR_PULL_STEAL_SWITCH, 1, -+ [Samba's new push/pull switch functions]) -+ AC_MSG_NOTICE([Samba has support for new ndr_push_steal_switch_value and ndr_pull_steal_switch_value functions]) -+ else -+ AC_MSG_NOTICE([Samba supports old ndr_pull_steal_switch_value and ndr_pull_steal_switch_value functions]) -+ fi - else - AC_MSG_NOTICE([Samba's struct idmap_domain does not have dom_sid member]) -+ AC_MSG_NOTICE([Samba supports old ndr_pull_steal_switch_value and ndr_pull_steal_switch_value functions]) - fi -- - fi - - SAVE_CFLAGS=$CFLAGS -diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c -index 101701c..ee7203c 100644 ---- a/src/providers/ad/ad_gpo_ndr.c -+++ b/src/providers/ad/ad_gpo_ndr.c -@@ -105,9 +105,14 @@ ndr_pull_security_ace_object_type(struct ndr_pull *ndr, - union security_ace_object_type *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { -+ /* This token is not used again (except perhaps below in the NDR_BUFFERS case) */ -+#ifdef SMB_HAS_NEW_NDR_PULL_STEAL_SWITCH -+ NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level)); -+#else -+ level = ndr_pull_steal_switch_value(ndr, r); -+#endif - NDR_CHECK(ndr_pull_union_align(ndr, 4)); - switch (level) { - case SEC_ACE_OBJECT_TYPE_PRESENT: { -@@ -117,14 +122,6 @@ ndr_pull_security_ace_object_type(struct ndr_pull *ndr, - break; } - } - } -- if (ndr_flags & NDR_BUFFERS) { -- switch (level) { -- case SEC_ACE_OBJECT_TYPE_PRESENT: -- break; -- default: -- break; -- } -- } - return NDR_ERR_SUCCESS; - } - -@@ -135,9 +132,14 @@ ndr_pull_security_ace_object_inherited_type(struct ndr_pull *ndr, - union security_ace_object_inherited_type *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { -+ /* This token is not used again (except perhaps below in the NDR_BUFFERS case) */ -+#ifdef SMB_HAS_NEW_NDR_PULL_STEAL_SWITCH -+ NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level)); -+#else -+ level = ndr_pull_steal_switch_value(ndr, r); -+#endif - NDR_CHECK(ndr_pull_union_align(ndr, 4)); - switch (level) { - case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT: { -@@ -149,14 +151,6 @@ ndr_pull_security_ace_object_inherited_type(struct ndr_pull *ndr, - break; } - } - } -- if (ndr_flags & NDR_BUFFERS) { -- switch (level) { -- case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT: -- break; -- default: -- break; -- } -- } - return NDR_ERR_SUCCESS; - } - -@@ -198,9 +192,14 @@ ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, - union security_ace_object_ctr *r) - { - uint32_t level; -- level = ndr_pull_get_switch_value(ndr, r); - NDR_PULL_CHECK_FLAGS(ndr, ndr_flags); - if (ndr_flags & NDR_SCALARS) { -+ /* This token is not used again (except perhaps below in the NDR_BUFFERS case) */ -+#ifdef SMB_HAS_NEW_NDR_PULL_STEAL_SWITCH -+ NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level)); -+#else -+ level = ndr_pull_steal_switch_value(ndr, r); -+#endif - NDR_CHECK(ndr_pull_union_align(ndr, 4)); - switch (level) { - case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT: { -@@ -224,6 +223,14 @@ ndr_pull_security_ace_object_ctr(struct ndr_pull *ndr, - } - } - if (ndr_flags & NDR_BUFFERS) { -+ if (!(ndr_flags & NDR_SCALARS)) { -+ /* We didn't get it above, and the token is not needed after this. */ -+#ifdef SMB_HAS_NEW_NDR_PULL_STEAL_SWITCH -+ NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level)); -+#else -+ level = ndr_pull_steal_switch_value(ndr, r); -+#endif -+ } - switch (level) { - case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT: - NDR_CHECK(ndr_pull_security_ace_object
