svn commit: r566444 - in head: net-mgmt net-mgmt/nagios-check_bacula11 sysutils sysutils/bacula11-client sysutils/bacula11-client-static sysutils/bacula11-docs sysutils/bacula11-server sysutils/bac...

Wed Feb 24 02:33:06 UTC 2021

Author: dvl
Date: Wed Feb 24 02:33:02 2021
New Revision: 566444
URL: https://svnweb.freebsd.org/changeset/ports/566444

Log:
  Add Bacula 11.0.1
  
  NOTE: New Catalog format in version 11.0 and greater
  The upgrade process will require more or less twice the
  size of the actual database.
  
  see update_bacula_tables
  
  re https://www.bacula.org/bacula-release-11-0-1/
  
  While here, update Bacula 9 conflicts.

Added:
  head/net-mgmt/nagios-check_bacula11/
     - copied from r566440, head/net-mgmt/nagios-check_bacula9/
  head/sysutils/bacula11-client/
     - copied from r566440, head/sysutils/bacula9-client/
  head/sysutils/bacula11-client-static/
     - copied from r566440, head/sysutils/bacula9-client-static/
  head/sysutils/bacula11-docs/
     - copied from r566440, head/sysutils/bacula9-docs/
  head/sysutils/bacula11-server/
     - copied from r566440, head/sysutils/bacula9-server/
Modified:
  head/net-mgmt/Makefile
  head/net-mgmt/nagios-check_bacula11/Makefile
  head/sysutils/Makefile
  head/sysutils/bacula11-client-static/Makefile
  head/sysutils/bacula11-client/Makefile
  head/sysutils/bacula11-docs/Makefile
  head/sysutils/bacula11-docs/distinfo
  head/sysutils/bacula11-server/Makefile
  head/sysutils/bacula11-server/Makefile.common
  head/sysutils/bacula11-server/distinfo
  head/sysutils/bacula11-server/files/patch-src_baconfig.h
  head/sysutils/bacula11-server/files/patch-src_console_Makefile.in
  head/sysutils/bacula11-server/files/patch-src_dird_Makefile.in
  head/sysutils/bacula11-server/files/patch-src_filed_Makefile.in
  head/sysutils/bacula9-docs/Makefile
  head/sysutils/bacula9-server/Makefile

Modified: head/net-mgmt/Makefile
==============================================================================

--- head/net-mgmt/Makefile	Wed Feb 24 02:05:16 2021	(r566443)
+++ head/net-mgmt/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -135,6 +135,7 @@
     SUBDIR += nagios
     SUBDIR += nagios-certexp-plugin
     SUBDIR += nagios-check_bacula9
+    SUBDIR += nagios-check_bacula11
     SUBDIR += nagios-check_clamav
     SUBDIR += nagios-check_cpu_usage
     SUBDIR += nagios-check_dhcp.pl

Modified: head/net-mgmt/nagios-check_bacula11/Makefile
==============================================================================
--- head/net-mgmt/nagios-check_bacula9/Makefile	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/net-mgmt/nagios-check_bacula11/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -4,17 +4,17 @@
 PORTNAME=	bacula
 CATEGORIES=	net-mgmt
 PKGNAMEPREFIX=	nagios-check_
-PKGNAMESUFFIX=	9
+PKGNAMESUFFIX=	11
 
 MAINTAINER=	dvl at FreeBSD.org
 COMMENT=	Nagios plugin for Bacula
 
-LIB_DEPENDS+=	libbac.so:sysutils/bacula9-client
+LIB_DEPENDS+=	libbac.so:sysutils/bacula11-client
 
 PLIST=		${.CURDIR}/pkg-plist
 PLIST_FILES=	libexec/nagios/check_bacula
 WITH_NAGIOS_CHECK_ONLY=	yes
-MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula11-server
 
 CONFIGURE_ARGS=	--enable-client-only	\
 		--disable-build-dird	\

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed Feb 24 02:05:16 2021	(r566443)
+++ head/sysutils/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -88,6 +88,10 @@
     SUBDIR += bacula9-client-static
     SUBDIR += bacula9-docs
     SUBDIR += bacula9-server
+    SUBDIR += bacula11-client
+    SUBDIR += bacula11-client-static
+    SUBDIR += bacula11-docs
+    SUBDIR += bacula11-server
     SUBDIR += baloo-widgets
     SUBDIR += bamf
     SUBDIR += bareos-client

Modified: head/sysutils/bacula11-client-static/Makefile
==============================================================================
--- head/sysutils/bacula9-client-static/Makefile	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-client-static/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PKGNAMESUFFIX=	9-client-static
+PKGNAMESUFFIX=	11-client-static
 
 COMMENT=	Network backup solution (static client)
 
