Date: Wed, 30 Aug 2017 18:11:06 +0000 (UTC) From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448995 - in head: net-mgmt net-mgmt/nagios-check_bacula9 sysutils sysutils/bacula9-bat sysutils/bacula9-client sysutils/bacula9-client-static sysutils/bacula9-docs sysutils/bacula9-ser... Message-ID: <201708301811.v7UIB65L057522@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dvl Date: Wed Aug 30 18:11:06 2017 New Revision: 448995 URL: https://svnweb.freebsd.org/changeset/ports/448995 Log: Add Bacula 9.0.3 PR: 221710 Added: head/net-mgmt/nagios-check_bacula9/ - copied from r448872, head/net-mgmt/nagios-check_bacula/ head/sysutils/bacula9-bat/ - copied from r448872, head/sysutils/bacula-bat/ head/sysutils/bacula9-client/ - copied from r448872, head/sysutils/bacula-client/ head/sysutils/bacula9-client-static/ - copied from r448872, head/sysutils/bacula-client-static/ head/sysutils/bacula9-docs/ - copied from r448872, head/sysutils/bacula-docs/ head/sysutils/bacula9-server/ - copied from r448872, head/sysutils/bacula-server/ Deleted: head/sysutils/bacula9-server/files/patch-src_stored_Makefile.in head/sysutils/bacula9-server/files/patch-src_tools_Makefile.in Modified: head/net-mgmt/Makefile head/net-mgmt/nagios-check_bacula9/Makefile head/sysutils/Makefile head/sysutils/bacula9-client-static/Makefile head/sysutils/bacula9-client/Makefile head/sysutils/bacula9-docs/Makefile head/sysutils/bacula9-docs/distinfo head/sysutils/bacula9-server/Makefile head/sysutils/bacula9-server/Makefile.common head/sysutils/bacula9-server/distinfo head/sysutils/bacula9-server/files/patch-src_filed_Makefile.in head/sysutils/bacula9-server/files/pkg-message.server.in head/sysutils/bacula9-server/pkg-plist head/sysutils/bacula9-server/pkg-plist.client Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Wed Aug 30 18:06:15 2017 (r448994) +++ head/net-mgmt/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -131,6 +131,7 @@ SUBDIR += nagios-certexp-plugin SUBDIR += nagios-check_bacula SUBDIR += nagios-check_bacula5 + SUBDIR += nagios-check_bacula9 SUBDIR += nagios-check_clamav SUBDIR += nagios-check_cpu_usage SUBDIR += nagios-check_dhcp.pl Modified: head/net-mgmt/nagios-check_bacula9/Makefile ============================================================================== --- head/net-mgmt/nagios-check_bacula/Makefile Mon Aug 28 15:36:03 2017 (r448872) +++ head/net-mgmt/nagios-check_bacula9/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -2,20 +2,19 @@ # $FreeBSD$ PORTNAME= bacula -PORTREVISION= 3 CATEGORIES= net-mgmt PKGNAMEPREFIX= nagios-check_ PKGNAMESUFFIX= # -MAINTAINER= freebsd@troback.com +MAINTAINER= dvl@FreeBSD.org COMMENT= Nagios plugin for Bacula -LIB_DEPENDS+= libbac.so:sysutils/bacula-client +LIB_DEPENDS+= libbac.so:sysutils/bacula9-client PLIST= ${.CURDIR}/pkg-plist PLIST_FILES= libexec/nagios/check_bacula WITH_NAGIOS_CHECK_ONLY= yes -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server CONFIGURE_ARGS= --enable-client-only \ --disable-build-dird \ Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Wed Aug 30 18:06:15 2017 (r448994) +++ head/sysutils/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -79,6 +79,11 @@ SUBDIR += bacula5-client-static SUBDIR += bacula5-docs SUBDIR += bacula5-server + SUBDIR += bacula9-bat + SUBDIR += bacula9-client + SUBDIR += bacula9-client-static + SUBDIR += bacula9-docs + SUBDIR += bacula9-server SUBDIR += baloo SUBDIR += baloo-widgets SUBDIR += bamf Modified: head/sysutils/bacula9-client-static/Makefile ============================================================================== --- head/sysutils/bacula-client-static/Makefile Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-client-static/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -1,18 +1,19 @@ # $FreeBSD$ PORTNAME= bacula -PKGNAMESUFFIX= -client-static +PKGNAMESUFFIX= 9-client-static COMMENT= Network backup solution (static client) +WITH_CLIENT_ONLY=yes PLIST= ${.CURDIR}/pkg-plist -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server PLIST_FILES= sbin/bacula-fd-static \ sbin/bconsole-static -OPTIONS_DEFINE= NLS -OPTIONS_DEFAULT=# +OPTIONS_DEFINE= NLS OPENSSL +OPTIONS_DEFAULT=OPENSSL CONFIGURE_ARGS+= --enable-client-only \ --enable-static-fd \ @@ -22,5 +23,7 @@ CONFIGURE_ARGS+= --enable-client-only \ --disable-build-stored BROKEN_aarch64= Fails to link: missing sbrk + +BROKEN_SSL= libressl .include "${MASTERDIR}/Makefile" Modified: head/sysutils/bacula9-client/Makefile ============================================================================== --- head/sysutils/bacula-client/Makefile Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-client/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bacula -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 9-client COMMENT= Network backup solution (client) @@ -9,7 +9,7 @@ WITH_CLIENT_ONLY=yes USE_RC_SUBR= bacula-fd PLIST= ${PKGDIR}/pkg-plist.client -MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server +MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server OPTIONS_DEFINE= NLS PYTHON IPV6 Modified: head/sysutils/bacula9-docs/Makefile ============================================================================== --- head/sysutils/bacula-docs/Makefile Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-docs/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -1,10 +1,14 @@ # Created by: Dan Langille <dan@langille.org> # $FreeBSD$ -PORTNAME= bacula-docs -PORTVERSION= 7.4.4 +PORTNAME= bacula +PORTVERSION= 9.0.3 CATEGORIES= sysutils MASTER_SITES= SF +PKGNAMESUFFIX= 9-docs +DISTNAME= ${PORTNAME}-docs-${PORTVERSION} + +CONFLICTS= bacula-* bacula5-* MAINTAINER= dvl@FreeBSD.org COMMENT= Bacula document set Modified: head/sysutils/bacula9-docs/distinfo ============================================================================== --- head/sysutils/bacula-docs/distinfo Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-docs/distinfo Wed Aug 30 18:11:06 2017 (r448995) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474884209 -SHA256 (bacula-docs-7.4.4.tar.bz2) = d932af80be91b42014c0405242ce20c8db29361d752646ddae30052c9cc50751 -SIZE (bacula-docs-7.4.4.tar.bz2) = 44510911 +TIMESTAMP = 1503938340 +SHA256 (bacula-docs-9.0.3.tar.bz2) = 96ed36991d486f4fd5cb0734d3fa7c12f7dbcac936d0e0a87d6c25f7fa3066cb +SIZE (bacula-docs-9.0.3.tar.bz2) = 50216652 Modified: head/sysutils/bacula9-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/Makefile Wed Aug 30 18:11:06 2017 (r448995) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= bacula -PORTVERSION= 7.4.7 -PORTREVISION= 2 +PORTVERSION= 9.0.3 +PORTREVISION= 0 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= 9-server MAINTAINER= dvl@FreeBSD.org COMMENT?= Network backup solution (server) @@ -16,7 +16,7 @@ USES+= libtool readline shebangfix ssl SHEBANG_FILES= scripts/dvd-handler.in src/cats/make_catalog_backup.pl.in python_OLD_CMD= @PYTHON@ -CONFLICTS?= bacula5-server-* +CONFLICTS?= bacula5-server-* bacula-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 @@ -34,7 +34,7 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= MTX PYTHON NLS IPV6 MTX_DESC= Install mtx for control of autochanger devices -.if ${PKGNAMESUFFIX} == "-server" +.if ${PKGNAMESUFFIX} == "9-server" OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= SQLITE3 MYSQL PGSQL OPTIONS_DEFAULT+= PGSQL @@ -42,13 +42,13 @@ OPTIONS_DEFAULT+= PGSQL OPTIONS_SUB= yes -.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file +.if ${PKGNAMESUFFIX} == "9-client" || ${PKGNAMESUFFIX} == "9-server" #Till end of the file PYTHON_USES= python PYTHON_CONFIGURE_ON= --with-python=yes .if !defined(WITH_CLIENT_ONLY) -LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula-client +LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula9-client USE_RC_SUBR?= bacula-dir bacula-sd .endif @@ -212,6 +212,6 @@ post-install: .endif .else .include "${MASTERDIR}/Makefile.common" -.endif # -client and -server are defined +.endif # 9-client and 9-server are defined .include <bsd.port.post.mk> Modified: head/sysutils/bacula9-server/Makefile.common ============================================================================== --- head/sysutils/bacula-server/Makefile.common Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/Makefile.common Wed Aug 30 18:11:06 2017 (r448995) @@ -18,7 +18,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif -.if ${PKGNAMESUFFIX} == "-client-static" +.if ${PKGNAMESUFFIX} == "9-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/bacula9-server/distinfo ============================================================================== --- head/sysutils/bacula-server/distinfo Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/distinfo Wed Aug 30 18:11:06 2017 (r448995) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490014191 -SHA256 (bacula-7.4.7.tar.gz) = 6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40 -SIZE (bacula-7.4.7.tar.gz) = 3312991 +TIMESTAMP = 1503524082 +SHA256 (bacula-9.0.3.tar.gz) = ae8501960d43399bea13113274993637b6395d73d7d2c47f9b7a07cb4aa72251 +SIZE (bacula-9.0.3.tar.gz) = 3951688 Modified: head/sysutils/bacula9-server/files/patch-src_filed_Makefile.in ============================================================================== --- head/sysutils/bacula-server/files/patch-src_filed_Makefile.in Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/files/patch-src_filed_Makefile.in Wed Aug 30 18:11:06 2017 (r448995) @@ -1,21 +1,6 @@ --- src/filed/Makefile.in.orig 2015-08-13 13:52:24 UTC +++ src/filed/Makefile.in -@@ -65,12 +65,12 @@ acl.o: acl.c - - bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) - @echo "Linking $@ ..." -- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ -+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(SVROBJS) \ - $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - - static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ -+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) -static -L../lib -L../findlib $(LDFLAGS) -o $@ $(SVROBJS) \ - $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ - $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) - strip $@ -@@ -127,7 +127,7 @@ uninstall: +@@ -137,7 +127,7 @@ uninstall: depend: @$(MV) Makefile Makefile.bak @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile Modified: head/sysutils/bacula9-server/files/pkg-message.server.in ============================================================================== --- head/sysutils/bacula-server/files/pkg-message.server.in Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/files/pkg-message.server.in Wed Aug 30 18:11:06 2017 (r448995) @@ -2,6 +2,9 @@ bacula server was installed +A database upgrade is required if upgrading from Bacula < 9.0. +See %%DATADIR%%/update_bacula_tables + An auto-changer manipulation script based on FreeBSDs chio command is included and installed at Modified: head/sysutils/bacula9-server/pkg-plist ============================================================================== --- head/sysutils/bacula-server/pkg-plist Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/pkg-plist Wed Aug 30 18:11:06 2017 (r448995) @@ -9,12 +9,16 @@ lib/libbaccats.so %%MYSQL%%lib/libbaccats-mysql.so %%PGSQL%%lib/libbaccats-postgresql.so %%SQLITE3%%lib/libbaccats-sqlite3.so +lib/libbacsd-%%LIB_VERSION%%.so +lib/libbacsd.so lib/libbacsql-%%LIB_VERSION%%.so lib/libbacsql.so sbin/bacula sbin/bacula-dir sbin/bacula-sd sbin/bcopy +sbin/bdirjson +sbin/bsdjson sbin/bextract sbin/bls sbin/bregex @@ -31,12 +35,15 @@ sbin/dbcheck %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd %%DATADIR%%/bacula-ctl-sd +%%DATADIR%%/bacula-tray-monitor.desktop +%%DATADIR%%/baculabackupreport %%DATADIR%%/bacula_config %%DATADIR%%/bconsole %%DATADIR%%/btraceback.dbx %%DATADIR%%/btraceback.gdb %%DATADIR%%/btraceback.mdb %%DATADIR%%/create_bacula_database +%%DATADIR%%/tapealert %%MYSQL%%%%DATADIR%%/create_mysql_database %%PGSQL%%%%DATADIR%%/create_postgresql_database %%SQLITE3%%%%DATADIR%%/create_sqlite3_database Modified: head/sysutils/bacula9-server/pkg-plist.client ============================================================================== --- head/sysutils/bacula-server/pkg-plist.client Mon Aug 28 15:36:03 2017 (r448872) +++ head/sysutils/bacula9-server/pkg-plist.client Wed Aug 30 18:11:06 2017 (r448995) @@ -11,6 +11,8 @@ man/man8/bacula.8.gz man/man8/bacula-fd.8.gz man/man8/bconsole.8.gz sbin/bacula-fd +sbin/bbconsjson +sbin/bfdjson @(,bacula,750) sbin/bconsole @dir(bacula,bacula,) %%BACULA_DIR%% @dir share/bacula
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708301811.v7UIB65L057522>