8 files changed, 24 insertions, 224 deletions

diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index 894ea3bdd3e2..3427d664550c 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTREVISION=	3
 PKGNAMESUFFIX=	-bat
 
 COMMENT=	Network backup solution (GUI)
diff --git a/sysutils/bacula-client-static/Makefile b/sysutils/bacula-client-static/Makefile
index 35e39a628a7b..5fd6ce74cf02 100644
--- a/sysutils/bacula-client-static/Makefile
+++ b/sysutils/bacula-client-static/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTREVISION=	2
 PKGNAMESUFFIX=	-client-static
 
 COMMENT=	Network backup solution (static client)
diff --git a/sysutils/bacula-client/Makefile b/sysutils/bacula-client/Makefile
index b583fb0ba30d..aa3afd912ca6 100644
--- a/sysutils/bacula-client/Makefile
+++ b/sysutils/bacula-client/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTREVISION=	3
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Network backup solution (client)
@@ -12,7 +11,9 @@ USE_RC_SUBR=	bacula-fd
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
 
-OPTIONS_DEFINE=	NLS PYTHON
-OPTIONS_DEFAULT=#
+OPTIONS_DEFINE=	NLS PYTHON ENABLE_IPV6
+OPTIONS_DEFAULT=ENABLE_IPV6
+
+ENABLE_IPV6_DESC=	Enable IPv6 support
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 29c90a2f96bc..e0113316d82f 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-DISTVERSION=	7.2.0
-PORTREVISION?=	1
+DISTVERSION=	7.4.0
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -32,9 +31,10 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS
-OPTIONS_DEFAULT?=	NLS PGSQL
+OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS ENABLE_IPV6
+OPTIONS_DEFAULT?=	NLS PGSQL ENABLE_IPV6
 MTX_DESC=		Install mtx for control of autochanger devices
+ENABLE_IPV6_DESC=	Enable IPv6 support
 
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 
@@ -140,6 +140,11 @@ readline_CONFIGURE=	${LOCALBASE}
 readline_CONFIGURE=	yes
 .endif
 
+# if IPv6 is not in the kernel, it generates many errors
+.if ! ${PORT_OPTIONS:MENABLE_IPV6}
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 CONFIGURE_ARGS+=	--with-readline=${readline_CONFIGURE}
 
 .if defined(WITH_CLIENT_ONLY)