@@ -11,7 +11,7 @@ BROKEN_SSL=	libressl
 
 WITH_CLIENT_ONLY=yes
 PLIST=		${.CURDIR}/pkg-plist
-MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula11-server
 
 PLIST_FILES=	sbin/bacula-fd-static \
 		sbin/bconsole-static

Modified: head/sysutils/bacula11-client/Makefile
==============================================================================
--- head/sysutils/bacula9-client/Makefile	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-client/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PKGNAMESUFFIX=	9-client
+PKGNAMESUFFIX=	11-client
 
 COMMENT=	Network backup solution (client)
 
@@ -12,7 +12,7 @@ WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bacula-fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
-MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula11-server
 
 OPTIONS_DEFINE=	NLS PYTHON IPV6
 

Modified: head/sysutils/bacula11-docs/Makefile
==============================================================================
--- head/sysutils/bacula9-docs/Makefile	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-docs/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,14 +1,13 @@
-# Created by: Dan Langille <dan at langille.org>
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTVERSION=	9.6.7
+PORTVERSION=	11.0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
-PKGNAMESUFFIX=	9-docs
+PKGNAMESUFFIX=	11-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula-* bacula5-*
+CONFLICTS=	bacula9-*
 
 MAINTAINER=	dvl at FreeBSD.org
 COMMENT=	Bacula document set

Modified: head/sysutils/bacula11-docs/distinfo
==============================================================================
--- head/sysutils/bacula9-docs/distinfo	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-docs/distinfo	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607966527
-SHA256 (bacula-docs-9.6.7.tar.bz2) = d5b7e6adfde83b7b47e21184baa695819cab0699570b9426289ac9e87977f919
-SIZE (bacula-docs-9.6.7.tar.bz2) = 58633475
+TIMESTAMP = 1614132177
+SHA256 (bacula-docs-11.0.1.tar.bz2) = 9d7dcbeac3f59466dabc221e49a5d73112b643367727d0f39b36606c6a3ac9a1
+SIZE (bacula-docs-11.0.1.tar.bz2) = 53307003

Modified: head/sysutils/bacula11-server/Makefile
==============================================================================
--- head/sysutils/bacula9-server/Makefile	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-PORTVERSION=	9.6.7
+PORTVERSION=	11.0.1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
-PKGNAMESUFFIX?=	9-server
+PKGNAMESUFFIX?=	11-server
 
 MAINTAINER=	dvl at FreeBSD.org
 COMMENT?=	Network backup solution (server)
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES+=		libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in
 
-CONFLICTS?=	bacula5-server-* bacula-server-*
+CONFLICTS?=	bacula9-server-* bacula5-server-* bacula-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 
@@ -35,7 +35,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE?=	MTX NLS IPV6
 MTX_DESC=		Install mtx for control of autochanger devices
 
-.if ${PKGNAMESUFFIX} == "9-server"
+.if ${PKGNAMESUFFIX} == "11-server"
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	SQLITE3 MYSQL PGSQL
 OPTIONS_DEFAULT+=	PGSQL
@@ -43,10 +43,10 @@ OPTIONS_DEFAULT+=	PGSQL
 
 OPTIONS_SUB=		yes
 
-.if ${PKGNAMESUFFIX} == "9-client" || ${PKGNAMESUFFIX} == "9-server"  #Till end of the file
+.if ${PKGNAMESUFFIX} == "11-client" || ${PKGNAMESUFFIX} == "11-server"  #Till end of the file
 
 .if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula9-client
+LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula11-client
 USE_RC_SUBR?=	bacula-dir bacula-sd
 .endif
 
@@ -203,6 +203,6 @@ post-install:
 .endif
 .else
 .include "${MASTERDIR}/Makefile.common"
-.endif # 9-client and 9-server are defined
+.endif # 11-client and 11-server are defined
 
 .include <bsd.port.post.mk>

Modified: head/sysutils/bacula11-server/Makefile.common
==============================================================================
--- head/sysutils/bacula9-server/Makefile.common	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/Makefile.common	Wed Feb 24 02:33:02 2021	(r566444)
@@ -6,7 +6,7 @@ post-build:
 .endif
 
 do-install:
-.if ${PKGNAMESUFFIX} == "9-bat"
+.if ${PKGNAMESUFFIX} == "11-bat"
 # Install config files and preserve existing ones
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
@@ -18,7 +18,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
 	${STAGEDIR}${PREFIX}/libexec/nagios
 .endif
-.if ${PKGNAMESUFFIX} == "9-client-static"
+.if ${PKGNAMESUFFIX} == "11-client-static"
 	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static
 	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
 .endif

