OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Jul-2005 22:02:01
Branch: HEAD Handle: 2005072021020100
Modified files:
openpkg-src/bacula bacula.spec rc.bacula
Log:
finally fix the %status stuff and change with_tls to with_ssl to by in
sync with the other packages (we dediced some years ago to
consistently use with_ssl and no with_openssl, with_tls or similar
variants because SSL is the most prominent way)
Summary:
Revision Changes Path
1.5 +3 -4 openpkg-src/bacula/bacula.spec
1.3 +1 -3 openpkg-src/bacula/rc.bacula
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 bacula.spec
--- openpkg-src/bacula/bacula.spec 20 Jul 2005 19:46:29 -0000 1.4
+++ openpkg-src/bacula/bacula.spec 20 Jul 2005 20:02:01 -0000 1.5
@@ -22,7 +22,6 @@
## SUCH DAMAGE.
##
-# FIXME: rse: cleanup/fix/confirm "bacula status" command in
rc.bacula:%status
# FIXME: rse: re-add "odoc" once its issues are resolved, too.
# package component versions
@@ -46,7 +45,7 @@
%option with_server yes
%option with_user %{l_musr}
%option with_group %{l_mgrp}
-%option with_tls yes
+%option with_ssl yes
%option with_db sqlite
%option with_dvd no
%option with_mtx no
@@ -66,7 +65,7 @@
PreReq: OpenPKG, openpkg >= 20040712
BuildPreReq: readline, zlib
PreReq: readline, zlib
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
BuildPreReq: openssl >= 0.9.8
PreReq: openssl >= 0.9.8
%endif
@@ -138,7 +137,7 @@
%if "%{with_server}" == "no"
--enable-client-only
%endif
-%if "%{with_tls}" == "yes"
+%if "%{with_ssl}" == "yes"
--with-openssl=%{l_prefix} \
%endif
$cfg_db \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/rc.bacula
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.bacula
--- openpkg-src/bacula/rc.bacula 20 Jul 2005 19:45:16 -0000 1.2
+++ openpkg-src/bacula/rc.bacula 20 Jul 2005 20:02:01 -0000 1.3
@@ -13,9 +13,7 @@
%status -u @l_susr@ -o
bacula_usable="no"
bacula_active="no"
- @l_prefix@/libexec/bacula/bacula status \
- "$bacula_debug" $bacula_dir_enable $bacula_sd_enable
$bacula_fd_enable && \
- bacula_active="yes"
+ [ "[EMAIL PROTECTED]@/libexec/bacula/bacula status 2>/dev/null | grep
running`" != . ] && bacula_active="yes"
echo "bacula_enable=\"$bacula_enable\""
echo "bacula_usable=\"$bacula_usable\""
echo "bacula_active=\"$bacula_active\""
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
