From 1512debfaa3369e1362c851d92ef4512b5216c725b4c260e5b8f5981d0e57157 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Apr 2012 17:58:50 +0000 Subject: [PATCH 1/6] 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 --- sssd-1.5.11-194a6c5.diff | 35 +++++++++++++++++++++ sssd-1.8.0.tar.bz2 | 3 -- sssd-1.8.2.tar.gz | 3 ++ sssd.changes | 13 ++++++++ sssd.spec | 67 +++++++++++++++++++++++++++++++++------- 5 files changed, 106 insertions(+), 15 deletions(-) create mode 100644 sssd-1.5.11-194a6c5.diff delete mode 100644 sssd-1.8.0.tar.bz2 create mode 100644 sssd-1.8.2.tar.gz diff --git a/sssd-1.5.11-194a6c5.diff b/sssd-1.5.11-194a6c5.diff new file mode 100644 index 0000000..d9a09ce --- /dev/null +++ b/sssd-1.5.11-194a6c5.diff @@ -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; diff --git a/sssd-1.8.0.tar.bz2 b/sssd-1.8.0.tar.bz2 deleted file mode 100644 index 77d917e..0000000 --- a/sssd-1.8.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09f5e6d9f4ab7f7ad8d2cbe818f22de416963d62b995d030ecfdd34c55e56059 -size 1733496 diff --git a/sssd-1.8.2.tar.gz b/sssd-1.8.2.tar.gz new file mode 100644 index 0000000..30f3af1 --- /dev/null +++ b/sssd-1.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59231dbe76f53b4d2ae026419940c5afceb3307a221648226bc661ce8b871575 +size 2128880 diff --git a/sssd.changes b/sssd.changes index 743805a..3a34d9c 100644 --- a/sssd.changes +++ b/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 diff --git a/sssd.spec b/sssd.spec index e743bab..9d888e8 100644 --- a/sssd.spec +++ b/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 From 580711b945af58dfc703418bc288d117702b71be2ac9f5935edd69e8788114e1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 12 Apr 2012 21:15:53 +0000 Subject: [PATCH 2/6] Simply last changeset OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=65 --- sssd.spec | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/sssd.spec b/sssd.spec index 9d888e8..0caefe4 100644 --- a/sssd.spec +++ b/sssd.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: sssd Version: 1.8.2 Release: 0 @@ -22,18 +23,14 @@ 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.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 - %define servicename sssd %define sssdstatedir %{_localstatedir}/lib/sss %define dbpath %{sssdstatedir}/db @@ -98,6 +95,7 @@ BuildRequires: pam-devel BuildRequires: pkg-config %if %suse_version >= 1210 BuildRequires: systemd +%{?systemd_requires} %endif %description @@ -195,12 +193,10 @@ export PATH="$PATH:/usr/sbin" --with-selinux=no \ --with-os=suse \ %if 0%{?sles_version} == 11 - --with-semanage=no \ --with-unicode-lib=glib2 -%else - --with-semanage=no %endif - + --with-semanage=no + make %{?_smp_mflags} all %install @@ -220,7 +216,7 @@ 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 -%if %suse_version >= 1210 +%if 0%{?_unitdir:1} install -d $RPM_BUILD_ROOT/%{_unitdir} install src/sysv/systemd/sssd.service $RPM_BUILD_ROOT/%{_unitdir}/sssd.service %endif @@ -242,21 +238,20 @@ rm -rf \ %find_lang %{name} --all-name -%if %suse_version >= 1210 - +%if 0%{?_unitdir:1} %pre %service_add_pre sssd.service %endif %post /sbin/ldconfig -%if %suse_version >= 1210 +%if 0%{?_unitdir:1} %service_add_post sssd.service %endif %preun %stop_on_removal sssd -%if %suse_version >= 1210 +%if 0%{?_unitdir:1} %service_del_preun sssd.service %endif @@ -264,7 +259,7 @@ rm -rf \ /sbin/ldconfig %restart_on_update sssd %insserv_cleanup -%if %suse_version >= 1210 +%if 0%{?_unitdir:1} %service_del_postun sssd.service %endif @@ -276,7 +271,7 @@ rm -rf \ %defattr(-,root,root,-) %doc COPYING %{_initrddir}/%{name} -%if %suse_version >= 1210 +%if 0%{?_unitdir:1} %{_unitdir}/sssd.service %endif %{_sbindir}/sssd From b707c92f135b2f8a4a22cdb49d47f6ea7ba98572bcafb58f9880bcf6582cacef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 12 Apr 2012 23:43:09 +0000 Subject: [PATCH 3/6] Add changelogs OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=66 --- sssd.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sssd.changes b/sssd.changes index 3a34d9c..e3d094d 100644 --- a/sssd.changes +++ b/sssd.changes @@ -4,11 +4,16 @@ 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 +* Fix for GSSAPI binds when the keytab contains unrelated + principals +* Workarounds added for LDAP servers with unreadable RootDSE ------------------------------------------------------------------- Wed Apr 4 16:13:33 PDT 2012 - ben.kevan@gmail.com - Update to new upstream release 1.8.1 +* Resolve issue where we could enter an infinite loop trying to + connect to an auth server ------------------------------------------------------------------- From fe36221f240411ba7c5a47cfa2484244185bdbf785bf1f1eb84d7470b06fa6e9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 13 Apr 2012 20:32:22 +0000 Subject: [PATCH 4/6] Accepting request 113452 from home:eclipseagent:branches:network:ldap Fix issue with build on SLES builds (missing / after argument for glib2). OBS-URL: https://build.opensuse.org/request/show/113452 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=67 --- sssd.changes | 5 +++++ sssd.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sssd.changes b/sssd.changes index e3d094d..d56caf6 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 13 13:03:44 PDT 2012 - ben.kevan@gmail.com + +- Fix build error on SLES 11 builds + ------------------------------------------------------------------- Mon Apr 9 21:45:45 PDT 2012 - ben.kevan@gmail.com diff --git a/sssd.spec b/sssd.spec index 0caefe4..bef2003 100644 --- a/sssd.spec +++ b/sssd.spec @@ -18,7 +18,7 @@ Name: sssd Version: 1.8.2 -Release: 0 +Release: 1 Summary: System Security Services Daemon License: GPL-3.0+ and LGPL-3.0+ Group: System/Daemons @@ -193,7 +193,7 @@ export PATH="$PATH:/usr/sbin" --with-selinux=no \ --with-os=suse \ %if 0%{?sles_version} == 11 - --with-unicode-lib=glib2 + --with-unicode-lib=glib2 \ %endif --with-semanage=no From 97f80bf8f2d73efff204d69f4cd71b2ad2e87985ea0879c676ee946852dea821 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Apr 2012 13:53:28 +0000 Subject: [PATCH 5/6] New BuildRequires for factory OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=68 --- sssd.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sssd.spec b/sssd.spec index bef2003..939efc9 100644 --- a/sssd.spec +++ b/sssd.spec @@ -18,7 +18,7 @@ Name: sssd Version: 1.8.2 -Release: 1 +Release: 0 Summary: System Security Services Daemon License: GPL-3.0+ and LGPL-3.0+ Group: System/Daemons @@ -81,14 +81,19 @@ BuildRequires: bind-utils BuildRequires: docbook-xsl-stylesheets BuildRequires: krb5-devel BuildRequires: libtool -%if 0%{?sles_version} == 11 +%if 0%{?suse_version} >= 1140 +BuildRequires: libunistring-devel +%else # SLES 11 SP2 does not have libunistring BuildRequires: glib2-devel -%else -BuildRequires: libunistring-devel %endif +%if 0%{?suse_version} >= 1220 +BuildRequires: libxml2-tools +BuildRequires: libxslt-tools +%else BuildRequires: libxml2 BuildRequires: libxslt +%endif BuildRequires: nscd BuildRequires: openldap2-devel BuildRequires: pam-devel From 504d56f5fc9d47b571b10da9d20cc174f29b0db14241e0c8cda5dd99619a9fcb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Apr 2012 13:54:23 +0000 Subject: [PATCH 6/6] Remove old files OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=69 --- sssd-1.5.11-194a6c5.diff | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 sssd-1.5.11-194a6c5.diff diff --git a/sssd-1.5.11-194a6c5.diff b/sssd-1.5.11-194a6c5.diff deleted file mode 100644 index d9a09ce..0000000 --- a/sssd-1.5.11-194a6c5.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- 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;