Modified: head/sysutils/bacula11-server/distinfo
==============================================================================
--- head/sysutils/bacula9-server/distinfo	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/distinfo	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607965673
-SHA256 (bacula-9.6.7.tar.gz) = df0f8525ecdba380e74b537ca71adf3b7596593f02189b59ab0ebffc85ccc8de
-SIZE (bacula-9.6.7.tar.gz) = 4168102
+TIMESTAMP = 1614131085
+SHA256 (bacula-11.0.1.tar.gz) = 2ebd9cdb885953c03f09df31180eeb7ea81aebb821cf45c9fdcb3fcff85294f5
+SIZE (bacula-11.0.1.tar.gz) = 5975841

Modified: head/sysutils/bacula11-server/files/patch-src_baconfig.h
==============================================================================
--- head/sysutils/bacula9-server/files/patch-src_baconfig.h	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/files/patch-src_baconfig.h	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,7 +1,7 @@
---- src/baconfig.h.orig	2018-08-29 14:09:36 UTC
+--- src/baconfig.h.orig	2021-02-05 21:23:44 UTC
 +++ src/baconfig.h
-@@ -38,6 +38,10 @@
- #define have_tls 0
+@@ -45,6 +45,10 @@
+  #define tls_psk_default 0
  #endif
  
 +#ifndef ENODATA

Modified: head/sysutils/bacula11-server/files/patch-src_console_Makefile.in
==============================================================================
--- head/sysutils/bacula9-server/files/patch-src_console_Makefile.in	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/files/patch-src_console_Makefile.in	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,6 +1,6 @@
---- src/console/Makefile.in.orig	2015-08-13 13:52:24 UTC
+--- src/console/Makefile.in.orig	2021-02-05 21:23:44 UTC
 +++ src/console/Makefile.in
-@@ -121,7 +121,7 @@ uninstall:
+@@ -128,7 +128,7 @@ uninstall:
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile

Modified: head/sysutils/bacula11-server/files/patch-src_dird_Makefile.in
==============================================================================
--- head/sysutils/bacula9-server/files/patch-src_dird_Makefile.in	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/files/patch-src_dird_Makefile.in	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,6 +1,6 @@
---- src/dird/Makefile.in.orig	2015-08-13 13:52:24 UTC
+--- src/dird/Makefile.in.orig	2021-02-05 21:23:44 UTC
 +++ src/dird/Makefile.in
-@@ -140,7 +140,7 @@ uninstall:
+@@ -150,7 +150,7 @@ uninstall:
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile

Modified: head/sysutils/bacula11-server/files/patch-src_filed_Makefile.in
==============================================================================
--- head/sysutils/bacula9-server/files/patch-src_filed_Makefile.in	Wed Feb 24 01:42:08 2021	(r566440)
+++ head/sysutils/bacula11-server/files/patch-src_filed_Makefile.in	Wed Feb 24 02:33:02 2021	(r566444)
@@ -1,11 +1,11 @@
---- src/filed/Makefile.in.orig	2015-08-13 13:52:24 UTC
+--- src/filed/Makefile.in.orig	2021-02-24 01:52:05 UTC
 +++ src/filed/Makefile.in
-@@ -137,7 +127,7 @@ uninstall:
+@@ -193,7 +193,7 @@ uninstall:
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 -	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
 +	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
- 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(LZO_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(LZO_INC) $(AFS_CFLAGS) $(GPFS_CFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
  	@if test -f Makefile ; then \
  	    $(RMF) Makefile.bak; \

Modified: head/sysutils/bacula9-docs/Makefile
==============================================================================
--- head/sysutils/bacula9-docs/Makefile	Wed Feb 24 02:05:16 2021	(r566443)
+++ head/sysutils/bacula9-docs/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -3,12 +3,13 @@
 
 PORTNAME=	bacula
 PORTVERSION=	9.6.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	9-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula-* bacula5-*
+CONFLICTS=	bacula-* bacula5-* bacula11-*
 
 MAINTAINER=	dvl at FreeBSD.org
 COMMENT=	Bacula document set

Modified: head/sysutils/bacula9-server/Makefile
==============================================================================
--- head/sysutils/bacula9-server/Makefile	Wed Feb 24 02:05:16 2021	(r566443)
+++ head/sysutils/bacula9-server/Makefile	Wed Feb 24 02:33:02 2021	(r566444)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bacula
 PORTVERSION=	9.6.7
+PORTREVISION=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -17,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES+=		libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in
 
-CONFLICTS?=	bacula5-server-* bacula-server-*
+CONFLICTS?=	bacula11-server-* bacula5-server-* bacula-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 
