Here's a patch to upgrade bacula to 2.2.0 (released today).
Note: bacula-2.2.0 comes with an admin tool called bat. I've disabled
building it (CONFIGURE_ARGS) since it relies on some QT stuff that isn't
in tree yet (qmake & qwt). I'll work on ports for that post-42.
It's probably too late to get this into 4.2, but I thought I'd send it
anyway (in case I'm wrong).
Please test.
-ME
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 22 Jul 2007 21:20:08 -0000 1.2
+++ Makefile 11 Aug 2007 19:22:14 -0000
@@ -4,7 +4,7 @@ COMMENT-main= network backup solution
COMMENT-client= network backup solution (client)
COMMENT-server= network backup solution (server)
-VERSION= 2.0.3
+VERSION= 2.2.0
DISTNAME= bacula-${VERSION}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-client= ${DISTNAME:S/-/-client-/}
@@ -60,7 +60,7 @@ CONFIGURE_ARGS= --enable-smartalloc \
--without-job-email \
--without-dump-email \
--disable-gnome \
- --disable-wx-console \
+ --disable-bwx-console \
--disable-tray-monitor \
--disable-nls \
--disable-conio \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ distinfo 11 Aug 2007 19:22:14 -0000
@@ -1,5 +1,5 @@
-MD5 (bacula-2.0.3.tar.gz) = RD0lYKzpUXOg2LpGXeST7w==
-RMD160 (bacula-2.0.3.tar.gz) = 9jKIWwUvGI0rmGwJgWcAk1PzK7M=
-SHA1 (bacula-2.0.3.tar.gz) = 71jJEkO9gZ4Kwni5GurhZjnWyM4=
-SHA256 (bacula-2.0.3.tar.gz) = UZM2Vgvm6SwASXWlphwsQ46sUOONmraZshW6Jpcgwt4=
-SIZE (bacula-2.0.3.tar.gz) = 2527956
+MD5 (bacula-2.2.0.tar.gz) = vdIyDxrcA8VSWYsURDpNPQ==
+RMD160 (bacula-2.2.0.tar.gz) = fK6A7P1HR+5hHWedIpZbZqN23LA=
+SHA1 (bacula-2.2.0.tar.gz) = siYQhWV9tP63PhQi+f6Rji4Q6N4=
+SHA256 (bacula-2.2.0.tar.gz) = xc9N8FEAuKxKgEgoX+k/NWlWFDRzLy9cpy+Kwh9JL+I=
+SIZE (bacula-2.2.0.tar.gz) = 3022702
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ patches/patch-configure 11 Aug 2007 19:22:14 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
---- configure.orig Fri Jan 26 20:04:17 2007
-+++ configure Fri Jan 26 20:05:12 2007
-@@ -4151,7 +4151,7 @@ echo "${ECHO_T}no" >&6; }
+$OpenBSD$
+--- configure.orig Sat Aug 11 11:02:29 2007
++++ configure Sat Aug 11 11:04:23 2007
+@@ -3262,7 +3262,7 @@ else
+ echo "${ECHO_T}no" >&6
fi
-
-if test ! -e $CXX; then
+if test ! -e `which $CXX`; then
Index: patches/patch-scripts_mtx-changer_in
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-scripts_mtx-changer_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-scripts_mtx-changer_in
--- patches/patch-scripts_mtx-changer_in 20 Jul 2007 11:02:14 -0000
1.1.1.1
+++ patches/patch-scripts_mtx-changer_in 11 Aug 2007 19:22:14 -0000
@@ -1,15 +1,15 @@
$OpenBSD: patch-scripts_mtx-changer_in,v 1.1.1.1 2007/07/20 11:02:14 robert
Exp $
---- scripts/mtx-changer.in.orig Wed Oct 11 17:34:24 2006
-+++ scripts/mtx-changer.in Sat May 26 15:33:25 2007
+--- scripts/mtx-changer.in.orig Sat Jun 9 05:25:27 2007
++++ scripts/mtx-changer.in Sat Aug 11 12:02:35 2007
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Bacula interface to mtx autoloader
+# Bacula interface to chio autoloader
#
- # $Id: patch-scripts_mtx-changer_in,v 1.1.1.1 2007/07/20 11:02:14 robert Exp
$
+ # $Id: mtx-changer.in 5002 2007-06-09 09:25:27Z kerns $
#
-@@ -27,10 +27,10 @@
+@@ -39,10 +39,10 @@
# e.g. mt -f $4 offline
#
# Many changers need an offline after the unload. Also many
@@ -22,7 +22,7 @@ $OpenBSD: patch-scripts_mtx-changer_in,v
# exit code, Bacula will assume the request failed.
#
-@@ -149,17 +149,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
+@@ -161,17 +161,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
case $cmd in
unload)
@@ -44,7 +44,7 @@ $OpenBSD: patch-scripts_mtx-changer_in,v
rtn=$?
#
# Increase the sleep time if you have a slow device
-@@ -170,14 +170,14 @@ case $cmd in
+@@ -182,36 +182,37 @@ case $cmd in
;;
list)
@@ -55,14 +55,17 @@ $OpenBSD: patch-scripts_mtx-changer_in,v
# ${MTX} -f $ctl inventory
${MTX} -f $ctl status >${TMPFILE}
rtn=$?
-- cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | awk "{print
\$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
-- cat ${TMPFILE} | grep "^Data Transfer Element [0-9]*:Full (Storage
Element [0-9]" | awk '{printf "%s:%s\n",$7,$10}'
+- cat ${TMPFILE} | grep " Storage Element [0-9]*:.*Full" | awk "{print
\$3 \$4}" | sed "s/Full *\(:VolumeTag=\)*//"
+ cat ${TMPFILE} | grep " *slot [0-9]*: <ACCESS,.*FULL.*>" | awk "{print
\$2 \$4 \$5 \$6 \$7 \$8}"
-+ cat ${TMPFILE} | grep " *drive [0-9]*: <.*FULL.*>" | awk "{print \$2
\$4 \$5 \$6 \$7 \$8}" | sed "s/^/D/"
- rm -f ${TMPFILE} >/dev/null 2>&1
#
# If you have a VXA PacketLoader and the above does not work, try
-@@ -187,18 +187,19 @@ case $cmd in
+ # turning it off and enabling the following line.
+ # cat ${TMPFILE} | grep " *Storage Element [0-9]*:.*Full" | sed "s/
Storage Element //" | sed "s/Full :VolumeTag=//"
+ #
+- cat ${TMPFILE} | grep "^Data Transfer Element [0-9]*:Full (Storage
Element [0-9]" | awk '{printf "%s:%s\n",$7,$10}'
++ cat ${TMPFILE} | grep " *drive [0-9]*: <.*FULL.*>" | awk "{print \$2
\$4 \$5 \$6 \$7 \$8}" | sed "s/^/D/"
+ rm -f ${TMPFILE} >/dev/null 2>&1
+ exit $rtn
;;
loaded)
Index: patches/patch-src_dird_bacula-dir_conf_in
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_dird_bacula-dir_conf_in
--- patches/patch-src_dird_bacula-dir_conf_in 20 Jul 2007 11:02:14 -0000
1.1.1.1
+++ patches/patch-src_dird_bacula-dir_conf_in 11 Aug 2007 19:22:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.1.1.1 2007/07/20 11:02:14
robert Exp $
---- src/dird/bacula-dir.conf.in.orig Thu Jul 12 11:22:02 2007
-+++ src/dird/bacula-dir.conf.in Thu Jul 12 11:24:22 2007
+--- src/dird/bacula-dir.conf.in.orig Sun May 27 15:30:39 2007
++++ src/dird/bacula-dir.conf.in Sat Aug 11 12:04:41 2007
@@ -13,7 +13,8 @@
#
@@ -98,7 +98,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# SDPort = @sd_port@
# Password = "@sd_password@"
# Device = "DVD Writer"
-@@ -286,7 +287,7 @@ Pool {
+@@ -292,7 +293,7 @@ Pool {
# Restricted console used by tray-monitor to get the status of the director
#
Console {
Index: patches/patch-src_stored_bacula-sd_conf_in
===================================================================
RCS file:
/cvs/ports/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_stored_bacula-sd_conf_in
--- patches/patch-src_stored_bacula-sd_conf_in 20 Jul 2007 11:02:14 -0000
1.1.1.1
+++ patches/patch-src_stored_bacula-sd_conf_in 11 Aug 2007 19:22:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.1.1.1 2007/07/20 11:02:14
robert Exp $
---- src/stored/bacula-sd.conf.in.orig Mon Mar 5 07:33:59 2007
-+++ src/stored/bacula-sd.conf.in Thu Jul 12 11:26:01 2007
+--- src/stored/bacula-sd.conf.in.orig Mon Apr 23 12:31:14 2007
++++ src/stored/bacula-sd.conf.in Sat Aug 11 12:06:26 2007
@@ -11,7 +11,7 @@
#
@@ -47,7 +47,7 @@ $OpenBSD: patch-src_stored_bacula-sd_con
# AutomaticMount = yes; # when device opened, read it
# AlwaysOpen = yes;
# RemovableMedia = yes;
-@@ -84,7 +84,7 @@ Device {
+@@ -90,7 +90,7 @@ Device {
# Name = Drive-2 #
# Drive Index = 1
# Media Type = DLT-8000
@@ -56,7 +56,7 @@ $OpenBSD: patch-src_stored_bacula-sd_con
# AutomaticMount = yes; # when device opened, read it
# AlwaysOpen = yes;
# RemovableMedia = yes;
-@@ -108,7 +108,7 @@ Device {
+@@ -114,7 +114,7 @@ Device {
# RemovableMedia = yes;
# RandomAccess = no;
## Changer Command = "@scriptdir@/mtx-changer %c %o %S %a %d"
@@ -65,7 +65,7 @@ $OpenBSD: patch-src_stored_bacula-sd_con
## AutoChanger = yes
# # Enable the Alert command only if you have the mtx package loaded
## Alert Command = "sh -c 'tapeinfo -f %c |grep TapeAlert|cat'"
-@@ -123,7 +123,7 @@ Device {
+@@ -129,7 +129,7 @@ Device {
# Name = DDS-4
# Description = "DDS-4 for FreeBSD"
# Media Type = DDS-4
@@ -74,16 +74,27 @@ $OpenBSD: patch-src_stored_bacula-sd_con
# AutomaticMount = yes; # when device opened, read it
# AlwaysOpen = yes
# Offline On Unmount = no
-@@ -162,7 +162,7 @@ Device {
- #Device {
- # Name = "DVD-Writer"
+@@ -169,7 +169,7 @@ Device {
+ # Name = "DVD Writer"
# Media Type = DVD
+ # Device Type = DVD
-# Archive Device = /dev/hdc
+# Archive Device = /dev/cd0
# LabelMedia = yes; # lets Bacula label unlabeled media
# Random Access = Yes;
# AutomaticMount = yes; # when device opened, read it
-@@ -184,7 +184,7 @@ Device {
+@@ -177,8 +177,8 @@ Device {
+ # AlwaysOpen = no;
+ # MaximumPartSize = 800M;
+ # RequiresMount = yes;
+-# MountPoint = /mnt/cdrom;
+-# MountCommand = "/bin/mount -t iso9660 -o ro %a %m";
++# MountPoint = /mnt;
++# MountCommand = "/bin/mount -t cd9660 -o ro %a %m";
+ # UnmountCommand = "/bin/umount %m";
+ # SpoolDirectory = /tmp/backup;
+ # WritePartCommand = "/etc/bacula/dvd-handler %a write %e %v"
+@@ -191,7 +191,7 @@ Device {
#Device {
# Name = DDS-3
# Media Type = DDS-3
@@ -92,7 +103,7 @@ $OpenBSD: patch-src_stored_bacula-sd_con
# Use MTIOCGET= no
# BSF at EOM = yes
# TWO EOF = no
-@@ -218,5 +218,5 @@ Device {
+@@ -225,5 +225,5 @@ Device {
#
Messages {
Name = Standard
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ pkg/PLIST-main 11 Aug 2007 19:22:14 -0000
@@ -32,9 +32,10 @@ libexec/bacula/startmysql
libexec/bacula/stopmysql
libexec/bacula/update_bacula_tables
libexec/bacula/update_${BACKEND}_tables
[EMAIL PROTECTED] @man man/man1/bacula-console-gnome.1
[EMAIL PROTECTED] @man man/man1/bacula-bgnome-console.1
[EMAIL PROTECTED] @man man/man1/bacula-bwxconsole.1
@comment @man man/man1/bacula-tray-monitor.1
[EMAIL PROTECTED] @man man/man1/bacula-wxconsole.1
[EMAIL PROTECTED] @man man/man1/bat.1
@man man/man1/bsmtp.1
@man man/man8/bacula-dir.8
@man man/man8/bacula-fd.8
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/PLIST-server,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-server
--- pkg/PLIST-server 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ pkg/PLIST-server 11 Aug 2007 19:22:14 -0000
@@ -30,9 +30,10 @@ libexec/bacula/startmysql
libexec/bacula/stopmysql
libexec/bacula/update_bacula_tables
libexec/bacula/update_${BACKEND}_tables
[EMAIL PROTECTED] @man man/man1/bacula-console-gnome.1
[EMAIL PROTECTED] @man man/man1/bacula-bgnome-console.1
[EMAIL PROTECTED] @man man/man1/bacula-bwxconsole.1
@comment @man man/man1/bacula-tray-monitor.1
[EMAIL PROTECTED] @man man/man1/bacula-wxconsole.1
[EMAIL PROTECTED] @man man/man1/bat.1
@man man/man1/bsmtp.1
@man man/man8/bacula-dir.8
@man man/man8/bacula-sd.8
