From owner-svn-ports-head@FreeBSD.ORG Thu Aug 7 19:24:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3AEE41E4 for ; Thu, 7 Aug 2014 19:24:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2775F2A35 for ; Thu, 7 Aug 2014 19:24:14 +0000 (UTC) Received: from wg (uid 1317) (envelope-from wg@FreeBSD.org) id 2da7 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Thu, 07 Aug 2014 19:24:11 +0000 From: William Grzybowski Date: Thu, 7 Aug 2014 19:24:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364313 - in head/sysutils/bacula-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e3d25b.2da7.4e03ad4e@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Aug 2014 19:24:14 -0000 Author: wg Date: Thu Aug 7 19:24:11 2014 New Revision: 364313 URL: http://svnweb.freebsd.org/changeset/ports/364313 QAT: https://qat.redports.org/buildarchive/r364313/ Log: sysutils/bacula-server: update to 7.0.4 PR: 191311 Submitted by: maintainer Added: head/sysutils/bacula-server/files/pkg-deinstall.server.in (contents, props changed) head/sysutils/bacula-server/files/pkg-install.server.in (contents, props changed) Deleted: head/sysutils/bacula-server/files/patch-src__cats__Makefile.in head/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in head/sysutils/bacula-server/files/patch-src__console__Makefile.in head/sysutils/bacula-server/files/patch-src__dird__Makefile.in head/sysutils/bacula-server/files/patch-src__filed__Makefile.in head/sysutils/bacula-server/files/patch-src__findlib__Makefile.in head/sysutils/bacula-server/files/patch-src__lib__Makefile.in head/sysutils/bacula-server/files/patch-src__stored__Makefile.in head/sysutils/bacula-server/files/patch-src__tools__Makefile.in Modified: head/sysutils/bacula-server/Makefile head/sysutils/bacula-server/Makefile.common head/sysutils/bacula-server/distinfo head/sysutils/bacula-server/files/pkg-deinstall.client.in head/sysutils/bacula-server/files/pkg-install.client.in head/sysutils/bacula-server/files/pkg-message.client.in head/sysutils/bacula-server/files/pkg-message.server.in head/sysutils/bacula-server/pkg-plist head/sysutils/bacula-server/pkg-plist.client Modified: head/sysutils/bacula-server/Makefile ============================================================================== --- head/sysutils/bacula-server/Makefile Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/Makefile Thu Aug 7 19:24:11 2014 (r364313) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= bacula -DISTVERSION= 5.2.12 -PORTREVISION?= 6 +DISTVERSION= 7.0.4 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -12,29 +12,27 @@ PKGNAMESUFFIX?= -server MAINTAINER= dan@langille.org COMMENT?= Network backup solution (server) -USES+= libtool:keepla +USES+= libtool:oldver + +CONFLICTS?= bacula5-server-* LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 USERS= bacula GROUPS= ${USERS} -PLIST_SUB+= MAJOR=${PORTVERSION:R:R} +PLIST_SUB+= LIB_VERSION=${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +#LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL OPTIONS_DEFAULT?= NLS OPENSSL PGSQL MTX_DESC= Install mtx for control of autochanger devices -OPENSSL_USE= OPENSSL=yes -OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} -OPENSSL_CONFIGURE_OFF= --with-openssl="no" - .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file PYTHON_USE= PYTHON=yes @@ -66,6 +64,7 @@ CONFIGURE_ARGS+=--with-tcp-wrappers=/usr --with-db-name=bacula \ --with-sbin-perm=755 \ --with-db-user=bacula \ + --with-logdir=/var/log \ --with-baseport=9101 .if defined(WITH_CLIENT_ONLY) @@ -111,11 +110,11 @@ CONFFILES= sd dir # Server default database MYSQL_CONFIGURE_ON= --with-mysql=yes -MYSQL_USE= MYSQL=yes +MYSQL_USE= MYSQL=yes SQLITE3_CONFIGURE_ON= --with-sqlite3=yes SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 PGSQL_CONFIGURE_ON= --with-postgresql=yes -PGSQL_USES= pgsql +PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx @@ -131,43 +130,41 @@ DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} - .endif .if defined(WITH_CLIENT_ONLY) -MP8+= bacula-fd.8 bconsole.8 +MP8+= bacula.8 bacula-fd.8 bconsole.8 .else -MP8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ +MP8+= bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8 -MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 +MP1+= bsmtp.1 bacula-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: -# This port does not install docs. See bacula-docs for that + # This port does not install docs. See bacula-docs for that ${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in -# Change $(ECHO) to echo in some Makefile.in files + # Change $(ECHO) to echo in some Makefile.in files @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \ ${WRKSRC}/src/console/Makefile.in -# Default bconsole.conf is in ${ETCDIR} + # Default bconsole.conf is in ${ETCDIR} @${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in .if defined(WITH_CLIENT_ONLY) -# In client port only install startup script out of script dir (see below post-install) -# Dont mkdir ${PREFIX}/share/bacula cause it's empty + # In client port only install startup script out of script dir (see below post-install) + # Dont mkdir ${PREFIX}/share/bacula cause it's empty @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in .else -# In server port don't install filed + # In server port don't install filed @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \ -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \ ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in - @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \ - ${WRKSRC}/src/tools/bpluginfo.c .endif + pre-install: ${MKDIR} ${STAGEDIR}${BACULA_DIR} @@ -177,7 +174,7 @@ post-install: ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample + ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples ${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp .endif for na in ${CONFFILES}; do \ @@ -187,4 +184,5 @@ post-install: .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined + .include Modified: head/sysutils/bacula-server/Makefile.common ============================================================================== --- head/sysutils/bacula-server/Makefile.common Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/Makefile.common Thu Aug 7 19:24:11 2014 (r364313) @@ -1,8 +1,3 @@ -post-patch: -# Change $(ECHO) to echo in some Makefile.in files - @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \ - ${WRKSRC}/src/console/Makefile.in - post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula Modified: head/sysutils/bacula-server/distinfo ============================================================================== --- head/sysutils/bacula-server/distinfo Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/distinfo Thu Aug 7 19:24:11 2014 (r364313) @@ -1,2 +1,2 @@ -SHA256 (bacula-5.2.12.tar.gz) = 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887 -SIZE (bacula-5.2.12.tar.gz) = 4147847 +SHA256 (bacula-7.0.4.tar.gz) = ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e +SIZE (bacula-7.0.4.tar.gz) = 3596569 Modified: head/sysutils/bacula-server/files/pkg-deinstall.client.in ============================================================================== --- head/sysutils/bacula-server/files/pkg-deinstall.client.in Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/files/pkg-deinstall.client.in Thu Aug 7 19:24:11 2014 (r364313) @@ -14,7 +14,7 @@ TMPFILE=/tmp/services-$RANDOM-$$ case "$2" in "DEINSTALL") # Delete entries in /etc/services - sed -e '/# Bacula port start/,/# Bacule port end/{' \ + sed -e '/# Bacula port start/,/# Bacula port end/{' \ -e 'd' \ -e '}' /etc/services > $TMPFILE mv -f $TMPFILE /etc/services Added: head/sysutils/bacula-server/files/pkg-deinstall.server.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bacula-server/files/pkg-deinstall.server.in Thu Aug 7 19:24:11 2014 (r364313) @@ -0,0 +1,34 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/usr/sbin + +# Note how to delete UID/GID +USER=%%BACULA_USER%% +GROUP=%%BACULA_GROUP%% +UID=%%BACULA_UID%% +GID=%%BACULA_UID%% +BACULA_DIR=%%BACULA_DIR%% + +TMPFILE=/tmp/services-$RANDOM-$$ + +case "$2" in +"DEINSTALL") + # Delete entries in /etc/services + sed -e '/# Bacula port start/,/# Bacula port end/{' \ + -e 'd' \ + -e '}' /etc/services > $TMPFILE + mv -f $TMPFILE /etc/services + + if [ -d ${BACULA_DIR} ]; then + rmdir ${BACULA_DIR}; + fi + if [ -d ${BACULA_DIR} ]; then + echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port." + fi + + if pw usershow "${USER}" 2>/dev/null 1>&2; then + echo "To delete Bacula user permanently, use 'pw userdel ${USER}'" + echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'" + fi + ;; +esac Modified: head/sysutils/bacula-server/files/pkg-install.client.in ============================================================================== --- head/sysutils/bacula-server/files/pkg-install.client.in Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/files/pkg-install.client.in Thu Aug 7 19:24:11 2014 (r364313) @@ -9,5 +9,5 @@ if [ "$?" != "0" ]; then bacula-dir 9101/tcp #Bacula director daemon bacula-fd 9102/tcp #Bacula file daemon bacula-sd 9103/tcp #Bacula storage daemon -# Bacule port end" >> /etc/services +# Bacula port end" >> /etc/services fi Added: head/sysutils/bacula-server/files/pkg-install.server.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bacula-server/files/pkg-install.server.in Thu Aug 7 19:24:11 2014 (r364313) @@ -0,0 +1,13 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/usr/sbin + +# Always add lines in /etc/services +grep -q "bacula-dir" /etc/services +if [ "$?" != "0" ]; then + echo "# Bacula port start +bacula-dir 9101/tcp #Bacula director daemon +bacula-fd 9102/tcp #Bacula file daemon +bacula-sd 9103/tcp #Bacula storage daemon +# Bacula port end" >> /etc/services +fi Modified: head/sysutils/bacula-server/files/pkg-message.client.in ============================================================================== --- head/sysutils/bacula-server/files/pkg-message.client.in Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/files/pkg-message.client.in Thu Aug 7 19:24:11 2014 (r364313) @@ -2,14 +2,7 @@ NOTE: Sample files are installed in %%PREFIX%%/etc/bacula: -bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample - Please read this file: - - %%DOCSDIR%%/ReleaseNotes - - as installed by docs port for the upgrade procedure. - -Read the ReleaseNotes for further information. + bconsole.conf.sample, bacula-fd.conf.sample ################################################################################ Modified: head/sysutils/bacula-server/files/pkg-message.server.in ============================================================================== --- head/sysutils/bacula-server/files/pkg-message.server.in Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/files/pkg-message.server.in Thu Aug 7 19:24:11 2014 (r364313) @@ -2,13 +2,6 @@ bacula server was installed -1) Important information about new version of bacula can be found in the - ReleaseNotes. - - %%DOCSDIR%%/ReleaseNotes - -NOTE: - An auto-changer manipulation script based on FreeBSDs chio command is included and installed at @@ -55,12 +48,6 @@ Look at %%PREFIX%%/share/bacula/update_b database update procedure. Details can be found in the ReleaseNotes - Please read this file: - - %%DOCSDIR%%/ReleaseNotes - - as installed by docs port for the upgrade procedure. - If you are using sqlite you need to run the make_sqlite_tables script as the bacula user. Do this using 'sudo su -m bacula'. Modified: head/sysutils/bacula-server/pkg-plist ============================================================================== --- head/sysutils/bacula-server/pkg-plist Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/pkg-plist Thu Aug 7 19:24:11 2014 (r364313) @@ -1,51 +1,36 @@ -@sample %%ETCDIR%%/bacula-barcodes.sample +@sample %%ETCDIR%%/bacula-barcodes.samples @group bacula @sample %%ETCDIR%%/bacula-dir.conf.sample @group wheel @sample %%ETCDIR%%/bacula-sd.conf.sample +lib/libbaccats-%%LIB_VERSION%%.so lib/libbaccats.la lib/libbaccats.so -lib/libbaccats.so.5 -lib/libbaccats.so.5.0.2 +lib/libbaccats-%%DBTYPE%%-%%LIB_VERSION%%.so lib/libbaccats-%%DBTYPE%%.la lib/libbaccats-%%DBTYPE%%.so -lib/libbaccats-%%DBTYPE%%.so.5 -lib/libbaccats-%%DBTYPE%%.so.5.0.2 +lib/libbacsql-%%LIB_VERSION%%.so lib/libbacsql.la lib/libbacsql.so -lib/libbacsql.so.5 -lib/libbacsql.so.5.0.2 -man/man1/bacula-bwxconsole.1.gz -man/man1/bacula-tray-monitor.1.gz -man/man1/bsmtp.1.gz -man/man8/bacula-dir.8.gz -man/man8/bacula-sd.8.gz -man/man8/bacula.8.gz -man/man8/bcopy.8.gz -man/man8/bextract.8.gz -man/man8/bls.8.gz -man/man8/bregex.8.gz -man/man8/bscan.8.gz -man/man8/btape.8.gz -man/man8/btraceback.8.gz -man/man8/bwild.8.gz -man/man8/dbcheck.8.gz sbin/bacula sbin/bacula-dir sbin/bacula-sd sbin/bcopy sbin/bextract sbin/bls +sbin/bpluginfo sbin/bregex sbin/bscan +@mode 755 sbin/bsmtp +@mode sbin/btape sbin/btraceback sbin/bwild sbin/chio-bacula -@group bacula sbin/dbcheck @owner bacula +@group bacula %%DATADIR%%/bacula %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd @@ -75,5 +60,19 @@ sbin/dbcheck %%DATADIR%%/query.sql %%DATADIR%%/update_bacula_tables %%DATADIR%%/update_%%DBTYPE%%_tables -@owner root -@group wheel +@owner +@group +man/man1/bsmtp.1.gz +man/man1/bacula-tray-monitor.1.gz +man/man8/bacula-dir.8.gz +man/man8/bacula-sd.8.gz +man/man8/bcopy.8.gz +man/man8/bextract.8.gz +man/man8/bls.8.gz +man/man8/bregex.8.gz +man/man8/bscan.8.gz +man/man8/btape.8.gz +man/man8/btraceback.8.gz +man/man8/bwild.8.gz +man/man8/dbcheck.8.gz +@dirrmtry %%ETCDIR%% Modified: head/sysutils/bacula-server/pkg-plist.client ============================================================================== --- head/sysutils/bacula-server/pkg-plist.client Thu Aug 7 19:21:45 2014 (r364312) +++ head/sysutils/bacula-server/pkg-plist.client Thu Aug 7 19:24:11 2014 (r364313) @@ -2,23 +2,17 @@ @group bacula @sample %%ETCDIR%%/bconsole.conf.sample @group wheel +lib/libbac-%%LIB_VERSION%%.so lib/libbac.la lib/libbac.so -lib/libbac.so.5 -lib/libbac.so.5.0.2 +lib/libbaccfg-%%LIB_VERSION%%.so lib/libbaccfg.la lib/libbaccfg.so -lib/libbaccfg.so.5 -lib/libbaccfg.so.5.0.2 +lib/libbacfind-%%LIB_VERSION%%.so lib/libbacfind.la lib/libbacfind.so -lib/libbacfind.so.5 -lib/libbacfind.so.5.0.2 -lib/libbacpy.la -lib/libbacpy.so -lib/libbacpy.so.5 -lib/libbacpy.so.5.0.2 lib/bpipe-fd.so +man/man8/bacula.8.gz man/man8/bacula-fd.8.gz man/man8/bconsole.8.gz sbin/bacula-fd