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: 15-May-2006 09:31:40
Branch: HEAD Handle: 2006051508313900
Modified files:
openpkg-src/bacula bacula.patch bacula.spec
Log:
upgrading package: bacula 1.38.5 -> 1.38.9
Summary:
Revision Changes Path
1.5 +28 -86 openpkg-src/bacula/bacula.patch
1.24 +8 -12 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 bacula.patch
--- openpkg-src/bacula/bacula.patch 1 Oct 2005 19:34:07 -0000 1.4
+++ openpkg-src/bacula/bacula.patch 15 May 2006 07:31:39 -0000 1.5
@@ -1,24 +1,9 @@
Index: scripts/bacula.in
---- scripts/bacula.in.orig 2005-07-04 21:57:31.000000000 +0200
-+++ scripts/bacula.in 2005-08-20 13:22:03.830778000 +0200
-@@ -21,11 +21,11 @@
- # easier to "steal" this code for the development
- # environment where they are different.
- #
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+--- scripts/bacula.in.orig 2006-04-05 15:18:45 +0200
++++ scripts/bacula.in 2006-05-14 20:38:13 +0200
+@@ -17,31 +17,37 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
-@@ -203,9 +203,15 @@
- export LD_ASSUME_KERNEL=2.4.19
- fi
-case "$1" in
+action=$1
@@ -26,92 +11,49 @@
+[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
+[ -n "$4" ] && enable_sd=$4 || enable_sd=yes
+[ -n "$5" ] && enable_fd=$5 || enable_fd=yes
-+
++
+case "$action" in
start)
-- [ -x ${BACSDBIN}/bacula-sd ] && {
-+ [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && {
- echo "Starting the Bacula Storage daemon"
- OPTIONS=''
- if [ "${SD_USER}" != '' ]; then
-@@ -216,10 +222,10 @@
- OPTIONS="${OPTIONS} -g ${SD_GROUP}"
- fi
-
-- ${BACSDBIN}/bacula-sd $2 ${OPTIONS} -v -c ${BACSDCFG}/bacula-sd.conf
-+ ${BACSDBIN}/bacula-sd $debug ${OPTIONS} -v -c
${BACSDCFG}/bacula-sd.conf
- }
-
-- [ -x ${BACFDBIN}/bacula-fd ] && {
-+ [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && {
- echo "Starting the Bacula File daemon"
- OPTIONS=''
- if [ "${FD_USER}" != '' ]; then
-@@ -230,10 +236,10 @@
- OPTIONS="${OPTIONS} -g ${FD_GROUP}"
- fi
-
-- ${BACFDBIN}/bacula-fd $2 ${OPTIONS} -v -c ${BACFDCFG}/bacula-fd.conf
-+ ${BACFDBIN}/bacula-fd $debug ${OPTIONS} -v -c
${BACFDCFG}/bacula-fd.conf
- }
-
-- [ -x ${BACDIRBIN}/bacula-dir ] && {
-+ [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && {
- sleep 2
- echo "Starting the Bacula Director daemon"
- OPTIONS=''
-@@ -245,23 +251,23 @@
- OPTIONS="${OPTIONS} -g ${DIR_GROUP}"
- fi
-
-- ${BACDIRBIN}/bacula-dir $2 ${OPTIONS} -v -c
${BACDIRCFG}/bacula-dir.conf
-+ ${BACDIRBIN}/bacula-dir $debug ${OPTIONS} -v -c
${BACDIRCFG}/bacula-dir.conf
- }
+- [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2
+- [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2
+- [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1
$2
++ [ "$enable_sd" = "yes" ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] &&
${BACSDCFG}/bacula-ctl-sd $1 $2
++ [ "$enable_fd" = "yes" ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] &&
${BACFDCFG}/bacula-ctl-fd $1 $2
++ [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] &&
${BACDIRCFG}/bacula-ctl-dir $1 $2
;;
stop)
# Stop the FD first so that SD will fail jobs and update catalog
-- [ -x ${BACFDBIN}/bacula-fd ] && {
-+ [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && {
- echo "Stopping the Bacula File daemon"
- killproc ${BACFDBIN}/bacula-fd ${FD_PORT}
- }
-
-- [ -x ${BACSDBIN}/bacula-sd ] && {
-+ [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && {
- echo "Stopping the Bacula Storage daemon"
- killproc ${BACSDBIN}/bacula-sd ${SD_PORT}
- }
-
-- [ -x ${BACDIRBIN}/bacula-dir ] && {
-+ [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && {
- echo "Stopping the Bacula Director daemon"
- killproc ${BACDIRBIN}/bacula-dir ${DIR_PORT}
- }
-@@ -269,15 +275,15 @@
+- [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd $1 $2
+- [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd $1 $2
+- [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir $1
$2
++ [ "$enable_fd" = "yes" ] && [ -x ${BACFDCFG}/bacula-ctl-fd ] &&
${BACFDCFG}/bacula-ctl-fd $1 $2
++ [ "$enable_sd" = "yes" ] && [ -x ${BACSDCFG}/bacula-ctl-sd ] &&
${BACSDCFG}/bacula-ctl-sd $1 $2
++ [ "$enable_dir" = "yes" ] && [ -x ${BACDIRCFG}/bacula-ctl-dir ] &&
${BACDIRCFG}/bacula-ctl-dir $1 $2
+ echo
+ sleep 6
;;
restart)
- $0 stop
-+ $0 stop $debug $enable_dir $enable_sd $enable_fd
- sleep 5
- $0 start
++ $0 stop $debug $enable_dir $enable_sd $enable_fd
+ $0 start $debug $enable_dir $enable_sd $enable_fd
;;
status)
-- [ -x ${BACSDBIN}/bacula-sd ] && status ${BACSDBIN}/bacula-sd
${SD_PORT}
-- [ -x ${BACFDBIN}/bacula-fd ] && status ${BACFDBIN}/bacula-fd
${FD_PORT}
-- [ -x ${BACDIRBIN}/bacula-dir ] && status ${BACDIRBIN}/bacula-dir
${DIR_PORT}
-+ [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && status
${BACSDBIN}/bacula-sd ${SD_PORT}
-+ [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && status
${BACFDBIN}/bacula-fd ${FD_PORT}
+- [ -x ${BACSDCFG}/bacula-ctl-sd ] && ${BACSDCFG}/bacula-ctl-sd status
+- [ -x ${BACFDCFG}/bacula-ctl-fd ] && ${BACFDCFG}/bacula-ctl-fd status
+- [ -x ${BACDIRCFG}/bacula-ctl-dir ] && ${BACDIRCFG}/bacula-ctl-dir
status
++ [ "$enable_sd" = "yes" ] && [ -x ${BACSDBIN}/bacula-sd ] && status
${BACSDBIN}/bacula-sd ${SD_PORT}
++ [ "$enable_fd" = "yes" ] && [ -x ${BACFDBIN}/bacula-fd ] && status
${BACFDBIN}/bacula-fd ${FD_PORT}
+ [ "$enable_dir" = "yes" ] && [ -x ${BACDIRBIN}/bacula-dir ] && status
${BACDIRBIN}/bacula-dir ${DIR_PORT}
;;
*)
Index: scripts/btraceback.in
---- scripts/btraceback.in.orig 2005-05-08 11:18:21.000000000 +0200
-+++ scripts/btraceback.in 2005-08-20 20:06:37.084652000 +0200
+--- scripts/btraceback.in.orig 2005-05-08 11:18:21 +0200
++++ scripts/btraceback.in 2006-05-14 20:32:36 +0200
@@ -11,6 +11,9 @@
PNAME=`basename $1`
if test `uname -s` = SunOS ; then
@@ -123,8 +65,8 @@
| @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX
traceback of ${PNAME}" @dump_email@
else
Index: src/dird/bacula-dir.conf.in
---- src/dird/bacula-dir.conf.in.orig 2005-07-04 21:57:32.000000000 +0200
-+++ src/dird/bacula-dir.conf.in 2005-08-24 08:09:43.569070000 +0200
+--- src/dird/bacula-dir.conf.in.orig 2005-10-26 16:02:04 +0200
++++ src/dird/bacula-dir.conf.in 2006-05-14 20:32:36 +0200
@@ -29,7 +29,8 @@
Level = Incremental
Client = @[EMAIL PROTECTED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 bacula.spec
--- openpkg-src/bacula/bacula.spec 10 Mar 2006 08:59:56 -0000 1.23
+++ openpkg-src/bacula/bacula.spec 15 May 2006 07:31:39 -0000 1.24
@@ -25,8 +25,8 @@
# FIXME: rse: "odoc" support still not in final shape
# package component versions
-%define V_bacula 1.38.5
-%define V_doc 1.38.5
+%define V_bacula 1.38.9
+%define V_doc 1.38.9
# package information
Name: bacula
@@ -39,7 +39,7 @@
Group: System
License: GPL
Version: %{V_bacula}
-Release: 20060310
+Release: 20060515
# package options
%option with_server yes
@@ -59,8 +59,8 @@
%endif
# list of sources
-Source0: http://osdn.dl.sourceforge.net/bacula/bacula-%{V_bacula}.tar.gz
-Source1:
http://osdn.dl.sourceforge.net/bacula/bacula-docs-%{V_doc}.tar.gz
+Source0:
http://switch.dl.sourceforge.net/bacula/bacula-%{V_bacula}.tar.gz
+Source1:
http://switch.dl.sourceforge.net/bacula/bacula-docs-%{V_doc}.tar.gz
Source2: rc.bacula
Source3: bexec.sh
Patch0: bacula.patch
@@ -68,7 +68,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040712, gcc, odoc
+BuildPreReq: OpenPKG, openpkg >= 20040712, gcc
PreReq: OpenPKG, openpkg >= 20040712
BuildPreReq: readline, zlib
PreReq: readline, zlib
@@ -262,12 +262,8 @@
%{l_shtool} install -c -m 644 \
-e 's,/usr/share/doc/bacula-<version>,%{l_prefix}/doc/bacula,' \
scripts/bacula.man $RPM_BUILD_ROOT%{l_prefix}/man/man8/bacula.8
- if %{l_odoc} -F; then
- echo "WARNING: will not package auxiliary documentation" 1>&2
- else
- mv ../bacula-docs-%{V_doc}/* $RPM_BUILD_ROOT%{l_docdir}/bacula/
- %{l_odoc} -ame %{_specdir}/bacula.spec
- fi
+ # mv ../bacula-docs-%{V_doc}/* $RPM_BUILD_ROOT%{l_docdir}/bacula/
+ # %{l_odoc} -ame %{_specdir}/bacula.spec
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
