- 3.0.0

Changed files:
    bacula-link.patch -> 1.2
    bacula-tinfo-readline.patch -> 1.4

diff --git a/bacula-link.patch b/bacula-link.patch
index e7f6d92a7ca254bd8f6d15e1caa48a2e31102c80..ca9ea7ca2eb3b152560fa5d88a5281cb288f4df1 100644 (file)
--- a/bacula-link.patch
+++ b/bacula-link.patch
@@ -1,24 +1,29 @@
---- bacula-1.38.11/src/tray-monitor/Makefile.in.orig   2006-10-20 01:35:19.000000000 +0000
-+++ bacula-1.38.11/src/tray-monitor/Makefile.in        2006-10-20 01:39:22.000000000 +0000
-@@ -46,8 +46,8 @@
-       @echo " "
+--- 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-tray-monitor: $(MONITOROBJS) ../lib/libbac.a
--      $(CXX) $(LDFLAGS) $(MONITOR_LDFLAGS) -L../lib -L../cats -o $@ \
-- $(MONITOROBJS) $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
-+      $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ \
-+ $(MONITOROBJS) $(DLIB) $(MONITOR_LDFLAGS) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ libbac.la: Makefile $(LIBBAC_OBJS)
+       @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)
  
+ libbaccfg.a: $(LIBBACCFG_OBJS) 
+       @echo "Making $@ ..."
+@@ -125,7 +125,7 @@
  
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
---- bacula-1.38.9/src/filed/Makefile.in.orig   2006-06-26 13:39:07.000000000 +0000
-+++ bacula-1.38.9/src/filed/Makefile.in        2006-06-26 13:39:35.000000000 +0000
-@@ -86,7 +86,7 @@
- static-bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
-       $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-          $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
--         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
-+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) -ldl
-       strip $@
+ libbaccfg.la: Makefile $(LIBBACCFG_OBJS) 
+       @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)
+ 
+ libbacpy.a: $(LIBBACPY_OBJS) 
+       @echo "Making $@ ..."
+@@ -134,7 +134,7 @@
  
+ libbacpy.la: Makefile $(LIBBACPY_OBJS) 
+       @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)
  
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+       cd $(topdir) \

diff --git a/bacula-tinfo-readline.patch b/bacula-tinfo-readline.patch
index 52d040d07d84fea6d7d8326aac2aa581fb57b5ea..cd9d2017897ca17ff20459603f91573abc59d455 100644 (file)
--- a/bacula-tinfo-readline.patch
+++ b/bacula-tinfo-readline.patch
@@ -1,7 +1,6 @@
-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 19:06:59.025825009 +0100
-@@ -574,9 +574,9 @@
+--- bacula-3.0.0/autoconf/configure.in.orig    2009-04-07 16:07:30.000000000 +0000
++++ bacula-3.0.0/autoconf/configure.in 2009-04-10 22:28:47.948114014 +0000
+@@ -776,9 +776,9 @@
  
  got_conio="no"
  if test x$support_conio = xyes; then
@@ -11,32 +10,33 @@ diff -urN bacula-2.2.6.org/autoconf/configure.in bacula-2.2.6/autoconf/configure
 +   AC_CHECK_HEADER(ncurses.h, 
 +     [ AC_CHECK_LIB(tinfo, tgetent, 
 +       [ CONS_LIBS="-ltinfo"
-        CONS_OBJ="conio.o"
-        CONS_SRC="conio.c"
-        got_conio="yes"
-@@ -646,7 +646,7 @@
-         fi
-         AC_CHECK_HEADER(${with_readline}/readline.h, 
-            [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
--             CONS_LIBS="-lreadline -lhistory -ltermcap"
-+             CONS_LIBS="-lreadline -lhistory"
-              got_readline="yes"   
-            ],
-            [ echo " "
-@@ -662,14 +662,14 @@
-        [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
-          got_readline="yes"
-          CONS_INC="-I/usr/include/readline"
--         CONS_LIBS="-lreadline -ltermcap"
-+         CONS_LIBS="-lreadline"
-        ], [
-          # Did not find standard library, so try Bacula's default
-           AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
-             [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
-                got_readline="yes"   
-                CONS_INC="-I${TOP_DIR}/depkgs/readline"
--               CONS_LIBS="-lreadline -lhistory -ltermcap"
-+               CONS_LIBS="-lreadline -lhistory"
-                CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
-                PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
-             ],
+     CONS_OBJ="conio.o"
+     CONS_SRC="conio.c"
+     got_conio="yes"
+@@ -854,7 +854,7 @@
+            AC_CHECK_HEADER(${with_readline}/readline.h, 
+               [
+                   AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
+-                  CONS_LIBS="-lreadline -lhistory -ltermcap"
++                  CONS_LIBS="-lreadline -lhistory"
+                   got_readline="yes"   
+               ], [
+                   echo " "
+@@ -871,7 +871,7 @@
+               AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
+               got_readline="yes"
+               CONS_INC="-I/usr/include/readline"
+-              CONS_LIBS="-lreadline -ltermcap"
++              CONS_LIBS="-lreadline"
+           ], [
+               dnl Did not find standard library, so try Bacula's default
+               AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
+@@ -879,7 +879,7 @@
+                       AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
+                       got_readline="yes"   
+                       CONS_INC="-I${TOP_DIR}/depkgs/readline"
+-                      CONS_LIBS="-lreadline -lhistory -ltermcap"
++                      CONS_LIBS="-lreadline -lhistory"
+                       CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
+                       PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
+                   ], [