- fix building with samba 4.12

- fix python shebang
- rel 10

diff --git a/samba-4.12.patch b/samba-4.12.patch
new file mode 100644 (file)
index 0000000..5be3f41
--- /dev/null
+++ b/samba-4.12.patch
@@ -0,0 +1,53 @@
+From bc56b10aea999284458dcc293b54cf65288e325d Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Fri, 24 Jan 2020 15:17:39 +0100
+Subject: [PATCH] Fix build failure against samba 4.12.0rc1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The ndr_pull_get_switch() function was dropped, but it was just a wrapper
+around the ndr_token_peek() function, so we can use this approach on both
+old and new versions of libndr.
+
+Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
+
+Reviewed-by: Pavel Březina <pbrezina@redhat.com>
+---
+ src/providers/ad/ad_gpo_ndr.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c
+index d57303349..8f405aa62 100644
+--- a/src/providers/ad/ad_gpo_ndr.c
++++ b/src/providers/ad/ad_gpo_ndr.c
+@@ -105,7 +105,7 @@ 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);
++    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 @@ 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);
++    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 @@ 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);
++    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));
+-- 
+2.20.1
+

diff --git a/sssd.spec b/sssd.spec
index 6bf1689c8495d31bc393566f9627016375828bfa..3edc2fcd6aa124a1ce2452f341fd41207122ef1a 100644 (file)
--- a/sssd.spec
+++ b/sssd.spec
@@ -14,7 +14,7 @@ Summary:      System Security Services Daemon
 Summary(pl.UTF-8):     System Security Services Daemon - demon usług bezpieczeństwa systemu
 Name:          sssd
 Version:       1.13.4
 Summary(pl.UTF-8):     System Security Services Daemon - demon usług bezpieczeństwa systemu
 Name:          sssd
 Version:       1.13.4

-Release:       9
+Release:       10

 License:       GPL v3+
 Group:         Applications/System
 Source0:       https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz
 License:       GPL v3+
 Group:         Applications/System
 Source0:       https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz


@@ -26,6 +26,7 @@ Patch2:               %{name}-systemd.patch
 Patch3:                %{name}-link.patch
 Patch4:                format.patch
 Patch5:                array-size.patch
 Patch3:                %{name}-link.patch
 Patch4:                format.patch
 Patch5:                array-size.patch

+Patch6:                samba-4.12.patch

 URL:           https://fedorahosted.org/sssd/
 BuildRequires: augeas-devel >= 1.0.0
 BuildRequires: autoconf >= 2.59
 URL:           https://fedorahosted.org/sssd/
 BuildRequires: augeas-devel >= 1.0.0
 BuildRequires: autoconf >= 2.59


@@ -464,6 +465,10 @@ Pliki nagłówkowe biblioteki libsss_simpleifp.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

+%patch6 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+      src/tools/sss_obfuscate

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}