From df5d2d0f39a5a67b280d59ac35543083720ebdd88b75fd329567ea5cff9798d6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 16 Feb 2015 10:34:43 +0000 Subject: [PATCH 1/2] Accepting request 286307 from home:guohouzuo A minor rpmspec cleanup to get rid of five rpmlint warnings OBS-URL: https://build.opensuse.org/request/show/286307 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=145 --- sssd.changes | 8 ++++++++ sssd.spec | 41 +---------------------------------------- 2 files changed, 9 insertions(+), 40 deletions(-) diff --git a/sssd.changes b/sssd.changes index 41a374f..72e9489 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 16 10:09:18 UTC 2015 - howard@localhost + +- A minor rpmspec cleanup to get rid of five rpmlint warnings +* Remove mentioning of system-wide dbus configuration file from comments. +* Remove traditional init script. +* Remove compatibility for producing packages on older OpenSUSE releases. + ------------------------------------------------------------------- Thu Jan 8 22:23:42 UTC 2015 - jengelh@inai.de diff --git a/sssd.spec b/sssd.spec index 8bed6ac..7ac763d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -45,13 +45,7 @@ BuildRequires: bind-utils BuildRequires: cifs-utils-devel BuildRequires: cyrus-sasl-devel BuildRequires: docbook-xsl-stylesheets -%if 0%{?suse_version} >= 1320 BuildRequires: krb5-devel >= 1.12 -%define have_localauth 1 -%else -BuildRequires: krb5-devel -%define have_localauth 0 -%endif BuildRequires: libsmbclient-devel BuildRequires: libtool BuildRequires: libxml2-tools @@ -291,8 +285,6 @@ License: LGPL-3.0+ Group: System/Libraries Provides: libsss_sudo-devel = %version-%release Obsoletes: libsss_sudo-devel < %version-%release -# No provides: true obsolete. -Obsoletes: libsss_sudo1 Supplements: packageand(sudo:sssd-client) %description -n libsss_sudo @@ -374,17 +366,10 @@ install -d "$b/%_mandir"/{cs,cs/man8,nl,nl/man8,pt,pt/man8,uk,uk/man1} \ "$b/%_mandir"/{uk/man5,uk/man8}; install -d "$b/%_sysconfdir/sssd"; install -m600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf"; -%if 0%{?_unitdir:1} install -d "$b/%_unitdir"; -# Missing service file in 1.11.5.1 -#install src/sysv/systemd/sssd.service "$b/%_unitdir/sssd.service"; install -m644 %{S:4} "$b/%_unitdir/sssd.service"; rm -Rf "$b/%_initddir" ln -s service "$b/%_sbindir/rcsssd" -%else -install src/sysv/SUSE/sssd "$b/%_sysconfdir/init.d/sssd"; -ln -sf ../../etc/init.d/sssd "$b/usr/sbin/rcsssd" -%endif mkdir -p "$b/%_sysconfdir/ld.so.conf.d" cat >"$b/%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf" <<-EOF @@ -392,48 +377,32 @@ cat >"$b/%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf" <<-EOF EOF find "$b" -type f -name "*.la" -delete; -%if %suse_version <= 1110 -# remove some unsupported languages, sssd does not contain -# translations for these anyway -rm -Rf "$b/usr/share/locale"/{fa_IR,ja_JP,lt_LT,ta_IN,vi_VN} -%endif - rm -Rf "$b/%_sysconfdir/dbus-1" "$b/%_datadir/dbus-1" %find_lang %name --all-name -%if 0%{?_unitdir:1} %pre %service_add_pre sssd.service -%endif %post # migrate config variable krb5_kdcip to krb5_server (bnc#851048) /bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' %_sysconfdir/sssd/sssd.conf /sbin/ldconfig -%if 0%{?_unitdir:1} %service_add_post sssd.service -%endif -%if 0%{?_unitdir:1} %preun %service_del_preun sssd.service -%endif %postun if [ "$1" = "0" ]; then "%_sbindir/pam-config" -d --sss || :; fi; /sbin/ldconfig -%if 0%{?_unitdir:1} # Clear caches, which may have an incompatible format afterwards # (especially, downgrades) rm -f /var/lib/sss/db/*.ldb # del_postun includes a try-restart %service_del_postun sssd.service -%else -%restart_on_update sssd -%endif %insserv_cleanup %post -n libipa_hbac0 -p /sbin/ldconfig @@ -448,11 +417,7 @@ rm -f /var/lib/sss/db/*.ldb %files -f sssd.lang %defattr(-,root,root) %doc COPYING -%if 0%{?_unitdir:1} %_unitdir -%else -%_initrddir/%name -%endif %_bindir/sss_ssh_* %_sbindir/sssd %_sbindir/rcsssd @@ -507,9 +472,7 @@ rm -f /var/lib/sss/db/*.ldb /%_lib/security/pam_sss.so %_libdir/cifs-utils/ %_libdir/krb5/ -%if %have_localauth %_libdir/%name/modules/sssd_krb5_localauth_plugin.so -%endif %_mandir/??/man8/pam_sss.8* %_mandir/??/man8/sssd_krb5_locator_plugin.8* %_mandir/man8/pam_sss.8* @@ -537,8 +500,6 @@ rm -f /var/lib/sss/db/*.ldb %dir %_mandir/??/ %dir %_mandir/??/man5/ %_mandir/??/man5/sssd-ifp.5* -#%_sysconfdir/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf -#%_datadir/dbus-1/system-services/org.freedesktop.sssd.infopipe.service %files ipa %defattr(-,root,root) @@ -610,7 +571,7 @@ rm -f /var/lib/sss/db/*.ldb %files wbclient %defattr(-,root,root) -%_sysconfdir/ld.so.conf.d/sssd-wbclient.conf +%config %_sysconfdir/ld.so.conf.d/sssd-wbclient.conf %dir %_libdir/sssd/ %dir %_libdir/sssd/modules/ %_libdir/sssd/modules/libwbclient.so.* From 7a747e45df11edd1ca58dc989c77a1ea67549d35ed10facc668db27ab4f3c5e5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 19 Feb 2015 11:27:30 +0000 Subject: [PATCH 2/2] Accepting request 286738 from home:guohouzuo OBS-URL: https://build.opensuse.org/request/show/286738 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=146 --- sssd-1.12.3.tar.gz | 3 --- sssd-1.12.3.tar.gz.asc | 7 ------- sssd-1.12.4.tar.gz | 3 +++ sssd-1.12.4.tar.gz.asc | 7 +++++++ sssd.changes | 19 +++++++++++++++++++ sssd.spec | 2 +- 6 files changed, 30 insertions(+), 11 deletions(-) delete mode 100644 sssd-1.12.3.tar.gz delete mode 100644 sssd-1.12.3.tar.gz.asc create mode 100644 sssd-1.12.4.tar.gz create mode 100644 sssd-1.12.4.tar.gz.asc diff --git a/sssd-1.12.3.tar.gz b/sssd-1.12.3.tar.gz deleted file mode 100644 index a33a6bd..0000000 --- a/sssd-1.12.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d32c41b7964e3a49e27c8e278daff70f4e1d0171c7f641ffb4e800724cabf42 -size 4198515 diff --git a/sssd-1.12.3.tar.gz.asc b/sssd-1.12.3.tar.gz.asc deleted file mode 100644 index 6718431..0000000 --- a/sssd-1.12.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlSuve8ACgkQHsardTLnvCWtlwCfZGbXyMTjWgYK3gBCqEaSj92y -67cAoKZZQEn1+pdNjxgZN+C1J02+2xJz -=X5Ef ------END PGP SIGNATURE----- diff --git a/sssd-1.12.4.tar.gz b/sssd-1.12.4.tar.gz new file mode 100644 index 0000000..4396546 --- /dev/null +++ b/sssd-1.12.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea3be3a40b20284bd3126481dd0747cd07e39d5ef7ef7026d4902d96fc3e9edf +size 4226841 diff --git a/sssd-1.12.4.tar.gz.asc b/sssd-1.12.4.tar.gz.asc new file mode 100644 index 0000000..cea6482 --- /dev/null +++ b/sssd-1.12.4.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlTk1dAACgkQHsardTLnvCWfnwCg4JrLxP6Jjm9GYlTAqQS5N5cb +ufYAniGjhC+1IBPQVJYiYiCkzjoYDpq3 +=XPd1 +-----END PGP SIGNATURE----- diff --git a/sssd.changes b/sssd.changes index 72e9489..0add0b0 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Feb 19 10:51:22 UTC 2015 - hguo@suse.com + +- Update to new upstream release 1.12.4 (Changelog highlights following) +* This is mostly a bug fixing release with only minor enhancements + visible to the end user. +* Contains many fixes and enhancements related to the ID views + functionality of FreeIPA servers. +* Several fixes related to retrieving AD group membership in an + IPA-AD trust scenario. +* Fixes a bug where the GPO access control previously didn't work + at all if debugging was enabled in smb.conf. +* SSSD can now be pinned to a particular AD site instead of + autodiscovering the site. +* A regression that caused setting the SELinux context for IPA users + to fail, was fixed. +* Fixed a potential crash caused by a double-free error when an SSSD + service was killed by the monitor process. + ------------------------------------------------------------------- Mon Feb 16 10:09:18 UTC 2015 - howard@localhost diff --git a/sssd.spec b/sssd.spec index 7ac763d..ac3af7f 100644 --- a/sssd.spec +++ b/sssd.spec @@ -17,7 +17,7 @@ Name: sssd -Version: 1.12.3 +Version: 1.12.4 Release: 0 Summary: System Security Services Daemon License: GPL-3.0+ and LGPL-3.0+