Reset bconsole/bat permissions, prepare for QT tray-monitor
This commit is contained in:
parent
51ec14dd2c
commit
88081c4756
@ -1,12 +0,0 @@
|
||||
--- bacula-5.2.1/scripts/bat.pamd.orig 2007-07-11 18:42:33.000000000 +0200
|
||||
+++ bacula-5.2.1/scripts/bat.pamd 2007-07-11 18:42:57.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth sufficient pam_timestamp.so
|
||||
-auth required pam_stack.so service=system-auth
|
||||
+auth include system-auth
|
||||
session optional pam_xauth.so
|
||||
session optional pam_timestamp.so
|
||||
account required pam_permit.so
|
||||
|
@ -4,7 +4,7 @@ Encoding=UTF-8
|
||||
Name=Bacula Bat Console
|
||||
GenericName=Backup Management Console
|
||||
Comment=Control your Bacula Server
|
||||
Exec=/usr/bin/bat -c /etc/bacula/bat.conf
|
||||
Exec=/usr/sbin/bat -c /etc/bacula/bat.conf
|
||||
Icon=bat_icon
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
13
bacula.spec
13
bacula.spec
@ -28,7 +28,6 @@ Patch3: bacula-5.2.2-queryfile.patch
|
||||
Patch4: bacula-5.2.2-mysql.patch
|
||||
Patch5: bacula-5.2.2-log-path.patch
|
||||
Patch6: bacula-5.0.3-sqlite-priv.patch
|
||||
Patch7: bacula-5.2.1-bat-pamd.patch
|
||||
Patch8: bacula-5.2.2-qt-console-optflags.patch
|
||||
|
||||
BuildRequires: openssl-devel, ncurses-devel, perl, glibc-devel
|
||||
@ -300,7 +299,6 @@ Provides check_bacula support for Nagios.
|
||||
%patch4 -p1 -b .mysql
|
||||
%patch5 -p1 -b .log-path
|
||||
%patch6 -p0 -b .priv
|
||||
%patch7 -p1 -b .bat-pamd
|
||||
%patch8 -p1 -b .optflags
|
||||
|
||||
# Remove execution permissions from files we're packaging as docs later on
|
||||
@ -411,9 +409,6 @@ mkdir -p %{buildroot}%{_bindir}
|
||||
# Bat
|
||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||
install -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
|
||||
install -m 644 -D scripts/bat.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
|
||||
install -m 644 -D scripts/bat.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bat
|
||||
ln -sf consolehelper %{buildroot}%{_bindir}/bat
|
||||
desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
|
||||
%else
|
||||
rm -f %{buildroot}%{_mandir}/man1/bat.1*
|
||||
@ -798,17 +793,14 @@ fi
|
||||
%files console
|
||||
%defattr(-,root,root,-)
|
||||
%{_sbindir}/bconsole
|
||||
%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
|
||||
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
|
||||
%{_mandir}/man8/bconsole.8.gz
|
||||
|
||||
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
|
||||
%files console-bat
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_datadir}/doc/bacula-console-bat-%{version}/*
|
||||
%config(noreplace) %{_sysconfdir}/security/console.apps/bat
|
||||
%config(noreplace) %{_sysconfdir}/pam.d/bat
|
||||
%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
|
||||
%{_bindir}/bat
|
||||
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
|
||||
%{_sbindir}/bat
|
||||
%{_mandir}/man1/bat.1.gz
|
||||
%{_datadir}/applications/fedora-bacula-bat.desktop
|
||||
@ -839,6 +831,7 @@ fi
|
||||
* Sun Dec 11 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-11
|
||||
- Add bat html docs so the help button works.
|
||||
- Minor packaging changes.
|
||||
- Default permissions on bconsole and bat.
|
||||
|
||||
* Sat Dec 10 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-10
|
||||
- Added patch for mysql 5.5.18 from Oliver Falk.
|
||||
|
Loading…
Reference in New Issue
Block a user