On Tue, Sep 11, 2007 at 11:16:51PM -0400, Mike Erdely wrote:
Attached is a diff to update bacula to 2.2.4. Included with 2.2.x is a
new qt/qtw-based GUI admin tools called "bat".
Please review, test & comment.
It would be especially helpful if someone could test the mtx-changer +
chio interaction with a tape changer.
Thanks.
-ME
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 5 Sep 2007 07:57:33 -0000 1.5
+++ Makefile 14 Sep 2007 20:42:41 -0000
@@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.5 2007/09/05 07:57:33 merdely Exp $
-COMMENT-main= network backup solution
-COMMENT-client= network backup solution (client)
+COMMENT-main= network backup solution (client)
+COMMENT-bat= network backup solution (gui-client)
COMMENT-server= network backup solution (server)
-VERSION= 2.0.3
+VERSION= 2.2.4
DISTNAME= bacula-${VERSION}
-PKGNAME-main= ${DISTNAME}p0
-FULLPKGNAME-client= bacula-client-${VERSION}p2
-PKGNAME-server= bacula-server-${VERSION}p1
+FULLPKGNAME-main= bacula-client-${VERSION}
+FULLPKGNAME-bat= bacula-bat-${VERSION}
+PKGNAME-server= bacula-server-${VERSION}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -19,9 +19,11 @@ MAINTAINER= Michael Erdely <[EMAIL PROTECTED]
WANTLIB= c pthread crypto ssl z m stdc++
WANTLIB-server= ${WANTLIB} readline termcap
-WANTLIB-main= ${WANTLIB} readline termcap
+WANTLIB-bat= ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
+WANTLIB-bat+= Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
+WANTLIB-bat+= gthread-2.0 iconv intl png
-MULTI_PACKAGES= -main -client -server
+MULTI_PACKAGES= -main -bat -server
# Modified GPLv2
# http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html
@@ -55,18 +57,21 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-dir-group=_bacula \
--with-sd-user=root \
--with-sd-group=wheel \
+ --with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
--disable-gnome \
- --disable-wx-console \
+ --disable-bwx-console \
--disable-tray-monitor \
--disable-nls \
--disable-conio \
--enable-readline \
- --with-openssl
+ --with-openssl \
+ --enable-bat \
+ --with-qwt=${LOCALBASE}
CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline \
-I${LOCALBASE}/include" \
@@ -75,7 +80,8 @@ CONFIGURE_ENV+= CPPFLAGS="-I/usr/includ
PTHREAD_LIBS="${PTHREAD_LIBS}" \
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
- CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site
+ CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
+
PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4"
BACKEND=
.if ${FLAVOR:L:Mpgsql}
@@ -99,7 +105,8 @@ ERRORS+= "Fatal: choose either pgsql or
CONFIGURE_ARGS+= --without-postgresql \
--with-mysql \
--without-sqlite \
- --without-sqlite3
+ --without-sqlite3 \
+ --enable-batch-insert
LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
BACKEND= mysql
.else
@@ -139,14 +146,19 @@ SUBST_VARS+= BACKEND
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or
sqlite3"
.endif
-LIB_DEPENDS-client=
+LIB_DEPENDS-main=
+LIB_DEPENDS-bat= qwt.>=5::x11/qwt
+RUN_DEPENDS-bat= ${LIB_DEPENDS-bat}
+
post-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
${INSTALL_DATA} ${WRKINST}/etc/bacula/bacula-dir.conf \
${WRKINST}/etc/bacula/bacula-fd.conf \
${WRKINST}/etc/bacula/bacula-sd.conf \
${WRKINST}/etc/bacula/bconsole.conf \
+ ${WRKINST}/etc/bacula/bat.conf \
${PREFIX}/share/examples/bacula/
.include <bsd.port.mk>
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 14 Sep 2007 20:42:41 -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.4.tar.gz) = Lju6w7+LbUwIJZl8MAnxjw==
+RMD160 (bacula-2.2.4.tar.gz) = UAXVVm9VqP64p++mEM1go9kjg68=
+SHA1 (bacula-2.2.4.tar.gz) = H9jnXyMfs6gRaWwF6jwMcZx1KJo=
+SHA256 (bacula-2.2.4.tar.gz) = EFie0fy6gjoCE38OroQeZHY+m3pZkIcYTGnRczUJWLE=
+SIZE (bacula-2.2.4.tar.gz) = 3020298
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 14 Sep 2007 20:42:41 -0000
@@ -1,12 +1,21 @@
-$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 Fri Sep 7 08:00:34 2007
++++ configure Mon Sep 10 23:42:04 2007
+@@ -3261,7 +3261,7 @@ else
+ echo "${ECHO_T}no" >&6
fi
-
-if test ! -e $CXX; then
+if test ! -e `which $CXX`; then
{ { echo "$as_me:$LINENO: error: Unable to find C++ compiler" >&5
echo "$as_me: error: Unable to find C++ compiler" >&2;}
{ (exit 1); exit 1; }; }
+@@ -32106,7 +32106,7 @@ if test "${support_bat}" = "yes" ; then
+ cd src/qt-console
+ chmod 755 install_conf_file build-depkgs-qt-console
+ echo "Creating bat Makefile"
+- qmake
++ qmake4
+ cd ${BUILD_DIR}
+ fi
+
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 14 Sep 2007 20:42:41 -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 Thu Aug 16 09:01:19 2007
++++ scripts/mtx-changer.in Wed Sep 5 01:21:25 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 5360 2007-08-16 13:01:19Z pbuschman $
#
-@@ -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 14 Sep 2007 20:42:41 -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_qt-console_bat_conf_in
===================================================================
RCS file: patches/patch-src_qt-console_bat_conf_in
diff -N patches/patch-src_qt-console_bat_conf_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_qt-console_bat_conf_in 14 Sep 2007 20:42:41 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- src/qt-console/bat.conf.in.orig Mon Sep 10 23:42:32 2007
++++ src/qt-console/bat.conf.in Mon Sep 10 23:42:44 2007
+@@ -3,7 +3,7 @@
+ #
+
+ Director {
+- Name = @[EMAIL PROTECTED]
++ Name = bacula-dir
+ DIRport = @dir_port@
+- address = @hostname@
++ address = bacula-dir
+ Password = "@dir_password@"
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 14 Sep 2007 20:42:41 -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/DESCR-bat
===================================================================
RCS file: pkg/DESCR-bat
diff -N pkg/DESCR-bat
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-bat 14 Sep 2007 20:42:41 -0000
@@ -0,0 +1 @@
+bat is short for Bacula Administration Tool. It is a GUI form of bconsole, but
with many additional features.
Index: pkg/DESCR-client
===================================================================
RCS file: pkg/DESCR-client
diff -N pkg/DESCR-client
--- pkg/DESCR-client 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Bacula comes by night and sucks the vital essence from your computers.
-
-Bacula is a set of computer programs that permit you (or the system
-administrator) to manage backup, recovery, and verification of
-computer data across a network of computers of different kinds.
-In technical terms, it is a network Client/Server based backup program.
-Bacula is relatively easy to use and efficient, while offering many
-advanced storage management features that make it easy to find and
-recover lost or damaged files. Due to its modular design, Bacula is
-scalable from small single computer systems to systems consisting of
-hundreds of computers located over a large network.
-
-bacula-client contains the bacula-fd "backup agent" that gets installed
-on the computers you want to back up.
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/DESCR-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-main
--- pkg/DESCR-main 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ pkg/DESCR-main 14 Sep 2007 20:42:41 -0000
@@ -9,3 +9,6 @@ advanced storage management features tha
recover lost or damaged files. Due to its modular design, Bacula is
scalable from small single computer systems to systems consisting of
hundreds of computers located over a large network.
+
+bacula-client contains the bacula-fd "backup agent" that gets installed
+on the computers you want to back up.
Index: pkg/DESCR-server
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/DESCR-server,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-server
--- pkg/DESCR-server 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ pkg/DESCR-server 14 Sep 2007 20:42:41 -0000
@@ -14,3 +14,10 @@ bacula-server contains the bacula-sd "st
backup data to the backup device. bacula-dir is the "director" that
manages backups. bconsole is the management application to control
the director and get status of file daemons and storage daemons.
+
+Available flavors are:
+ - sqlite: use the sqlite 2.x library as a storage engine.
+ - sqlite3: use the sqlite 3.x library as a storage engine. This is the
+ default.
+ - pgsql: use a postgresql server as a storage engine.
+ - mysql: use a mysql server as a storage engine.
Index: pkg/MESSAGE-client
===================================================================
RCS file: pkg/MESSAGE-client
diff -N pkg/MESSAGE-client
--- pkg/MESSAGE-client 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-Example config files for Bacula have been installed in
-${PREFIX}/share/examples/bacula and copied also to
-${BACULACONF}, edit them to your site's needs.
-
-To start, add the following to /etc/rc.local:
-if [ -x ${PREFIX}/libexec/bacula/bacula-ctl-fd ]; then
- ${PREFIX}/libexec/bacula/bacula-ctl-fd start
- echo -n ' bacula-fd'
-fi
Index: pkg/MESSAGE-main
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/MESSAGE-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 MESSAGE-main
--- pkg/MESSAGE-main 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ pkg/MESSAGE-main 14 Sep 2007 20:42:41 -0000
@@ -1,23 +1,9 @@
-To take advantage of bacula's DVD/CD writing, install cdrtools and
-dvd+rw-tools packages.
-
Example config files for Bacula have been installed in
${PREFIX}/share/examples/bacula and copied also to
${BACULACONF}, edit them to your site's needs.
-Backend database creation/update scripts are located in
-${PREFIX}/libexec/bacula
-
To start, add the following to /etc/rc.local:
if [ -x ${PREFIX}/libexec/bacula/bacula-ctl-fd ]; then
${PREFIX}/libexec/bacula/bacula-ctl-fd start
echo -n ' bacula-fd'
-fi
-if [ -x ${PREFIX}/libexec/bacula/bacula-ctl-sd ]; then
- ${PREFIX}/libexec/bacula/bacula-ctl-sd start
- echo -n ' bacula-sd'
-fi
-if [ -x ${PREFIX}/libexec/bacula/bacula-ctl-dir ]; then
- ${PREFIX}/libexec/bacula/bacula-ctl-dir start
- echo -n ' bacula-dir'
fi
Index: pkg/PLIST-bat
===================================================================
RCS file: pkg/PLIST-bat
diff -N pkg/PLIST-bat
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-bat 14 Sep 2007 20:42:41 -0000
@@ -0,0 +1,13 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-client,v 1.2 2007/09/05 07:57:33 merdely Exp $
[EMAIL PROTECTED] man/man1/bat.1
+sbin/bat
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
[EMAIL PROTECTED] 755
+share/examples/bacula/
[EMAIL PROTECTED] 750
[EMAIL PROTECTED] ${BACULACONF}/
[EMAIL PROTECTED] 644
+share/examples/bacula/bat.conf
[EMAIL PROTECTED] 640
[EMAIL PROTECTED] ${BACULACONF}/bat.conf
Index: pkg/PLIST-client
===================================================================
RCS file: pkg/PLIST-client
diff -N pkg/PLIST-client
--- pkg/PLIST-client 5 Sep 2007 07:57:33 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-client,v 1.2 2007/09/05 07:57:33 merdely Exp $
[EMAIL PROTECTED] bacula-*
-libexec/bacula/
-libexec/bacula/bacula-ctl-fd
[EMAIL PROTECTED] man/man8/bacula-fd.8
-sbin/bacula-fd
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
[EMAIL PROTECTED] 755
-share/examples/bacula/
[EMAIL PROTECTED] 750
[EMAIL PROTECTED] ${BACULACONF}/
[EMAIL PROTECTED] ${BACULASTATE}/
[EMAIL PROTECTED] 644
-share/examples/bacula/bacula-fd.conf
[EMAIL PROTECTED] 640
[EMAIL PROTECTED] ${BACULACONF}/bacula-fd.conf
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 14 Sep 2007 20:42:41 -0000
@@ -1,105 +1,16 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.1.1.1 2007/07/20 11:02:14 robert Exp
$
[EMAIL PROTECTED] bacula-client-*
[EMAIL PROTECTED] bacula-server-*
[EMAIL PROTECTED] _bacula:591
[EMAIL PROTECTED] _bacula:591:_bacula:daemon:Bacula
Director:/var/bacula:/sbin/nologin
[EMAIL PROTECTED] $OpenBSD: PLIST-client,v 1.2 2007/09/05 07:57:33 merdely Exp $
libexec/bacula/
-libexec/bacula/bacula
-libexec/bacula/bacula-ctl-dir
libexec/bacula/bacula-ctl-fd
-libexec/bacula/bacula-ctl-sd
-libexec/bacula/bconsole
-libexec/bacula/btraceback.dbx
-libexec/bacula/btraceback.gdb
-libexec/bacula/create_bacula_database
-libexec/bacula/create_${BACKEND}_database
-libexec/bacula/delete_catalog_backup
-libexec/bacula/disk-changer
-libexec/bacula/drop_bacula_database
-libexec/bacula/drop_bacula_tables
-libexec/bacula/drop_${BACKEND}_database
-libexec/bacula/drop_${BACKEND}_tables
-libexec/bacula/dvd-handler
[EMAIL PROTECTED] libexec/bacula/gconsole
-libexec/bacula/grant_bacula_privileges
-libexec/bacula/grant_${BACKEND}_privileges
-libexec/bacula/make_bacula_tables
-libexec/bacula/make_catalog_backup
-libexec/bacula/make_${BACKEND}_tables
-libexec/bacula/mtx-changer
-libexec/bacula/query.sql
-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-tray-monitor.1
[EMAIL PROTECTED] @man man/man1/bacula-wxconsole.1
[EMAIL PROTECTED] man/man1/bsmtp.1
[EMAIL PROTECTED] man/man8/bacula-dir.8
@man man/man8/bacula-fd.8
[EMAIL PROTECTED] man/man8/bacula-sd.8
[EMAIL PROTECTED] man/man8/bacula.8
[EMAIL PROTECTED] man/man8/bconsole.8
[EMAIL PROTECTED] man/man8/bcopy.8
[EMAIL PROTECTED] man/man8/bextract.8
[EMAIL PROTECTED] man/man8/bls.8
[EMAIL PROTECTED] man/man8/bscan.8
[EMAIL PROTECTED] man/man8/btape.8
[EMAIL PROTECTED] man/man8/btraceback.8
[EMAIL PROTECTED] man/man8/dbcheck.8
-sbin/bacula-dir
sbin/bacula-fd
-sbin/bacula-sd
-sbin/bconsole
-sbin/bcopy
-sbin/bextract
-sbin/bls
-sbin/bregex
-sbin/bscan
-sbin/bsmtp
-sbin/btape
-sbin/btraceback
-sbin/bwild
-sbin/dbcheck
[EMAIL PROTECTED] 755
@owner root
@group wheel
[EMAIL PROTECTED] 755
share/examples/bacula/
@mode 750
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
@sample ${BACULACONF}/
@sample ${BACULASTATE}/
@mode 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
-share/examples/bacula/bacula-dir.conf
[EMAIL PROTECTED] 640
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] ${BACULACONF}/bacula-dir.conf
[EMAIL PROTECTED] 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
share/examples/bacula/bacula-fd.conf
@mode 640
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
@sample ${BACULACONF}/bacula-fd.conf
[EMAIL PROTECTED] 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
-share/examples/bacula/bacula-sd.conf
[EMAIL PROTECTED] 640
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] ${BACULACONF}/bacula-sd.conf
[EMAIL PROTECTED] 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
-share/examples/bacula/bconsole.conf
[EMAIL PROTECTED] 640
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] ${BACULACONF}/bconsole.conf
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 14 Sep 2007 20:42:41 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
[EMAIL PROTECTED] bacula-*
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
libexec/bacula/
@@ -30,9 +29,9 @@ 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
@man man/man1/bsmtp.1
@man man/man8/bacula-dir.8
@man man/man8/bacula-sd.8
