On Fri, Jan 11, 2008 at 05:34:08PM -0500, Mike Erdely wrote:
> On Fri, Jan 11, 2008 at 05:16:52PM -0500, Mike Erdely wrote:
> > On Fri, Jan 11, 2008 at 09:34:32PM +0000, Stuart Henderson wrote:
> > > On 2008/01/11 15:18, Mike Erdely wrote:
> > > > [EMAIL PROTECTED] _bacula-sd:596:_bacula:daemon:Bacula Storage
> > > > Daemon:/var/bacula:/sbin/nologin
> > >
> > > 597 now (unless something else is committed in the meantime).
>
> As Stu reminded me, _bacula-sd's uid needs to be updated in other
> PLIST-* files. I had also missed some patch files and two README files
> from the previous diffs.
Updated diff with minor tweaks (VERSION -> V, PREFIX -> LOCALBASE).
Comments? Anyone testing this? Anyone using bacula on OpenBSD?
Thanks.
-ME
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 9 Oct 2007 15:39:17 -0000 1.8
+++ Makefile 11 Jan 2008 22:43:35 -0000
@@ -1,20 +1,22 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/09 15:39:17 merdely Exp $
+# $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-doc= network backup solution (doc)
COMMENT-server= network backup solution (server)
-VERSION= 2.0.3
-DISTNAME= bacula-${VERSION}
-PKGNAME-main= ${DISTNAME}p3
-FULLPKGNAME-client= bacula-client-${VERSION}p3
-PKGNAME-server= bacula-server-${VERSION}p4
+V= 2.2.7
+DISTNAME= bacula-$V
+FULLPKGNAME-main= bacula-client-$V
+FULLPKGNAME-doc= bacula-doc-$V
+PKGNAME-server= bacula-server-$V
CATEGORIES= sysutils
-DIST_SUBDIR= bacula
-PATCHFILES= ${VERSION}-restore.patch
-PATCH_DIST_ARGS= -d ${WRKSRC}/src/stored --quiet
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
+MASTER_SITES0= ${HOMEPAGE}
+
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= rel-bacula.pdf:0
HOMEPAGE= http://www.bacula.org/
@@ -22,20 +24,20 @@ MAINTAINER= Michael Erdely <[EMAIL PROTECTED]
WANTLIB= c pthread crypto ssl z m stdc++
WANTLIB-server= ${WANTLIB} readline termcap
-WANTLIB-main= ${WANTLIB} readline termcap
-MULTI_PACKAGES= -main -client -server
+MULTI_PACKAGES= -main -doc -server
-# Modified GPLv2
+# FDL (for docs), GPL (majority), LGPL (some libraries) and PD
# http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+SD_USER= _bacula-sd
BACULACONF= /etc/bacula
BACULASTATE= /var/bacula
-SUBST_VARS= BACULACONF BACULASTATE
+SUBST_VARS= SD_USER BACULACONF BACULASTATE
CONFIGURE_STYLE= simple
USE_GMAKE= yes
@@ -56,8 +58,8 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-working-dir=${BACULASTATE} \
--with-dir-user=_bacula \
--with-dir-group=_bacula \
- --with-sd-user=root \
- --with-sd-group=wheel \
+ --with-sd-user=${SD_USER} \
+ --with-sd-group=_bacula \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
@@ -65,7 +67,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 \
@@ -79,7 +81,9 @@ 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 \
+ QMAKEQT4=${LOCALBASE}/bin/qmake4 \
+
PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4"
BACKEND=
.if ${FLAVOR:L:Mpgsql}
@@ -103,7 +107,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
@@ -143,7 +148,27 @@ SUBST_VARS+= BACKEND
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or
sqlite3"
.endif
-LIB_DEPENDS-client=
+LIB_DEPENDS-main=
+
+PSEUDO_FLAVORS+= no_bat
+.if ${FLAVOR:L:Mno_bat}
+CONFIGURE_ARGS+= --disable-bat \
+ --without-qwt
+.else
+CONFIGURE_ARGS+= --enable-bat \
+ --with-qwt=${LOCALBASE}
+FULLPKGNAME-bat= bacula-bat-$V
+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+= -bat
+LIB_DEPENDS-bat= qwt.>=5::x11/qwt
+COMMENT-bat= network backup solution (gui-client)
+.endif
+
+pre-configure:
+ perl -pi -e "s%!!BACULACONF!!%${BACULACONF}%" \
+ ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
@@ -152,5 +177,19 @@ post-install:
${WRKINST}/etc/bacula/bacula-sd.conf \
${WRKINST}/etc/bacula/bconsole.conf \
${PREFIX}/share/examples/bacula/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
+ ${INSTALL_DATA} ${DISTDIR}/rel-bacula.pdf \
+ ${PREFIX}/share/doc/bacula/
+ perl -pe
"s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g" \
+ ${FILESDIR}/README-client.OpenBSD > \
+ ${PREFIX}/share/doc/bacula/README-client.OpenBSD
+ perl -pe
"s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g,s%!!SD_USER!!%${SD_USER}%g"
\
+ ${FILESDIR}/README-server.OpenBSD > \
+ ${PREFIX}/share/doc/bacula/README-server.OpenBSD
+.if !${FLAVOR:L:Mno_bat}
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
+ ${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
+ ${PREFIX}/share/examples/bacula/
+.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 14 Sep 2007 14:58:58 -0000 1.2
+++ distinfo 9 Jan 2008 20:20:32 -0000
@@ -1,10 +1,10 @@
-MD5 (bacula/2.0.3-restore.patch) = AqfgIRtK6ngixqaBeUqrdw==
-MD5 (bacula/bacula-2.0.3.tar.gz) = RD0lYKzpUXOg2LpGXeST7w==
-RMD160 (bacula/2.0.3-restore.patch) = VH47r3vTvW7l/ZRGMBb7A+kO/L0=
-RMD160 (bacula/bacula-2.0.3.tar.gz) = 9jKIWwUvGI0rmGwJgWcAk1PzK7M=
-SHA1 (bacula/2.0.3-restore.patch) = MHwwGqg3A6Fuj3plgHkZSuiFmNE=
-SHA1 (bacula/bacula-2.0.3.tar.gz) = 71jJEkO9gZ4Kwni5GurhZjnWyM4=
-SHA256 (bacula/2.0.3-restore.patch) =
r+5ADZ7sb2laqU2f4v9pDtaTICNbrc97XFTe8cLvoiw=
-SHA256 (bacula/bacula-2.0.3.tar.gz) =
UZM2Vgvm6SwASXWlphwsQ46sUOONmraZshW6Jpcgwt4=
-SIZE (bacula/2.0.3-restore.patch) = 3078
-SIZE (bacula/bacula-2.0.3.tar.gz) = 2527956
+MD5 (bacula-2.2.7.tar.gz) = C6D08y7If8QLb+Q3zrv/dg==
+MD5 (rel-bacula.pdf) = 1LB8NTKMtvAjRmxVC4uTDg==
+RMD160 (bacula-2.2.7.tar.gz) = FZcv8GfIN+I4ogzDuVArPClH1aU=
+RMD160 (rel-bacula.pdf) = qSvTezDPhEeKrjGcO1U27TNF+dU=
+SHA1 (bacula-2.2.7.tar.gz) = SJZgY20+fmOS4deHKEdAlWRITnQ=
+SHA1 (rel-bacula.pdf) = po9/V09cK/v9EdSjMnc8gf3aSNU=
+SHA256 (bacula-2.2.7.tar.gz) = bj+jDk1JlZ16IeooPI6SLquB9PGD5Tn5B1a2yo1IK1c=
+SHA256 (rel-bacula.pdf) = iQc29G2dF8pZILgOFWyGxruSHvHtbfxTxee9l0pEEGU=
+SIZE (bacula-2.2.7.tar.gz) = 3055837
+SIZE (rel-bacula.pdf) = 4395019
Index: files/README-client.OpenBSD
===================================================================
RCS file: files/README-client.OpenBSD
diff -N files/README-client.OpenBSD
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/README-client.OpenBSD 21 Dec 2007 06:05:40 -0000
@@ -0,0 +1,9 @@
+Example config files for Bacula have been installed in
+!!TRUEPREFIX!!/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 !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-fd ]; then
+ !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-fd start
+ echo -n ' bacula-fd'
+fi
Index: files/README-server.OpenBSD
===================================================================
RCS file: files/README-server.OpenBSD
diff -N files/README-server.OpenBSD
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/README-server.OpenBSD 21 Dec 2007 06:05:40 -0000
@@ -0,0 +1,22 @@
+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
+!!TRUEPREFIX!!/share/examples/bacula and copied also to
+!!BACULACONF!!, edit them to your site's needs.
+
+Backend database creation/update scripts are located in
+!!TRUEPREFIX!!/libexec/bacula
+
+To allow the storage daemon user to access tape devices,
+be sure to add !!SD_USER!! to the operator group.
+
+To start, add the following to /etc/rc.local:
+if [ -x !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-sd ]; then
+ !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-sd start
+ echo -n ' bacula-sd'
+fi
+if [ -x !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-dir ]; then
+ !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-dir start
+ echo -n ' bacula-dir'
+fi
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 9 Jan 2008 21:28:07 -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 Nov 30 16:32:48 2007
++++ configure Wed Jan 9 16:27:57 2008
+@@ -3262,7 +3262,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; }; }
+@@ -32221,7 +32221,7 @@ if test "${support_bat}" = "yes" ; then
+ QMAKEBIN="qmake"
+
+ if test "x$QMAKEQT4" != "xnone"; then
+- QMAKEBIN=qmake-qt4
++ QMAKEBIN=${QMAKEQT4}
+ fi
+
+
Index: patches/patch-manpages_bat_1
===================================================================
RCS file: patches/patch-manpages_bat_1
diff -N patches/patch-manpages_bat_1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-manpages_bat_1 21 Dec 2007 06:05:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- manpages/bat.1.orig Mon Oct 22 15:29:44 2007
++++ manpages/bat.1 Mon Oct 22 15:29:53 2007
+@@ -22,7 +22,7 @@ but it is graphical oriented.
+ bat [\-s] [\-c config_file] [\-d debug_level] [-t]
+ .TP
+ .B \-c <config>
+-Specify configuration file. Default is bat.conf.
++Specify configuration file. Default is !!BACULACONF!!/bat.conf.
+ .TP
+ .B \-d <nn>
+ Set debug level to \fInn\fP.
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 9 Jan 2008 21:19:35 -0000
@@ -1,15 +1,12 @@
$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
-@@ -1,6 +1,6 @@
- #!/bin/sh
+--- scripts/mtx-changer.in.orig Thu Aug 16 09:01:19 2007
++++ scripts/mtx-changer.in Wed Jan 9 16:17:45 2008
+@@ -2,3 +2,3 @@
#
-# 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
$
- #
-@@ -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 +19,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 +41,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 +52,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.2
diff -u -p -r1.2 patch-src_dird_bacula-dir_conf_in
--- patches/patch-src_dird_bacula-dir_conf_in 9 Oct 2007 15:39:17 -0000
1.2
+++ patches/patch-src_dird_bacula-dir_conf_in 21 Dec 2007 06:05:41 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.2 2007/10/09 15:39:17 merdely
Exp $
---- src/dird/bacula-dir.conf.in.orig Sun Aug 20 09:27:55 2006
-+++ src/dird/bacula-dir.conf.in Mon Oct 8 20:37:51 2007
+$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 Wed Oct 3 12:22:07 2007
++++ src/dird/bacula-dir.conf.in Mon Oct 22 11:55:00 2007
@@ -13,7 +13,8 @@
#
@@ -111,7 +111,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# SDPort = @sd_port@
# Password = "@sd_password@"
# Device = "DVD Writer"
-@@ -286,7 +283,7 @@ Pool {
+@@ -292,7 +289,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 21 Dec 2007 06:05:41 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/qt-console/bat.conf.in.orig Sat Jul 28 06:36:28 2007
++++ src/qt-console/bat.conf.in Mon Oct 22 11:51:54 2007
+@@ -3,8 +3,8 @@
+ #
+
+ Director {
+- Name = @[EMAIL PROTECTED]
++ Name = bacula-dir
+ DIRport = @dir_port@
+- address = @hostname@
++ address = bacula-dir
+ Password = "@dir_password@"
+ }
Index: patches/patch-src_qt-console_main_cpp
===================================================================
RCS file: patches/patch-src_qt-console_main_cpp
diff -N patches/patch-src_qt-console_main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_qt-console_main_cpp 21 Dec 2007 06:05:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/qt-console/main.cpp.orig Mon Oct 22 15:29:07 2007
++++ src/qt-console/main.cpp Mon Oct 22 15:29:31 2007
+@@ -46,7 +46,7 @@ void terminate_console(int sig);
+ static void usage();
+ static int check_resources();
+
+-#define CONFIG_FILE "./bat.conf" /* default configuration file */
++#define CONFIG_FILE "!!BACULACONF!!/bat.conf" /* default configuration file
*/
+
+ /* Static variables */
+ static char *configfile = NULL;
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 21 Dec 2007 06:05: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 21 Dec 2007 06:05:41 -0000
@@ -0,0 +1,2 @@
+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-doc
===================================================================
RCS file: pkg/DESCR-doc
diff -N pkg/DESCR-doc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-doc 21 Dec 2007 06:05:41 -0000
@@ -0,0 +1 @@
+Documentation for bacula in PDF format.
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 11 Jan 2008 20:14:26 -0000
@@ -1,11 +1,14 @@
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.
+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.
+
+This packatge 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 21 Dec 2007 06:05:41 -0000
@@ -1,16 +1,23 @@
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.
+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-server contains the bacula-sd "storage daemon" that writes the
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.
+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 21 Dec 2007 06:05:41 -0000
@@ -1,23 +1,2 @@
-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
+See ${PREFIX}/share/doc/bacula/README-client.OpenBSD
+for more setup information.
Index: pkg/MESSAGE-server
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/MESSAGE-server,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 MESSAGE-server
--- pkg/MESSAGE-server 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ pkg/MESSAGE-server 21 Dec 2007 06:05:41 -0000
@@ -1,19 +1,2 @@
-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-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
+See ${PREFIX}/share/doc/bacula/README-server.OpenBSD
+for more setup information.
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 11 Jan 2008 22:27:34 -0000
@@ -0,0 +1,19 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-client,v 1.2 2007/09/05 07:57:33 merdely Exp $
[EMAIL PROTECTED] _bacula:591
[EMAIL PROTECTED] _bacula:591:_bacula:daemon:Bacula
Director:/var/bacula:/sbin/nologin
[EMAIL PROTECTED] _bacula-sd:597:_bacula:daemon:Bacula Storage
Daemon:/nonexistent:/sbin/nologin
[EMAIL PROTECTED] man/man1/bat.1
+sbin/bat
+share/examples/bacula/
[EMAIL PROTECTED] 750
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] ${BACULACONF}/
[EMAIL PROTECTED] 644
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+share/examples/bacula/bat.conf
[EMAIL PROTECTED] 640
[EMAIL PROTECTED] _bacula
[EMAIL PROTECTED] _bacula
[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-doc
===================================================================
RCS file: pkg/PLIST-doc
diff -N pkg/PLIST-doc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-doc 21 Dec 2007 06:05:41 -0000
@@ -0,0 +1,3 @@
[EMAIL PROTECTED] $OpenBSD$
+share/doc/bacula/
+share/doc/bacula/rel-bacula.pdf
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 Jan 2008 22:27:38 -0000
@@ -1,70 +1,16 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.1.1.1 2007/07/20 11:02:14 robert Exp
$
[EMAIL PROTECTED] $OpenBSD: PLIST-client,v 1.2 2007/09/05 07:57:33 merdely Exp $
@conflict bacula-client-*
[EMAIL PROTECTED] bacula-server-*
[EMAIL PROTECTED] bacula-server-<2.2.7
[EMAIL PROTECTED] sysutils/bacula,-client
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
[EMAIL PROTECTED] _bacula-sd:597:_bacula:daemon:Bacula Storage
Daemon:/nonexistent:/sbin/nologin
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
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
+share/doc/bacula/
+share/doc/bacula/README-client.OpenBSD
share/examples/bacula/
@mode 750
@owner _bacula
@@ -72,34 +18,10 @@ share/examples/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
[EMAIL PROTECTED]
[EMAIL PROTECTED]
share/examples/bacula/bacula-fd.conf
@mode 640
@owner _bacula
@group _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 11 Jan 2008 22:13:56 -0000
@@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-server,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
[EMAIL PROTECTED] bacula-*
[EMAIL PROTECTED] bacula-<2.2.7
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
[EMAIL PROTECTED] _bacula-sd:597:_bacula:daemon:Bacula Storage
Daemon:/nonexistent:/sbin/nologin
libexec/bacula/
libexec/bacula/bacula
libexec/bacula/bacula-ctl-dir
@@ -30,9 +31,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
@@ -58,34 +59,34 @@ sbin/btape
sbin/btraceback
sbin/bwild
sbin/dbcheck
[EMAIL PROTECTED] 755
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
+share/doc/bacula/
+share/doc/bacula/README-server.OpenBSD
share/examples/bacula/
@mode 750
@owner _bacula
@group _bacula
@sample ${BACULACONF}/
[EMAIL PROTECTED] 770
@sample ${BACULASTATE}/
@mode 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
[EMAIL PROTECTED]
[EMAIL PROTECTED]
share/examples/bacula/bacula-dir.conf
@mode 640
@owner _bacula
@group _bacula
@sample ${BACULACONF}/bacula-dir.conf
@mode 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
[EMAIL PROTECTED]
[EMAIL PROTECTED]
share/examples/bacula/bacula-sd.conf
@mode 640
@owner _bacula
@group _bacula
@sample ${BACULACONF}/bacula-sd.conf
@mode 644
[EMAIL PROTECTED] root
[EMAIL PROTECTED] wheel
[EMAIL PROTECTED]
[EMAIL PROTECTED]
share/examples/bacula/bconsole.conf
@mode 640
@owner _bacula
