Update bacula to 5.0.2.

Fixes the weird install issues with the bat binary

New features can be found here:
http://www.bacula.org/5.0.x-manuals/en/main/main/New_Features_in_5_0_0.html

Thanks to sthen for help with the new wantlib/lib_depends stuff,
removing the sqlite flavor, ...

Thanks to giovanni for pointing out a ${TRUEPREFIX} -> /usr/local that
crept into one of my patch files.

ok sthen@
This commit is contained in:
merdely 2010-07-20 14:38:39 +00:00
parent f809246d18
commit b92ffdaba9
20 changed files with 250 additions and 143 deletions

View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.20 2010/03/28 16:05:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2010/07/20 14:38:39 merdely Exp $
COMMENT-main= network backup solution (client)
COMMENT-server= network backup solution (server)
COMMENT-bat= network backup solution (gui-client)
V= 3.0.3
V= 5.0.2
DISTNAME= bacula-$V
FULLPKGNAME-main= bacula-client-$Vp0
FULLPKGNAME-main= bacula-client-$V
FULLPKGPATH-main= ${PKGPATH},-main
PKGNAME-server= bacula-server-$V
FULLPKGNAME-bat= bacula-bat-$Vp1
FULLPKGNAME-bat= bacula-bat-$V
FULLPKGPATH-bat= ${PKGPATH},-bat
CATEGORIES= sysutils
SHARED_LIBS += bac 0.0 # .1.0
SHARED_LIBS += baccfg 0.0 # .1.0
SHARED_LIBS += bacpy 0.0 # .1.0
SHARED_LIBS += bacfind 0.0 # .1.0
SHARED_LIBS += bacsql 0.0 # .1.0
SHARED_LIBS += bac 1.0 # .1.0
SHARED_LIBS += baccfg 1.0 # .1.0
SHARED_LIBS += bacpy 1.0 # .1.0
SHARED_LIBS += bacfind 1.0 # .1.0
SHARED_LIBS += bacsql 1.0 # .1.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
HOMEPAGE= http://www.bacula.org/
@ -47,7 +47,7 @@ USE_LIBTOOL= yes
NO_REGRESS= yes
PSEUDO_FLAVORS= no_bat no_server
FLAVORS= pgsql mysql sqlite3 sqlite
FLAVORS= pgsql mysql sqlite3
FLAVOR?= sqlite3
CONFIGURE_ARGS= --enable-smartalloc \
@ -89,7 +89,8 @@ CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline \
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
QMAKEQT4=${LOCALBASE}/bin/qmake4 \
QMAKEBIN4=qmake4 \
QMAKE=${LOCALBASE}/bin/${QMAKEBIN4} \
PKG_CONFIG_LIBDIR="${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4"
.if ${FLAVOR:L:Mno_server}
@ -98,8 +99,8 @@ CONFIGURE_ARGS+= --enable-client-only \
--disable-build-stored
.else
MULTI_PACKAGES+= -server
WANTLIB-server= ${WANTLIB} readline termcap
LIB_DEPENDS-server= bac,baccfg,bacfind,bacpy::sysutils/bacula,-main
WANTLIB-server= ${WANTLIB} bac baccfg bacfind bacpy readline termcap
LIB_DEPENDS-server= ::sysutils/bacula,-main
CONFIGURE_ARGS+= --with-dir-user=_bacula \
--with-dir-group=_bacula \
--with-sd-user=${SD_USER} \
@ -108,10 +109,11 @@ CONFIGURE_ARGS+= --with-dir-user=_bacula \
BACKEND=
.if ${FLAVOR:L:Mpgsql}
.if !empty(BACKEND)
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3"
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite3"
.endif
CONFIGURE_ARGS+= --with-postgresql
LIB_DEPENDS-server+= pq.>=2:postgresql-client-*:databases/postgresql
WANTLIB-server+= pq.>=2
LIB_DEPENDS-server+= :postgresql-client-*:databases/postgresql
BACKEND= postgresql
.else
CONFIGURE_ARGS+= --without-postgresql
@ -119,11 +121,12 @@ CONFIGURE_ARGS+= --without-postgresql
.if ${FLAVOR:L:Mmysql}
.if !empty(BACKEND)
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3"
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite3"
.endif
CONFIGURE_ARGS+= --with-mysql \
--enable-batch-insert
LIB_DEPENDS-server+= mysqlclient_r.>=18::databases/mysql
WANTLIB-server+= mysqlclient_r.>=18
LIB_DEPENDS-server+= ::databases/mysql
BACKEND= mysql
.else
CONFIGURE_ARGS+= --without-mysql
@ -131,29 +134,19 @@ CONFIGURE_ARGS+= --without-mysql
.if ${FLAVOR:L:Msqlite3}
.if !empty(BACKEND)
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3"
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite3"
.endif
CONFIGURE_ARGS+= --with-sqlite3
LIB_DEPENDS-server+= sqlite3.>=8::databases/sqlite3
WANTLIB-server+= sqlite3.>=8
LIB_DEPENDS-server+= ::databases/sqlite3
BACKEND= sqlite3
.else
CONFIGURE_ARGS+= --without-sqlite3
.endif
.if ${FLAVOR:L:Msqlite}
.if !empty(BACKEND)
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3"
.endif
CONFIGURE_ARGS+= --with-sqlite
LIB_DEPENDS-server+= sqlite::databases/sqlite
BACKEND= sqlite
.else
CONFIGURE_ARGS+= --without-sqlite
.endif
SUBST_VARS+= BACKEND
.if empty(BACKEND)
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3"
ERRORS+= "Fatal: choose either pgsql or mysql or sqlite3"
.endif
.endif # if no_server
@ -163,13 +156,11 @@ LIB_DEPENDS-main=
CONFIGURE_ARGS+= --disable-bat
.else
CONFIGURE_ARGS+= --enable-bat
WANTLIB-bat= ${WANTLIB} ICE SM X11 Xau Xdmcp Xext Xi Xinerama \
Xrender expat fontconfig freetype gobject-2.0 glib-2.0 \
gthread-2.0 iconv intl pcre png pthread-stubs xcb
WANTLIB-bat += QtCore QtGui bac baccfg c crypto m pthread ssl stdc++
MULTI_PACKAGES+= -bat
RUN_DEPENDS-bat= ::devel/desktop-file-utils
LIB_DEPENDS-bat= QtCore,QtGui::x11/qt4 \
bac,baccfg::sysutils/bacula,-main
LIB_DEPENDS-bat= ::x11/qt4 \
::sysutils/bacula,-main
.endif
post-extract:
@ -200,7 +191,11 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/updatedb/* ${PREFIX}/libexec/bacula/updatedb
.endif
.if !${FLAVOR:L:Mno_bat}
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin/
if [ -f ${PREFIX}/lib/libbac.so.${LIBbac_VERSION} ] ; then \
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin/; \
else \
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/; \
fi
${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
${PREFIX}/share/examples/bacula/
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps

View File

@ -1,5 +1,5 @@
MD5 (bacula-3.0.3.tar.gz) = /rpYaRtnSxIFY1nUWa1pQA==
RMD160 (bacula-3.0.3.tar.gz) = hDzKYpCyeAzMN6IR+UEGpKdOlT8=
SHA1 (bacula-3.0.3.tar.gz) = tPf3suua+oBeG64RC+a8bphhxQY=
SHA256 (bacula-3.0.3.tar.gz) = NZLPUyo9NKyIr9PJraJV2cWxAlnCFuX/QpO7pxRB6WY=
SIZE (bacula-3.0.3.tar.gz) = 3903085
MD5 (bacula-5.0.2.tar.gz) = 6SBNLncvEmYt4o2jMnhT3g==
RMD160 (bacula-5.0.2.tar.gz) = yy52dHa68NC8NXOjmIKHDkHdpts=
SHA1 (bacula-5.0.2.tar.gz) = /luNaC/nPSRY8LKWXqiDhrpA8NU=
SHA256 (bacula-5.0.2.tar.gz) = xGXQDdlogy0Sm6aO6llxQ1dgWkYddFzvfoApeMRTw/s=
SIZE (bacula-5.0.2.tar.gz) = 4189272

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2009/10/02 02:34:05 merdely Exp $
--- configure.orig Fri Jul 10 15:12:39 2009
+++ configure Mon Sep 21 20:59:33 2009
@@ -4239,7 +4239,7 @@ echo "${ECHO_T}no" >&6; }
$OpenBSD: patch-configure,v 1.6 2010/07/20 14:38:39 merdely Exp $
--- configure.orig Tue Apr 27 15:58:29 2010
+++ configure Mon Jul 19 15:43:39 2010
@@ -4267,7 +4267,7 @@ echo "${ECHO_T}no" >&6; }
fi
@ -10,7 +10,25 @@ $OpenBSD: patch-configure,v 1.5 2009/10/02 02:34:05 merdely Exp $
{ { 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; }; }
@@ -42224,13 +42224,13 @@ _ACEOF
@@ -15929,7 +15929,7 @@ if test x$use_libtool != xno; then
LIBTOOL_INSTALL_TARGET="libtool-install"
LIBTOOL_UNINSTALL_TARGET="libtool-uninstall"
LIBTOOL_CLEAN_TARGET="libtool-clean"
- QMAKE_LIBTOOL="${BUILD_DIR}/libtool"
+ QMAKE_LIBTOOL="${LIBTOOL}"
FD_PLUGIN_DIR="src/plugins/fd"
have_plugins=yes
else
@@ -15940,7 +15940,7 @@ else
LIBTOOL_INSTALL_TARGET=""
LIBTOOL_UNINSTALL_TARGET=""
LIBTOOL_CLEAN_TARGET=""
- QMAKE_LIBTOOL="# ${BUILD_DIR}/libtool"
+ QMAKE_LIBTOOL="# ${LIBTOOL}"
FD_PLUGIN_DIR=""
have_plugins=no
fi
@@ -43349,13 +43349,13 @@ _ACEOF
fi
PTHREAD_LIB=""
@ -27,7 +45,7 @@ $OpenBSD: patch-configure,v 1.5 2009/10/02 02:34:05 merdely Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -42286,7 +42286,7 @@ fi
@@ -43411,7 +43411,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
if test $ac_cv_lib_pthread_pthread_create = yes; then
@ -36,20 +54,50 @@ $OpenBSD: patch-configure,v 1.5 2009/10/02 02:34:05 merdely Exp $
else
{ echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
@@ -42715,6 +42715,7 @@ openbsd)
@@ -44158,6 +44158,7 @@ openbsd)
platforms/openbsd/bacula-fd \
platforms/openbsd/bacula-sd \
platforms/openbsd/bacula-dir"
+ largefile_support="yes"
;;
redhat)
ping -c 1 $hostname 2>&1 1>/dev/null
@@ -45729,7 +45730,7 @@ echo "$as_me: error: Could not find qmake or qmake-qt4
QMAKEBIN="qmake"
if test -f /etc/whitebox-release ; then
@@ -44299,7 +44300,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
exit 1
fi
if test "x$QMAKEQT4" != "xnone"; then
- QMAKEBIN=qmake-qt4
+ QMAKEBIN=${QMAKEQT4}
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/create_ingres_database src/cats/update_ingres_tables src/cats/make_ingres_tables src/cats/grant_ingres_privileges src/cats/drop_ingres_tables src/cats/drop_ingres_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 examples/nagios/check_bacula/Makefile $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/create_ingres_database src/cats/update_ingres_tables src/cats/make_ingres_tables src/cats/grant_ingres_privileges src/cats/drop_ingres_tables src/cats/drop_ingres_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 examples/nagios/check_bacula/Makefile $PFILES"
ac_config_commands="$ac_config_commands default"
@@ -45332,9 +45333,11 @@ do
"src/win32/Makefile.inc") CONFIG_FILES="$CONFIG_FILES src/win32/Makefile.inc" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"updatedb/update_mysql_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_9_to_10" ;;
+ "updatedb/update_sqlite_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite_tables_9_to_10" ;;
"updatedb/update_sqlite3_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_9_to_10" ;;
"updatedb/update_postgresql_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_9_to_10" ;;
"updatedb/update_mysql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_10_to_11" ;;
+ "updatedb/update_sqlite_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite_tables_10_to_11" ;;
"updatedb/update_sqlite3_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_10_to_11" ;;
"updatedb/update_postgresql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_10_to_11" ;;
"examples/nagios/check_bacula/Makefile") CONFIG_FILES="$CONFIG_FILES examples/nagios/check_bacula/Makefile" ;;
@@ -47193,7 +47196,7 @@ echo "$as_me: error: Could not find qmake $PATH. Check
{ (exit 1); exit 1; }; }
fi
- QMAKEBIN="qmake"
+ QMAKEBIN=${QMAKEBIN4}
cd src/qt-console
echo "Creating bat Makefile"
touch bat
@@ -47221,7 +47224,7 @@ cd ..
c=updatedb
chmod 755 $c/update_mysql_tables_10_to_11 $c/update_sqlite3_tables_10_to_11
-chmod 755 $c/update_postgresql_tables_10_to_11
+chmod 755 $c/update_sqlite_tables_10_to_11 $c/update_postgresql_tables_10_to_11
c=src/cats

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-manpages_Makefile_in,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
--- manpages/Makefile.in.orig Sat May 26 14:04:01 2007
+++ manpages/Makefile.in Sat May 26 14:05:04 2007
@@ -20,15 +20,11 @@ depend:
$OpenBSD: patch-manpages_Makefile_in,v 1.2 2010/07/20 14:38:39 merdely Exp $
--- manpages/Makefile.in.orig Tue Apr 27 15:58:29 2010
+++ manpages/Makefile.in Thu Jun 24 09:37:46 2010
@@ -21,15 +21,11 @@ depend:
install:
$(MKDIR) $(DESTDIR)/$(mandir)/man8
for I in ${MAN8}; \

View File

@ -1,12 +1,12 @@
$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.
$OpenBSD: patch-manpages_bat_1,v 1.3 2010/07/20 14:38:39 merdely Exp $
--- manpages/bat.1.orig Tue Apr 27 15:58:29 2010
+++ manpages/bat.1 Thu Jun 24 16:25:08 2010
@@ -22,7 +22,7 @@ but it is graphical oriented and more features.
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.
+Specify configuration file. Default is /etc/bacula/bat.conf.
.TP
.B \-d <nn>
Set debug level to \fInn\fP.

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_bat_desktop_in,v 1.2 2010/03/28 16:05:25 ajacoutot Exp $
--- scripts/bat.desktop.in.orig Tue Jun 2 01:03:45 2009
+++ scripts/bat.desktop.in Tue Jun 2 01:03:55 2009
$OpenBSD: patch-scripts_bat_desktop_in,v 1.3 2010/07/20 14:38:39 merdely Exp $
--- scripts/bat.desktop.in.orig Tue Apr 27 15:58:29 2010
+++ scripts/bat.desktop.in Thu Jun 24 16:25:08 2010
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Bacula Administration Tool

View File

@ -1,15 +1,17 @@
$OpenBSD: patch-scripts_mtx-changer_in,v 1.4 2009/10/02 02:34:05 merdely Exp $
$OpenBSD: patch-scripts_mtx-changer_in,v 1.5 2010/07/20 14:38:39 merdely Exp $
XXX first hunk hand-rolled for CVS keyword, Id
--- scripts/mtx-changer.in.orig Fri Jul 18 09:44:03 2008
+++ scripts/mtx-changer.in Mon Sep 21 20:58:36 2009
@@ -1,4 +1,4 @@
--- scripts/mtx-changer.in.orig Tue Apr 27 15:58:29 2010
+++ scripts/mtx-changer.in Thu Jun 24 10:22:49 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Bacula interface to mtx autoloader
+# Bacula interface to chio autoloader
#
# If you set in your Device resource
#
@@ -39,10 +39,10 @@
# e.g. mt -f $4 offline
#
@ -23,7 +25,7 @@ XXX first hunk hand-rolled for CVS keyword, Id
# exit code, Bacula will assume the request failed.
#
@@ -143,7 +143,7 @@ debug "Parms: $ctl $cmd $slot $device $drive"
@@ -152,7 +152,7 @@ debug "Parms: $ctl $cmd $slot $device $drive"
case $cmd in
unload)
@ -32,7 +34,7 @@ XXX first hunk hand-rolled for CVS keyword, Id
if test ${offline} -eq 1 ; then
mt -f $device offline
@@ -151,12 +151,12 @@ case $cmd in
@@ -160,12 +160,12 @@ case $cmd in
if test ${offline_sleep} -ne 0 ; then
sleep ${offline_sleep}
fi
@ -48,7 +50,7 @@ XXX first hunk hand-rolled for CVS keyword, Id
rtn=$?
if test ${load_sleep} -ne 0 ; then
sleep ${load_sleep}
@@ -166,36 +166,33 @@ case $cmd in
@@ -175,56 +175,22 @@ case $cmd in
;;
list)
@ -72,6 +74,47 @@ XXX first hunk hand-rolled for CVS keyword, Id
exit $rtn
;;
listall)
-# Drive content: D:Drive num:F:Slot loaded:Volume Name
-# D:0:F:2:vol2 or D:Drive num:E
-# D:1:F:42:vol42
-# D:3:E
-#
-# Slot content:
-# S:1:F:vol1 S:Slot num:F:Volume Name
-# S:2:E or S:Slot num:E
-# S:3:F:vol4
-#
-# Import/Export tray slots:
-# I:10:F:vol10 I:Slot num:F:Volume Name
-# I:11:E or I:Slot num:E
-# I:12:F:vol40
-
- debug "Doing mtx -f $ctl -- to list all"
- make_temp_file
- if test ${inventory} -ne 0 ; then
- ${MTX} -f $ctl inventory
- fi
- ${MTX} -f $ctl status >${TMPFILE}
- rtn=$?
- # can be converted to awk+sed+cut, contributions are welcome
- perl -ne '
-/Data Transfer Element (\d+):Empty/ && print "D:$1:E\n";
-/Data Transfer Element (\d+):Full \(Storage Element (\d+) Loaded\)(:VolumeTag =\s*(.+))?/ && print "D:$1:F:$2:$4\n";
-/Storage Element (\d+):Empty/ && print "S:$1:E\n";
-/Storage Element (\d+):Full( :VolumeTag=(.+))?/ && print "S:$1:F:$3\n";
-/Storage Element (\d+) IMPORT.EXPORT:Empty/ && print "I:$1:E\n";
-/Storage Element (\d+) IMPORT.EXPORT:Full( :VolumeTag=(.+))?/ && print "I:$1:F:$3\n";' ${TMPFILE}
- rm -f ${TMPFILE} >/dev/null 2>&1
- exit $rtn
+ echo "The listall command is not implemented on OpenBSD"
+ exit 1
;;
transfer)
@@ -236,18 +202,19 @@ case $cmd in
;;
loaded)
- debug "Doing mtx -f $ctl $drive -- to find what is loaded"
+ debug "Doing chio -f $ctl status -- to find what is loaded"

View File

@ -1,11 +1,11 @@
Alpha fails to build because ioctl_req_t is defined as unsigned long int.
$OpenBSD: patch-src_baconfig_h,v 1.1 2009/11/08 01:26:08 merdely Exp $
--- src/baconfig.h.orig Fri Nov 6 10:46:05 2009
+++ src/baconfig.h Fri Nov 6 10:45:43 2009
@@ -647,6 +647,11 @@ int m_msg(const char *file, int line, POOLMEM *&pool_
#define ioctl_req_t int
#endif
$OpenBSD: patch-src_baconfig_h,v 1.2 2010/07/20 14:38:39 merdely Exp $
--- src/baconfig.h.orig Tue Apr 27 15:58:29 2010
+++ src/baconfig.h Thu Jun 24 09:37:47 2010
@@ -727,6 +727,11 @@ extern "C" int setdomainname(char *name, int namelen);
#endif /* HAVE_HPUX_OS */
+#if defined (__OpenBSD__) && defined (__alpha__)
+#undef ioctl_req_t
@ -13,5 +13,5 @@ $OpenBSD: patch-src_baconfig_h,v 1.1 2009/11/08 01:26:08 merdely Exp $
+#endif
+
#ifdef HAVE_OSF1_OS
#undef ioctl_req_t
#define ioctl_req_t int
extern "C" int fchdir(int filedes);
extern "C" long gethostid(void);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_cats_Makefile_in,v 1.1 2010/07/20 14:38:39 merdely Exp $
--- src/cats/Makefile.in.orig Thu Jun 24 15:33:25 2010
+++ src/cats/Makefile.in Thu Jun 24 15:39:29 2010
@@ -69,7 +69,7 @@ libbacsql.a: $(LIBBACSQL_OBJS)
libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_CURRENT).$(LIBBACSQL_LT_REVISION).$(LIBBACSQL_LT_AGE) $(DB_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbacsql_LTVERSION) $(DB_LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Exp $
--- src/dird/bacula-dir.conf.in.orig Wed Jul 15 18:05:40 2009
+++ src/dird/bacula-dir.conf.in Tue Sep 1 22:38:31 2009
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.6 2010/07/20 14:38:39 merdely Exp $
--- src/dird/bacula-dir.conf.in.orig Tue Apr 27 15:58:29 2010
+++ src/dird/bacula-dir.conf.in Thu Jun 24 09:37:47 2010
@@ -14,6 +14,7 @@
Director { # define myself
@ -9,7 +9,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Ex
DIRport = @dir_port@ # where we listen for UA connections
QueryFile = "@scriptdir@/query.sql"
WorkingDirectory = "@working_dir@"
@@ -79,8 +80,8 @@ Job {
@@ -76,8 +77,8 @@ Job {
Job {
Name = "RestoreFiles"
Type = Restore
@ -20,7 +20,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Ex
Storage = File
Pool = Default
Messages = Standard
@@ -157,7 +158,7 @@ FileSet {
@@ -154,7 +155,7 @@ FileSet {
# Client (File Services) to backup
Client {
Name = @basename@-fd
@ -29,7 +29,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Ex
FDPort = @fd_port@
Catalog = MyCatalog
Password = "@fd_password@" # password for FileDaemon
@@ -171,8 +172,8 @@ Client {
@@ -168,8 +169,8 @@ Client {
# You should change Name, Address, and Password before using
#
#Client {
@ -40,7 +40,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Ex
# FDPort = @fd_port@
# Catalog = MyCatalog
# Password = "@fd_password@2" # password for FileDaemon 2
@@ -199,7 +200,7 @@ Storage {
@@ -196,7 +197,7 @@ Storage {
#Storage {
# Name = DDS-4
# Do not use "localhost" here
@ -49,7 +49,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Ex
# SDPort = @sd_port@
# Password = "@sd_password@" # password for Storage daemon
# Device = DDS-4 # must be same as Device in Storage daemon
@@ -211,7 +212,7 @@ Storage {
@@ -208,7 +209,7 @@ Storage {
#Storage {
# Name = "8mmDrive"
# Do not use "localhost" here
@ -58,7 +58,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.5 2009/10/02 02:34:05 merdely Ex
# SDPort = @sd_port@
# Password = "@sd_password@"
# Device = "Exabyte 8mm"
@@ -222,7 +223,7 @@ Storage {
@@ -219,7 +220,7 @@ Storage {
#Storage {
# Name = "DVD"
# Do not use "localhost" here

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_findlib_Makefile_in,v 1.1 2010/07/20 14:38:39 merdely Exp $
--- src/findlib/Makefile.in.orig Thu Jun 24 15:40:33 2010
+++ src/findlib/Makefile.in Thu Jun 24 15:40:54 2010
@@ -59,7 +59,7 @@ libbacfind.a: $(LIBBACFIND_OBJS)
libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbacfind_LTVERSION)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_lib_Makefile_in,v 1.1 2010/07/20 14:38:39 merdely Exp $
--- src/lib/Makefile.in.orig Thu Jun 24 15:40:58 2010
+++ src/lib/Makefile.in Thu Jun 24 15:42:22 2010
@@ -126,7 +126,7 @@ libbac.a: $(LIBBAC_OBJS)
libbac.la: Makefile $(LIBBAC_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbac_LTVERSION)
libbaccfg.a: $(LIBBACCFG_OBJS)
@echo "Making $@ ..."
@@ -135,7 +135,7 @@ libbaccfg.a: $(LIBBACCFG_OBJS)
libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbaccfg_LTVERSION)
libbacpy.a: $(LIBBACPY_OBJS)
@echo "Making $@ ..."
@@ -144,7 +144,7 @@ libbacpy.a: $(LIBBACPY_OBJS)
libbacpy.la: Makefile $(LIBBACPY_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_CURRENT).$(LIBBACPY_LT_REVISION).$(LIBBACPY_LT_AGE) $(PYTHON_LIBS)
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) $(LIBbacpy_LTVERSION)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_plugins_dir_Makefile_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
--- src/plugins/dir/Makefile.in.orig Mon Sep 21 21:00:47 2009
+++ src/plugins/dir/Makefile.in Mon Sep 21 21:00:52 2009
@@ -28,7 +28,7 @@ dir_plugins.o: ${DIRDIR}/dir_plugins.h ${DIRDIR}/dir_p
$(CXX) -I${SRCDIR} -I${DIRDIR} -DTEST_PROGRAM -c ${DIRDIR}/dir_plugins.c
main: dir_plugins.o
- $(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl
+ $(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -pthread -lssl -l crypto -ldl
example-plugin-dir.o: example-plugin-dir.c ${DIRDIR}/dir_plugins.h
$(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -fPIC -I../.. -I${DIRDIR} -c example-plugin-dir.c

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_plugins_fd_Makefile_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
--- src/plugins/fd/Makefile.in.orig Mon Sep 21 21:00:25 2009
+++ src/plugins/fd/Makefile.in Mon Sep 21 21:00:30 2009
@@ -28,7 +28,7 @@ fd_plugins.o: ${FDDIR}/fd_plugins.h ${FDDIR}/fd_plugin
$(CXX) -I${SRCDIR} -I${FDDIR} -DTEST_PROGRAM -c ${FDDIR}/fd_plugins.c
main: fd_plugins.o
- $(CXX) $(LDFLAGS) -L${LIBDIR} fd_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl
+ $(CXX) $(LDFLAGS) -L${LIBDIR} fd_plugins.o -o main -lbac -pthread -lssl -l crypto -ldl
example-plugin-fd.o: example-plugin-fd.c ${FDDIR}/fd_plugins.h
$(CXX) -fPIC -I../.. -I${FDDIR} -c example-plugin-fd.c

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_plugins_sd_Makefile_in,v 1.1 2009/10/02 02:34:05 merdely Exp $
--- src/plugins/sd/Makefile.in.orig Mon Sep 21 21:01:21 2009
+++ src/plugins/sd/Makefile.in Mon Sep 21 21:01:25 2009
@@ -28,7 +28,7 @@ dir_plugins.o: ${SDDIR}/dir_plugins.h ${SDDIR}/dir_plu
$(CXX) -I${SRCDIR} -I${SDDIR} -DTEST_PROGRAM -c ${SDDIR}/dir_plugins.c
main: dir_plugins.o
- $(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -lpthread -lssl -l crypto -ldl
+ $(CXX) $(LDFLAGS) -L${LIBDIR} dir_plugins.o -o main -lbac -pthread -lssl -l crypto -ldl
example-plugin-sd.o: example-plugin-sd.c ${SDDIR}/dir_plugins.h
$(CXX) $(DEFS) $(DEBUG) $(CPPFLAGS) -fPIC -I../.. -I${SDDIR} -c example-plugin-sd.c

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_qt-console_main_cpp,v 1.3 2009/10/02 02:34:05 merdely Exp $
--- src/qt-console/main.cpp.orig Thu May 14 11:41:48 2009
+++ src/qt-console/main.cpp Tue Sep 1 22:32:50 2009
@@ -49,7 +49,7 @@ static int check_resources();
$OpenBSD: patch-src_qt-console_main_cpp,v 1.4 2010/07/20 14:38:39 merdely Exp $
--- src/qt-console/main.cpp.orig Tue Apr 27 15:58:29 2010
+++ src/qt-console/main.cpp Thu Jun 24 16:25:08 2010
@@ -49,7 +49,7 @@ extern bool parse_bat_config(CONFIG *config, const cha
extern void message_callback(int /* type */, char *msg);
extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code);
-#define CONFIG_FILE "bat.conf" /* default configuration file */
+#define CONFIG_FILE "${BACULACONF}/bat.conf" /* default configuration file */

View File

@ -1,4 +1,8 @@
See ${PREFIX}/share/doc/bacula/README-server.OpenBSD
for more setup information.
Note: If upgrading from a version older than 5.0.0, a database upgrade
is necessary. Also, Director and Storage Daemons must be upgraded at
the same time, but older File Daemons can be used with 5.0.x.
See http://bacula.org/en/rel-manual/index.html for Bacula documentation.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-bat,v 1.6 2009/12/22 12:51:52 sthen Exp $
@comment $OpenBSD: PLIST-bat,v 1.7 2010/07/20 14:38:39 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
@ -11,6 +11,7 @@
@mode
@owner
@group
share/applications/
share/applications/bat.desktop
share/doc/bacula/html/
share/doc/bacula/html/clients.html
@ -35,6 +36,7 @@ share/examples/bacula/bat.conf
@mode
@owner
@group
share/pixmaps/
share/pixmaps/bat_icon.png
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.6 2010/01/19 14:50:51 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2010/01/19 14:50:51 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2010/07/20 14:38:39 merdely Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2010/07/20 14:38:39 merdely Exp $
@conflict bacula-client-*
@conflict bacula-server-<3.0.2
@pkgpath sysutils/bacula,-client
@ -17,11 +17,11 @@ lib/libbacpy.a
@comment lib/libbacpy.la
libexec/bacula/
libexec/bacula/bacula-ctl-fd
libexec/bacula/bacula_config
libexec/bacula/mtx-changer.conf
@man man/man8/bacula-fd.8
sbin/bacula
@bin sbin/bacula-fd
share/applications/
share/doc/bacula/
@comment share/doc/bacula/ChangeLog
@comment share/doc/bacula/INSTALL
@ -45,7 +45,3 @@ share/examples/bacula/bacula-fd.conf
@owner _bacula
@group _bacula
@sample ${BACULACONF}/bacula-fd.conf
@mode
@owner
@group
share/pixmaps/

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-server,v 1.6 2009/10/02 02:34:05 merdely Exp $
@comment $OpenBSD: PLIST-server,v 1.7 2010/07/20 14:38:39 merdely Exp $
@conflict bacula-<2.2.7
@newgroup _bacula:591
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
@ -27,6 +27,7 @@ libexec/bacula/grant_bacula_privileges
libexec/bacula/grant_${BACKEND}_privileges
libexec/bacula/make_bacula_tables
libexec/bacula/make_catalog_backup
libexec/bacula/make_catalog_backup.pl
libexec/bacula/make_${BACKEND}_tables
libexec/bacula/mtx-changer
libexec/bacula/query.sql
@ -47,12 +48,12 @@ libexec/bacula/updatedb/update_mysql_tables_7_to_8
libexec/bacula/updatedb/update_mysql_tables_8_to_9
libexec/bacula/updatedb/update_mysql_tables_9_to_10
@comment libexec/bacula/updatedb/update_mysql_tables_9_to_10.in
@comment libexec/bacula/updatedb/update_postgresql_tables_10_to_11.in
libexec/bacula/updatedb/update_postgresql_tables_10_to_11
@comment libexec/bacula/updatedb/update_postgresql_tables_10_to_11.in
libexec/bacula/updatedb/update_postgresql_tables_7_to_8
libexec/bacula/updatedb/update_postgresql_tables_8_to_9
@comment libexec/bacula/updatedb/update_postgresql_tables_9_to_10.in
libexec/bacula/updatedb/update_postgresql_tables_9_to_10
@comment libexec/bacula/updatedb/update_postgresql_tables_9_to_10.in
libexec/bacula/updatedb/update_sqlite3_tables_10_to_11
@comment libexec/bacula/updatedb/update_sqlite3_tables_10_to_11.in
libexec/bacula/updatedb/update_sqlite3_tables_8_to_9