changeset
Resynchronize with upstream package maintainer version.
Tue, 28 Aug 2012 18:36:30 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:36:30 +0200
- changeset 578
- ac1eb2cd38a8
- parent 577
- e3c6a8f912f4
- child 579
- 6b18bb69901e
Resynchronize with upstream package maintainer version.
| bacula/bacula.patch | file | annotate | diff | comparison | revisions | |
| bacula/bacula.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/bacula/bacula.patch Tue Aug 28 18:36:20 2012 +0200 1.2 +++ b/bacula/bacula.patch Tue Aug 28 18:36:30 2012 +0200 1.3 @@ -1,8 +1,7 @@ 1.4 Index: manpages/Makefile.in 1.5 -diff -Nau manpages/Makefile.in.orig manpages/Makefile.in 1.6 --- manpages/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 1.7 -+++ manpages/Makefile.in 2011-05-01 17:26:43.000000000 +0200 1.8 -@@ -20,23 +20,21 @@ 1.9 ++++ manpages/Makefile.in 2010-12-19 19:30:06.000000000 +0100 1.10 +@@ -21,23 +21,21 @@ 1.11 install: 1.12 $(MKDIR) $(DESTDIR)/$(mandir)/man8 1.13 for I in ${MAN8}; \ 1.14 @@ -33,35 +32,25 @@ 1.15 1.16 clean: 1.17 Index: scripts/bacula.in 1.18 -diff -Nau scripts/bacula.in.orig scripts/bacula.in 1.19 --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 1.20 -+++ scripts/bacula.in 2011-05-01 17:26:43.000000000 +0200 1.21 -@@ -13,37 +13,43 @@ 1.22 - # easier to "steal" this code for the development 1.23 - # environment where they are different. 1.24 - # 1.25 --SCRIPTDIR=@scriptdir@ 1.26 -+SCRIPTDIR=@libexecdir@ 1.27 - # 1.28 - # Disable Glibc malloc checks, it doesn't help and it keeps from getting 1.29 - # good dumps 1.30 ++++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100 1.31 +@@ -20,30 +20,36 @@ 1.32 MALLOC_CHECK_=0 1.33 export MALLOC_CHECK_ 1.34 1.35 --case "$1" in 1.36 +action=$1 1.37 +debug=$2 1.38 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes 1.39 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes 1.40 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes 1.41 -+ 1.42 -+case "$action" in 1.43 ++ 1.44 + case "$1" in 1.45 start) 1.46 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 1.47 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 1.48 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 1.49 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 1.50 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 1.51 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 1.52 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 1.53 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 1.54 ;; 1.55 1.56 @@ -70,14 +59,14 @@ 1.57 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 1.58 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 1.59 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 1.60 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 1.61 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 1.62 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 1.63 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 1.64 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 1.65 ;; 1.66 1.67 restart) 1.68 - $0 stop 1.69 -+ $0 stop $debug $enable_dir $enable_sd $enable_fd 1.70 ++ $0 stop $debug $enable_dir $enable_sd $enable_fd 1.71 sleep 2 1.72 - $0 start 1.73 + $0 start $debug $enable_dir $enable_sd $enable_fd 1.74 @@ -87,16 +76,15 @@ 1.75 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status 1.76 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status 1.77 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status 1.78 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status 1.79 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status 1.80 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status 1.81 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status 1.82 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status 1.83 ;; 1.84 1.85 *) 1.86 Index: src/dird/bacula-dir.conf.in 1.87 -diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in 1.88 --- src/dird/bacula-dir.conf.in.orig 2010-08-05 16:29:51.000000000 +0200 1.89 -+++ src/dird/bacula-dir.conf.in 2011-05-01 17:26:43.000000000 +0200 1.90 ++++ src/dird/bacula-dir.conf.in 2010-12-19 19:30:06.000000000 +0100 1.91 @@ -29,7 +29,8 @@ 1.92 Level = Incremental 1.93 Client = @basename@-fd 1.94 @@ -106,17 +94,8 @@ 1.95 + Schedule = "NEVER" 1.96 Storage = File 1.97 Messages = Standard 1.98 - Pool = Default 1.99 -@@ -109,7 +110,7 @@ 1.100 - # directory to give a reasonable FileSet to backup to 1.101 - # disk storage during initial testing. 1.102 - # 1.103 -- File = @sbindir@ 1.104 -+ File = @scriptdir@ 1.105 - } 1.106 - 1.107 - # 1.108 -@@ -126,6 +127,11 @@ 1.109 + Pool = File 1.110 +@@ -123,6 +124,11 @@ 1.111 } 1.112 } 1.113
2.1 --- a/bacula/bacula.spec Tue Aug 28 18:36:20 2012 +0200 2.2 +++ b/bacula/bacula.spec Tue Aug 28 18:36:30 2012 +0200 2.3 @@ -1,6 +1,6 @@ 2.4 ## 2.5 ## bacula.spec -- OpenPKG RPM Package Specification 2.6 -## Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 2.8 ## 2.9 ## Permission to use, copy, modify, and distribute this software for 2.10 ## any purpose with or without fee is hereby granted, provided that 2.11 @@ -21,15 +21,6 @@ 2.12 ## SUCH DAMAGE. 2.13 ## 2.14 2.15 -# MSvB: 2.16 -# MSvB: Note, see http://www.bacula.org/en/?page=news 2.17 -# MSvB: for information on new configuration options. 2.18 -# MSvB: Warning! -L /pfx/lib is placed before locally 2.19 -# MSvB: built libraries (bacula-<ver>/src/cats...) 2.20 -# MSvB: which causes the old version of bacula to 2.21 -# MSvB: supply logic to the new version build! 2.22 -# MSvB: 2.23 - 2.24 # package information 2.25 Name: bacula 2.26 Summary: Network Backup Tool 2.27 @@ -40,8 +31,8 @@ 2.28 Class: PLUS 2.29 Group: System 2.30 License: GPL 2.31 -Version: 5.0.3 2.32 -Release: 20120208 2.33 +Version: 5.2.10 2.34 +Release: 20120629 2.35 2.36 # package options 2.37 %option with_server yes 2.38 @@ -67,15 +58,13 @@ 2.39 Patch0: bacula.patch 2.40 2.41 # build information 2.42 -Prefix: %{l_prefix} 2.43 -BuildRoot: %{l_buildroot} 2.44 -BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, gcc::with_cxx = yes 2.45 -PreReq: OpenPKG, openpkg >= 20060823 2.46 -BuildPreReq: ncurses, readline, zlib 2.47 -PreReq: ncurses, readline, zlib 2.48 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, gcc::with_cxx = yes 2.49 +PreReq: OpenPKG, openpkg >= 20100101 2.50 +BuildPreReq: readline, zlib 2.51 +PreReq: readline, zlib 2.52 %if "%{with_ssl}" == "yes" 2.53 -BuildPreReq: openssl >= 0.9.8, openssl::with_threads = yes 2.54 -PreReq: openssl >= 0.9.8, openssl::with_threads = yes 2.55 +BuildPreReq: openssl >= 0.9.8 2.56 +PreReq: openssl >= 0.9.8 2.57 %endif 2.58 %if "%{with_wrap}" == "yes" 2.59 BuildPreReq: tcpwrappers 2.60 @@ -105,8 +94,6 @@ 2.61 BuildPreReq: python 2.62 PreReq: python 2.63 %endif 2.64 -AutoReq: no 2.65 -AutoReqProv: no 2.66 2.67 %description 2.68 Bacula is a set of computer programs that permit you (or the system 2.69 @@ -138,30 +125,20 @@ 2.70 -e "s;For Bacula release @VERSION@ .*;;" \ 2.71 `find . -name "*.conf.in"` 2.72 2.73 - # help specific platforms find fdatasync(3) 2.74 - libs="" 2.75 - case "%{l_platform -t}" in 2.76 - *-sunos* ) libs="-lrt" ;; 2.77 - esac 2.78 - 2.79 # use localhost as default host 2.80 %{l_shtool} subst \ 2.81 -e 's;hostname=.*;hostname=localhost;g' \ 2.82 - -e 's;\(CONS_LIBS="-lreadline.*\)-ltermcap;\1-lncurses;g' \ 2.83 configure 2.84 2.85 # configure 2.86 LIBS= 2.87 case "%{l_platform -t}" in 2.88 - *-linux*) ldfl="-L/usr/lib/termcap" ;; 2.89 - *-sunos*) ldfl="-ldl" ;; 2.90 + *-linux*) LIBS="-L/usr/lib/termcap";; 2.91 esac 2.92 CC="%{l_cc}" \ 2.93 CFLAGS="%{l_cflags -O}" \ 2.94 - CPPFLAGS="%{l_cppflags ncurses}" \ 2.95 - LDFLAGS="%{l_ldflags} $ldfl" \ 2.96 - LIBS="$libs -lz" \ 2.97 - GREP="grep" \ 2.98 + CPPFLAGS="%{l_cppflags}" \ 2.99 + LDFLAGS="%{l_ldflags} $LIBS" \ 2.100 ./configure \ 2.101 --prefix=%{l_prefix} \ 2.102 --with-dir-user=%{l_rusr} \ 2.103 @@ -202,24 +179,17 @@ 2.104 %endif 2.105 --enable-wx-console=no \ 2.106 --sysconfdir=%{l_prefix}/etc/bacula \ 2.107 - --libexecdir=%{l_prefix}/libexec/bacula \ 2.108 --mandir=%{l_prefix}/man \ 2.109 --with-scriptdir=%{l_prefix}/libexec/bacula \ 2.110 --with-working-dir=%{l_prefix}/var/bacula \ 2.111 --with-pid-dir=%{l_prefix}/var/bacula/run \ 2.112 --with-subsys-dir=%{l_prefix}/var/bacula/run/subsys \ 2.113 - --with-archivedir=/tmp \ 2.114 - --with-sbin-perm=0755 \ 2.115 - --disable-shared \ 2.116 - --disable-libtool \ 2.117 --disable-nls 2.118 2.119 # build 2.120 %{l_make} %{l_mflags -O} 2.121 2.122 %install 2.123 - # clean up build cruft 2.124 - rm -rf $RPM_BUILD_ROOT 2.125 2.126 # create installation hierarchy 2.127 %{l_shtool} mkdir -f -p -m 755 \ 2.128 @@ -234,15 +204,18 @@ 2.129 $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run \ 2.130 $RPM_BUILD_ROOT%{l_prefix}/var/bacula/run/subsys \ 2.131 $RPM_BUILD_ROOT%{l_prefix}/man/man1 \ 2.132 - $RPM_BUILD_ROOT%{l_prefix}/man/man8 2.133 + $RPM_BUILD_ROOT%{l_prefix}/man/man8 \ 2.134 + $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples \ 2.135 + $RPM_BUILD_ROOT%{l_prefix}/share/bacula/examples/default-config 2.136 2.137 # install 2.138 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 2.139 2.140 # strip down installation 2.141 - strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true 2.142 + # do not strip binaries, to make it easier to diagnose problems 2.143 + # strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* 2>/dev/null || true 2.144 ( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula && 2.145 - for unwanted in startmysql stopmysql; do 2.146 + for unwanted in bconsole startmysql stopmysql; do 2.147 rm -f $unwanted 2.148 done 2.149 ) || exit $? 2.150 @@ -250,22 +223,20 @@ 2.151 # install additional files 2.152 %{l_shtool} install -c -m 754 %{l_value -s -a} \ 2.153 %{SOURCE bexec.sh} $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula/bexec 2.154 - %{l_shtool} install -c -m 640 \ 2.155 - src/console/bconsole.conf $RPM_BUILD_ROOT%{l_prefix}/etc/bacula/ 2.156 2.157 - ## wrap binaries to avoid to specify "-c" for each run 2.158 - #( cd $RPM_BUILD_ROOT%{l_prefix}/sbin 2.159 - # for bin in bacula-dir bacula-fd bacula-sd \ 2.160 - # bconsole bcopy bextract bls bscan dbcheck \ 2.161 - # tray-monitor wx-console; do 2.162 - # if [ -x $bin ]; then 2.163 - # mv $bin $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula 2.164 - # ln $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula/bexec ./$bin 2.165 - # fi 2.166 - # done 2.167 - #) || exit $? 2.168 + # wrap binaries to avoid to specify "-c" for each run 2.169 + ( cd $RPM_BUILD_ROOT%{l_prefix}/sbin 2.170 + for bin in bacula-dir bacula-fd bacula-sd \ 2.171 + bconsole bcopy bextract bls bscan dbcheck \ 2.172 + tray-monitor wx-console; do 2.173 + if [ -x $bin ]; then 2.174 + mv $bin $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula 2.175 + ln $RPM_BUILD_ROOT%{l_prefix}/libexec/bacula/bexec ./$bin 2.176 + fi 2.177 + done 2.178 + ) || exit $? 2.179 2.180 - # install runcommand script 2.181 + # install run-command script 2.182 %{l_shtool} install -c -m 755 %{l_value -s -a} \ 2.183 -e 's,@with_server@,%{with_server},g' \ 2.184 %{SOURCE rc.bacula} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ 2.185 @@ -273,23 +244,27 @@ 2.186 # determine installation files 2.187 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 2.188 %{l_files_std} \ 2.189 - '%config(noreplace) %{l_prefix}/etc/bacula/*.conf' \ 2.190 -%if "%{with_server}" == "yes" 2.191 - '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \ 2.192 - '%attr(-,%{l_musr},%{l_rgrp}) %config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \ 2.193 - '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup' \ 2.194 - '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \ 2.195 -%endif 2.196 + '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' \ 2.197 + '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \ 2.198 + '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \ 2.199 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/dvd-handler' \ 2.200 '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/mtx-changer' \ 2.201 - '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run/subsys' \ 2.202 - '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula/run' \ 2.203 - '%attr(700,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/bacula' 2.204 +%if "%{with_server}" == "yes" 2.205 + '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/make_catalog_backup' \ 2.206 + '%attr(-,%{l_musr},%{l_rgrp}) %{l_prefix}/libexec/bacula/delete_catalog_backup'\ 2.207 + '%config(noreplace) %{l_prefix}/etc/bacula/bacula-dir.conf' \ 2.208 + '%config(noreplace) %{l_prefix}/etc/bacula/bacula-sd.conf' \ 2.209 +%endif 2.210 + '%config(noreplace) %{l_prefix}/etc/bacula/bacula-fd.conf' \ 2.211 +%if "%{with_server}" == "yes" 2.212 + '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \ 2.213 + '%attr(640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \ 2.214 +%endif 2.215 + '%attr(640,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/bacula/bacula-fd.conf' 2.216 2.217 %files -f files 2.218 2.219 %clean 2.220 - rm -rf $RPM_BUILD_ROOT 2.221 2.222 %post 2.223 # create initial database
