forked from pool/sssd
Accepting request 113128 from home:eclipseagent:branches:network:ldap
Fixed what's requested, although I didn't bzip the source file (which you didn't mention as a requirement). I've expanded the macro, and I use make all vs make more as an OCD, then a true requirement. OBS-URL: https://build.opensuse.org/request/show/113128 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=64
This commit is contained in:
Git OBS Bridge
parent
d193a7e341
commit
1512debfaa
35
sssd-1.5.11-194a6c5.diff
Normal file
35
sssd-1.5.11-194a6c5.diff
Normal file
@ -0,0 +1,35 @@
|
||||
--- sssd-1.5.11/src/providers/ldap/sdap_async_accounts.c 2011-07-05 10:41:13.000000000 -0700
|
||||
+++ sssd-1.5.11/src/providers/ldap/sdap_async_accounts.c.new 2012-04-04 21:18:36.366685716 -0700
|
||||
@@ -3550,8 +3550,8 @@
|
||||
|
||||
filter = talloc_asprintf(
|
||||
sdap_attrs, "(&(objectclass=%s)(%s=*))",
|
||||
- state->opts->group_map[SDAP_OC_GROUP].name,
|
||||
- state->opts->group_map[SDAP_AT_GROUP_NAME].name);
|
||||
+ state->opts->group_map[SDAP_OC_GROUP].sys_name,
|
||||
+ state->opts->group_map[SDAP_AT_GROUP_NAME].sys_name);
|
||||
if (!filter) {
|
||||
talloc_free(sdap_attrs);
|
||||
return ENOMEM;
|
||||
@@ -3884,10 +3884,10 @@
|
||||
}
|
||||
|
||||
filter = talloc_asprintf(state, "(&(%s=%s)(objectclass=%s)(%s=*))",
|
||||
- opts->group_map[SDAP_AT_GROUP_MEMBER].name,
|
||||
+ opts->group_map[SDAP_AT_GROUP_MEMBER].sys_name,
|
||||
clean_orig_dn,
|
||||
opts->group_map[SDAP_OC_GROUP].name,
|
||||
- opts->group_map[SDAP_AT_GROUP_NAME].name);
|
||||
+ opts->group_map[SDAP_AT_GROUP_NAME].sys_name);
|
||||
if (!filter) {
|
||||
talloc_zfree(req);
|
||||
return NULL;
|
||||
@@ -4065,7 +4065,7 @@
|
||||
ret = sysdb_attrs_primary_name_list(
|
||||
state->sysdb, tmp_ctx,
|
||||
state->ldap_groups, state->ldap_groups_count,
|
||||
- state->opts->group_map[SDAP_AT_GROUP_NAME].name,
|
||||
+ state->opts->group_map[SDAP_AT_GROUP_NAME].sys_name,
|
||||
&ldap_grouplist);
|
||||
if (ret != EOK) {
|
||||
goto error;
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:09f5e6d9f4ab7f7ad8d2cbe818f22de416963d62b995d030ecfdd34c55e56059
|
||||
size 1733496
|
||||
3
sssd-1.8.2.tar.gz
Normal file
3
sssd-1.8.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59231dbe76f53b4d2ae026419940c5afceb3307a221648226bc661ce8b871575
|
||||
size 2128880
|
||||
13
sssd.changes
13
sssd.changes
@ -1,4 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 9 21:45:45 PDT 2012 - ben.kevan@gmail.com
|
||||
|
||||
- Add suse_version condition for glib over libunistring for
|
||||
SLES 11 SP2.
|
||||
- Update to new upstream release 1.8.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 4 16:13:33 PDT 2012 - ben.kevan@gmail.com
|
||||
|
||||
- Update to new upstream release 1.8.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
Sun Mar 11 18:36:44 UTC 2012 - jengelh@medozas.de
|
||||
|
||||
- Update to new upstream release 1.8.0
|
||||
|
||||
67
sssd.spec
67
sssd.spec
@ -14,19 +14,22 @@
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
Name: sssd
|
||||
Version: 1.8.0
|
||||
Version: 1.8.2
|
||||
Release: 0
|
||||
Summary: System Security Services Daemon
|
||||
License: GPL-3.0+ and LGPL-3.0+
|
||||
Group: System/Daemons
|
||||
Url: https://fedorahosted.org/sssd/
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
#removed bz2
|
||||
Source1: baselibs.conf
|
||||
Patch3: 0003-Allow-LDAP-to-decide-when-an-expiration-warning-is-w.patch
|
||||
Patch4: 0004-avoid-hard-crypto-dep.diff
|
||||
Patch5: 0005-implicit-decl.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%if %suse_version >= 1210
|
||||
%{?systemd_requires}
|
||||
%endif
|
||||
@ -81,8 +84,12 @@ BuildRequires: bind-utils
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libtool
|
||||
%if 0%{?sles_version} == 11
|
||||
# SLES 11 SP2 does not have libunistring
|
||||
BuildRequires: glib2-devel
|
||||
%else
|
||||
BuildRequires: libunistring-devel
|
||||
# wants: xmllint, xsltproc
|
||||
%endif
|
||||
BuildRequires: libxml2
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: nscd
|
||||
@ -187,13 +194,29 @@ export PATH="$PATH:/usr/sbin"
|
||||
--with-ldb-lib-dir="$LDB_DIR" \
|
||||
--with-selinux=no \
|
||||
--with-os=suse \
|
||||
%if 0%{?sles_version} == 11
|
||||
--with-semanage=no \
|
||||
--with-unicode-lib=glib2
|
||||
%else
|
||||
--with-semanage=no
|
||||
make %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags} all
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
# Copy default sssd.conf file
|
||||
install -d %{buildroot}%{_mandir}/cs
|
||||
install -d %{buildroot}%{_mandir}/cs/man8
|
||||
install -d %{buildroot}%{_mandir}/nl
|
||||
install -d %{buildroot}%{_mandir}/nl/man8
|
||||
install -d %{buildroot}%{_mandir}/pt
|
||||
install -d %{buildroot}%{_mandir}/pt/man8
|
||||
install -d %{buildroot}%{_mandir}/uk
|
||||
install -d %{buildroot}%{_mandir}/uk/man1
|
||||
install -d %{buildroot}%{_mandir}/uk/man5
|
||||
install -d %{buildroot}%{_mandir}/uk/man8
|
||||
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
|
||||
install -m600 src/examples/sssd-example.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
|
||||
install src/sysv/SUSE/sssd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/sssd
|
||||
@ -260,6 +283,24 @@ rm -rf \
|
||||
%{_sbindir}/rcsssd
|
||||
%dir %{_libdir}/%{name}
|
||||
%dir %{_libexecdir}/%{name}
|
||||
%dir %{_mandir}/cs
|
||||
%dir %{_mandir}/cs/man8
|
||||
%dir %{_mandir}/nl
|
||||
%dir %{_mandir}/nl/man8
|
||||
%dir %{_mandir}/pt
|
||||
%dir %{_mandir}/pt/man8
|
||||
%dir %{_mandir}/uk
|
||||
%dir %{_mandir}/uk/man1
|
||||
%dir %{_mandir}/uk/man5
|
||||
%dir %{_mandir}/uk/man8
|
||||
%{_mandir}/??/man?/*
|
||||
%{_mandir}/man5/sssd-krb5.5*
|
||||
%{_mandir}/man5/sssd-ldap.5*
|
||||
%{_mandir}/man5/sssd-simple.5*
|
||||
%{_mandir}/man8/sssd.8*
|
||||
%{_mandir}/man5/sssd.conf.5.gz
|
||||
%{_mandir}/man8/pam_sss.8.gz
|
||||
%{_mandir}/man8/sssd_krb5_locator_plugin.8.gz
|
||||
%{_libexecdir}/%{name}/sss*
|
||||
%{_libexecdir}/%{name}/*_child
|
||||
%{_libdir}/%{name}/libsss_krb5*
|
||||
@ -278,19 +319,11 @@ rm -rf \
|
||||
%config(noreplace) %{_sysconfdir}/sssd/sssd.conf
|
||||
/%{_lib}/libnss_sss.so.2
|
||||
/%{_lib}/security/pam_sss.so
|
||||
%{_mandir}/man5/sssd-krb5.*
|
||||
%{_mandir}/man5/sssd-ldap.*
|
||||
%{_mandir}/man5/sssd-simple.*
|
||||
%{_mandir}/man5/sssd.conf.*
|
||||
%_datadir/sssd
|
||||
%exclude %_datadir/sssd/sssd.api.d/sssd-ipa.conf
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root,-)
|
||||
%_mandir/man8/*
|
||||
%dir %_mandir/??
|
||||
%dir %_mandir/??/man*
|
||||
%_mandir/??/man8/*
|
||||
%{_sbindir}/sss_cache
|
||||
%{_sbindir}/sss_debuglevel
|
||||
%{_sbindir}/sss_useradd
|
||||
@ -300,6 +333,16 @@ rm -rf \
|
||||
%{_sbindir}/sss_groupdel
|
||||
%{_sbindir}/sss_groupmod
|
||||
%{_sbindir}/sss_groupshow
|
||||
%{_mandir}/man8/sss_groupadd.8*
|
||||
%{_mandir}/man8/sss_groupdel.8*
|
||||
%{_mandir}/man8/sss_groupmod.8*
|
||||
%{_mandir}/man8/sss_groupshow.8*
|
||||
%{_mandir}/man8/sss_useradd.8*
|
||||
%{_mandir}/man8/sss_userdel.8*
|
||||
%{_mandir}/man8/sss_usermod.8*
|
||||
%{_mandir}/man8/sss_obfuscate.8*
|
||||
%{_mandir}/man8/sss_cache.8*
|
||||
%{_mandir}/man8/sss_debuglevel.8*
|
||||
%attr(0755,root,root) %{_sbindir}/sss_obfuscate
|
||||
|
||||
%files ipa-provider
|
||||
|
||||
Loading…
Reference in New Issue
Block a user