- add init script

Changed files:
    sssd.init -> 1.1
    sssd.spec -> 1.3

diff --git a/sssd.init b/sssd.init
new file mode 100644 (file)
index 0000000..2ec439b
--- /dev/null
+++ b/sssd.init
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# sssd System Security Services Daemon
+#
+# chkconfig:   2345 84 16
+#
+# description: Cache for LDAP and Kerberos credentials for disconnected use
+#
+# processname: sssd
+# config:      /etc/sssd/sssd.conf
+# pidfile:     /var/lib/sssd/sssd.pid
+#
+# $Id$
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+# Get service config - may override defaults
+[ -f /etc/sysconfig/sssd ] && . /etc/sysconfig/sssd
+
+# Check that networking is up.
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "System Security Services Daemon"
+               exit 1
+       fi
+else
+       exit 0
+fi
+
+start() {
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/sssd ]; then
+               msg_starting "System Security Services Daemon"
+               daemon --fork /usr/sbin/sssd --defaults-file=/etc/sssd/sssd.conf
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sssd
+       else
+               msg_already_running "System Security Services Daemon"
+       fi
+}
+
+stop() {
+       if [ -f /var/lock/subsys/sssd ]; then
+               # Stop daemons.
+               msg_stopping "System Security Services Daemon"
+               /sbin/start-stop-daemon -q --stop \
+                       --retry TERM/600/KILL/10 \
+                       -s TERM --pidfile /var/lib/sssd/sssd.pid
+               local result=$?
+               if [ "$result" -eq 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+
+               rm -f /var/lock/subsys/sssd
+       else
+               msg_not_running "System Security Services Daemon"
+       fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/sssd ]; then
+               stop
+               start
+       else
+               msg_not_running "System Security Services Daemon"
+               RETVAL=$1
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
+  status)
+       status sssd
+       RETVAL=$?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
+       exit 3
+esac
+
+exit $RETVAL

diff --git a/sssd.spec b/sssd.spec
index 2e87a4470bbe66bb1ea3930c9d417de39b33e71f..9a70ccb28b3ef5927928a9bd573ed6c2d0cfd3fb 100644 (file)
--- a/sssd.spec
+++ b/sssd.spec
@@ -2,9 +2,6 @@
 #error: Failed build dependencies:
 #        keyutils-libs-devel is needed by sssd-1.6.1-0.1.src
 #        krb5-devel >= 1.9 is needed by sssd-1.6.1-0.1.src
-#        libcollection-devel is needed by sssd-1.6.1-0.1.src
-#        libdhash-devel >= 0.4.2 is needed by sssd-1.6.1-0.1.src
-#        libini_config-devel is needed by sssd-1.6.1-0.1.src
 
 %define                ldb_version 1.1.0
 Summary:       System Security Services Daemon
@@ -15,6 +12,10 @@ License:     GPL v3+
 Group:         Applications/System
 URL:           http://fedorahosted.org/sssd/
 Source0:       https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz
+# Source0-md5: 2da6d0006b70929d4d491e952e808bf5
+Source1:    %{name}.init
+Patch0:                %{name}-python-config.patch
+Patch1:                %{name}-heimdal.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bind-utils
@@ -22,13 +23,14 @@ BuildRequires:      c-ares-devel
 BuildRequires: check-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-libs
+BuildRequires: docbook-dtd44-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: doxygen
 BuildRequires: gettext-devel
-BuildRequires: keyutils-libs-devel
-BuildRequires: krb5-devel >= 1.9
+BuildRequires: heimdal-devel
+BuildRequires: keyutils-devel
 BuildRequires: libcollection-devel
-BuildRequires: libdhash-devel >= 0.4.2
+BuildRequires: libdhash-devel
 BuildRequires: libini_config-devel
 BuildRequires: libldb-devel = %{ldb_version}
 BuildRequires: libnl-devel
@@ -51,13 +53,10 @@ BuildRequires:      python-devel
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: tdb-devel
 BuildRequires: tevent-devel
