Update to bacula 2.4.3.
Add no_server PSEUDO_FLAVOR Reorganize the Makefile some. Remove dependency on qwt. Set FULLPKGPATH for -main and -bat to remove backend dependencies (found by and solution from naddy@) Use SUBST_CMD. ok jdixon@, okan@
This commit is contained in:
merdely
parent
7e52c3f399
commit
a23f39a1d5
@ -1,12 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2008/02/16 21:22:41 merdely Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2008/10/19 03:44:42 merdely Exp $
|
||||
|
||||
COMMENT-main= network backup solution (client)
|
||||
COMMENT-server= network backup solution (server)
|
||||
COMMENT-bat= network backup solution (gui-client)
|
||||
|
||||
V= 2.2.8
|
||||
V= 2.4.3
|
||||
DISTNAME= bacula-$V
|
||||
FULLPKGNAME-main= bacula-client-$Vp0
|
||||
PKGNAME-server= bacula-server-$Vp0
|
||||
FULLPKGNAME-main= bacula-client-$V
|
||||
FULLPKGPATH-main= ${PKGPATH},-main
|
||||
PKGNAME-server= bacula-server-$V
|
||||
FULLPKGNAME-bat= bacula-bat-$V
|
||||
FULLPKGPATH-bat= ${PKGPATH},-bat
|
||||
CATEGORIES= sysutils
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
|
||||
@ -15,9 +19,8 @@ HOMEPAGE= http://www.bacula.org/
|
||||
MAINTAINER= Michael Erdely <merdely@openbsd.org>
|
||||
|
||||
WANTLIB= c pthread crypto ssl z m stdc++
|
||||
WANTLIB-server= ${WANTLIB} readline termcap
|
||||
|
||||
MULTI_PACKAGES= -main -server
|
||||
MULTI_PACKAGES= -main
|
||||
|
||||
# GPL (majority), LGPL (some libraries) and PD
|
||||
# http://bacula.org/en/dev-manual/Bacula_Copyri_Tradem_Licens.html
|
||||
@ -29,12 +32,13 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
SD_USER= _bacula-sd
|
||||
BACULACONF= /etc/bacula
|
||||
BACULASTATE= /var/bacula
|
||||
SUBST_VARS= SD_USER BACULACONF BACULASTATE
|
||||
SUBST_VARS= SD_USER BACULACONF BACULASTATE TRUEPREFIX
|
||||
|
||||
CONFIGURE_STYLE= simple
|
||||
USE_GMAKE= yes
|
||||
NO_REGRESS= yes
|
||||
|
||||
PSEUDO_FLAVORS= no_bat no_server
|
||||
FLAVORS= pgsql mysql sqlite3 sqlite
|
||||
FLAVOR?= sqlite3
|
||||
|
||||
@ -48,16 +52,14 @@ CONFIGURE_ARGS= --enable-smartalloc \
|
||||
--with-pid-dir=/var/run \
|
||||
--with-subsys-dir=${BACULASTATE} \
|
||||
--with-working-dir=${BACULASTATE} \
|
||||
--with-dir-user=_bacula \
|
||||
--with-dir-group=_bacula \
|
||||
--with-sd-user=${SD_USER} \
|
||||
--with-sd-group=_bacula \
|
||||
--with-archivedir=/tmp \
|
||||
--with-sbin-perm=755 \
|
||||
--without-x \
|
||||
--without-tcp-wrappers \
|
||||
--without-smtp-host \
|
||||
--without-job-email \
|
||||
--without-dump-email \
|
||||
--without-qwt \
|
||||
--disable-gnome \
|
||||
--disable-bwx-console \
|
||||
--disable-tray-monitor \
|
||||
@ -77,6 +79,16 @@ CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline \
|
||||
QMAKEQT4=${LOCALBASE}/bin/qmake4 \
|
||||
PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4"
|
||||
|
||||
.if ${FLAVOR:L:Mno_server}
|
||||
CONFIGURE_ARGS+= --enable-client-only
|
||||
.else
|
||||
MULTI_PACKAGES+= -server
|
||||
WANTLIB-server= ${WANTLIB} readline termcap
|
||||
CONFIGURE_ARGS+= --with-dir-user=_bacula \
|
||||
--with-dir-group=_bacula \
|
||||
--with-sd-user=${SD_USER} \
|
||||
--with-sd-group=_bacula
|
||||
|
||||
BACKEND=
|
||||
.if ${FLAVOR:L:Mpgsql}
|
||||
.if !empty(BACKEND)
|
||||
@ -101,7 +113,7 @@ CONFIGURE_ARGS+= --without-postgresql \
|
||||
--without-sqlite \
|
||||
--without-sqlite3 \
|
||||
--enable-batch-insert
|
||||
LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
|
||||
LIB_DEPENDS+= mysqlclient_r.>=18::databases/mysql
|
||||
BACKEND= mysql
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-mysql
|
||||
@ -139,43 +151,44 @@ SUBST_VARS+= BACKEND
|
||||
.if empty(BACKEND)
|
||||
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3"
|
||||
.endif
|
||||
.endif # if no_server
|
||||
|
||||
LIB_DEPENDS-main=
|
||||
|
||||
PSEUDO_FLAVORS+= no_bat
|
||||
.if ${FLAVOR:L:Mno_bat}
|
||||
CONFIGURE_ARGS+= --disable-bat \
|
||||
--without-qwt
|
||||
CONFIGURE_ARGS+= --disable-bat
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-bat \
|
||||
--with-qwt=${LOCALBASE}
|
||||
FULLPKGNAME-bat= bacula-bat-$Vp0
|
||||
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
|
||||
CONFIGURE_ARGS+= --enable-bat
|
||||
WANTLIB-bat= ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes
|
||||
WANTLIB-bat+= Xi Xinerama Xrandr Xrender fontconfig freetype
|
||||
WANTLIB-bat+= glib-2.0 gthread-2.0 iconv intl png
|
||||
MULTI_PACKAGES+= -bat
|
||||
LIB_DEPENDS-bat= qwt.>=5::x11/qwt
|
||||
COMMENT-bat= network backup solution (gui-client)
|
||||
LIB_DEPENDS-bat= QtCore,QtGui::x11/qt4
|
||||
.endif
|
||||
|
||||
post-extract:
|
||||
@cp ${FILESDIR}/README-*.OpenBSD ${WRKSRC}/
|
||||
|
||||
pre-configure:
|
||||
perl -pi -e "s%!!BACULACONF!!%${BACULACONF}%" \
|
||||
${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
|
||||
${SUBST_CMD} ${WRKSRC}/manpages/bat.1 \
|
||||
${WRKSRC}/src/qt-console/main.cpp \
|
||||
${WRKSRC}/README-client.OpenBSD ${WRKSRC}/README-server.OpenBSD
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
|
||||
${INSTALL_DATA} ${WRKINST}/etc/bacula/bacula-fd.conf \
|
||||
${PREFIX}/share/examples/bacula/
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
|
||||
${INSTALL_DATA} ${WRKSRC}/README-client.OpenBSD \
|
||||
${PREFIX}/share/doc/bacula/
|
||||
.if !${FLAVOR:L:Mno_server}
|
||||
${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 \
|
||||
${PREFIX}/share/examples/bacula/
|
||||
${INSTALL_DATA_DIR} ${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
|
||||
${INSTALL_DATA} ${WRKSRC}/README-server.OpenBSD \
|
||||
${PREFIX}/share/doc/bacula/
|
||||
.endif
|
||||
.if !${FLAVOR:L:Mno_bat}
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
|
||||
${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (bacula-2.2.8.tar.gz) = RUfQv5+XbV2epfIae9B47g==
|
||||
RMD160 (bacula-2.2.8.tar.gz) = uDrYjVmPHOit8B7jle6/aNC/BRc=
|
||||
SHA1 (bacula-2.2.8.tar.gz) = RBVeLyNktMmNwa/aZk2WArsoYuc=
|
||||
SHA256 (bacula-2.2.8.tar.gz) = CFnihb6Wk7zRjejntpuSK7wLZACn6t37SnssEWjjpMo=
|
||||
SIZE (bacula-2.2.8.tar.gz) = 3063481
|
||||
MD5 (bacula-2.4.3.tar.gz) = bGH3MOiW5hYdIdZ+/tVaWw==
|
||||
RMD160 (bacula-2.4.3.tar.gz) = P8IWcYdG+M3B5Mo4Xj1vnHLFNMU=
|
||||
SHA1 (bacula-2.4.3.tar.gz) = wk58K9hwZGfXHGCzLMzexBaQLMM=
|
||||
SHA256 (bacula-2.4.3.tar.gz) = 8NK802omeocROP+XOU7GRnHxwJ3G6aib8iHOCVfN+sI=
|
||||
SIZE (bacula-2.4.3.tar.gz) = 3125702
|
||||
|
||||
@ -1,9 +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.
|
||||
${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
|
||||
if [ -x ${TRUEPREFIX}/libexec/bacula/bacula-ctl-fd ]; then
|
||||
${TRUEPREFIX}/libexec/bacula/bacula-ctl-fd start
|
||||
echo -n ' bacula-fd'
|
||||
fi
|
||||
|
||||
@ -2,21 +2,21 @@ 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.
|
||||
${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
|
||||
${TRUEPREFIX}/libexec/bacula
|
||||
|
||||
To allow the storage daemon user to access tape devices,
|
||||
be sure to add !!SD_USER!! to the operator group.
|
||||
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
|
||||
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
|
||||
if [ -x ${TRUEPREFIX}/libexec/bacula/bacula-ctl-dir ]; then
|
||||
${TRUEPREFIX}/libexec/bacula/bacula-ctl-dir start
|
||||
echo -n ' bacula-dir'
|
||||
fi
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2008/02/07 02:53:35 merdely Exp $
|
||||
--- configure.orig Fri Nov 30 16:32:48 2007
|
||||
+++ configure Sun Jan 27 12:46:08 2008
|
||||
@@ -3262,7 +3262,7 @@ else
|
||||
echo "${ECHO_T}no" >&6
|
||||
$OpenBSD: patch-configure,v 1.3 2008/10/19 03:44:42 merdely Exp $
|
||||
--- configure.orig Thu Jun 19 15:44:34 2008
|
||||
+++ configure Tue Jul 1 19:28:12 2008
|
||||
@@ -4014,7 +4014,7 @@ 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; }; }
|
||||
@@ -30401,6 +30401,7 @@ openbsd)
|
||||
@@ -29982,6 +29982,7 @@ openbsd)
|
||||
platforms/openbsd/bacula-fd \
|
||||
platforms/openbsd/bacula-sd \
|
||||
platforms/openbsd/bacula-dir"
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.2 2008/02/07 02:53:35 merdely Exp $
|
||||
;;
|
||||
redhat)
|
||||
if test -f /etc/whitebox-release ; then
|
||||
@@ -32221,7 +32222,7 @@ if test "${support_bat}" = "yes" ; then
|
||||
@@ -31766,7 +31767,7 @@ if test "${support_bat}" = "yes" ; then
|
||||
QMAKEBIN="qmake"
|
||||
|
||||
if test "x$QMAKEQT4" != "xnone"; then
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-manpages_bat_1,v 1.1 2008/02/07 02:53:35 merdely Exp $
|
||||
$OpenBSD: patch-manpages_bat_1,v 1.2 2008/10/19 03:44:42 merdely Exp $
|
||||
--- 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.
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-manpages_bat_1,v 1.1 2008/02/07 02:53:35 merdely Exp $
|
||||
.TP
|
||||
.B \-c <config>
|
||||
-Specify configuration file. Default is bat.conf.
|
||||
+Specify configuration file. Default is !!BACULACONF!!/bat.conf.
|
||||
+Specify configuration file. Default is ${BACULACONF}/bat.conf.
|
||||
.TP
|
||||
.B \-d <nn>
|
||||
Set debug level to \fInn\fP.
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-scripts_bacula_in,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
|
||||
--- scripts/bacula.in.orig Thu Jul 12 11:20:52 2007
|
||||
+++ scripts/bacula.in Thu Jul 12 11:21:23 2007
|
||||
@@ -13,9 +13,9 @@
|
||||
# easier to "steal" this code for the development
|
||||
# environment where they are different.
|
||||
#
|
||||
-BACFDCFG=@sysconfdir@
|
||||
-BACSDCFG=@sysconfdir@
|
||||
-BACDIRCFG=@sysconfdir@
|
||||
+BACFDCFG=@scriptdir@
|
||||
+BACSDCFG=@scriptdir@
|
||||
+BACDIRCFG=@scriptdir@
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-scripts_mtx-changer_in,v 1.2 2008/02/07 02:53:35 merdely Exp $
|
||||
--- scripts/mtx-changer.in.orig Thu Aug 16 09:01:19 2007
|
||||
+++ scripts/mtx-changer.in Wed Jan 9 16:17:45 2008
|
||||
$OpenBSD: patch-scripts_mtx-changer_in,v 1.3 2008/10/19 03:44:42 merdely Exp $
|
||||
--- scripts/mtx-changer.in.orig Wed Jul 2 16:49:44 2008
|
||||
+++ scripts/mtx-changer.in Tue Jul 1 19:28:12 2008
|
||||
@@ -2,3 +2,3 @@
|
||||
#
|
||||
-# Bacula interface to mtx autoloader
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-scripts_mtx-changer_in,v 1.2 2008/02/07 02:53:35 merdely Exp $
|
||||
# exit code, Bacula will assume the request failed.
|
||||
#
|
||||
|
||||
@@ -161,17 +161,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
|
||||
@@ -173,17 +173,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
|
||||
|
||||
case $cmd in
|
||||
unload)
|
||||
@ -41,7 +41,7 @@ $OpenBSD: patch-scripts_mtx-changer_in,v 1.2 2008/02/07 02:53:35 merdely Exp $
|
||||
rtn=$?
|
||||
#
|
||||
# Increase the sleep time if you have a slow device
|
||||
@@ -182,36 +182,37 @@ case $cmd in
|
||||
@@ -194,36 +194,37 @@ case $cmd in
|
||||
;;
|
||||
|
||||
list)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely 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
|
||||
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.4 2008/10/19 03:44:42 merdely Exp $
|
||||
--- src/dird/bacula-dir.conf.in.orig Thu Jun 19 15:44:34 2008
|
||||
+++ src/dird/bacula-dir.conf.in Tue Jul 1 19:28:12 2008
|
||||
@@ -13,7 +13,8 @@
|
||||
#
|
||||
|
||||
@ -29,7 +29,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
# JobDefs = "DefaultJob"
|
||||
# Write Bootstrap = "@working_dir@/Client2.bsr"
|
||||
#}
|
||||
@@ -75,8 +76,8 @@ Job {
|
||||
@@ -79,8 +80,8 @@ Job {
|
||||
Job {
|
||||
Name = "RestoreFiles"
|
||||
Type = Restore
|
||||
@ -40,7 +40,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
Storage = File
|
||||
Pool = Default
|
||||
Messages = Standard
|
||||
@@ -101,11 +102,7 @@ FileSet {
|
||||
@@ -105,11 +106,7 @@ FileSet {
|
||||
# if you have other partitons such as /usr or /home
|
||||
# you will probably want to add them too.
|
||||
#
|
||||
@ -53,7 +53,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
}
|
||||
|
||||
#
|
||||
@@ -150,8 +147,8 @@ FileSet {
|
||||
@@ -154,8 +151,8 @@ FileSet {
|
||||
|
||||
# Client (File Services) to backup
|
||||
Client {
|
||||
@ -64,7 +64,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
FDPort = @fd_port@
|
||||
Catalog = MyCatalog
|
||||
Password = "@fd_password@" # password for FileDaemon
|
||||
@@ -165,8 +162,8 @@ Client {
|
||||
@@ -169,8 +166,8 @@ Client {
|
||||
# You should change Name, Address, and Password before using
|
||||
#
|
||||
#Client {
|
||||
@ -75,7 +75,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
# FDPort = @fd_port@
|
||||
# Catalog = MyCatalog
|
||||
# Password = "@fd_password@2" # password for FileDaemon 2
|
||||
@@ -180,7 +177,7 @@ Client {
|
||||
@@ -184,7 +181,7 @@ Client {
|
||||
Storage {
|
||||
Name = File
|
||||
# Do not use "localhost" here
|
||||
@ -84,7 +84,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
SDPort = @sd_port@
|
||||
Password = "@sd_password@"
|
||||
Device = FileStorage
|
||||
@@ -193,7 +190,7 @@ Storage {
|
||||
@@ -197,7 +194,7 @@ Storage {
|
||||
#Storage {
|
||||
# Name = DDS-4
|
||||
# Do not use "localhost" here
|
||||
@ -93,7 +93,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
# SDPort = @sd_port@
|
||||
# Password = "@sd_password@" # password for Storage daemon
|
||||
# Device = DDS-4 # must be same as Device in Storage daemon
|
||||
@@ -205,7 +202,7 @@ Storage {
|
||||
@@ -209,7 +206,7 @@ Storage {
|
||||
#Storage {
|
||||
# Name = "8mmDrive"
|
||||
# Do not use "localhost" here
|
||||
@ -102,7 +102,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
# SDPort = @sd_port@
|
||||
# Password = "@sd_password@"
|
||||
# Device = "Exabyte 8mm"
|
||||
@@ -216,7 +213,7 @@ Storage {
|
||||
@@ -220,7 +217,7 @@ Storage {
|
||||
#Storage {
|
||||
# Name = "DVD"
|
||||
# Do not use "localhost" here
|
||||
@ -111,7 +111,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely Ex
|
||||
# SDPort = @sd_port@
|
||||
# Password = "@sd_password@"
|
||||
# Device = "DVD Writer"
|
||||
@@ -292,7 +289,7 @@ Pool {
|
||||
@@ -296,7 +293,7 @@ Pool {
|
||||
# Restricted console used by tray-monitor to get the status of the director
|
||||
#
|
||||
Console {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-src_qt-console_main_cpp,v 1.1 2008/02/07 02:53:35 merdely Exp $
|
||||
$OpenBSD: patch-src_qt-console_main_cpp,v 1.2 2008/10/19 03:44:42 merdely Exp $
|
||||
--- 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);
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-src_qt-console_main_cpp,v 1.1 2008/02/07 02:53:35 merdely Exp $
|
||||
static int check_resources();
|
||||
|
||||
-#define CONFIG_FILE "./bat.conf" /* default configuration file */
|
||||
+#define CONFIG_FILE "!!BACULACONF!!/bat.conf" /* default configuration file */
|
||||
+#define CONFIG_FILE "${BACULACONF}/bat.conf" /* default configuration file */
|
||||
|
||||
/* Static variables */
|
||||
static char *configfile = NULL;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PLIST-bat,v 1.2 2008/02/16 21:22:41 merdely Exp $
|
||||
@comment $OpenBSD: PLIST-bat,v 1.3 2008/10/19 03:44:42 merdely Exp $
|
||||
@newgroup _bacula:591
|
||||
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
|
||||
@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
|
||||
@man man/man1/bat.1
|
||||
sbin/bat
|
||||
@bin sbin/bat
|
||||
share/examples/bacula/
|
||||
@mode 750
|
||||
@owner _bacula
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2008/02/16 21:22:41 merdely Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2008/10/19 03:44:42 merdely Exp $
|
||||
@conflict bacula-client-*
|
||||
@conflict bacula-server-<2.2.7
|
||||
@pkgpath sysutils/bacula,-client
|
||||
@newgroup _bacula:591
|
||||
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
|
||||
@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin
|
||||
libexec/bacula/
|
||||
libexec/bacula/bacula-ctl-fd
|
||||
@man man/man8/bacula-fd.8
|
||||
sbin/bacula-fd
|
||||
@bin sbin/bacula-fd
|
||||
share/doc/bacula/
|
||||
share/doc/bacula/README-client.OpenBSD
|
||||
share/examples/bacula/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-server,v 1.3 2008/02/16 21:22:41 merdely Exp $
|
||||
@comment $OpenBSD: PLIST-server,v 1.4 2008/10/19 03:44:42 merdely Exp $
|
||||
@conflict bacula-<2.2.7
|
||||
@newgroup _bacula:591
|
||||
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
|
||||
@ -46,19 +46,19 @@ libexec/bacula/update_${BACKEND}_tables
|
||||
@man man/man8/btape.8
|
||||
@man man/man8/btraceback.8
|
||||
@man man/man8/dbcheck.8
|
||||
sbin/bacula-dir
|
||||
sbin/bacula-sd
|
||||
sbin/bconsole
|
||||
sbin/bcopy
|
||||
sbin/bextract
|
||||
sbin/bls
|
||||
sbin/bregex
|
||||
sbin/bscan
|
||||
sbin/bsmtp
|
||||
sbin/btape
|
||||
@bin sbin/bacula-dir
|
||||
@bin sbin/bacula-sd
|
||||
@bin sbin/bconsole
|
||||
@bin sbin/bcopy
|
||||
@bin sbin/bextract
|
||||
@bin sbin/bls
|
||||
@bin sbin/bregex
|
||||
@bin sbin/bscan
|
||||
@bin sbin/bsmtp
|
||||
@bin sbin/btape
|
||||
sbin/btraceback
|
||||
sbin/bwild
|
||||
sbin/dbcheck
|
||||
@bin sbin/bwild
|
||||
@bin sbin/dbcheck
|
||||
share/doc/bacula/
|
||||
share/doc/bacula/README-server.OpenBSD
|
||||
share/examples/bacula/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user