@@ -185,7 +190,7 @@ post-install:
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
-        #the following are installed by the -CLIENT port, and I (ler@lerctr.org)
+	#the following are installed by the -CLIENT port, and I (ler@lerctr.org)
 	#don't know how to remove them from being built for the -SERVER port.
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac-${PORTVERSION}.so
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 8ffad79b3cac..090e3f9911e3 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bacula-7.2.0.tar.gz) = 818606fe69c50c3ca21b91e609d4ac6ca08e4189419b89d3ec2e81c8c0389e1c
-SIZE (bacula-7.2.0.tar.gz) = 3301720
+SHA256 (bacula-7.4.0.tar.gz) = fe850b783523edb19fb4dbfa8c44752d20955121b71a52b0740a9e765bfd73cb
+SIZE (bacula-7.4.0.tar.gz) = 3314218
diff --git a/sysutils/bacula-server/files/patch-src_cats_make__catalog__backup.pl.in b/sysutils/bacula-server/files/patch-src_cats_make__catalog__backup.pl.in
new file mode 100644
index 000000000000..b7996d2f17f2
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src_cats_make__catalog__backup.pl.in
@@ -0,0 +1,8 @@
+--- src/cats/make_catalog_backup.pl.in.orig	2015-08-13 13:52:24 UTC
++++ src/cats/make_catalog_backup.pl.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/local/bin/perl
+ #
+ # Author: Eric Bollengier, Copyright, 2006
+ # License: BSD 2-Clause; see file LICENSE-FOSS
diff --git a/sysutils/bacula-server/files/patch-src_filed_acl.c b/sysutils/bacula-server/files/patch-src_filed_acl.c
deleted file mode 100644
index 759e9e686a36..000000000000
--- a/sysutils/bacula-server/files/patch-src_filed_acl.c
+++ /dev/null
@@ -1,190 +0,0 @@
---- src/filed/acl.c.orig	2015-08-13 13:52:24 UTC
-+++ src/filed/acl.c
-@@ -927,7 +927,7 @@ static bacl_rtn_code generic_set_acl_on_
-  * Define the supported ACL streams for this OS
-  */
- static int os_access_acl_streams[1] = {
--   STREAM_ACL_DARWIN_ACCESS_ACL
-+   STREAM_ACL_DARWIN_ACCESS
- };
- static int os_default_acl_streams[1] = {
-    -1
-@@ -988,11 +988,11 @@ static bacl_rtn_code (*os_restore_acl_st
-  * Define the supported ACL streams for these OSes
-  */
- static int os_access_acl_streams[2] = {
--   STREAM_ACL_FREEBSD_ACCESS_ACL,
--   STREAM_ACL_FREEBSD_NFS4_ACL
-+   STREAM_ACL_FREEBSD_ACCESS,
-+   STREAM_ACL_FREEBSD_NFS4
- };
- static int os_default_acl_streams[1] = {
--   STREAM_ACL_FREEBSD_DEFAULT_ACL
-+   STREAM_ACL_FREEBSD_DEFAULT
- };
- 
- static bacl_rtn_code freebsd_backup_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
-@@ -1065,7 +1065,7 @@ static bacl_rtn_code freebsd_backup_acl_
-          return bacl_rtn_fatal;
- 
-       if (jcr->acl_ctx->content_length > 0) {
--         if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_NFS4_ACL) == bacl_rtn_fatal)
-+         if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_NFS4) == bacl_rtn_fatal)
-             return bacl_rtn_fatal;
-       }
-       break;
-@@ -1077,7 +1077,7 @@ static bacl_rtn_code freebsd_backup_acl_
-          return bacl_rtn_fatal;
- 
-       if (jcr->acl_ctx->content_length > 0) {
--         if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_ACCESS_ACL) == bacl_rtn_fatal)
-+         if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_ACCESS) == bacl_rtn_fatal)
-             return bacl_rtn_fatal;
-       }
- 
-@@ -1088,7 +1088,7 @@ static bacl_rtn_code freebsd_backup_acl_
-          if (generic_get_acl_from_os(jcr, BACL_TYPE_DEFAULT) == bacl_rtn_fatal)
-             return bacl_rtn_fatal;
-          if (jcr->acl_ctx->content_length > 0) {
--            if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_DEFAULT_ACL) == bacl_rtn_fatal)
-+            if (send_acl_stream(jcr, STREAM_ACL_FREEBSD_DEFAULT) == bacl_rtn_fatal)
-                return bacl_rtn_fatal;
-          }
-       }
-@@ -1113,13 +1113,13 @@ static bacl_rtn_code freebsd_restore_acl
-     */
-    switch (stream) {
-    case STREAM_UNIX_ACCESS_ACL:
--   case STREAM_ACL_FREEBSD_ACCESS_ACL:
-+   case STREAM_ACL_FREEBSD_ACCESS:
-    case STREAM_UNIX_DEFAULT_ACL:
--   case STREAM_ACL_FREEBSD_DEFAULT_ACL:
-+   case STREAM_ACL_FREEBSD_DEFAULT:
-       acl_enabled = pathconf(jcr->last_fname, _PC_ACL_EXTENDED);
-       acl_type_name = "POSIX";
-       break;
--   case STREAM_ACL_FREEBSD_NFS4_ACL:
-+   case STREAM_ACL_FREEBSD_NFS4:
- #if defined(_PC_ACL_NFS4)
-       acl_enabled = pathconf(jcr->last_fname, _PC_ACL_NFS4);
- #endif
-@@ -1159,12 +1159,12 @@ static bacl_rtn_code freebsd_restore_acl
-     */
-    switch (stream) {
-    case STREAM_UNIX_ACCESS_ACL:
--   case STREAM_ACL_FREEBSD_ACCESS_ACL:
-+   case STREAM_ACL_FREEBSD_ACCESS:
-       return generic_set_acl_on_os(jcr, BACL_TYPE_ACCESS, content, content_length);
-    case STREAM_UNIX_DEFAULT_ACL:
--   case STREAM_ACL_FREEBSD_DEFAULT_ACL:
-+   case STREAM_ACL_FREEBSD_DEFAULT:
-       return generic_set_acl_on_os(jcr, BACL_TYPE_DEFAULT, content, content_length);
--   case STREAM_ACL_FREEBSD_NFS4_ACL:
-+   case STREAM_ACL_FREEBSD_NFS4:
-       return generic_set_acl_on_os(jcr, BACL_TYPE_NFS4, content, content_length);
-    default:
-       break;
-@@ -1273,11 +1273,11 @@ static bacl_rtn_code (*os_restore_acl_st
-  * Define the supported ACL streams for this OS
-  */
- static int os_access_acl_streams[1] = {
--   STREAM_ACL_TRU64_ACCESS_ACL
-+   STREAM_ACL_TRU64_ACCESS
- };
- static int os_default_acl_streams[2] = {
--   STREAM_ACL_TRU64_DEFAULT_ACL,
--   STREAM_ACL_TRU64_DEFAULT_DIR_ACL
-+   STREAM_ACL_TRU64_DEFAULT,
-+   STREAM_ACL_TRU64_DEFAULT_DIR
- };
- 
- static bacl_rtn_code tru64_backup_acl_streams(JCR *jcr, FF_PKT *ff_pkt)
-@@ -1564,8 +1564,8 @@ char *acl_strerror(int);
-  * Define the supported ACL streams for this OS
-  */
- static int os_access_acl_streams[2] = {
--   STREAM_ACL_SOLARIS_ACLENT,
--   STREAM_ACL_SOLARIS_ACE
-+   STREAM_ACL_SOLARIS_POSIX,
-+   STREAM_ACL_SOLARIS_NFS4
- };
- static int os_default_acl_streams[1] = {
-    -1
-@@ -1653,10 +1653,10 @@ static bacl_rtn_code solaris_backup_acl_
- 
-       switch (acl_type(aclp)) {
-       case ACLENT_T:
--         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT);
-+         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_POSIX);
-          break;
-       case ACE_T:
--         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACE);
-+         stream_status = send_acl_stream(jcr, STREAM_ACL_SOLARIS_NFS4);
-          break;
-       default:
-          break;
-@@ -1673,8 +1673,8 @@ static bacl_rtn_code solaris_restore_acl
-    acl_t *aclp;
-    int acl_enabled, error;
- 
--   if (stream != STREAM_UNIX_ACCESS_ACL || stream != STREAM_ACL_SOLARIS_ACLENT ||
--       stream != STREAM_ACL_SOLARIS_ACE) {
-+   if (stream != STREAM_UNIX_ACCESS_ACL || stream != STREAM_ACL_SOLARIS_POSIX ||
-+       stream != STREAM_ACL_SOLARIS_NFS4) {
-       return bacl_rtn_error;
-    }
- 
-@@ -1709,7 +1709,7 @@ static bacl_rtn_code solaris_restore_acl
-     * On a filesystem with ACL support make sure this particular ACL type can be restored.
-     */
-    switch (stream) {
--   case STREAM_ACL_SOLARIS_ACLENT:
-+   case STREAM_ACL_SOLARIS_POSIX:
-       /*
-        * An aclent can be restored on filesystems with _ACL_ACLENT_ENABLED or _ACL_ACE_ENABLED support.
-        */
-@@ -1720,7 +1720,7 @@ static bacl_rtn_code solaris_restore_acl
-          return bacl_rtn_error;
-       }
-       break;
--   case STREAM_ACL_SOLARIS_ACE:
-+   case STREAM_ACL_SOLARIS_NFS4:
-       /*
-        * An ace can only be restored on a filesystem with _ACL_ACE_ENABLED support.
-        */
-@@ -1750,7 +1750,7 @@ static bacl_rtn_code solaris_restore_acl
-     * Validate that the conversion gave us the correct acl type.
-     */
-    switch (stream) {
--   case STREAM_ACL_SOLARIS_ACLENT:
-+   case STREAM_ACL_SOLARIS_POSIX:
-       if (acl_type(aclp) != ACLENT_T) {
-          Mmsg1(jcr->errmsg,
-                _("wrong encoding of acl type in acl stream on file \"%s\"\n"),
-@@ -1758,7 +1758,7 @@ static bacl_rtn_code solaris_restore_acl
-          return bacl_rtn_error;
-       }
-       break;
--   case STREAM_ACL_SOLARIS_ACE:
-+   case STREAM_ACL_SOLARIS_NFS4:
-       if (acl_type(aclp) != ACE_T) {
-          Mmsg1(jcr->errmsg,
-                _("wrong encoding of acl type in acl stream on file \"%s\"\n"),
-@@ -1802,7 +1802,7 @@ static bacl_rtn_code solaris_restore_acl
-  * Define the supported ACL streams for this OS
-  */
- static int os_access_acl_streams[1] = {
--   STREAM_ACL_SOLARIS_ACLENT
-+   STREAM_ACL_SOLARIS_POSIX
- };
- static int os_default_acl_streams[1] = {
-    -1
-@@ -1861,7 +1861,7 @@ static bacl_rtn_code solaris_backup_acl_
-             pm_strcpy(jcr->acl_ctx->content, acl_text);
-          actuallyfree(acl_text);
-          free(acls);
--         return send_acl_stream(jcr, STREAM_ACL_SOLARIS_ACLENT);
-+         return send_acl_stream(jcr, STREAM_ACL_SOLARIS_POSIX);
-       }
- 
-       berrno be;
diff --git a/sysutils/bacula-server/files/patch-src_findlib_fstype.c b/sysutils/bacula-server/files/patch-src_findlib_fstype.c
deleted file mode 100644
index d4b90b8c14bd..000000000000
--- a/sysutils/bacula-server/files/patch-src_findlib_fstype.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/findlib/fstype.c.orig	2015-08-13 13:52:24 UTC
-+++ src/findlib/fstype.c
-@@ -31,7 +31,9 @@
- #include "find.h"
- #include <sys/types.h>
- #include <sys/stat.h>
--
-+#ifdef HAVE_SUN_OS
-+  #include <sys/mnttab.h>
-+#endif
- #else /* Set up for testing a stand alone program */
- 
- #include <stdio.h>
-@@ -373,7 +375,7 @@ bool read_mtab(mtab_handler_t *mtab_hand
-       mtab_handler(user_ctx, &st, mnt.mnt_fstype, mnt.mnt_mountp,
-          mnt.mnt_mntopts, mnt.mnt_special);
-    }
--   fclose(fp);
-+   fclose(mntfp);
-    V(mutex);
- #endif
-