From a279545357d466981b0b7a4b9b35048f7d68680a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 25 Feb 2010 10:17:55 +0000 Subject: [PATCH] - up to 5.0.1 Changed files: bacula-link.patch -> 1.3 bacula-mtx-changer.patch -> 1.2 --- bacula-link.patch | 28 ++++++++++++++-------------- bacula-mtx-changer.patch | 14 +++++++++++--- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/bacula-link.patch b/bacula-link.patch index ca9ea7c..9a28437 100644 --- a/bacula-link.patch +++ b/bacula-link.patch @@ -1,29 +1,29 @@ ---- bacula-3.0.0/src/lib/Makefile.in_ 2009-04-10 22:10:09.584897968 +0000 -+++ bacula-3.0.0/src/lib/Makefile.in 2009-04-10 22:11:28.661552416 +0000 -@@ -116,7 +116,7 @@ +--- bacula-5.0.1/src/lib/Makefile.in~ 2010-02-24 17:33:48.000000000 +0200 ++++ bacula-5.0.1/src/lib/Makefile.in 2010-02-25 11:57:20.038428596 +0200 +@@ -126,7 +126,7 @@ - libbac.la: Makefile $(LIBBAC_OBJS) + libbac.la: Makefile $(LIBBAC_LOBJS) @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_CURRENT):$(LIBBAC_LT_REVISION):$(LIBBAC_LT_AGE) $(WRAPLIBS) $(OPENSSL_LIBS) $(LIBS) +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) $(OPENSSL_LIBS) $(LIBS) libbaccfg.a: $(LIBBACCFG_OBJS) @echo "Making $@ ..." -@@ -125,7 +125,7 @@ +@@ -135,7 +135,7 @@ - libbaccfg.la: Makefile $(LIBBACCFG_OBJS) + libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_CURRENT):$(LIBBACCFG_LT_REVISION):$(LIBBACCFG_LT_AGE) $(OPENSSL_LIBS) $(LIBS) +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) $(OPENSSL_LIBS) $(LIBS) libbacpy.a: $(LIBBACPY_OBJS) @echo "Making $@ ..." -@@ -134,7 +134,7 @@ +@@ -144,7 +144,7 @@ - libbacpy.la: Makefile $(LIBBACPY_OBJS) + libbacpy.la: Makefile $(LIBBACPY_LOBJS) @echo "Making $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) -+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_OBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_CURRENT):$(LIBBACPY_LT_REVISION):$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) +- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) ++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS) Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ diff --git a/bacula-mtx-changer.patch b/bacula-mtx-changer.patch index 341bfb5..c40c6cf 100644 --- a/bacula-mtx-changer.patch +++ b/bacula-mtx-changer.patch @@ -1,9 +1,17 @@ ---- bacula-3.0.0/scripts/mtx-changer.in.org 2009-04-15 15:10:55.507667883 +0000 -+++ bacula-3.0.0/scripts/mtx-changer.in 2009-04-15 15:12:18.968782941 +0000 -@@ -47,7 +47,7 @@ +--- 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 @@ # # source our conf file +-if test ! -f @scriptdir@/mtx-changer.conf ; then ++if test ! -f /etc/bacula/mtx-changer.conf ; then + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +- echo "ERROR: @scriptdir@/mtx-changer.conf file not found!!!!" ++ echo "ERROR: /etc/bacula/mtx-changer.conf file not found!!!!" + echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" + exit 1 + fi -. @scriptdir@/mtx-changer.conf +. /etc/bacula/mtx-changer.conf -- 2.44.0