From 34c451039c2fb8c7111722c68b686a90458dadb9d2d71cc46d6d2e7999cb14f6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 21 Feb 2019 13:28:33 +0000
Subject: [PATCH] Accepting request 677966 from
 home:scabrero:branches:network:ldap

- Install systemd service unit file created from source's template
  (bsc#1120852)
- Install logrotate configuration (bsc#1004220)
- Set journald as system logger

OBS-URL: https://build.opensuse.org/request/show/677966
OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=213
---
 sssd.changes |  8 ++++++++
 sssd.service | 15 ---------------
 sssd.spec    | 21 +++++++++++++++------
 3 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 sssd.service

diff --git a/sssd.changes b/sssd.changes
index fa6dfc4..f2bde67 100644
--- a/sssd.changes
+++ b/sssd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 20 16:01:52 UTC 2019 - Samuel Cabrero <scabrero@suse.de>
+
+- Install systemd service unit file created from source's template
+  (bsc#1120852)
+- Install logrotate configuration (bsc#1004220)
+- Set journald as system logger
+
 -------------------------------------------------------------------
 Fri Feb 15 17:36:22 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/sssd.service b/sssd.service
deleted file mode 100644
index 0aa0e74..0000000
--- a/sssd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=System Security Services Daemon
-Before=nss-user-lookup.target
-Wants=nss-user-lookup.target
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/sssd
-ExecStart=/usr/sbin/sssd -D -f
-# These two should be used with traditional UNIX forking daemons
-# consult systemd.service(5) for more details
-Type=forking
-PIDFile=/var/run/sssd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sssd.spec b/sssd.spec
index 98e4932..69fe122 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package sssd
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -28,7 +28,6 @@ Url:            https://pagure.io/SSSD/sssd
 Source:         http://releases.pagure.org/SSSD/sssd/%name-%version.tar.gz
 Source2:        http://releases.pagure.org/SSSD/sssd/%name-%version.tar.gz.asc
 Source3:        baselibs.conf
-Source4:        sssd.service
 Source5:        %name.keyring
 Patch1:         krb-noversion.diff
 BuildRoot:      %_tmppath/%name-%version-build
@@ -391,6 +390,9 @@ export LDFLAGS="-pie"
     --with-pipe-path="%pipepath" \
     --with-pubconf-path="%pubconfpath" \
     --with-init-dir="%_initrddir" \
+    --with-environment-file=%{_sysconfdir}/sysconfig/sssd \
+    --with-initscript=systemd \
+    --with-syslog=journald \
     --enable-nsslibdir="/%_lib" \
     --enable-pammoddir="/%_lib/security" \
     --with-ldb-lib-dir="$LDB_DIR" \
@@ -399,7 +401,7 @@ export LDFLAGS="-pie"
     --with-semanage=no \
     --disable-ldb-version-check \
     --without-kcm \
-	--without-secrets \
+    --without-secrets \
     --without-python2-bindings
 make %{?_smp_mflags} all
 
@@ -417,7 +419,11 @@ install -d "$b/%_sysconfdir/sssd"
 install -m600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf"
 install -d "$b/%_sysconfdir/sssd/conf.d"
 install -d "$b/%_unitdir"
-install -m644 %{S:4} "$b/%_unitdir/sssd.service"
+
+# Copy default logrotate file
+install -d "$b/%{_sysconfdir}/logrotate.d"
+install -m644 src/examples/logrotate "$b/%{_sysconfdir}/logrotate.d/sssd"
+
 rm -Rf "$b/%_initddir"
 ln -s service "$b/%_sbindir/rcsssd"
 
@@ -472,8 +478,9 @@ rm -f /var/lib/sss/db/*.ldb
 
 %files -f sssd.lang
 %defattr(-,root,root)
-%doc COPYING
+%license COPYING
 %_unitdir
+%_unitdir/sssd.service
 %_bindir/sss_ssh_*
 %_sbindir/sssctl
 %_sbindir/sssd
@@ -529,6 +536,7 @@ rm -f /var/lib/sss/db/*.ldb
 %_libexecdir/%name/sssd_ssh
 %_libexecdir/%name/sssd_sudo
 %_libexecdir/%name/sss_signal
+%_libexecdir/%name/sssd_check_socket_activated_responders
 %dir %sssdstatedir
 %attr(700,root,root) %dir %dbpath/
 %attr(755,root,root) %dir %pipepath/
@@ -539,6 +547,7 @@ rm -f /var/lib/sss/db/*.ldb
 %attr(750,root,root) %dir %_localstatedir/log/%name/
 %dir %_sysconfdir/sssd/
 %config(noreplace) %_sysconfdir/sssd/sssd.conf
+%config(noreplace) %_sysconfdir/logrotate.d/sssd
 %dir %_sysconfdir/sssd/conf.d
 %dir %_sysconfdir/pam.d/
 %config(noreplace) %_sysconfdir/pam.d/sssd-shadowutils