X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fversion.h;h=01649d86890d5a76420fee1fed6b97da2a9cfcef;hb=aa43f8eee701e5ffd8144b1ec3868be1ab411cf3;hp=dd91bcd0996960679f386377fdce4ffb91ece63d;hpb=73b5f0be4ecf4adac4504378166ebf1e07a61c9a;p=bacula%2Fbacula

diff --git a/bacula/src/version.h b/bacula/src/version.h
index dd91bcd099..01649d8689 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,24 +1,21 @@
-/*
- *  Version $Id$
- */
 
 #undef  VERSION
-#define VERSION "3.1.4"
-#define BDATE   "18 October 2009"
-#define LSMDATE "18Oct09"
+#define VERSION "5.2.12"
+#define BDATE   "12 September 2012"
+#define LSMDATE "12Sep12"
 
-#define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
-#define BYEAR "2009"       /* year for copyright messages in progs */
+#define PROG_COPYRIGHT "Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n"
+#define BYEAR "2012"       /* year for copyright messages in progs */
 
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -27,17 +24,28 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
    Bacula® is a registered trademark of Kern Sibbald.
+
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
 
+/* Shared object library versions */
+
+/* Uncomment to overwrite default value from VERSION */
+/* #define LIBBAC_LT_RELEASE     "5.1.0" */
+/* #define LIBBACCFG_LT_RELEASE  "5.1.0" */
+/* #define LIBBACPY_LT_RELEASE   "5.1.0" */
+/* #define LIBBACSQL_LT_RELEASE  "5.1.0" */
+/* #define LIBBACCATS_LT_RELEASE  "5.1.0" */
+/* #define LIBBACFIND_LT_RELEASE "5.1.0" */
+
 
 /* Debug flags */
 #undef  DEBUG
@@ -46,7 +54,14 @@
 #define TRACE_FILE 1
 
 /* If this is set stdout will not be closed on startup */
-#define DEVELOPER 1
+/* #define DEVELOPER 1 */
+
+/* adjust DEVELOPER_MODE for status command */
+#ifdef DEVELOPER
+# define DEVELOPER_MODE 1
+#else
+# define DEVELOPER_MODE 0
+#endif
 
 /*
  * SMCHECK does orphaned buffer checking (memory leaks)
@@ -62,13 +77,28 @@
  *   it can always be turned on, but we advise to use it only
  *   for debug
  */
-#if DEVELOPER
 # ifndef _USE_LOCKMGR
 #  define _USE_LOCKMGR
-# endif
-#endif
+# endif /* _USE_LOCKMGR */
+/*
+ * Enable priority management with the lock manager
+ *
+ * Note, turning this on will cause the Bacula SD to abort if
+ *  mutexes are executed out of order, which could lead to a
+ *  deadlock.  However, note that this is not necessarily a
+ *  deadlock, so turn this on only for debugging.
+ */
+#define USE_LOCKMGR_PRIORITY
+
+/*
+ * Enable thread verification before kill 
+ *
+ * Note, this extra check have a high cost when using
+ * dozens of thread, so turn this only for debugging.
+ */
+/* #define USE_LOCKMGR_SAFEKILL */
 
-#if !HAVE_LINUX_OS
+#if !HAVE_LINUX_OS && !HAVE_SUN_OS && !HAVE_DARWIN_OS && !HAVE_FREEBSD_OS
 # undef _USE_LOCKMGR
 #endif
 
@@ -80,6 +110,11 @@
 # define USE_VTAPE
 #endif
 
+/*
+ * USE_FTP is a ftp driver for the FD using curl.
+ */
+// #define USE_FTP
+
 /* 
  * for fastest speed but you must have a UPS to avoid unwanted shutdowns
  */
@@ -109,6 +144,8 @@
 /* #define TRACE_RES 1 */
 /* #define DEBUG_MEMSET 1 */
 /* #define DEBUG_MUTEX 1 */
+/* #define DEBUG_BLOCK_CHECKSUM 1 */
+#define BEEF 0
 
 /*
  * Set SMALLOC_SANITY_CHECK to zero to turn off, otherwise