From 27df66b44d1b00438e77d8c39895580ae9c8e244 Mon Sep 17 00:00:00 2001 From: merdely Date: Thu, 7 Feb 2008 02:53:35 +0000 Subject: [PATCH] Update bacula to 2.2.8. Bacula changelog: http://bacula.svn.sourceforge.net/viewvc/bacula/branches/Branch-2.2/bacula/ChangeLog?revision=6309&view=markup Major port change in this version: -main subpackage is now bacula-client -server subpackage remains bacula-server -bat subpackage is new bacula admin tool -client subpackage goes away. If the old -main subpackage was installed, the upgrade path is to install both bacula-client and bacula-server. Lots of input and assistance from sthen and okan. ok okan; "if it works for you, go for it" sthen --- sysutils/bacula/Makefile | 75 ++++++++++----- sysutils/bacula/distinfo | 15 +-- sysutils/bacula/files/README-client.OpenBSD | 9 ++ sysutils/bacula/files/README-server.OpenBSD | 22 +++++ sysutils/bacula/patches/patch-configure | 27 +++++- sysutils/bacula/patches/patch-manpages_bat_1 | 12 +++ .../patches/patch-scripts_mtx-changer_in | 30 +++--- .../patches/patch-src_dird_bacula-dir_conf_in | 8 +- .../patches/patch-src_qt-console_bat_conf_in | 14 +++ .../patches/patch-src_qt-console_main_cpp | 12 +++ .../patch-src_stored_bacula-sd_conf_in | 33 ++++--- sysutils/bacula/pkg/DESCR-bat | 2 + sysutils/bacula/pkg/DESCR-client | 14 --- sysutils/bacula/pkg/DESCR-main | 19 ++-- sysutils/bacula/pkg/DESCR-server | 27 ++++-- sysutils/bacula/pkg/MESSAGE-client | 9 -- sysutils/bacula/pkg/MESSAGE-main | 25 +---- sysutils/bacula/pkg/MESSAGE-server | 21 +---- sysutils/bacula/pkg/PLIST-bat | 19 ++++ sysutils/bacula/pkg/PLIST-client | 17 ---- sysutils/bacula/pkg/PLIST-main | 94 ++----------------- sysutils/bacula/pkg/PLIST-server | 27 +++--- 22 files changed, 266 insertions(+), 265 deletions(-) create mode 100644 sysutils/bacula/files/README-client.OpenBSD create mode 100644 sysutils/bacula/files/README-server.OpenBSD create mode 100644 sysutils/bacula/patches/patch-manpages_bat_1 create mode 100644 sysutils/bacula/patches/patch-src_qt-console_bat_conf_in create mode 100644 sysutils/bacula/patches/patch-src_qt-console_main_cpp create mode 100644 sysutils/bacula/pkg/DESCR-bat delete mode 100644 sysutils/bacula/pkg/DESCR-client delete mode 100644 sysutils/bacula/pkg/MESSAGE-client create mode 100644 sysutils/bacula/pkg/PLIST-bat delete mode 100644 sysutils/bacula/pkg/PLIST-client diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 60559f0a025..23f451785f8 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,41 +1,35 @@ -# $OpenBSD: Makefile,v 1.8 2007/10/09 15:39:17 merdely Exp $ +# $OpenBSD: Makefile,v 1.9 2008/02/07 02:53:35 merdely Exp $ -COMMENT-main= network backup solution -COMMENT-client= network backup solution (client) +COMMENT-main= network backup solution (client) 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.8 +DISTNAME= bacula-$V +FULLPKGNAME-main= bacula-client-$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/} - HOMEPAGE= http://www.bacula.org/ MAINTAINER= Michael Erdely 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 -server -# Modified GPLv2 -# http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html +# GPL (majority), LGPL (some libraries) and PD +# http://bacula.org/en/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 +50,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 +59,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 +73,9 @@ CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline \ 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 +99,8 @@ ERRORS+= "Fatal: choose either pgsql or mysql or sqlite or sqlite3" 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 +140,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 +169,17 @@ post-install: ${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 +.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 diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index f93977603c5..756c968100f 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,10 +1,5 @@ -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.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 diff --git a/sysutils/bacula/files/README-client.OpenBSD b/sysutils/bacula/files/README-client.OpenBSD new file mode 100644 index 00000000000..a4299cf84c5 --- /dev/null +++ b/sysutils/bacula/files/README-client.OpenBSD @@ -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 diff --git a/sysutils/bacula/files/README-server.OpenBSD b/sysutils/bacula/files/README-server.OpenBSD new file mode 100644 index 00000000000..a033d30cb71 --- /dev/null +++ b/sysutils/bacula/files/README-server.OpenBSD @@ -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 diff --git a/sysutils/bacula/patches/patch-configure b/sysutils/bacula/patches/patch-configure index c7873607ac5..111f1963ad1 100644 --- a/sysutils/bacula/patches/patch-configure +++ b/sysutils/bacula/patches/patch-configure @@ -1,12 +1,29 @@ -$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: 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 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) + platforms/openbsd/bacula-fd \ + platforms/openbsd/bacula-sd \ + platforms/openbsd/bacula-dir" ++ largefile_support="yes" + ;; + redhat) + if test -f /etc/whitebox-release ; then +@@ -32221,7 +32222,7 @@ if test "${support_bat}" = "yes" ; then + QMAKEBIN="qmake" + + if test "x$QMAKEQT4" != "xnone"; then +- QMAKEBIN=qmake-qt4 ++ QMAKEBIN=${QMAKEQT4} + fi + + diff --git a/sysutils/bacula/patches/patch-manpages_bat_1 b/sysutils/bacula/patches/patch-manpages_bat_1 new file mode 100644 index 00000000000..b49e299d053 --- /dev/null +++ b/sysutils/bacula/patches/patch-manpages_bat_1 @@ -0,0 +1,12 @@ +$OpenBSD: patch-manpages_bat_1,v 1.1 2008/02/07 02:53:35 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. + bat [\-s] [\-c config_file] [\-d debug_level] [-t] + .TP + .B \-c +-Specify configuration file. Default is bat.conf. ++Specify configuration file. Default is !!BACULACONF!!/bat.conf. + .TP + .B \-d + Set debug level to \fInn\fP. diff --git a/sysutils/bacula/patches/patch-scripts_mtx-changer_in b/sysutils/bacula/patches/patch-scripts_mtx-changer_in index 96a684ff20a..38840d3ba68 100644 --- a/sysutils/bacula/patches/patch-scripts_mtx-changer_in +++ b/sysutils/bacula/patches/patch-scripts_mtx-changer_in @@ -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 +$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 +@@ -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 1.1.1.1 2007/07/20 11:02:14 robert Exp # 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 1.1.1.1 2007/07/20 11:02:14 robert Exp 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 1.1.1.1 2007/07/20 11:02:14 robert Exp # ${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]*: " | 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) diff --git a/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in b/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in index 0d432ec32bb..9b6b669d6d3 100644 --- a/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in +++ b/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in @@ -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.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 @@ -13,7 +13,8 @@ # @@ -111,7 +111,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.2 2007/10/09 15:39:17 merdely Ex # 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 { diff --git a/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in b/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in new file mode 100644 index 00000000000..9f83b427013 --- /dev/null +++ b/sysutils/bacula/patches/patch-src_qt-console_bat_conf_in @@ -0,0 +1,14 @@ +$OpenBSD: patch-src_qt-console_bat_conf_in,v 1.1 2008/02/07 02:53:35 merdely Exp $ +--- 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 = @hostname@-dir ++ Name = bacula-dir + DIRport = @dir_port@ +- address = @hostname@ ++ address = 127.0.0.1 + Password = "@dir_password@" + } diff --git a/sysutils/bacula/patches/patch-src_qt-console_main_cpp b/sysutils/bacula/patches/patch-src_qt-console_main_cpp new file mode 100644 index 00000000000..ec53f20afdf --- /dev/null +++ b/sysutils/bacula/patches/patch-src_qt-console_main_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_qt-console_main_cpp,v 1.1 2008/02/07 02:53:35 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); + 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; diff --git a/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in b/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in index f2908e9d975..0719120a48e 100644 --- a/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in +++ b/sysutils/bacula/patches/patch-src_stored_bacula-sd_conf_in @@ -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 +$OpenBSD: patch-src_stored_bacula-sd_conf_in,v 1.2 2008/02/07 02:53:35 merdely Exp $ +--- 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_conf_in,v 1.1.1.1 2007/07/20 11:02:14 rober # 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_conf_in,v 1.1.1.1 2007/07/20 11:02:14 rober # 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_conf_in,v 1.1.1.1 2007/07/20 11:02:14 rober ## 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_conf_in,v 1.1.1.1 2007/07/20 11:02:14 rober # 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_conf_in,v 1.1.1.1 2007/07/20 11:02:14 rober # Use MTIOCGET= no # BSF at EOM = yes # TWO EOF = no -@@ -218,5 +218,5 @@ Device { +@@ -225,5 +225,5 @@ Device { # Messages { Name = Standard diff --git a/sysutils/bacula/pkg/DESCR-bat b/sysutils/bacula/pkg/DESCR-bat new file mode 100644 index 00000000000..465f4e8f64c --- /dev/null +++ b/sysutils/bacula/pkg/DESCR-bat @@ -0,0 +1,2 @@ +bat is short for Bacula Administration Tool. It is a GUI form of +bconsole, but with many additional features. diff --git a/sysutils/bacula/pkg/DESCR-client b/sysutils/bacula/pkg/DESCR-client deleted file mode 100644 index e36943e6689..00000000000 --- a/sysutils/bacula/pkg/DESCR-client +++ /dev/null @@ -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. diff --git a/sysutils/bacula/pkg/DESCR-main b/sysutils/bacula/pkg/DESCR-main index 821e4d3c6f6..20670a9dfba 100644 --- a/sysutils/bacula/pkg/DESCR-main +++ b/sysutils/bacula/pkg/DESCR-main @@ -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. diff --git a/sysutils/bacula/pkg/DESCR-server b/sysutils/bacula/pkg/DESCR-server index 4b2afd64ccd..7a586972619 100644 --- a/sysutils/bacula/pkg/DESCR-server +++ b/sysutils/bacula/pkg/DESCR-server @@ -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. diff --git a/sysutils/bacula/pkg/MESSAGE-client b/sysutils/bacula/pkg/MESSAGE-client deleted file mode 100644 index 2de62cadf3f..00000000000 --- a/sysutils/bacula/pkg/MESSAGE-client +++ /dev/null @@ -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 diff --git a/sysutils/bacula/pkg/MESSAGE-main b/sysutils/bacula/pkg/MESSAGE-main index 0e3c87be624..55bbf8a8124 100644 --- a/sysutils/bacula/pkg/MESSAGE-main +++ b/sysutils/bacula/pkg/MESSAGE-main @@ -1,23 +1,4 @@ -To take advantage of bacula's DVD/CD writing, install cdrtools and -dvd+rw-tools packages. +See ${PREFIX}/share/doc/bacula/README-client.OpenBSD +for more setup information. -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 http://bacula.org/en/rel-manual/index.html for Bacula documentation. diff --git a/sysutils/bacula/pkg/MESSAGE-server b/sysutils/bacula/pkg/MESSAGE-server index eaf2dd4d348..4af3711255f 100644 --- a/sysutils/bacula/pkg/MESSAGE-server +++ b/sysutils/bacula/pkg/MESSAGE-server @@ -1,19 +1,4 @@ -To take advantage of bacula's DVD/CD writing, install cdrtools and -dvd+rw-tools packages. +See ${PREFIX}/share/doc/bacula/README-server.OpenBSD +for more setup information. -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 http://bacula.org/en/rel-manual/index.html for Bacula documentation. diff --git a/sysutils/bacula/pkg/PLIST-bat b/sysutils/bacula/pkg/PLIST-bat new file mode 100644 index 00000000000..ef58abd28e9 --- /dev/null +++ b/sysutils/bacula/pkg/PLIST-bat @@ -0,0 +1,19 @@ +@comment $OpenBSD: PLIST-bat,v 1.1 2008/02/07 02:53:35 merdely Exp $ +@newgroup _bacula:591 +@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin +@newuser _bacula-sd:597:_bacula:daemon:Bacula Storage Daemon:/nonexistent:/sbin/nologin +@man man/man1/bat.1 +sbin/bat +share/examples/bacula/ +@mode 750 +@owner _bacula +@group _bacula +@sample ${BACULACONF}/ +@mode 644 +@owner +@group +share/examples/bacula/bat.conf +@mode 640 +@owner _bacula +@group _bacula +@sample ${BACULACONF}/bat.conf diff --git a/sysutils/bacula/pkg/PLIST-client b/sysutils/bacula/pkg/PLIST-client deleted file mode 100644 index f5c5da2688f..00000000000 --- a/sysutils/bacula/pkg/PLIST-client +++ /dev/null @@ -1,17 +0,0 @@ -@comment $OpenBSD: PLIST-client,v 1.2 2007/09/05 07:57:33 merdely Exp $ -@conflict bacula-* -libexec/bacula/ -libexec/bacula/bacula-ctl-fd -@man man/man8/bacula-fd.8 -sbin/bacula-fd -@owner root -@group wheel -@mode 755 -share/examples/bacula/ -@mode 750 -@sample ${BACULACONF}/ -@sample ${BACULASTATE}/ -@mode 644 -share/examples/bacula/bacula-fd.conf -@mode 640 -@sample ${BACULACONF}/bacula-fd.conf diff --git a/sysutils/bacula/pkg/PLIST-main b/sysutils/bacula/pkg/PLIST-main index 41198a4a019..91e70ce4120 100644 --- a/sysutils/bacula/pkg/PLIST-main +++ b/sysutils/bacula/pkg/PLIST-main @@ -1,70 +1,16 @@ -@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $ +@comment $OpenBSD: PLIST-main,v 1.2 2008/02/07 02:53:35 merdely Exp $ @conflict bacula-client-* -@conflict bacula-server-* +@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: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 -@comment 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 -@comment @man man/man1/bacula-console-gnome.1 -@comment @man man/man1/bacula-tray-monitor.1 -@comment @man man/man1/bacula-wxconsole.1 -@man man/man1/bsmtp.1 -@man man/man8/bacula-dir.8 @man man/man8/bacula-fd.8 -@man man/man8/bacula-sd.8 -@man man/man8/bacula.8 -@man man/man8/bconsole.8 -@man man/man8/bcopy.8 -@man man/man8/bextract.8 -@man man/man8/bls.8 -@man man/man8/bscan.8 -@man man/man8/btape.8 -@man man/man8/btraceback.8 -@man 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 -@mode 755 -@owner root -@group 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 -@owner root -@group wheel -share/examples/bacula/bacula-dir.conf -@mode 640 -@owner _bacula -@group _bacula -@sample ${BACULACONF}/bacula-dir.conf -@mode 644 -@owner root -@group wheel +@owner +@group share/examples/bacula/bacula-fd.conf @mode 640 @owner _bacula @group _bacula @sample ${BACULACONF}/bacula-fd.conf -@mode 644 -@owner root -@group wheel -share/examples/bacula/bacula-sd.conf -@mode 640 -@owner _bacula -@group _bacula -@sample ${BACULACONF}/bacula-sd.conf -@mode 644 -@owner root -@group wheel -share/examples/bacula/bconsole.conf -@mode 640 -@owner _bacula -@group _bacula -@sample ${BACULACONF}/bconsole.conf diff --git a/sysutils/bacula/pkg/PLIST-server b/sysutils/bacula/pkg/PLIST-server index 06d93bbfc99..0608b8e8c1f 100644 --- a/sysutils/bacula/pkg/PLIST-server +++ b/sysutils/bacula/pkg/PLIST-server @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST-server,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $ -@conflict bacula-* +@comment $OpenBSD: PLIST-server,v 1.2 2008/02/07 02:53:35 merdely Exp $ +@conflict bacula-<2.2.7 @newgroup _bacula:591 @newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin +@newuser _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 -@comment @man man/man1/bacula-console-gnome.1 +@comment @man man/man1/bacula-bgnome-console.1 +@comment @man man/man1/bacula-bwxconsole.1 @comment @man man/man1/bacula-tray-monitor.1 -@comment @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 -@mode 755 -@owner root -@group wheel +share/doc/bacula/ +share/doc/bacula/README-server.OpenBSD share/examples/bacula/ @mode 750 @owner _bacula @group _bacula @sample ${BACULACONF}/ +@mode 770 @sample ${BACULASTATE}/ @mode 644 -@owner root -@group wheel +@owner +@group share/examples/bacula/bacula-dir.conf @mode 640 @owner _bacula @group _bacula @sample ${BACULACONF}/bacula-dir.conf @mode 644 -@owner root -@group wheel +@owner +@group share/examples/bacula/bacula-sd.conf @mode 640 @owner _bacula @group _bacula @sample ${BACULACONF}/bacula-sd.conf @mode 644 -@owner root -@group wheel +@owner +@group share/examples/bacula/bconsole.conf @mode 640 @owner _bacula