From 275c8d2044488777d820cb7a457dba432e05e9bb4ffcc4f77fda2c56f8cf940d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 27 Mar 2010 19:17:37 +0000 Subject: [PATCH] merged OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=8 --- ...tion-to-use-libcrypto-instead-of-NSS.patch | 4 +- ...nts-for-LDAP-Password-Policy-support.patch | 4 +- 0003-ldap-provider-ld-flags.patch | 29 --- 0004-init-script-dependencies.patch | 29 --- baselibs.conf | 4 - sssd.changes | 28 --- sssd.spec | 224 ++++-------------- 7 files changed, 51 insertions(+), 271 deletions(-) delete mode 100644 0003-ldap-provider-ld-flags.patch delete mode 100644 0004-init-script-dependencies.patch delete mode 100644 baselibs.conf diff --git a/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch b/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch index 429adf0..d1d728e 100644 --- a/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch +++ b/0001-Added-option-to-use-libcrypto-instead-of-NSS.patch @@ -1,7 +1,7 @@ From bf75a22ffc04dfa0387a1389750b0a1e6d3ac397 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 26 Mar 2010 15:04:51 +0100 -Subject: [PATCH] Added option to use libcrypto instead of NSS. +Subject: [PATCH 1/2] Added option to use libcrypto instead of NSS. crypto_sha512crypt.c is a clone of nss_sha512crypt.c with the exception that all usage of NSS and related libraries has been switched to libcrypto. @@ -447,5 +447,5 @@ index 0000000..5512c5d + const char *key, const char *salt, char **_hash); +int s3crypt_gen_salt(TALLOC_CTX *memctx, char **_salt); -- -1.7.0.2 +1.6.4.2 diff --git a/0002-Improvements-for-LDAP-Password-Policy-support.patch b/0002-Improvements-for-LDAP-Password-Policy-support.patch index c155afe..24992a3 100644 --- a/0002-Improvements-for-LDAP-Password-Policy-support.patch +++ b/0002-Improvements-for-LDAP-Password-Policy-support.patch @@ -1,7 +1,7 @@ From 536c01cf9a04573c2351542fe00973e1538014a5 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Fri, 12 Mar 2010 10:54:40 +0100 -Subject: [PATCH] Improvements for LDAP Password Policy support +Subject: [PATCH 2/2] Improvements for LDAP Password Policy support Display warnings about remaining grace logins and password expiration to the user, when LDAP Password Policies are used. @@ -411,5 +411,5 @@ index 2edd158..f387265 100644 /** * @} -- -1.7.0.2 +1.6.4.2 diff --git a/0003-ldap-provider-ld-flags.patch b/0003-ldap-provider-ld-flags.patch deleted file mode 100644 index 087ae76..0000000 --- a/0003-ldap-provider-ld-flags.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 840bb425fe0cb6f4904d5610ffd1fdfd9eed235d Mon Sep 17 00:00:00 2001 -From: Ralf Haferkamp -Date: Wed, 31 Mar 2010 10:40:13 +0200 -Subject: [PATCH] ldap provider ld flags - -The LDAP provider needs to be linked against libdhash ---- - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 6d46cda..6f14eee 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -717,9 +717,11 @@ libsss_ldap_la_SOURCES = \ - util/sss_krb5.c - libsss_ldap_la_CFLAGS = \ - $(AM_CFLAGS) \ -+ $(DHASH_CFLAGS) \ - $(LDAP_CFLAGS) \ - $(KRB5_CFLAGS) - libsss_ldap_la_LIBADD = \ -+ $(DHASH_LIBS) \ - $(OPENLDAP_LIBS) \ - $(KRB5_LIBS) - libsss_ldap_la_LDFLAGS = \ --- -1.7.0.2 - diff --git a/0004-init-script-dependencies.patch b/0004-init-script-dependencies.patch deleted file mode 100644 index 326a9c2..0000000 --- a/0004-init-script-dependencies.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b9090cb4d12147267a4fb1ad9bb74bb226bcbe34 Mon Sep 17 00:00:00 2001 -From: Ralf Haferkamp -Date: Wed, 31 Mar 2010 12:21:21 +0200 -Subject: [PATCH] init script dependencies - ---- - src/sysv/SUSE/sssd | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/sysv/SUSE/sssd b/src/sysv/SUSE/sssd -index 2f98c21..262ecde 100644 ---- a/src/sysv/SUSE/sssd -+++ b/src/sysv/SUSE/sssd -@@ -1,10 +1,10 @@ - #!/bin/sh - ### BEGIN INIT INFO - # Provides: sssd --# Required-Start: $remote_fs $time -+# Required-Start: $network $remote_fs $time - # Should-Start: $syslog - # Should-Stop: $syslog --# Required-Stop: $remote_fs -+# Required-Stop: $network $remote_fs $time - # Default-Start: 3 5 - # Default-Stop: 0 1 2 4 6 - # Short-Description: System Security Services Daemon --- -1.7.0.2 - diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 22e0a35..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,4 +0,0 @@ -sssd - supplements "packageand(sssd:pam-)" - supplements "packageand(sssd:glibc-)" - -/usr/lib(64)?/* diff --git a/sssd.changes b/sssd.changes index 2cf79d0..22304b5 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,31 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 31 14:02:43 UTC 2010 - rhafer@novell.com - -- Package pam- and nss-Modules as baselibs -- cleaned up file list and dependencies -- fixed init script dependencies - -------------------------------------------------------------------- -Wed Mar 31 07:57:25 UTC 2010 - rhafer@novell.com - -- Updated to 1.1.0 - * Support for IPv6 - * Support for LDAP referrals - * Offline failed login counter - * Fix for the long-standing cache cleanup performance issues - * libini_config, libcollection, libdhash, libref_array and - libpath_utils are now built as shared libraries for general - consumption (libref_array and libpath_utils are currently not - packaged, as no component in sssd links against them) - * Users get feedback from PAM if they authenticated offline - * Native local backend now has a utility to show nested memberships - (sss_groupshow) - * New "simple" access provider for easy restriction of users -- Backported libcrypto support from master to avoid Mozilla NSS - dependency -- Backported password policy improvments for LDAP provider from - master - ------------------------------------------------------------------- Mon Mar 8 14:06:29 UTC 2010 - rhafer@novell.com diff --git a/sssd.spec b/sssd.spec index e7725ef..af92655 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,5 +1,5 @@ # -# spec file for package sssd (Version 1.1.0) +# spec file for package sssd (Version 1.0.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,24 +19,15 @@ Name: sssd Version: 1.1.0 -Release: 1 +Release: 0 Group: System/Daemons Summary: System Security Services Daemon -License: GPLv3+ and LGPLv3+ -Url: https://fedorahosted.org/sssd/ -Source0: %{name}-%{version}.tar.gz -Source1: baselibs.conf -Patch1: 0001-Added-option-to-use-libcrypto-instead-of-NSS.patch -Patch2: 0002-Improvements-for-LDAP-Password-Policy-support.patch -Patch3: 0003-ldap-provider-ld-flags.patch -Patch4: 0004-init-script-dependencies.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%define dhash_version 0.4.0 -%define path_utils_version 0.2.0 -%define collection_version 0.4.0 -%define ini_config_version 0.4.0 -%define refarray_version 0.1.0 +License: GPLv3+ and LGPLv3+ +URL: https://fedorahosted.org/sssd/ +Source0: %{name}-%{version}.tar.gz +Patch1: 0001-Added-option-to-use-libcrypto-instead-of-NSS.patch +Patch2: 0002-Improvements-for-LDAP-Password-Policy-support.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build ### Dependencies ### %define servicename sssd @@ -45,26 +36,26 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define pipepath %{sssdstatedir}/pipes ### Build Dependencies ### -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: m4 -BuildRequires: popt-devel -BuildRequires: libtalloc-devel -BuildRequires: libtevent-devel -BuildRequires: libtdb-devel -BuildRequires: libldb-devel -BuildRequires: dbus-1-devel -BuildRequires: openldap2-devel -BuildRequires: pam-devel -BuildRequires: pkg-config -BuildRequires: pcre-devel -BuildRequires: libxslt -BuildRequires: libxml2 -BuildRequires: docbook-xsl-stylesheets -BuildRequires: krb5-devel -BuildRequires: libcares-devel -BuildRequires: python-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: m4 +BuildRequires: popt-devel +BuildRequires: libtalloc-devel +BuildRequires: libtevent-devel +BuildRequires: libtdb-devel +BuildRequires: libldb-devel +BuildRequires: dbus-1-devel +BuildRequires: openldap2-devel +BuildRequires: pam-devel +BuildRequires: pkg-config +BuildRequires: pcre-devel +BuildRequires: libxslt +BuildRequires: libxml2 +BuildRequires: docbook-xsl-stylesheets +BuildRequires: krb5-devel +BuildRequires: libcares-devel +BuildRequires: python-devel %description Provides a set of daemons to manage access to remote directories and @@ -103,81 +94,10 @@ Group: Development/Libraries/Python Provide python module to access and manage configuration of the System Security Services Daemon (sssd). -%package -n libdhash1 -Summary: Dynamic hash table -Group: Development/Libraries/C and C++ -Version: %{dhash_version} -Release: 1 -License: LGPLv3+ - -%description -n libdhash1 -A hash table which will dynamically resize to achieve optimal storage & access -time properties - -%package -n libdhash-devel -Summary: Development files for libdhash -Group: Development/Libraries/C and C++ -Version: %{dhash_version} -Release: 1 -Requires: libdhash1 = %{dhash_version} -License: LGPLv3+ - -%description -n libdhash-devel -A hash table which will dynamically resize to achieve optimal storage & access -time properties - -%package -n libcollection1 -Summary: Collection data-type for C -Group: Development/Libraries/C and C++ -Version: %{collection_version} -Release: 1 -License: LGPLv3+ - -%description -n libcollection1 -A data-type to collect data in a heirarchical structure for easy iteration -and serialization - -%package -n libcollection-devel -Summary: Development files for libcollection -Group: Development/Libraries/C and C++ -Version: %{collection_version} -Release: 1 -Requires: libcollection1 = %{collection_version} -License: LGPLv3+ - -%description -n libcollection-devel -A data-type to collect data in a heirarchical structure for easy iteration -and serialization - -%package -n libini_config1 -Summary: INI file parser for C -Group: Development/Libraries/C and C++ -Version: %{ini_config_version} -Release: 1 -License: LGPLv3+ - -%description -n libini_config1 -Library to process config files in INI format into a libcollection data -structure - -%package -n libini_config-devel -Summary: Development files for libini_config -Group: Development/Libraries/C and C++ -Version: %{ini_config_version} -Release: 1 -Requires: libini_config1 = %{ini_config_version} -License: LGPLv3+ - -%description -n libini_config-devel -Library to process config files in INI format into a libcollection data -structure - %prep %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build autoreconf @@ -202,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # Copy default sssd.conf file -install -d $RPM_BUILD_ROOT/%{_sysconfdir}/sssd +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd install -m600 src/examples/sssd.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf install src/sysv/SUSE/sssd $RPM_BUILD_ROOT%{_sysconfdir}/init.d/sssd ln -sf ../../etc/init.d/sssd $RPM_BUILD_ROOT/usr/sbin/rcsssd @@ -221,59 +141,29 @@ rm -f \ $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_simple.la \ $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la -rm $RPM_BUILD_ROOT/%{_libdir}/*.a +rm $RPM_BUILD_ROOT/%{_prefix}/include/*.h \ + $RPM_BUILD_ROOT/%{_libdir}/*.a \ + $RPM_BUILD_ROOT/%{_libdir}/*.so \ + $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/* + +rm -r $RPM_BUILD_ROOT/%{_prefix}/share/doc/dhash + %find_lang sss_daemon #%find_lang sss_client #cat sss_client.lang >> sss_daemon.lang -install -d $RPM_BUILD_ROOT/%{_docdir}/dhash -mv $RPM_BUILD_ROOT/%{_datarootdir}/doc/dhash/* $RPM_BUILD_ROOT/%{_docdir}/dhash - -# remove currently unused libraries -rm -f \ - $RPM_BUILD_ROOT/%{_libdir}/libref_array.* \ - $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/ref_array.pc \ - $RPM_BUILD_ROOT/%{_prefix}/include/ref_array*.h \ - $RPM_BUILD_ROOT/%{_libdir}/libpath_utils.* \ - $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/path_utils.pc \ - $RPM_BUILD_ROOT/%{_prefix}/include/path_utils.h - %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%preun -%stop_on_removal sssd - -%postun -/sbin/ldconfig -%restart_on_update sssd -%insserv_cleanup - -%post -n libdhash1 -p /sbin/ldconfig - -%postun -n libdhash1 -p /sbin/ldconfig - -%post -n libcollection1 -p /sbin/ldconfig - -%postun -n libcollection1 -p /sbin/ldconfig - -%post -n libini_config1 -p /sbin/ldconfig - -%postun -n libini_config1 -p /sbin/ldconfig - %files -f sss_daemon.lang %defattr(-,root,root,-) %doc COPYING %{_initrddir}/%{name} %{_sbindir}/sssd %{_sbindir}/rcsssd -%dir %{_libdir}/%{name} -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/sss* -%{_libexecdir}/%{name}/*_child -%{_libexecdir}/%{name}/upgrade_config.py +%{_libexecdir}/%{servicename}/ +%{_libdir}/*.so.* +%dir %{_libdir}/%{name}/ %{_libdir}/%{name}/libsss_krb5* %{_libdir}/%{name}/libsss_ldap* %{_libdir}/%{name}/libsss_proxy* @@ -324,35 +214,15 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/*.py* %{python_sitelib}/*.egg-info -%files -n libdhash1 -%defattr(-,root,root,-) -%{_libdir}/libdhash.so.* +%post +/sbin/ldconfig -%files -n libdhash-devel -%defattr(-,root,root,-) -%{_libdir}/libdhash.so -%{_libdir}/pkgconfig/dhash.pc -%{_prefix}/include/dhash.h -%doc %{_docdir}/dhash +%preun +%stop_on_removal sssd -%files -n libini_config1 -%defattr(-,root,root,-) -%{_libdir}/libini_config.so.* - -%files -n libini_config-devel -%defattr(-,root,root,-) -%{_libdir}/libini_config.so -%{_libdir}/pkgconfig/ini_config.pc -%{_prefix}/include/ini_config.h - -%files -n libcollection1 -%defattr(-,root,root,-) -%{_libdir}/libcollection.so.* - -%files -n libcollection-devel -%defattr(-,root,root,-) -%{_libdir}/libcollection.so -%{_libdir}/pkgconfig/collection.pc -%{_prefix}/include/collection*.h +%postun +/sbin/ldconfig +%restart_on_update sssd +%insserv_cleanup %changelog