sssd-2.3.1-1: Rebase to latest upstream release
This commit is contained in:
Pavel Březina
parent
1424e14b42
commit
cf3c8f20ee
@ -1,38 +0,0 @@
|
||||
From 88a0c39b341098f92725458b2055faaaf2bbad5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
||||
Date: Wed, 20 May 2020 12:07:13 +0200
|
||||
Subject: [PATCH] test: avoid endian issues in network tests
|
||||
|
||||
---
|
||||
src/tests/cmocka/test_nss_srv.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/src/tests/cmocka/test_nss_srv.c b/src/tests/cmocka/test_nss_srv.c
|
||||
index 2c91d0a23fe4ce6e66fee70da7501b0ec5f0feb8..3cd7809cf001f5f8ac68fcd191e05660b40cd267 100644
|
||||
--- a/src/tests/cmocka/test_nss_srv.c
|
||||
+++ b/src/tests/cmocka/test_nss_srv.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "util/util_sss_idmap.h"
|
||||
#include "util/crypto/sss_crypto.h"
|
||||
#include "util/crypto/nss/nss_util.h"
|
||||
+#include "util/sss_endian.h"
|
||||
#include "db/sysdb_private.h" /* new_subdomain() */
|
||||
#include "db/sysdb_iphosts.h"
|
||||
#include "db/sysdb_ipnetworks.h"
|
||||
@@ -5308,7 +5309,13 @@ struct netent test_netent = {
|
||||
.n_name = discard_const("test_network"),
|
||||
.n_aliases = discard_const(test_netent_aliases),
|
||||
.n_addrtype = AF_INET,
|
||||
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
|
||||
.n_net = 0x04030201 /* 1.2.3.4 */
|
||||
+#elif (__BYTE_ORDER == __BIG_ENDIAN)
|
||||
+ .n_net = 0x01020304 /* 1.2.3.4 */
|
||||
+#else
|
||||
+ #error "unknow endianess"
|
||||
+#endif
|
||||
};
|
||||
|
||||
static void mock_input_netbyname(const char *name)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
77
sssd.spec
77
sssd.spec
@ -1,7 +1,7 @@
|
||||
%global rhel7_minor %(%{__grep} -o "7.[0-9]*" /etc/redhat-release |%{__sed} -s 's/7.//')
|
||||
|
||||
# we don't want to provide private python extension libs
|
||||
%define __provides_exclude_from %{python3_sitearch}/.*\.so$|%{_libdir}/%{name}/modules/libwbclient.so.*$
|
||||
%define __provides_exclude_from %{python3_sitearch}/.*\.so$
|
||||
|
||||
# SSSD fails to build with -Wl,-z,defs
|
||||
%undefine _strict_symbol_defs_build
|
||||
@ -27,23 +27,15 @@
|
||||
%global use_openssl 1
|
||||
%endif
|
||||
|
||||
%global libwbc_alternatives_version 0.14
|
||||
%global libwbc_lib_version %{libwbc_alternatives_version}.0
|
||||
%global libwbc_alternatives_suffix %nil
|
||||
%if 0%{?__isa_bits} == 64
|
||||
%global libwbc_alternatives_suffix -64
|
||||
%endif
|
||||
|
||||
Name: sssd
|
||||
Version: 2.3.0
|
||||
Release: 5%{?dist}
|
||||
Version: 2.3.1
|
||||
Release: 1%{?dist}
|
||||
Summary: System Security Services Daemon
|
||||
License: GPLv3+
|
||||
URL: https://github.com/SSSD/sssd/
|
||||
Source0: https://github.com/SSSD/sssd/releases/download/sssd-2_3_0/sssd-2.3.0.tar.gz
|
||||
Source0: https://github.com/SSSD/sssd/releases/download/sssd-2_3_1/sssd-2.3.1.tar.gz
|
||||
|
||||
### Patches ###
|
||||
Patch0001: 0001-test-avoid-endian-issues-in-network-tests.patch
|
||||
|
||||
### Downstream only patches ###
|
||||
Patch0502: 0502-SYSTEMD-Use-capabilities.patch
|
||||
@ -317,7 +309,6 @@ Requires: sssd-krb5-common = %{version}-%{release}
|
||||
Requires: sssd-common-pac = %{version}-%{release}
|
||||
Recommends: bind-utils
|
||||
Recommends: adcli
|
||||
Suggests: sssd-libwbclient = %{version}-%{release}
|
||||
Suggests: sssd-winbind-idmap = %{version}-%{release}
|
||||
|
||||
%description ad
|
||||
@ -426,24 +417,6 @@ Requires: libsss_simpleifp = %{version}-%{release}
|
||||
%description -n libsss_simpleifp-devel
|
||||
Provides library that simplifies D-Bus API for the SSSD InfoPipe responder.
|
||||
|
||||
%package libwbclient
|
||||
Summary: The SSSD libwbclient implementation
|
||||
License: GPLv3+ and LGPLv3+
|
||||
Conflicts: libwbclient < 4.2.0-0.2.rc2
|
||||
Conflicts: sssd-common < %{version}-%{release}
|
||||
|
||||
%description libwbclient
|
||||
The SSSD libwbclient implementation.
|
||||
|
||||
%package libwbclient-devel
|
||||
Summary: Development libraries for the SSSD libwbclient implementation
|
||||
License: GPLv3+ and LGPLv3+
|
||||
Requires: sssd-libwbclient = %{version}-%{release}
|
||||
Conflicts: libwbclient-devel < 4.2.0-0.2.rc2
|
||||
|
||||
%description libwbclient-devel
|
||||
Development libraries for the SSSD libwbclient implementation.
|
||||
|
||||
%package winbind-idmap
|
||||
Summary: SSSD's idmap_sss Backend for Winbind
|
||||
License: GPLv3+ and LGPLv3+
|
||||
@ -559,12 +532,6 @@ unset CK_TIMEOUT_MULTIPLIER
|
||||
|
||||
%make_install
|
||||
|
||||
if [ ! -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/modules/libwbclient.so.%{libwbc_lib_version} ]
|
||||
then
|
||||
echo "Expected libwbclient version not found, please check if version has changed."
|
||||
exit -1
|
||||
fi
|
||||
|
||||
# Prepare language files
|
||||
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sssd
|
||||
|
||||
@ -935,16 +902,6 @@ done
|
||||
%files -n python3-libipa_hbac
|
||||
%{python3_sitearch}/pyhbac.so
|
||||
|
||||
%files libwbclient
|
||||
%dir %{_libdir}/%{name}
|
||||
%dir %{_libdir}/%{name}/modules
|
||||
%{_libdir}/%{name}/modules/libwbclient.so.*
|
||||
|
||||
%files libwbclient-devel
|
||||
%{_includedir}/wbclient_sssd.h
|
||||
%{_libdir}/%{name}/modules/libwbclient.so
|
||||
%{_libdir}/pkgconfig/wbclient_sssd.pc
|
||||
|
||||
%files winbind-idmap -f sssd_winbind_idmap.lang
|
||||
%dir %{_libdir}/samba/idmap
|
||||
%{_libdir}/samba/idmap/sss.so
|
||||
@ -1055,30 +1012,10 @@ fi
|
||||
%posttrans common
|
||||
%systemd_postun_with_restart sssd.service
|
||||
|
||||
%posttrans libwbclient
|
||||
%{_sbindir}/update-alternatives \
|
||||
--install %{_libdir}/libwbclient.so.%{libwbc_alternatives_version} \
|
||||
libwbclient.so.%{libwbc_alternatives_version}%{libwbc_alternatives_suffix} \
|
||||
%{_libdir}/%{name}/modules/libwbclient.so.%{libwbc_lib_version} 5
|
||||
/sbin/ldconfig
|
||||
|
||||
%preun libwbclient
|
||||
%{_sbindir}/update-alternatives \
|
||||
--remove libwbclient.so.%{libwbc_alternatives_version}%{libwbc_alternatives_suffix} \
|
||||
%{_libdir}/%{name}/modules/libwbclient.so.%{libwbc_lib_version}
|
||||
/sbin/ldconfig
|
||||
|
||||
%posttrans libwbclient-devel
|
||||
%{_sbindir}/update-alternatives --install %{_libdir}/libwbclient.so \
|
||||
libwbclient.so%{libwbc_alternatives_suffix} \
|
||||
%{_libdir}/%{name}/modules/libwbclient.so 5
|
||||
|
||||
%preun libwbclient-devel
|
||||
%{_sbindir}/update-alternatives --remove \
|
||||
libwbclient.so%{libwbc_alternatives_suffix} \
|
||||
%{_libdir}/%{name}/modules/libwbclient.so
|
||||
|
||||
%changelog
|
||||
* Fri Jul 24 2020 Pavel Březina <pbrezina@redhat.com> - 2.3.1-1
|
||||
- Rebase to SSSD 2.3.1
|
||||
|
||||
* Fri Jul 24 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.3.0-5
|
||||
- Minor ELN conditional fix
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user