- The code had a PID/priv issue. See bug # 932 at http://bugs.bacula.org/

In short, it was dropping privs before setting PID. Patch the code locally to
get FreeBSD users running.
- While here, if PostgreSQL is not installed, ask for 8.2, not the default of
8.1.
- Remove EOT model patch, now in vendor code.
- Update pkg-message to reflect new version.

PR:		115582
Submitted by:	Dan Langille (maintainer)

5 files changed, 37 insertions, 23 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 17008b595840..faa83cabddfa 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
@@ -140,6 +141,7 @@ USE_MYSQL=		yes
 DBTYPE=			mysql
 SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
 .elif defined(WITH_POSTGRESQL)
+DEFAULT_PGSQL_VER?=	82
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=yes
 DBTYPE=			postgresql
diff --git a/sysutils/bacula-server/files/eotmodel-src-stored-dev.c.patch b/sysutils/bacula-server/files/eotmodel-src-stored-dev.c.patch
deleted file mode 100644
index 9479683c4776..000000000000
--- a/sysutils/bacula-server/files/eotmodel-src-stored-dev.c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: src/stored/dev.c
-@@ -2368,7 +2368,7 @@
-       }
-    }
- /* Turn this on later when fully tested */
--#if defined(xxxMTIOCSETEOTMODEL) 
-+#if defined(MTIOCSETEOTMODEL) 
-    uint32_t neof;
-    if (dev->has_cap(CAP_TWOEOF)) {
-       neof = 2;
diff --git a/sysutils/bacula-server/files/patch-src-dird-dird.c b/sysutils/bacula-server/files/patch-src-dird-dird.c
new file mode 100644
index 000000000000..076ce53e39e9
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src-dird-dird.c
@@ -0,0 +1,33 @@
+--- src/dird/dird.c	2007-06-07 10:46:43.000000000 -0400
++++ src/dird/dird.c	2007-08-16 08:58:20.000000000 -0400
+@@ -228,6 +228,15 @@
+       Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Please correct configuration file: %s\n"), configfile);
+    }
+ 
++   if (background) {
++      daemon_start();
++      init_stack_dump();              /* grab new pid */
++   }
++
++   /* Create pid must come after we are a daemon -- so we have our final pid */
++   create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
++   read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
++
+    drop(uid, gid);                    /* reduce privileges if requested */
+ 
+    if (!check_catalog()) {
+@@ -247,14 +256,6 @@
+    FDConnectTimeout = (int)director->FDConnectTimeout;
+    SDConnectTimeout = (int)director->SDConnectTimeout;
+ 
+-   if (background) {
+-      daemon_start();
+-      init_stack_dump();              /* grab new pid */
+-   }
+-
+-   /* Create pid must come after we are a daemon -- so we have our final pid */
+-   create_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
+-   read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
+ 
+ 
+ #if !defined(HAVE_WIN32)
diff --git a/sysutils/bacula-server/files/pkg-message.client.in b/sysutils/bacula-server/files/pkg-message.client.in
index bb9c496d6b13..8d64c04d7014 100644
--- a/sysutils/bacula-server/files/pkg-message.client.in
+++ b/sysutils/bacula-server/files/pkg-message.client.in
@@ -10,14 +10,6 @@ bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample
 
   as installed by docs port for the upgrade procedure.
 
-IMPORTANT UPGRADE NOTES:
-
-- A database upgrade is required.
-- Your Director and SD must be simultaneously upgraded.
-- The "Accept Any Volume" directive has been removed.
-
-- Lots of new features
-
 Read the ReleaseNotes for further information.
 
 ################################################################################
diff --git a/sysutils/bacula-server/files/pkg-message.server.in b/sysutils/bacula-server/files/pkg-message.server.in
index cf7423856926..44862d9a2b7a 100644
--- a/sysutils/bacula-server/files/pkg-message.server.in
+++ b/sysutils/bacula-server/files/pkg-message.server.in
@@ -55,11 +55,8 @@ ReleaseNotes
 
 IMPORTANT UPGRADE NOTES FOR THIS RELEASE:
 
-- A database upgrade is required.
-- Your Director and SD must be simultaneously upgraded.
-- The "Accept Any Volume" directive has been removed.
-
-- Lots of new features
+- bacula-client and bacula-server do not need to be simultaneously 
+upgraded.
 
 Read the ReleaseNotes for further information.