[bacula/f16] Remove user definition during prep so they are not used during the install phase (rhbz#852732) and e

Simone Caronni slaanesh at fedoraproject.org
Mon Sep 24 13:28:07 UTC 2012


commit c49a1b1ebf55c434bdce5422c0e583c4ea6ba590
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Sep 24 11:30:14 2012 +0200

    Remove user definition during prep so they are not used during the install phase (rhbz#852732) and enforce permissions in default config files

 bacula.spec |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 0fd72b6..15144fa 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -470,13 +470,6 @@ export CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 %configure \
         --sysconfdir=%{_sysconfdir}/bacula \
-        --with-basename=bacula \
-        --with-dir-user=bacula \
-        --with-dir-group=bacula \
-        --with-sd-user=bacula \
-        --with-sd-group=disk \
-        --with-fd-user=root \
-        --with-fd-group=root \
         --with-dir-password=@@DIR_PASSWORD@@ \
         --with-fd-password=@@FD_PASSWORD@@ \
         --with-sd-password=@@SD_PASSWORD@@ \
@@ -1086,7 +1079,7 @@ fi
 
 %files client
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
 %{_sbindir}/bacula-fd
 %{_libdir}/bacula/bpipe-fd.so
@@ -1134,7 +1127,7 @@ fi
 %files director-common
 %defattr(-,root,root,-)
 %doc bacula-%{version}/updatedb/
-%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
 %config(noreplace) %{_sysconfdir}/bacula/query.sql
 %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
@@ -1212,7 +1205,7 @@ fi
 
 %files storage-common
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
 %if 0%{?fedora} || 0%{?rhel} > 6
 %{_unitdir}/bacula-sd.service


More information about the scm-commits mailing list