From: Jan Rękorajski Date: Sat, 2 Nov 2019 22:05:58 +0000 (+0100) Subject: - fix build, why do eve even keep this outdated piece of fedora? X-Git-Tag: auto/th/sssd-1.13.4-8 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsssd.git;a=commitdiff_plain;h=04f1a80 - fix build, why do eve even keep this outdated piece of fedora? - rel 8 --- diff --git a/array-size.patch b/array-size.patch new file mode 100644 index 0000000..a1f755a --- /dev/null +++ b/array-size.patch @@ -0,0 +1,22 @@ +--- sssd-1.13.4/src/providers/ad/ad_gpo_ndr.c~ 2016-04-13 16:48:41.000000000 +0200 ++++ sssd-1.13.4/src/providers/ad/ad_gpo_ndr.c 2019-11-02 23:00:49.203039214 +0100 +@@ -258,7 +258,7 @@ + NDR_CHECK(ndr_pull_align(ndr, 4)); + NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->sid_rev_num)); + NDR_CHECK(ndr_pull_int8(ndr, NDR_SCALARS, &r->num_auths)); +- if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) { ++ if (r->num_auths < 0 || r->num_auths > N_ELEMENTS(r->sub_auths)) { + return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range"); + } + NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6)); +--- sssd-1.13.4/src/util/util.h~ 2016-04-13 16:48:41.000000000 +0200 ++++ sssd-1.13.4/src/util/util.h 2019-11-02 23:02:39.186368813 +0100 +@@ -587,4 +587,8 @@ + */ + int sss_unique_filename(TALLOC_CTX *owner, char *path_tmpl); + ++#ifndef N_ELEMENTS ++#define N_ELEMENTS(arr) (sizeof(arr) / sizeof(arr[0])) ++#endif ++ + #endif /* __SSSD_UTIL_H__ */ diff --git a/sssd.spec b/sssd.spec index 38bea4f..70c77d6 100644 --- 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 -Release: 7 +Release: 8 License: GPL v3+ Group: Applications/System Source0: https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz @@ -25,6 +25,7 @@ Patch1: %{name}-heimdal.patch Patch2: %{name}-systemd.patch Patch3: %{name}-link.patch Patch4: format.patch +Patch5: array-size.patch URL: https://fedorahosted.org/sssd/ BuildRequires: augeas-devel >= 1.0.0 BuildRequires: autoconf >= 2.59 @@ -462,6 +463,7 @@ Pliki nagłówkowe biblioteki libsss_simpleifp. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{__libtoolize}