From nobody@FreeBSD.org Sun Jun 14 17:54:19 2009 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7009D10656C1 for ; Sun, 14 Jun 2009 17:54:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 5CD268FC16 for ; Sun, 14 Jun 2009 17:54:19 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n5EHsIr8096629 for ; Sun, 14 Jun 2009 17:54:18 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n5EHsI5h096628; Sun, 14 Jun 2009 17:54:18 GMT (envelope-from nobody) Message-Id: <200906141754.n5EHsI5h096628@www.freebsd.org> Date: Sun, 14 Jun 2009 17:54:18 GMT From: Vaclav Haisman To: freebsd-gnats-submit@FreeBSD.org Subject: Resurect Bacula 2.4.4 port. X-Send-Pr-Version: www-3.1 X-GNATS-Notify: >Number: 135580 >Category: ports >Synopsis: new port sysutils/bacula2: resurrect Bacula 2.4.4. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: wxs >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jun 14 18:00:01 UTC 2009 >Closed-Date: Mon Jun 15 18:17:32 UTC 2009 >Last-Modified: Mon Jun 15 18:20:07 UTC 2009 >Originator: Vaclav Haisman >Release: 7.1 >Organization: SU SH >Environment: FreeBSD shell.sh.cvut.cz 7.1-STABLE FreeBSD 7.1-STABLE #0: Sat Jan 10 11:26:26 CET 2009 root@shelldell.sh.cvut.cz:/usr/obj/usr/src/sys/SHELLDELL amd64 >Description: This is an attempt to resurrect the Bacula version 2.4.4 port which has been killed by version 3.x. Version 3.x does not talk to 2.x servers. In case the attachment does not make it through: >How-To-Repeat: >Fix: Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # sysutils/bacula2-client # sysutils/bacula2-client/Makefile # sysutils/bacula2-server # sysutils/bacula2-server/files # sysutils/bacula2-server/files/bacula-barcodes # sysutils/bacula2-server/files/bacula-dir.in # sysutils/bacula2-server/files/bacula-fd.in # sysutils/bacula2-server/files/bacula-sd.conf.in # sysutils/bacula2-server/files/bacula-sd.in # sysutils/bacula2-server/files/chio-bacula # sysutils/bacula2-server/files/patch-scripts-Makefile.in # sysutils/bacula2-server/files/patch-src-console-Makefile.in # sysutils/bacula2-server/files/patch-src-qt-console-build-depkgs-qt-console # sysutils/bacula2-server/files/pkg-message.client.in # sysutils/bacula2-server/files/pkg-message.server.in # sysutils/bacula2-server/files/patch-src-stored-acquire.c # sysutils/bacula2-server/files/patch-src-stored-reserve.c # sysutils/bacula2-server/Makefile # sysutils/bacula2-server/pkg-deinstall.client # sysutils/bacula2-server/pkg-deinstall.server # sysutils/bacula2-server/pkg-descr # sysutils/bacula2-server/pkg-install.client # sysutils/bacula2-server/pkg-install.server # sysutils/bacula2-server/pkg-plist # sysutils/bacula2-server/pkg-plist.client # sysutils/bacula2-server/distinfo # echo c - sysutils/bacula2-client mkdir -p sysutils/bacula2-client > /dev/null 2>&1 echo x - sysutils/bacula2-client/Makefile sed 's/^X//' >sysutils/bacula2-client/Makefile << '5d52f977c8a8a56baa01245ed758c66f' X X# $FreeBSD: ports/sysutils/bacula-client/Makefile,v 1.3 2006/04/07 17:29:53 garga Exp $ X XPORTNAME= bacula2 XPKGNAMESUFFIX= -client X XMASTERDIR= ${.CURDIR}/../bacula2-server XCOMMENT= The network backup solution (client) XPLIST= ${PKGDIR}/pkg-plist.client X XWITH_CLIENT_ONLY= yes XUSE_RC_SUBR= bacula-fd X X.include "${MASTERDIR}/Makefile" 5d52f977c8a8a56baa01245ed758c66f echo c - sysutils/bacula2-server mkdir -p sysutils/bacula2-server > /dev/null 2>&1 echo c - sysutils/bacula2-server/files mkdir -p sysutils/bacula2-server/files > /dev/null 2>&1 echo x - sysutils/bacula2-server/files/bacula-barcodes sed 's/^X//' >sysutils/bacula2-server/files/bacula-barcodes << 'b26460c9302bd63fe679901800274f39' X# X# Bacula barcode simulation file X# used by ${PREFIX}/sbin/chio-bacula (FreeBSD) X# X# The volumenames are returned by the "changer list" command X# labeling in the console is done by "label barcodes" X# (then all volumes belog to the default pool). X# All Lines with an "#" at the bedinning are ignored X# X# !!!! If you export an tape and reinsert another one, X# !!!! don't forget to change the volume name in this file! X# X1:Volume1-100 X2:Volume1-101 X3:Volume1-102 X4:Volume1-103 X5:Volume1-104 X6:Volume1-105 X7:Volume1-106 X8:Volume1-107 X9:Volume1-108 X10:Volume1-109 X11:Volume1-110 X12:Volume1-111 X# X# Further volumes exported from the changer X# X# 36GB AIT2 tapes X#Volume1-100 X#Volume1-101 X#Volume1-102 X#Volume1-103 X#Volume1-104 X#Volume1-105 X#Volume1-106 X#Volume1-107 X#Volume1-108 X#Volume1-109 X#Volume1-110 X#Volume1-111 X#Volume1-112 X#Volume1-113 X#Volume1-114 X#Volume1-115 X# X# 50GB AIT2 tapes X#Volume2-200 X#Volume2-201 X#Volume2-202 X#Volume2-203 X#Volume2-204 b26460c9302bd63fe679901800274f39 echo x - sysutils/bacula2-server/files/bacula-dir.in sed 's/^X//' >sysutils/bacula2-server/files/bacula-dir.in << '8450826aed9d201596b914b3409c49bc' X#!/bin/sh X# X# $FreeBSD: ports/sysutils/bacula-server/files/bacula-dir.in,v 1.3 2009/03/08 23:05:43 beech Exp $ X# X# PROVIDE: bacula_dir X# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% X# KEYWORD: shutdown X# X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf X# to enable this service: X# X# bacula_dir_enable (bool): Set to NO by default. X# Set it to YES to enable bacula_dir. X# bacula_dir_flags (params): Set params used to start bacula_dir. X# X X. %%RC_SUBR%% X Xname="bacula_dir" Xrcvar=${name}_enable Xcommand=%%PREFIX%%/sbin/bacula-dir X Xload_rc_config $name X X: ${bacula_dir_enable="NO"} X: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-dir.conf"} X: ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"} X Xpidfile="${bacula_dir_pidfile}" X Xrun_rc_command "$1" 8450826aed9d201596b914b3409c49bc echo x - sysutils/bacula2-server/files/bacula-fd.in sed 's/^X//' >sysutils/bacula2-server/files/bacula-fd.in << '9bb31e3d246ed412676efcd2089f996e' X#!/bin/sh X# X# $FreeBSD: ports/sysutils/bacula-server/files/bacula-fd.in,v 1.5 2009/03/08 23:05:43 beech Exp $ X# X# PROVIDE: bacula_fd X# REQUIRE: DAEMON X# KEYWORD: shutdown X# X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf X# to enable this service: X# X# bacula_fd_enable (bool): Set to NO by default. X# Set it to YES to enable bacula_fd. X# bacula_fd_flags (params): Set params used to start bacula_fd. X# X X. %%RC_SUBR%% X Xname="bacula_fd" Xrcvar=${name}_enable Xcommand=%%PREFIX%%/sbin/bacula-fd X Xload_rc_config $name X X: ${bacula_fd_enable="NO"} X: ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula-fd.conf"} X: ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"} X Xpidfile="${bacula_fd_pidfile}" X Xrun_rc_command "$1" 9bb31e3d246ed412676efcd2089f996e echo x - sysutils/bacula2-server/files/bacula-sd.conf.in sed 's/^X//' >sysutils/bacula2-server/files/bacula-sd.conf.in << '79313f682037901db4cfafacac260816' X--- src/stored/bacula-sd.conf.in.org Tue Feb 13 18:56:09 2007 X+++ src/stored/bacula-sd.conf.in Tue Feb 13 18:56:16 2007 X@@ -152,6 +152,7 @@ X #Device { X # Name = "DVD-Writer" X # Media Type = DVD X+# Device Type = DVD X # Archive Device = /dev/hdc X # LabelMedia = yes; # lets Bacula label unlabeled media X # Random Access = Yes; X@@ -162,7 +163,9 @@ X # RequiresMount = yes; X # MountPoint = /mnt/cdrom; X # MountCommand = "/bin/mount -t iso9660 -o ro %a %m"; X+# MountCommand = "/sbin/mount -t cd9660 -o ro %a %m"; # FreeBSD X # UnmountCommand = "/bin/umount %m"; X+# UnmountCommand = "/sbin/umount %m"; # FreeBSD X # SpoolDirectory = /tmp/backup; X # WritePartCommand = "/etc/bacula/dvd-handler %a write %e %v" X # FreeSpaceCommand = "/etc/bacula/dvd-handler %a free" 79313f682037901db4cfafacac260816 echo x - sysutils/bacula2-server/files/bacula-sd.in sed 's/^X//' >sysutils/bacula2-server/files/bacula-sd.in << 'e0a7115a4edc1f86a12fb5fa9c9ae8aa' X#!/bin/sh X# X# $FreeBSD: ports/sysutils/bacula-server/files/bacula-sd.in,v 1.4 2009/03/08 23:05:43 beech Exp $ X# X# PROVIDE: bacula_sd X# REQUIRE: DAEMON X# KEYWORD: shutdown X# X# Add the following lines to /etc/rc.conf.local or /etc/rc.conf X# to enable this service: X# X# bacula_sd_enable (bool): Set to NO by default. X# Set it to YES to enable bacula_sd. X# bacula_sd_flags (params): Set params used to start bacula_sd. X# X X. %%RC_SUBR%% X Xname="bacula_sd" Xrcvar=`set_rcvar` Xcommand=%%PREFIX%%/sbin/bacula-sd X Xload_rc_config $name X X: ${bacula_sd_enable="NO"} X: ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-sd.conf"} X: ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"} X Xpidfile="${bacula_sd_pidfile}" X Xrun_rc_command "$1" e0a7115a4edc1f86a12fb5fa9c9ae8aa echo x - sysutils/bacula2-server/files/chio-bacula sed 's/^X//' >sysutils/bacula2-server/files/chio-bacula << 'a7189b1bcf022132bfde5ace2fa66492' X#!/bin/sh X# X# Bacula interface to FreeBSD chio autoloader command with X# multiple drive support X# (By Lars Köller, lars+bacula@koellers.net, 2004) X# X# If you set in your Device resource X# X# Changer Command = "path-to-this-script/chio-bacula" %c %o %S %a X# you will have the following input to this script: X# X# chio-bacula "changer-device" "command" "slot" "archive-device" "drive-index" X# $1 $2 $3 $4 $5 X# for example: X# X# chio-bacula /dev/sg0 load 1 /dev/nst0 0 (on a FreeBSD system) X# X# If you need to to an offline, refer to the drive as $4 X# e.g. mt -f $f offline X# X# Many changers need an offline after the unload. Also many X# changers need a sleep 60 after the mtx load. X# X# N.B. If you change the script, take care to return either X# the mtx exit code or a 0. If the script exits with a non-zero X# exit code, Bacula will assume the request failed. X# Xme=$(basename $0) X X# Debug output, take care this file is writeable for user bacula! X#LOG=/var/db/bacula/chio-bacula.log X#exec 2>>$LOG X#echo "------------------------- $(date) Start $(basename $0) -------------------------" >> $LOG X#set -x X X# Debug Xlogger -p user.err "$me $@" X X# This simulates a barcode reader in the changer. X# The labes of the virtual barcode reader are located in the BARCODE_FILE XSIMULATE_BARCODE=true XBARCODE_FILE=/usr/local/etc/bacula-barcodes XMTX=/bin/chio X# Set default values (see case statement below for X# free mapping of drive index and tape device X# We have a double drive Qualstar where drive 1 is the default bacula drive X#TAPE=/dev/bacula-tape XTAPE=/dev/nrsa0 XDRIVE=0 X# Time to wait for (un)loading XSLEEP=20 X Xusage() X{ X echo "" X echo "The $me script for bacula" X echo "--------------------------------------" X echo "" X echo "usage: $me [slot] [devicename of tapedrive] [drive index]" X echo "" X echo "Valid commands:" X echo "" X echo "unload Unloads a tape into the slot" X echo " from where it was loaded." X echo "load Loads a tape from the slot " X echo " (slot-base is calculated to 1 as first slot)" X echo "list Lists full storage slots" X echo "loaded Gives slot from where the tape was loaded." X echo " 0 means the tape drive is empty." X echo "slots Gives Number of aviable slots." X echo "" X echo "Example:" X echo " $me /dev/changer load 1 loads a tape from slot 1" X echo "" X exit 2 X} X X# The changer device Xif [ -z "$1" ] ; then X usage; Xelse X CHANGER=$1 Xfi X# The command Xif [ -z "$2" ] ; then X usage; Xelse X COMMAND=$2 Xfi X# The slot number Xif [ ! -z "$3" ]; then X SLOT=$3 X # btape fill says "... slot 1 drive 0" :-( X if [ "$SLOT" = "slot" ]; then X shift X SLOT=$3 X fi Xfi X# Set tape device Xif [ ! -z "$4" ]; then X TAPE=$4 Xfi X X# Here you can map bacula drive number to any tape device X# DRIVE is the chio drive number used below by chio! Xcase $5 in X 0) X # First Drive in Changer is Bacula drive X DRIVE=0 X #TAPE=/dev/bacula-tape X TAPE=/dev/nrsa0 X ;; X 1) X DRIVE=1 X #TAPE=/dev/bacula-tape2 X TAPE=/dev/nrsa1 X ;; Xesac X X# X# Main X# Xcase ${COMMAND} in X unload) X # enable the following line if you need to eject the cartridge X mt -f ${TAPE} off X sleep 2 X # if we have a slot, try it X if [ ! -z "$SLOT" ]; then X ${MTX} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT}-1)) X exit $? X fi X # Try other way (works if source element information is valid for drive) X ${MTX} -f ${CHANGER} return drive ${DRIVE} X # If the changer is power cycled with a tape loaded in a drive X # we can compute the slot in case of a complete filled magazine, with X # one slot free. X if [ "$?" != "0" ]; then X free_slot=`${MTX} -f ${CHANGER} stat | grep "^slot " | grep -v "FULL" | awk '{print $2}'` X free_slot=${free_slot%:} X ${MTX} -f ${CHANGER} move drive ${DRIVE} slot $free_slot X fi X ;; X X load) X ${MTX} -f ${CHANGER} move slot $((${SLOT}-1)) drive ${DRIVE} X rtn=$? X # Increase the sleep time if you have a slow device X sleep $SLEEP X exit $rtn X ;; X X list) X if [ "${SIMULATE_BARCODE}" = "true" ]; then X if [ -f "$BARCODE_FILE" ]; then X cat $BARCODE_FILE | grep -v -e "^#" -e "^$" X exit 0 X else X echo "Barcode file $BARCODE_FILE missing ... exiting!" X exit 1 X fi X else X ${MTX} -f ${CHANGER} status | grep "^slot .*: .*FULL>" | awk '{print $2}' | awk -F: '{print $1+1" "}' | tr -d "[\r\n]" X fi X ;; X X loaded) X # echo "Request loaded" X ${MTX} -f ${CHANGER} status -S > /tmp/mtx.$$ X rtn=$? X # Try to get chio slot source from drive entry X SLOT=$(cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: .*slot" | awk '{print $6+1}' | tr -d ">") X if [ -z "$SLOT" ]; then X # This handles the case a source slot is not available (power on X # of the changer with a drive loaded) and all other slots are X # occupied with a tape! X SLOT=$(cat /tmp/mtx.$$ | grep "^slot .*: " | awk '{print $2+1}') X if [ -z "$SLOT" ]; then X echo 0 X else X echo $SLOT X fi X else X echo $SLOT X fi X # All tapes are in the slots X #cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: .* source: <>" | awk "{print 0}" X rm -f /tmp/mtx.$$ X exit $rtn X ;; X X slots) X # echo "Request slots" X ${MTX} -f ${CHANGER} status | grep "^slot " | tail -1 | awk '{print $2+1}' | tr -d ":" X ;; X X *) X usage X ;; Xesac a7189b1bcf022132bfde5ace2fa66492 echo x - sysutils/bacula2-server/files/patch-scripts-Makefile.in sed 's/^X//' >sysutils/bacula2-server/files/patch-scripts-Makefile.in << '7c7538bf560940f8c1fde2e48ee9bba4' X--- scripts/Makefile.in.orig Tue Sep 12 12:03:08 2006 X+++ scripts/Makefile.in Tue Sep 12 12:03:08 2006 X@@ -33,8 +33,6 @@ X $(MKDIR) $(DESTDIR)$(mandir) X X install: installdirs X- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql X- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql X $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole X $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole X $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula 7c7538bf560940f8c1fde2e48ee9bba4 echo x - sysutils/bacula2-server/files/patch-src-console-Makefile.in sed 's/^X//' >sysutils/bacula2-server/files/patch-src-console-Makefile.in << 'fc566edae4389386c165ded4ef62e254' X*** src/console/Makefile.in.org Sat Apr 3 20:40:26 2004 X--- src/console/Makefile.in Sat May 8 14:01:49 2004 X*************** X*** 89,95 **** X destconf=$$srcconf; \ X if test -f ${DESTDIR}${sysconfdir}/console.conf; then \ X echo "Existing console.conf moved to bconsole.conf"; \ X! @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \ X destconf=$$srcconf.new; \ X fi; \ X fi; \ X--- 89,95 ---- X destconf=$$srcconf; \ X if test -f ${DESTDIR}${sysconfdir}/console.conf; then \ X echo "Existing console.conf moved to bconsole.conf"; \ X! $(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \ X destconf=$$srcconf.new; \ X fi; \ X fi; \ fc566edae4389386c165ded4ef62e254 echo x - sysutils/bacula2-server/files/patch-src-qt-console-build-depkgs-qt-console sed 's/^X//' >sysutils/bacula2-server/files/patch-src-qt-console-build-depkgs-qt-console << 'f2420221228c1a0f8db83a7e1c1af80b' X--- src/qt-console/build-depkgs-qt-console.orig Sat Sep 15 12:11:32 2007 X+++ src/qt-console/build-depkgs-qt-console Sat Sep 15 12:11:32 2007 X@@ -147,7 +147,7 @@ X echo " INSTALLBASE = ${TOP_DIR}/qwt" >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri X echo "}" >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri X cat ${TOP_DIR}/qwtconfig.pri >>${TOP_DIR}/depkgs/qwt-5.0.2/qwtconfig.pri X- qmake >make.log X+ ${QMAKE} >make.log X do_make Makefile >>make.log X do_make Makefile install >>make.log X echo "In case of problems see: `pwd`/make.log" f2420221228c1a0f8db83a7e1c1af80b echo x - sysutils/bacula2-server/files/pkg-message.client.in sed 's/^X//' >sysutils/bacula2-server/files/pkg-message.client.in << '8a69408e774d6d5d86381989790f1745' X################################################################################ X XNOTE: XSample files are installed in ${PREFIX}/etc: Xbconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample X X Please read this file: X X %%DOCSDIR%%/ReleaseNotes X X as installed by docs port for the upgrade procedure. X XRead the ReleaseNotes for further information. X X################################################################################ 8a69408e774d6d5d86381989790f1745 echo x - sysutils/bacula2-server/files/pkg-message.server.in sed 's/^X//' >sysutils/bacula2-server/files/pkg-message.server.in << '40985569a2bffeea45fc5aa44e64855a' X################################################################################ XNOTE: X XAn auto-changer manipulation script based on FreeBSDs Xchio command is included and installed at X X ${PREFIX}/sbin/chio-bacula X XPlease have a look at it if you want to use an Xautochanger. You have to configure the usage in X X ${PREFIX}/etc/bacula-dir.conf X XTake care of correct permissions for changer and Xtape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e. Xthey must be accessible by user bacula. X XDue to lack of some features in the FreeBSD tape driver Ximplementation you MUST add some OS dependent options to Xthe bacula-sd.conf file: X X Hardware End of Medium = no; X Backward Space Record = no; X Backward Space File = no; X XWith 2 filemarks at EOT (see man mt): X Fast Forward Space File = no; X BSF at EOM = yes; X TWO EOF = yes; X XWith 1 filemarks at EOT (see man mt): X Fast Forward Space File = yes; X BSF at EOM = no; X TWO EOF = no; X XNOTE: YOU CAN SWITCH EOT model ONLY when starting X from scratch with EMPTY tapes. X XIt is also important that all the scripts accessed Xby RunBeforeJob and RunAfterJob will be executed by Xthe user bacula. Check your permissions. X XFor USB support read the bacula manual. It could be necessary Xto configure/compile a new kernel. X XLook at ${PREFIX}/share/bacula/update_bacula_tables for Xdatabase update procedure. Details can be found in the XReleaseNotes X X Please read this file: X X %%DOCSDIR%%/ReleaseNotes X X as installed by docs port for the upgrade procedure. X XIMPORTANT UPGRADE NOTES FOR THIS RELEASE: X X- bacula-client and bacula-server do not need to be simultaneously Xupgraded. X XRead the ReleaseNotes for further information. X X################################################################################ 40985569a2bffeea45fc5aa44e64855a echo x - sysutils/bacula2-server/files/patch-src-stored-acquire.c sed 's/^X//' >sysutils/bacula2-server/files/patch-src-stored-acquire.c << 'afd52830bf12c42936f26bc60d1f857b' XIndex: src/stored/acquire.c X=================================================================== X--- src/stored/acquire.c (revision 8426) X+++ src/stored/acquire.c (working copy) X@@ -1,7 +1,7 @@ X /* X Bacula® - The Network Backup Solution X X- Copyright (C) 2002-2008 Free Software Foundation Europe e.V. X+ Copyright (C) 2002-2009 Free Software Foundation Europe e.V. X X The main author of Bacula is Kern Sibbald, with contributions from X many others, a complete list can be found in the file AUTHORS. X@@ -647,8 +647,8 @@ X X /* Detach this dcr only if attached */ X if (dcr->attached_to_dev && dev) { X+ dev->dlock(); X dcr->unreserve_device(); X- dev->dlock(); X dcr->dev->attached_dcrs->remove(dcr); /* detach dcr from device */ X dcr->attached_to_dev = false; X // remove_dcr_from_dcrs(dcr); /* remove dcr from jcr list */ afd52830bf12c42936f26bc60d1f857b echo x - sysutils/bacula2-server/files/patch-src-stored-reserve.c sed 's/^X//' >sysutils/bacula2-server/files/patch-src-stored-reserve.c << '01abb75807881b00f368e3fb91787aa7' XIndex: src/stored/reserve.c X=================================================================== X--- src/stored/reserve.c (revision 8426) X+++ src/stored/reserve.c (working copy) X@@ -1,7 +1,7 @@ X /* X Bacula® - The Network Backup Solution X X- Copyright (C) 2000-2008 Free Software Foundation Europe e.V. X+ Copyright (C) 2000-2009 Free Software Foundation Europe e.V. X X The main author of Bacula is Kern Sibbald, with contributions from X many others, a complete list can be found in the file AUTHORS. X@@ -498,7 +498,6 @@ X void DCR::unreserve_device() X { X lock_volumes(); X- dev->dlock(); X if (is_reserved()) { X clear_reserved(); X reserved_volume = false; X@@ -514,7 +513,6 @@ X volume_unused(this); X } X } X- dev->dunlock(); X unlock_volumes(); X } 01abb75807881b00f368e3fb91787aa7 echo x - sysutils/bacula2-server/Makefile sed 's/^X//' >sysutils/bacula2-server/Makefile << '4e4016b12a017d3c840e6e7d388fa9c1' X# New ports collection makefile for: bacula X# Date created: 24 February 2003 X# Whom: Dmitry Sivachenko X# X# $FreeBSD: ports/sysutils/bacula-server/Makefile,v 1.112 2009/03/08 23:05:43 beech Exp $ X# X XPORTNAME= bacula2 XDISTVERSION= 2.4.4 XCATEGORIES?= sysutils XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE} XMASTER_SITE_SUBDIR= bacula X XMAINTAINER= v.haisman@sh.cvut.cz XCOMMENT?= The network backup solution (server) X XPKGNAMESUFFIX?= -server X XCONFLICTS= bacula-server-devel-[0-9]* \ X bacula-client-devel-[0-9]* \ X bacula-docs-devel-[0-9]* \ X bacula-server-[0-9]* \ X bacula-client-[0-9]* X XUNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX} X XDISTFILES= bacula-${DISTVERSION}.tar.gz XWRKSRC= ${WRKDIR}/bacula-${DISTVERSION} X X.if !defined(WITH_BAT) X.if !defined(WITH_CLIENT_ONLY) XUSE_RC_SUBR?= bacula-dir bacula-sd X.endif X X.if defined(WITH_CLIENT_ONLY) XSUB_FILES+= pkg-message.client X.else XSUB_FILES+= pkg-message.server X.endif X.endif X X# The user/group IDs below are registered, see X# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID X# XBACULA_DIR?=/var/db/bacula X# XMANCOMPRESSED= yes XGNU_CONFIGURE= yes XCONFIGURE_ARGS+= --with-tcp-wrappers=/usr/lib \ X --enable-smartalloc \ X --with-working-dir=${BACULA_DIR} \ X --with-scriptdir=${PREFIX}/share/${PORTNAME} \ X --with-readline=yes \ X --disable-conio \ X --enable-batch-insert X X.if defined(WITH_CLIENT_ONLY) XCONFIGURE_ARGS+= --with-fd-user=root \ X --with-fd-group=wheel X.else XCONFIGURE_ARGS+=--with-dir-user=bacula \ X --with-dir-group=bacula \ X --with-sd-user=bacula \ X --with-sd-group=operator X.endif X XCONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \ X LDFLAGS="-L${LOCALBASE}/lib" \ X PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ X PTHREAD_LIBS="${PTHREAD_LIBS}" X X.for opt in ${ALL_OPTIONS} X.if defined(WITH_${opt}) XBATCH= yes X.endif X.endfor X X.if !defined(BATCH) XIS_INTERACTIVE= yes X.endif X X.if defined(WITH_CLIENT_ONLY) XOPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off XOPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off X.elif defined(WITH_BAT) XOPTIONS= X.else XOPTIONS= SQLITE3 "Use SqLite-3 database instead of SqLite-2" off XOPTIONS+= MYSQL "Use MySQL database instead of SqLite" off XOPTIONS+= POSTGRESQL "Use PostgreSQL database instead of SqLite" off XOPTIONS+= MTX "Install mtx for control of autochanger devices" off X.endif X XOPTIONS+= NLS "Native Language Support via gettext utilities" on XOPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off X X# Prepare if bgnome-console is selected this must be happen before X# include of bsd.port.pre.mk! XWANT_GNOME= yes X.if defined(WITH_GNOMECONSOLE) XUSE_GNOME= libgnome gnomelibs libgnomeui X.endif X X.if !defined(WITH_BAT) XPLIST_SUB+= BACULA_DIR=${BACULA_DIR} X.endif X X.include X X.if defined(WITH_NLS) XUSE_GETTEXT= yes XCONFIGURE_ARGS+= --enable-nls X.else XCONFIGURE_ARGS+= --disable-nls X.endif X X# overridden if client install XPKGDEINSTALL= ${PKGDIR}/pkg-deinstall.server XPKGINSTALL= ${PKGDIR}/pkg-install.server X X# Client only or full server version X.if defined(WITH_CLIENT_ONLY) XCONFFILES= fd XCONFIGURE_ARGS+= --enable-client-only X XPKGDEINSTALL= ${PKGDIR}/pkg-deinstall.client XPKGINSTALL= ${PKGDIR}/pkg-install.client X# Build bgnome-console X.if defined(WITH_GNOMECONSOLE) XCONFIGURE_ARGS+= --enable-gnome XPLIST_SUB+= GNOMECONS="" X.else X# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) XWITHOUT_GNOME= yes XPLIST_SUB+= GNOMECONS="@comment " X.endif X# Build bwx-console X.if defined(WITH_WXCONSOLE) XUSE_WX= 2.4 XCONFIGURE_ARGS+= --enable-bwx-console XCONFIGURE_ENV+= WXCONFIG="${WX_CONFIG}" XPLIST_SUB+= WXCONS="" X.else X# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) XWITHOUT_GNOME= yes XPLIST_SUB+= WXCONS="@comment " X.endif X.else X# Server only Options XPLIST_SUB+= GNOMECONS="@comment " XPLIST_SUB+= WXCONS="@comment " XCONFFILES= sd dir X.if defined(WITH_MYSQL) XCONFIGURE_ARGS+= --with-mysql=yes XUSE_MYSQL= yes XDBTYPE= mysql XSUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" X.elif defined(WITH_POSTGRESQL) XDEFAULT_PGSQL_VER?= 82 XUSE_PGSQL= yes XCONFIGURE_ARGS+= --with-postgresql=yes XDBTYPE= postgresql XSUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql X.elif defined(WITH_SQLITE3) XCONFIGURE_ARGS+= --with-sqlite3=yes XLIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 XDBTYPE= sqlite3 X.else XCONFIGURE_ARGS+= --with-sqlite=yes XLIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 XDBTYPE= sqlite X.endif XPLIST_SUB+= DBTYPE=${DBTYPE} X# Install mtx X.if defined(WITH_MTX) XRUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx X.endif X.endif X X X.if defined(WITH_OPENSSL) XCONFIGURE_ARGS+= --with-openssl X.endif X X.if !defined(WITH_BAT) X.if defined(WITH_CLIENT_ONLY) XMAN8=bacula-fd.8 bconsole.8 X.else XMAN8=bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 btraceback.8 dbcheck.8 XMAN1=bsmtp.1 bacula-bgnome-console.1 bacula-tray-monitor.1 bacula-bwxconsole.1 X.endif X.endif X XMAKE_ARGS+= -E MAN8 -E MAN1 XMAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}" X Xpre-everything:: X.if !defined(WITH_CLIENT_ONLY) X @${ECHO_MSG} "You may use the following build options (or make config):" X @${ECHO_MSG} "" X @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." X @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console." X @${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console." X @${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control." X @${ECHO_MSG} " WITH_SQLITE3=yes if you want SqLite-3 instead of SqLite-2 as the database." X.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL) X @${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL instead of SqLite as the database." X @${ECHO_MSG} " WITH_POSTGRESQL=yes if you want PostgreSQL instead of SqLite as the database." X @${ECHO_MSG} "" X @${ECHO_MSG} "The default DB is SQLite-2!" X.endif X @${ECHO_MSG} " WITH_OPENSSL=yes Enable OpenSSL for encrypted communication." X @${ECHO_MSG} "" X @${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database." X @${ECHO_MSG} "" X.else X @${ECHO_MSG} "===> Building file daemon only." X.endif X Xpost-patch: X# Default bconsole.conf is ${PREFIX}/etc X @${REINPLACE_CMD} -e 's|./bconsole.conf|${PREFIX}/etc/bconsole.conf|g' ${WRKSRC}/src/console/console.c X.if defined(WITH_CLIENT_ONLY) X# In client port only install startup script out of script dir (see below post-install) X# Dont mkdir ${PREFIX}/share/bacula cause it's empty X @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in X ${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in X.else X# In server port don't install filed X @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' ${WRKSRC}/Makefile.in X.endif X X.if !target(pre-install) Xpre-install: X if [ ! -d "${BACULA_DIR}" ]; then \ X ${ECHO_CMD} "creating ${BACULA_DIR}" ; \ X ${MKDIR} ${BACULA_DIR}; \ X else \ X ${ECHO_CMD} "${BACULA_DIR} already exists"; \ X fi X X# Extend /etc/services and install UID/GID X @ ${SETENV} PKG_PREFIX=${PREFIX} \ X ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL X.endif X X X.if !target(post-install) Xpost-install: X.if defined(WITH_CLIENT_ONLY) X# Extend only /etc/services X @ ${SETENV} PKG_PREFIX=${PREFIX} \ X ${SH} ${PKGINSTALL} ${PORTNAME} X# Console stuff X if [ -f ${PREFIX}/etc/bconsole.conf.new ]; then \ X ${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \ X ${CHGRP} bacula ${PREFIX}/etc/bconsole.conf.new; \ X elif [ -f ${PREFIX}/etc/bconsole.conf ]; then \ X ${MV} ${PREFIX}/etc/bconsole.conf ${PREFIX}/etc/bconsole.conf.sample; \ X ${CHGRP} bacula ${PREFIX}/etc/bconsole.conf.sample; \ X ${ECHO_CMD} "etc/bconsole.conf.sample" >> ${TMPPLIST}; \ X fi X.if defined(WITH_WXCONSOLE) X if [ -f ${PREFIX}/etc/bwx-console.conf.new ]; then \ X ${ECHO_CMD} "etc/bwx-console.conf.new" >> ${TMPPLIST}; \ X elif [ -f ${PREFIX}/etc/bwx-console.conf ]; then \ X ${MV} ${PREFIX}/etc/bwx-console.conf ${PREFIX}/etc/bwx-console.conf.sample; \ X ${ECHO_CMD} "etc/bwx-console.conf.sample" >> ${TMPPLIST}; \ X fi X.endif X.if defined(WITH_GNOMECONSOLE) X if [ -f ${PREFIX}/etc/bgnome-console.conf.new ]; then \ X ${ECHO_CMD} "etc/bgnome-console.conf.new" >> ${TMPPLIST}; \ X elif [ -f ${PREFIX}/etc/bgnome-console.conf ]; then \ X ${MV} ${PREFIX}/etc/bgnome-console.conf ${PREFIX}/etc/bgnome-console.conf.sample; \ X ${ECHO_CMD} "etc/bgnome-console.conf.sample" >> ${TMPPLIST}; \ X fi X.endif X X# ensure that users in the bacula group can run bconsole X ${CHGRP} bacula ${PREFIX}/sbin/bconsole X.else X# Install config files and preserve existing ones X ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin X if [ -f ${PREFIX}/etc/bacula-barcodes ]; then \ X ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${PREFIX}/etc/bacula-barcodes.new ; \ X ${ECHO_CMD} "etc/bacula-barcodes.new" >> ${TMPPLIST}; \ X else \ X ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${PREFIX}/etc/bacula-barcodes.samples ; \ X ${ECHO_CMD} "etc/bacula-barcodes.samples" >> ${TMPPLIST}; \ X fi X# chmod of bsmtp program so bacula can use it with dropped down permissions X ${CHMOD} o+x ${PREFIX}/sbin/bsmtp X ${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula X X.endif X# Install leaves existing conf files untouched. Respect this here! X for na in ${CONFFILES}; do \ X if [ -f ${PREFIX}/etc/bacula-$$na.conf.new ]; then \ X ${ECHO_CMD} "etc/bacula-$$na.conf.new" >> ${TMPPLIST}; \ X elif [ -f ${PREFIX}/etc/bacula-$$na.conf ]; then \ X ${MV} ${PREFIX}/etc/bacula-$$na.conf ${PREFIX}/etc/bacula-$$na.conf.sample; \ X ${ECHO_CMD} "etc/bacula-$$na.conf.sample" >> ${TMPPLIST}; \ X fi; \ X done X X @${CAT} ${PKGMESSAGE} X.endif X X.include 4e4016b12a017d3c840e6e7d388fa9c1 echo x - sysutils/bacula2-server/pkg-deinstall.client sed 's/^X//' >sysutils/bacula2-server/pkg-deinstall.client << '057ada2969f75f6cde617d955d94e5a8' X#!/bin/sh X XPATH=/bin:/usr/bin:/usr/sbin XTMPFILE=/tmp/services-$RANDOM-$$ Xif [ -z "${BACULA_DIR}" ]; then X BACULA_DIR=/var/db/bacula Xfi X Xcase "$2" in X"DEINSTALL") X # Delete entries in /etc/services X sed -e '/# Bacula port start/,/# Bacule port end/{' \ X -e 'd' \ X -e '}' /etc/services > $TMPFILE X mv -f $TMPFILE /etc/services X X if [ -d ${BACULA_DIR} ]; then X rmdir ${BACULA_DIR}; X fi X if [ -d ${BACULA_DIR} ]; then X echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port" X fi X X # Note how to delete UID/GID X USER=bacula X GROUP=${USER} X if pw groupshow "${USER}" 2>/dev/null 1>&2; then X echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'" X fi X ;; Xesac 057ada2969f75f6cde617d955d94e5a8 echo x - sysutils/bacula2-server/pkg-deinstall.server sed 's/^X//' >sysutils/bacula2-server/pkg-deinstall.server << 'c6f81d339f76d8e78fbf934665b902de' X#!/bin/sh X XPATH=/bin:/usr/bin:/usr/sbin XTMPFILE=/tmp/services-$RANDOM-$$ Xif [ -z "${BACULA_DIR}" ]; then X BACULA_DIR=/var/db/bacula Xfi X Xcase "$2" in X"DEINSTALL") X # Delete entries in /etc/services X sed -e '/# Bacula port start/,/# Bacule port end/{' \ X -e 'd' \ X -e '}' /etc/services > $TMPFILE X mv -f $TMPFILE /etc/services X X if [ -d ${BACULA_DIR} ]; then X rmdir ${BACULA_DIR}; X fi X if [ -d ${BACULA_DIR} ]; then X echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port" X fi X X # Note how to delete UID/GID X USER=bacula X GROUP=${USER} X if pw usershow "${USER}" 2>/dev/null 1>&2; then X echo "To delete Bacula user permanently, use 'pw userdel ${USER}'" X echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'" X fi X ;; Xesac c6f81d339f76d8e78fbf934665b902de echo x - sysutils/bacula2-server/pkg-descr sed 's/^X//' >sysutils/bacula2-server/pkg-descr << '29e1f0cfde32f49b86b93575dfdbb9d0' XBacula is a set of computer programs that permit you (or the system Xadministrator) to manage backup, recovery, and verification of Xcomputer data across a network of computers of different kinds. XIn technical terms, it is a network Client/Server based backup program. XBacula is relatively easy to use and efficient, while offering many Xadvanced storage management features that make it easy to find and Xrecover lost or damaged files. Due to its modular design, Bacula is Xscalable from small single computer systems to systems consisting of Xhundreds of computers located over a large network. X XWWW: http://www.bacula.org/ 29e1f0cfde32f49b86b93575dfdbb9d0 echo x - sysutils/bacula2-server/pkg-install.client sed 's/^X//' >sysutils/bacula2-server/pkg-install.client << 'cf780ea13db76b775d71e232d843b845' X#!/bin/sh X XPATH=/bin:/usr/bin:/usr/sbin Xif [ -z "${BACULA_DIR}" ]; then X BACULA_DIR=/var/db/bacula Xfi X X# Always add lines in /etc/services Xgrep -q "bacula-dir" /etc/services Xif [ "$?" != "0" ]; then X echo "# Bacula port start Xbacula-dir 9101/tcp #Bacula director daemon Xbacula-fd 9102/tcp #Bacula file daemon Xbacula-sd 9103/tcp #Bacula storage daemon X# Bacule port end" >> /etc/services Xfi X Xcase $2 in XPRE-INSTALL) X # Install UID/GID X USER=bacula X GROUP=${USER} X UID=910 X GID=${UID} X X if [ ! -d ${BACULA_DIR} ]; then X mkdir -p ${BACULA_DIR} X fi X X if pw group show "${GROUP}" 2>/dev/null; then X echo "You already have a group \"${GROUP}\", so I will use it." X else X if pw groupadd ${GROUP} -g ${GID}; then X echo "Added group \"${GROUP}\"." X else X echo "Adding group \"${GROUP}\" failed..." X exit 1 X fi X fi X X chgrp -R ${GROUP} ${BACULA_DIR} X ;; Xesac cf780ea13db76b775d71e232d843b845 echo x - sysutils/bacula2-server/pkg-install.server sed 's/^X//' >sysutils/bacula2-server/pkg-install.server << '9d18ef81e3c6fad38618223102421ded' X#!/bin/sh X XPATH=/bin:/usr/bin:/usr/sbin Xif [ -z "${BACULA_DIR}" ]; then X BACULA_DIR=/var/db/bacula Xfi X X# Always add lines in /etc/services Xgrep -q "bacula-dir" /etc/services Xif [ "$?" != "0" ]; then X echo "# Bacula port start Xbacula-dir 9101/tcp #Bacula director daemon Xbacula-fd 9102/tcp #Bacula file daemon Xbacula-sd 9103/tcp #Bacula storage daemon X# Bacule port end" >> /etc/services Xfi X Xcase $2 in XPRE-INSTALL) X # Install UID/GID X USER=bacula X GROUP=${USER} X UID=910 X GID=${UID} X X if [ ! -d ${BACULA_DIR} ]; then X mkdir -p ${BACULA_DIR} X fi X X if pw group show "${GROUP}" 2>/dev/null; then X echo "You already have a group \"${GROUP}\", so I will use it." X else X if pw groupadd ${GROUP} -g ${GID}; then X echo "Added group \"${GROUP}\"." X else X echo "Adding group \"${GROUP}\" failed..." X exit 1 X fi X fi X X if pw user show "${USER}" 2>/dev/null; then X echo "You already have a user \"${USER}\", so I will use it." X if pw usermod ${USER} -d ${BACULA_DIR} -G operator X then X echo "Changed home directory of \"${USER}\" to \"${BACULA_DIR}\"" X else X echo "Changing home directory of \"${USER}\" to \"${BACULA_DIR}\" failed..." X exit 1 X fi X else X if pw useradd ${USER} -u ${UID} -g ${GROUP} -G operator -h - \ X -d ${BACULA_DIR} -s /sbin/nologin -c "Bacula Daemon" X then X echo "Added user \"${USER}\"." X else X echo "Adding user \"${USER}\" failed..." X exit 1 X fi X fi X chown -R ${USER}:${GROUP} ${BACULA_DIR} X ;; Xesac 9d18ef81e3c6fad38618223102421ded echo x - sysutils/bacula2-server/pkg-plist sed 's/^X//' >sysutils/bacula2-server/pkg-plist << '7fbadc3e1478f070a694952e6bd1ed49' Xsbin/bacula-dir Xsbin/bacula-sd Xsbin/bcopy Xsbin/bextract Xsbin/bls Xsbin/bregex Xsbin/bscan Xsbin/bsmtp Xsbin/btape Xsbin/btraceback Xsbin/bwild Xsbin/chio-bacula Xsbin/dbcheck X%%DATADIR%%/bacula X%%DATADIR%%/bacula-ctl-dir X%%DATADIR%%/bacula-ctl-fd X%%DATADIR%%/bacula-ctl-sd X%%DATADIR%%/bconsole X%%DATADIR%%/btraceback.gdb X%%DATADIR%%/btraceback.dbx X%%DATADIR%%/create_bacula_database X%%DATADIR%%/create_%%DBTYPE%%_database X%%DATADIR%%/delete_catalog_backup X%%DATADIR%%/disk-changer X%%DATADIR%%/drop_bacula_database X%%DATADIR%%/drop_bacula_tables X%%DATADIR%%/drop_%%DBTYPE%%_database X%%DATADIR%%/drop_%%DBTYPE%%_tables X%%DATADIR%%/dvd-handler X%%DATADIR%%/gconsole X%%DATADIR%%/grant_bacula_privileges X%%DATADIR%%/grant_%%DBTYPE%%_privileges X%%DATADIR%%/make_bacula_tables X%%DATADIR%%/make_catalog_backup X%%DATADIR%%/make_%%DBTYPE%%_tables X%%DATADIR%%/mtx-changer X%%DATADIR%%/query.sql X%%DATADIR%%/update_bacula_tables X%%DATADIR%%/update_%%DBTYPE%%_tables X X@dirrm %%DATADIR%% X@unexec /usr/bin/killall bacula-sd > /dev/null 2>&1 || true X@unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true X@exec mkdir -p %%BACULA_DIR%% X@dirrmtry %%BACULA_DIR%% 7fbadc3e1478f070a694952e6bd1ed49 echo x - sysutils/bacula2-server/pkg-plist.client sed 's/^X//' >sysutils/bacula2-server/pkg-plist.client << 'e6c02d2b0392e469e23e1913caa46c9b' Xsbin/bacula-fd Xsbin/bconsole X%%GNOMECONS%%sbin/gnome-console X%%WXCONS%%sbin/wx-console X@unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true X@exec mkdir -p %%BACULA_DIR%% X@dirrmtry %%BACULA_DIR%% X@dirrm share/bacula e6c02d2b0392e469e23e1913caa46c9b echo x - sysutils/bacula2-server/distinfo sed 's/^X//' >sysutils/bacula2-server/distinfo << '5aaf2243b1de32cd5c3bd5434150f4cd' XMD5 (bacula-2.4.4.tar.gz) = 4eb6155b45611018af03002d37a2ffde XSHA256 (bacula-2.4.4.tar.gz) = 3a698bdf0fd3f55733a6a4aabe8c3dc2b1ed1ad5ca7fab000f6e0f804a9d3d38 XSIZE (bacula-2.4.4.tar.gz) = 3145564 5aaf2243b1de32cd5c3bd5434150f4cd exit >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->dvl Responsible-Changed-By: edwin Responsible-Changed-When: Sun Jun 14 21:44:15 UTC 2009 Responsible-Changed-Why: Over to dvl@ for his words of wisdom. http://www.freebsd.org/cgi/query-pr.cgi?pr=135580 Responsible-Changed-From-To: dvl->wxs Responsible-Changed-By: wxs Responsible-Changed-When: Mon Jun 15 13:11:15 UTC 2009 Responsible-Changed-Why: I'll handle this one (maintainer approved too). http://www.freebsd.org/cgi/query-pr.cgi?pr=135580 State-Changed-From-To: open->closed State-Changed-By: wxs State-Changed-When: Mon Jun 15 18:17:30 UTC 2009 State-Changed-Why: New port added. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=135580 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/135580: commit references a PR Date: Mon, 15 Jun 2009 18:17:32 +0000 (UTC) wxs 2009-06-15 18:17:18 UTC FreeBSD ports repository Modified files: sysutils Makefile Added files: sysutils/bacula2-client Makefile sysutils/bacula2-server Makefile distinfo pkg-deinstall.client pkg-deinstall.server pkg-descr pkg-install.client pkg-install.server pkg-plist pkg-plist.client sysutils/bacula2-server/files bacula-barcodes bacula-dir.in bacula-fd.in bacula-sd.conf.in bacula-sd.in chio-bacula patch-scripts-Makefile.in patch-src-console-Makefile.in patch-src-qt-console-build-depkgs-qt-console patch-src-stored-acquire.c patch-src-stored-reserve.c pkg-message.client.in pkg-message.server.in Log: - Reintroduce bacula2.x as sysutils/bacula2-server and sysutils/bacula2-client - The 3.x line of bacula does not work with 2.x so these ports exist for those who can not upgrade to 3.x. Besides security/infrastructure fixes this port is not likely to see any functional upgrades. - The bacula-*-devel ports will be updated to a 3.1 release when it is available. PR: ports/135580 Submitted by: Vaclav Haisman Approved by: dvl (old maintainer) Thanks to: miwi for build-testing Revision Changes Path 1.1111 +2 -0 ports/sysutils/Makefile 1.1 +14 -0 ports/sysutils/bacula2-client/Makefile (new) 1.1 +310 -0 ports/sysutils/bacula2-server/Makefile (new) 1.1 +3 -0 ports/sysutils/bacula2-server/distinfo (new) 1.1 +51 -0 ports/sysutils/bacula2-server/files/bacula-barcodes (new) 1.1 +31 -0 ports/sysutils/bacula2-server/files/bacula-dir.in (new) 1.1 +31 -0 ports/sysutils/bacula2-server/files/bacula-fd.in (new) 1.1 +20 -0 ports/sysutils/bacula2-server/files/bacula-sd.conf.in (new) 1.1 +31 -0 ports/sysutils/bacula2-server/files/bacula-sd.in (new) 1.1 +200 -0 ports/sysutils/bacula2-server/files/chio-bacula (new) 1.1 +11 -0 ports/sysutils/bacula2-server/files/patch-scripts-Makefile.in (new) 1.1 +19 -0 ports/sysutils/bacula2-server/files/patch-src-console-Makefile.in (new) 1.1 +11 -0 ports/sysutils/bacula2-server/files/patch-src-qt-console-build-depkgs-qt-console (new) 1.1 +23 -0 ports/sysutils/bacula2-server/files/patch-src-stored-acquire.c (new) 1.1 +28 -0 ports/sysutils/bacula2-server/files/patch-src-stored-reserve.c (new) 1.1 +15 -0 ports/sysutils/bacula2-server/files/pkg-message.client.in (new) 1.1 +63 -0 ports/sysutils/bacula2-server/files/pkg-message.server.in (new) 1.1 +31 -0 ports/sysutils/bacula2-server/pkg-deinstall.client (new) 1.1 +32 -0 ports/sysutils/bacula2-server/pkg-deinstall.server (new) 1.1 +11 -0 ports/sysutils/bacula2-server/pkg-descr (new) 1.1 +43 -0 ports/sysutils/bacula2-server/pkg-install.client (new) 1.1 +62 -0 ports/sysutils/bacula2-server/pkg-install.server (new) 1.1 +45 -0 ports/sysutils/bacula2-server/pkg-plist (new) 1.1 +8 -0 ports/sysutils/bacula2-server/pkg-plist.client (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: