From: Marcin Krol Date: Mon, 26 Oct 2015 11:33:34 +0000 (+0000) Subject: - updated for 7.2.0 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=d1a4191a2b9c69a14d4025ebed1cef3e521b77e3;p=packages%2Fbacula.git - updated for 7.2.0 --- diff --git a/bacula-branding.patch b/bacula-branding.patch index f24961b..596160f 100644 --- a/bacula-branding.patch +++ b/bacula-branding.patch @@ -1,16 +1,18 @@ -diff -urN bacula-2.2.6.org/autoconf/configure.in bacula-2.2.6/autoconf/configure.in ---- bacula-2.2.6.org/autoconf/configure.in 2007-10-24 20:37:02.000000000 +0200 -+++ bacula-2.2.6/autoconf/configure.in 2007-11-24 22:01:38.010721290 +0100 -@@ -2094,6 +2094,12 @@ +diff -ur bacula-7.2.0.orig/autoconf/configure.in bacula-7.2.0/autoconf/configure.in +--- bacula-7.2.0.orig/autoconf/configure.in 2015-08-13 13:52:24.000000000 +0000 ++++ bacula-7.2.0/autoconf/configure.in 2015-10-26 10:29:17.601083332 +0000 +@@ -3188,6 +3188,14 @@ + platforms/suse/bacula-sd \ + platforms/suse/bacula-dir" ;; - esac - -+# force TLD branding -+DISTNAME="TLD/Linux" -+DISTVER=$(awk '{ print $3 }' /etc/tld-release 2> /dev/null) -+TAPEDRIVE="/dev/nst0" -+PSCMD="ps -e -o pid,command" -+ - AC_SUBST(hostname) - - LIBS="$PTHREAD_LIB $LIBS" ++tld-linux) ++ DISTNAME="TLD/Linux" ++ DISTVER=$(awk '{ print $3 }' /etc/tld-release 2> /dev/null) ++ TAPEDRIVE="/dev/nst0" ++ PSCMD="ps -e -o pid,command" ++ PFILES="${PFILES} \ ++ platforms/unknown/Makefile" ++ ;; + unknown) + DISTVER=unknown + TAPEDRIVE="/dev/nst0" diff --git a/bacula-mtx-changer.patch b/bacula-mtx-changer.patch index c40c6cf..85bd371 100644 --- a/bacula-mtx-changer.patch +++ b/bacula-mtx-changer.patch @@ -1,7 +1,8 @@ ---- bacula-5.0.1/scripts/mtx-changer.in~ 2010-02-24 17:33:48.000000000 +0200 -+++ bacula-5.0.1/scripts/mtx-changer.in 2010-02-25 11:49:14.545143118 +0200 -@@ -47,13 +47,13 @@ - # +diff -ur bacula-7.2.0.orig/scripts/mtx-changer.in bacula-7.2.0/scripts/mtx-changer.in +--- bacula-7.2.0.orig/scripts/mtx-changer.in 2015-08-13 13:52:24.000000000 +0000 ++++ bacula-7.2.0/scripts/mtx-changer.in 2015-10-26 07:07:13.370083332 +0000 +@@ -66,13 +66,13 @@ + myversion=2 # source our conf file -if test ! -f @scriptdir@/mtx-changer.conf ; then @@ -15,5 +16,5 @@ -. @scriptdir@/mtx-changer.conf +. /etc/bacula/mtx-changer.conf - MTX=@MTX@ - + if test "${version}" != "${myversion}" ; then + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" diff --git a/make_catalog_backup-setup-home.patch b/make_catalog_backup-setup-home.patch index 68d76a4..e5e63d1 100644 --- a/make_catalog_backup-setup-home.patch +++ b/make_catalog_backup-setup-home.patch @@ -1,6 +1,7 @@ ---- bacula-5.2.1/src/cats/make_catalog_backup.in~ 2011-10-30 13:03:42.000000000 +0100 -+++ bacula-5.2.1/src/cats/make_catalog_backup.in 2011-11-01 17:27:38.863760358 +0100 -@@ -13,12 +13,15 @@ +diff -ur bacula-7.2.0.orig/src/cats/make_catalog_backup.in bacula-7.2.0/src/cats/make_catalog_backup.in +--- bacula-7.2.0.orig/src/cats/make_catalog_backup.in 2015-08-13 13:52:24.000000000 +0000 ++++ bacula-7.2.0/src/cats/make_catalog_backup.in 2015-10-26 07:24:30.002083332 +0000 +@@ -16,12 +16,15 @@ # line arguments and the environment using ps. Please consult your # MySQL or PostgreSQL manual for secure methods of specifying the # password.