-Requires(post,preun):  /sbin/chkconfig
 Requires(post,postun): /sbin/ldconfig
+Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-client = %{version}-%{release}
 Requires:      cyrus-sasl-gssapi
-Requires:      krb5-libs >= 1.9
-Requires:      libldb = %{ldb_version}
-Requires:      tdb >= 1.1.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                servicename             sssd
@@ -130,9 +129,16 @@ Python applications.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf -ivf
+%{__gettextize}
+%{__aclocal}
+%{__automake}
+%{__autoconf}
+CFLAGS=-Wno-deprecated-declarations
+export CFLAGS
 %configure \
        --with-db-path=%{dbpath} \
        --with-pipe-path=%{pipepath} \
@@ -174,20 +180,7 @@ cp -p src/examples/logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/sssd
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d
 cp -p src/examples/rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/sssd
 
-# Remove .la files created by libtool
-%{__rm} \
-    $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
-    $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.la \
-    $RPM_BUILD_ROOT/%{ldb_modulesdir}/memberof.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_krb5.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ipa.la \
-    $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_simple.la \
-    $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.la \
-    $RPM_BUILD_ROOT/%{_libdir}/libipa_hbac.la \
-    $RPM_BUILD_ROOT/%{py_sitedir}/pysss.la \
-    $RPM_BUILD_ROOT/%{py_sitedir}/pyhbac.la
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 
 touch sssd_tools.lang
 for man in `find $RPM_BUILD_ROOT/%{_mandir}/??/man?/ -type f | sed -e "s#$RPM_BUILD_ROOT/%{_mandir}/##"`; do
@@ -224,9 +217,13 @@ fi
 
 %files -f sssd.lang
 %defattr(644,root,root,755)
+%attr(755,root,root) /etc/rc.d/init.d/sssd
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/sssd
-%{_libexecdir}/%{servicename}
-%{_libdir}/%{name}/
+%dir %{_libexecdir}/%{servicename}
+%attr(755,root,root) %{_libexecdir}/%{servicename}/*child
+%attr(755,root,root) %{_libexecdir}/%{servicename}/sssd_*
+%attr(755,root,root) %{_libexecdir}/%{servicename}/*.so
 %attr(755,root,root) %{ldb_modulesdir}/memberof.so
 %dir %{sssdstatedir}
 %attr(700,root,root) %dir %{dbpath}
@@ -235,12 +232,12 @@ fi
 %attr(700,root,root) %dir %{pipepath}/private
 %attr(750,root,root) %dir %{_var}/log/%{name}
 %attr(700,root,root) %dir %{_sysconfdir}/sssd
-%config(noreplace) %{_sysconfdir}/sssd/sssd.conf
+%config(noreplace) %attr(600,root,root) %{_sysconfdir}/sssd/sssd.conf
 %config(noreplace) /etc/logrotate.d/sssd
 %config(noreplace) %{_sysconfdir}/rwtab.d/sssd
 %config %{_sysconfdir}/sssd/sssd.api.conf
 %attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
-%config %{_sysconfdir}/sssd/sssd.api.d/
+%config %attr(600,root,root) %{_sysconfdir}/sssd/sssd.api.d/*
 %{_mandir}/man5/sssd.conf.5*
 %{_mandir}/man5/sssd-ipa.5*
 %{_mandir}/man5/sssd-krb5.5*
@@ -254,7 +251,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libnss_sss.so.2
 %attr(755,root,root) /%{_lib}/security/pam_sss.so
-%attr(755,root,root) %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
+#%attr(755,root,root) %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
 %{_mandir}/man8/pam_sss.8*
 %{_mandir}/man8/sssd_krb5_locator_plugin.8*
 
@@ -281,7 +278,7 @@ fi
 
 %files -n libipa_hbac
 %defattr(644,root,root,755)
-%{_libdir}/libipa_hbac.so.*
+%attr(755,root,root) %{_libdir}/libipa_hbac.so.*
 
 %files -n libipa_hbac-devel
 %defattr(644,root,root,755)