From 02eb3d99ed55ba885a5b94217dfebcc4933183a3 Mon Sep 17 00:00:00 2001 From: praveenp Date: Fri, 7 Jan 2011 15:55:51 -0600 Subject: [PATCH] Fixed BZ #660072. Added root to sfcb group in %pre section. --- .gitignore | 1 + sblim-sfcb.spec | 13 +++++++++++-- sources | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f35a9e0..d70652a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ sblim-sfcb-1.3.7.tar.bz2 sblim-sfcb-1.3.8.tar.bz2 /sblim-sfcb-1.3.9.tar.bz2 /sblim-sfcb-1.3.10.tar.bz2 +/sfcb.service diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 5666c69..24f511b 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://www.sblim.org Version: 1.3.10 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System License: EPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} @@ -18,6 +18,7 @@ Patch1: sblim-sfcb-1.3.7-initscript.patch Patch2: sblim-sfcb-1.3.7-close_logging.patch Patch3: sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch Patch4: sblim-sfcb-1.3.10-CMGetCharPtr.patch +Source1: sfcb.service Provides: cim-server Requires: cim-schema BuildRequires: libcurl-devel @@ -84,12 +85,15 @@ echo "%{_libdir}/sfcb/*.so" >> _pkg_list #echo "%{_libdir}/sfcb/*.la" >> _pkg_list cat _pkg_list +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system +install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT/lib/systemd/system/sfcb.service %clean rm -rf $RPM_BUILD_ROOT %pre /usr/bin/getent group sfcb >/dev/null || /usr/sbin/groupadd -r sfcb +/usr/sbin/usermod -a -G sfcb root > /dev/null 2>&1 || : %post %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || : @@ -110,7 +114,7 @@ if [ $1 -gt 1 ]; then fi %files -f _pkg_list - +/lib/systemd/system/sfcb.service #%files devel #%defattr(-,root,root) ##%{_includedir}/* @@ -119,6 +123,11 @@ fi #%doc COPYING README %changelog +* Fri Jan 7 2011 Praveen K Paladugu - 1.3.10-2 +- Following the BZ#660072, added sfcb.service file for compliance with systemd +- Since sfcb's PAM authentication requires, the user to be in group sfcb, +- added the root user to "sfcb" group in %pre section. + * Mon Dec 6 2010 Vitezslav Crhonek - 1.3.10-1 - Update to sblim-sfcb-1.3.10 - Fix CMGetCharPtr macro (patch by Kamil Dudka) diff --git a/sources b/sources index a39bfcd..8f34b85 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 157c4ce334e75c3de2ae76742f3f79a5 sblim-sfcb-1.3.10.tar.bz2 +494b9bdd96c1d8d90dafc26cd5534082 sfcb.service