From: Sławomir Paszkiewicz <paszczus@pld-linux.org>
Date: Thu, 31 Jul 2008 12:04:52 +0000 (+0000)
Subject: - outdated
X-Git-Tag: auto/ac/bacula-2_4_2-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbacula.git;a=commitdiff_plain;h=67d1f2f5fa5c6fdedf98d61de6d2e08350e707b2

- outdated

Changed files:
    bacula-mysql-timeout.patch -> 1.2
    bacula-sd-crash.patch -> 1.2
    bacula-tinfo-readline.patch -> 1.2
---

diff --git a/bacula-mysql-timeout.patch b/bacula-mysql-timeout.patch
deleted file mode 100644
index 2885e46..0000000
--- a/bacula-mysql-timeout.patch
+++ /dev/null
@@ -1,27 +0,0 @@
- This patch fixes #1034 by setting big timeout on mysql connections
-
- Apply this patch to version 2.4.1 with:
-
- cd <bacula-source>
- patch -p0 < patches/2.4.1-mysql-timeout.patch
- ./configure <your-options>
- make
- ...
- make install
-
-
-Index: src/cats/mysql.c
-===================================================================
---- src/cats/mysql.c    (révision 7401)
-+++ src/cats/mysql.c    (copie de travail)
-@@ -205,6 +205,10 @@
-    Dmsg3(100, "opendb ref=%d connected=%d db=%p\n", mdb->ref_count,
-          mdb->connected, mdb->db);
-
-+   /* Set connection timeout to 8 days specialy for batch mode */
-+   sql_query(mdb, "SET wait_timeout=691200");
-+   sql_query(mdb, "SET interactive_timeout=691200");
-+
-    V(mutex);
-    return 1;
- }
diff --git a/bacula-sd-crash.patch b/bacula-sd-crash.patch
deleted file mode 100644
index 6ac2e4c..0000000
--- a/bacula-sd-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
- This patch removes an unfortunate piece of debug code that crept into
- the 2.4.1 release and causes it to purposely, but incorrectly seg fault
- whenever a volume name error occurs.  Typically this may happen if a
- non-bacula tape is mounted at startup or at the end of volume during
- restore.
-
- Apply the patch with:
-
- cd <bacula-source>
- patch -p0 <2.4.1-sd-crash.patch
- ./configure <your-options>
- make
- ...
- make install
-
-
-
-Index: src/stored/acquire.c
-===================================================================
---- src/stored/acquire.c	(revision 7405)
-+++ src/stored/acquire.c	(working copy)
-@@ -266,7 +266,6 @@
-             dev->close();                                                          
-          }
-          dev->set_load();
--         ASSERT(0);
-          /* Fall through */
-       default:
-          Jmsg1(jcr, M_WARNING, 0, "%s", jcr->errmsg);
diff --git a/bacula-tinfo-readline.patch b/bacula-tinfo-readline.patch
deleted file mode 100644
index 52d040d..0000000
--- a/bacula-tinfo-readline.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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 @@
- 
- got_conio="no"
- if test x$support_conio = xyes; then
--   AC_CHECK_HEADER(termcap.h, 
--     [ AC_CHECK_LIB(termcap, tgetent, 
--       [ CONS_LIBS="-ltermcap"
-+   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"
- 	      ],