diff options
Diffstat (limited to 'sysutils')
23 files changed, 452 insertions, 348 deletions
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile index 874154c..767b360 100644 --- a/sysutils/bacula-server/Makefile +++ b/sysutils/bacula-server/Makefile @@ -6,12 +6,11 @@ # PORTNAME= bacula -PORTVERSION= 1.32f5 +PORTVERSION= 1.34.2 #PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula -DISTNAME= ${PORTNAME}-1.32f-5 MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE COMMENT= The network backup solution @@ -26,37 +25,73 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ + --with-scriptdir=${PREFIX}/share/bacula \ --with-fd-user=root \ --with-fd-group=wheel \ --with-dir-user=bacula \ --with-dir-group=bacula \ --with-sd-user=bacula \ - --with-sd-group=operator + --with-sd-group=operator \ + --with-readline=yes \ + --disable-conio -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= CLIENT_ONLY "Build bacule file daemon only" off -OPTIONS+= MYSQL "Build for MySQL database instead of SqLite" off +OPTIONS+= WXCONSOLE "Build with wxGTK based GUI console" off +OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console" off +OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off +OPTIONS+= POSTGRESQL7 "Use PostgreSQL 7.X database instead of SqLite" off + +# Prepare if gnome-console is selected this must be happen before +# include of bsd.port.pre.mk! +WANT_GNOME= yes +.if defined(WITH_GNOMECONSOLE) +USE_GNOME= libgnome +.endif .include <bsd.port.pre.mk> -# Default is full build with sqlite +# Build gnome-console +.if defined(WITH_GNOMECONSOLE) +CONFIGURE_ARGS+= --enable-gnome +.else +# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) +WITHOUT_GNOME= yes +PLIST_SUB+= GNOMECONS="@comment " +.endif + +# Build wx-console +.if defined(WITH_WXCONSOLE) +CONFIGURE_ARGS+= --enable-wx-console +LIB_DEPENDS+= wx_gtk-2.4:${PORTSDIR}/x11-toolkits/wxgtk +.else +# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) +WITHOUT_GNOME= yes +PLIST_SUB+= WXCONS="@comment " +.endif + +# Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFIGURE_ARGS+= --enable-client-only PLIST_SUB+= SERVER="@comment " .else .if defined(WITH_MYSQL) -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -DBTYPE= mysql +CONFIGURE_ARGS+= --with-mysql=yes +USE_MYSQL= yes +DBTYPE= mysql +.elif defined(WITH_POSTGRESQL7) +CONFIGURE_ARGS+= --with-postgresql=yes +LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +DBTYPE= postgresql .else CONFIGURE_ARGS+= --with-sqlite=yes -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite -DBTYPE= sqlite +LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite +DBTYPE= sqlite .endif -PLIST_SUB+= DBTYPE=${DBTYPE} -PLIST_SUB+= SERVER="" +PLIST_SUB+= DBTYPE=${DBTYPE} +PLIST_SUB+= SERVER="" .endif PORTDOCS= bacula.pdf html-manual/* @@ -64,20 +99,28 @@ PORTDOCS= bacula.pdf html-manual/* pre-everything:: .if !defined(WITH_CLIENT_ONLY) @${ECHO_MSG} "=======> ATTENTION <=======" + @${ECHO_MSG} "######################################################" + @${ECHO_MSG} "===> READ the file ReleaseNotes for upgrade procedure!" + @${ECHO_MSG} "===> IF YOU IGNORE, it is possible to !! LOOSE DATA !!" + @${ECHO_MSG} "######################################################" @${ECHO_MSG} "===> Note that there is a pthreads problem, which leads to the loss of 500kB" - @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in FreeBSD" - @${ECHO_MSG} "===> 4.9-RELEASE and 5.2-RELEASE or use the -stable or -current tree." + @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in newer versinon of FreeBSD" + @${ECHO_MSG} "===> READ ${WRKDIR}/bacula-1.34.1/platforms/freebsd/pthreads-fix.txt" @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options (or make config):" @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." -.if !defined(WITH_MYSQL) + @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console." + @${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console." +.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL7) @${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL instead of SqLite as the database." -.else + @${ECHO_MSG} " WITH_POSTGRESQL=yes if you want PostgeSQL 7.X instead of SqLite as the database." @${ECHO_MSG} "" - @${ECHO_MSG} "===> Using MySQL as the bacula database." + @${ECHO_MSG} "The default DB is SQLite!" .endif @${ECHO_MSG} "" + @${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database." + @${ECHO_MSG} "" .else @${ECHO_MSG} "===> Building file daemon only." .endif @@ -110,8 +153,21 @@ post-install: elif [ -f ${PREFIX}/etc/console.conf ]; then \ ${ECHO_CMD} "etc/console.conf" >> ${TMPPLIST}; \ fi - # chmod of smtp program so bacula can use it with dropped down permissions - ${CHMOD} o+x ${PREFIX}/sbin/smtp +.if defined(WITH_WXCONSOLE) + if [ -f ${PREFIX}/etc/wx-console.conf.new ]; then \ + ${ECHO_CMD} "etc/wx-console.conf.new" >> ${TMPPLIST}; \ + elif [ -f ${PREFIX}/etc/wx-console.conf ]; then \ + ${ECHO_CMD} "etc/wx-console.conf" >> ${TMPPLIST}; \ + fi +.endif +.if defined(WITH_GNOMECONSOLE) + if [ -f ${PREFIX}/etc/gnome-console.conf.new ]; then \ + ${ECHO_CMD} "etc/gnome-console.conf.new" >> ${TMPPLIST}; \ + elif [ -f ${PREFIX}/etc/gnome-console.conf ]; then \ + ${ECHO_CMD} "etc/gnome-console.conf" >> ${TMPPLIST}; \ + fi +.endif # chmod of bsmtp program so bacula can use it with dropped down permissions + ${CHMOD} o+x ${PREFIX}/sbin/bsmtp ${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula .endif # Install leaves existing conf files untouched. Respect this here! @@ -157,6 +213,7 @@ post-install: @${ECHO_MSG} " Hardware End of Medium = no;" @${ECHO_MSG} " Fast Forward Space File = no;" @${ECHO_MSG} " BSF at EOM = yes;" + @${ECHO_MSG} " TWOEOF = yes;" @${ECHO_MSG} "" @${ECHO_MSG} "It is also important that all the scripts accessed" @${ECHO_MSG} "by RunBeforeJob and RunAfterJob could be executed by" diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo index 1a9abf2..d586323 100644 --- a/sysutils/bacula-server/distinfo +++ b/sysutils/bacula-server/distinfo @@ -1,2 +1,2 @@ -MD5 (bacula-1.32f-5.tar.gz) = 20fe32f7849723c8717ba59121eb6f99 -SIZE (bacula-1.32f-5.tar.gz) = 3337763 +MD5 (bacula-1.34.2.tar.gz) = 138aab493a9508800b6cd42c92fb6001 +SIZE (bacula-1.34.2.tar.gz) = 4437245 diff --git a/sysutils/bacula-server/files/chio-bacula b/sysutils/bacula-server/files/chio-bacula index d832c19..5ac65fe 100644 --- a/sysutils/bacula-server/files/chio-bacula +++ b/sysutils/bacula-server/files/chio-bacula @@ -8,11 +8,11 @@ # Changer Command = "path-to-this-script/chio-bacula" %c %o %S %a # you will have the following input to this script: # -# chio-bacula "changer-device" "command" "slot" "archive-device" -# +# chio-bacula "changer-device" "command" "slot" "archive-device" "drive-index" +# $1 $2 $3 $4 $5 # for example: # -# chio-bacula /dev/sg0 load 1 /dev/nst0 (on a FreeBSD system) +# chio-bacula /dev/sg0 load 1 /dev/nst0 0 (on a FreeBSD system) # # If you need to to an offline, refer to the drive as $4 # e.g. mt -f $f offline @@ -29,37 +29,53 @@ # The labes of the virtual barcode reader are located in the BARCODE_FILE SIMULATE_BARCODE=true BARCODE_FILE=/usr/local/etc/bacula-barcodes +MTX=/bin/chio +# Set default values (see case statement below for +# free mapping of drive index and tape device +TAPE=/dev/nrsa0 +DRIVE=0 +# Time to wait for (un)loading +SLEEP=20 me=$(basename $0) # Debug logger -p user.err "$me $@" +# The changer device if [ -z "$1" ] ; then usage; +else + CHANGER=$1 fi - +# The command if [ -z "$2" ] ; then usage; +else + COMMAND=$2 fi - -MTX=/bin/chio -CHANGER=$1 -COMMAND=$2 +# The slot number if [ ! -z "$3" ]; then SLOT=$3 fi +# Set tape device if [ ! -z "$4" ]; then TAPE=$4 -else - TAPE=/dev/nrsa2 fi - -# Time to wait for loading -SLEEP=20 -# What drive of the autochanger should be used primary -# At the moment bacula (1.31a) could not deal with more than one drive -DRIVE=1 +# Set drive for chio as you need +# here you can also map to any tape device +case $5 in + 0) + DRIVE=0 + #DRIVE=1 + #TAPE=/dev/nrsa2 + ;; + 1) + DRIVE=1 + #DRIVE=0 + #TAPE=/dev/nrsa1 + ;; +esac usage() { @@ -67,7 +83,7 @@ usage() echo "The $me script for bacula" echo "--------------------------------------" echo "" - echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive]" + echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive] [drive index]" echo "" echo "Valid commands:" echo "" diff --git a/sysutils/bacula-server/files/patch-Makefile.in b/sysutils/bacula-server/files/patch-Makefile.in new file mode 100644 index 0000000..63cad52 --- /dev/null +++ b/sysutils/bacula-server/files/patch-Makefile.in @@ -0,0 +1,20 @@ +*** Makefile.in.orig Thu Apr 29 13:36:45 2004 +--- Makefile.in Thu Apr 29 13:37:22 2004 +*************** +*** 16,22 **** + dummy: + + fd_subdirs = src scripts doc src/lib src/findlib src/filed \ +! @READLINE_SRC@ src/console rescue rescue/linux + + + subdirs = src/cats src/dird src/stored @GNOME_DIR@ @WX_DIR@ src/tools +--- 16,23 ---- + dummy: + + fd_subdirs = src scripts doc src/lib src/findlib src/filed \ +! @READLINE_SRC@ src/console @GNOME_DIR@ @WX_DIR@ \ +! rescue rescue/linux + + + subdirs = src/cats src/dird src/stored @GNOME_DIR@ @WX_DIR@ src/tools diff --git a/sysutils/bacula-server/files/patch-configure b/sysutils/bacula-server/files/patch-configure deleted file mode 100644 index 96fc462..0000000 --- a/sysutils/bacula-server/files/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ -*** configure.org Thu Jan 1 18:52:12 2004 ---- configure Thu Jan 1 18:52:33 2004 -*************** -*** 19029,19038 **** - - Director User: ${dir_user} - Director Group: ${dir_group} -! Storage Daemon User: ${dir_user} -! Storage DaemonGroup: ${dir_group} -! File Daemon User: ${dir_user} -! File Daemon Group: ${dir_group} - - SQL binaries Directory ${SQL_BINDIR} - ---- 19029,19038 ---- - - Director User: ${dir_user} - Director Group: ${dir_group} -! Storage Daemon User: ${sd_user} -! Storage DaemonGroup: ${sd_group} -! File Daemon User: ${fd_user} -! File Daemon Group: ${fd_group} - - SQL binaries Directory ${SQL_BINDIR} - diff --git a/sysutils/bacula-server/files/patch-dird.c b/sysutils/bacula-server/files/patch-dird.c deleted file mode 100644 index bd5efe3..0000000 --- a/sysutils/bacula-server/files/patch-dird.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/dird/dird.c 27 Dec 2003 13:14:12 -0000 1.41 -+++ src/dird/dird.c 2 Jan 2004 17:21:21 -0000 1.42 -@@ -197,10 +197,10 @@ - init_stack_dump(); /* grab new pid */ - } - -- drop(uid, gid); /* reduce priveleges if requested */ -- - /* Create pid must come after we are a daemon -- so we have our final pid */ - create_pid_file(director->pid_directory, "bacula-dir", director->DIRport); -+ -+ drop(uid, gid); /* reduce priveleges if requested */ - - /* signal(SIGHUP, reload_config); */ diff --git a/sysutils/bacula-server/files/patch-filed.c b/sysutils/bacula-server/files/patch-filed.c deleted file mode 100644 index d52d994..0000000 --- a/sysutils/bacula-server/files/patch-filed.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/filed/filed.c 23 Dec 2003 20:23:15 -0000 1.21 -+++ src/filed/filed.c 2 Jan 2004 17:21:21 -0000 1.22 -@@ -211,10 +211,10 @@ - init_stack_dump(); /* set new pid */ - } - -- drop(uid, gid); -- - /* Maximum 1 daemon at a time */ - create_pid_file(me->pid_directory, "bacula-fd", me->FDport); -+ -+ drop(uid, gid); - - #ifdef BOMB - me += 1000000; diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in index 34b3278..f3bb312 100644 --- a/sysutils/bacula-server/files/patch-scripts-Makefile.in +++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in @@ -1,27 +1,35 @@ ---- scripts/Makefile.in~ Thu May 8 07:27:37 2003 -+++ scripts/Makefile.in Thu May 8 07:34:21 2003 -@@ -32,15 +32,15 @@ - $(MKDIR) $(DESTDIR)$(scriptdir) - - install: installdirs -- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql -- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql -- $(INSTALL_SCRIPT) console $(DESTDIR)$(scriptdir)/console -- $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole -- $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula -- $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd -- $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -- $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback -- $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb -+# $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(sysconfdir)/startmysql -+# $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(syscondir)/stopmysql -+# $(INSTALL_SCRIPT) console $(DESTDIR)$(syscondir)/console -+# $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(syscondir)/gconsole -+ $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample -+ $(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample -+# $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -+# $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback -+# $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb - - uninstall: - (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) +*** scripts/Makefile.in.orig Wed Mar 31 00:54:17 2004 +--- scripts/Makefile.in Thu Apr 8 19:56:21 2004 +*************** +*** 32,46 **** + $(MKDIR) $(DESTDIR)$(scriptdir) + + install: installdirs +! $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql +! $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql +! $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole +! $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole +! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula +! $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd +! $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer +! $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback + + uninstall: + (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) +--- 32,46 ---- + $(MKDIR) $(DESTDIR)$(scriptdir) + + install: installdirs +! # $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql +! # $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql +! # $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole +! # $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole +! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample +! $(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample +! # $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer +! # $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! # $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback + + uninstall: + (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) diff --git a/sysutils/bacula-server/files/patch-src-cats-Makefile.in b/sysutils/bacula-server/files/patch-src-cats-Makefile.in index 0c7ce27..545ba4e 100644 --- a/sysutils/bacula-server/files/patch-src-cats-Makefile.in +++ b/sysutils/bacula-server/files/patch-src-cats-Makefile.in @@ -1,43 +1,49 @@ -*** src/cats/Makefile.in.orig Sun May 11 22:39:16 2003 ---- src/cats/Makefile.in Wed Oct 1 20:59:45 2003 +*** src/cats/Makefile.in.orig Thu Apr 8 19:58:05 2004 +--- src/cats/Makefile.in Thu Apr 8 20:02:12 2004 *************** -*** 12,17 **** ---- 12,18 ---- - thisdir = src/cats - - DEBUG=@DEBUG@ -+ MKDIR=$(topdir)/autoconf/mkinstalldirs - - SQL_INC=@SQL_INCLUDE@ - -*************** -*** 73,86 **** - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) +*** 91,112 **** + (cd $(srcdir); $(RMF) Makefile) install: ! $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database -! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables +! $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables ! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables -! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables +! $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges +! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables +! $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database +! +! $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database +! $(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables ! $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables +! $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges +! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database + ! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup ! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup -! $(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database) ---- 74,87 ---- - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) +--- 91,112 ---- + (cd $(srcdir); $(RMF) Makefile) install: -! $(MKDIR) $(DESTDIR)$(datadir)/bacula ! $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database +! $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/update_@DB_NAME@_tables +! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula//make_@DB_NAME@_tables +! $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(datadir)/bacula/grant_@DB_NAME@_privileges ! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables -! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables -! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_database +! +! $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(datadir)/bacula/create_bacula_database +! $(INSTALL_SCRIPT) update_bacula_tables $$(DESTDIR)$(datadir)/bacula/update_bacula_tables ! $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables -! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup -! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup +! $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(datadir)/bacula/grant_bacula_privileges +! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(datadir)/bacula/drop_bacula_database + +! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup +! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database) diff --git a/sysutils/bacula-server/files/patch-src__cats__Makefile.in b/sysutils/bacula-server/files/patch-src__cats__Makefile.in index 0c7ce27..545ba4e 100644 --- a/sysutils/bacula-server/files/patch-src__cats__Makefile.in +++ b/sysutils/bacula-server/files/patch-src__cats__Makefile.in @@ -1,43 +1,49 @@ -*** src/cats/Makefile.in.orig Sun May 11 22:39:16 2003 ---- src/cats/Makefile.in Wed Oct 1 20:59:45 2003 +*** src/cats/Makefile.in.orig Thu Apr 8 19:58:05 2004 +--- src/cats/Makefile.in Thu Apr 8 20:02:12 2004 *************** -*** 12,17 **** ---- 12,18 ---- - thisdir = src/cats - - DEBUG=@DEBUG@ -+ MKDIR=$(topdir)/autoconf/mkinstalldirs - - SQL_INC=@SQL_INCLUDE@ - -*************** -*** 73,86 **** - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) +*** 91,112 **** + (cd $(srcdir); $(RMF) Makefile) install: ! $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database -! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables +! $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables ! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables -! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables +! $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges +! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables +! $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database +! +! $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database +! $(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables ! $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables +! $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges +! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database + ! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup ! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup -! $(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database) ---- 74,87 ---- - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) +--- 91,112 ---- + (cd $(srcdir); $(RMF) Makefile) install: -! $(MKDIR) $(DESTDIR)$(datadir)/bacula ! $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database +! $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/update_@DB_NAME@_tables +! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula//make_@DB_NAME@_tables +! $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(datadir)/bacula/grant_@DB_NAME@_privileges ! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables -! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables -! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_database +! +! $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(datadir)/bacula/create_bacula_database +! $(INSTALL_SCRIPT) update_bacula_tables $$(DESTDIR)$(datadir)/bacula/update_bacula_tables ! $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables -! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup -! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup +! $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(datadir)/bacula/grant_bacula_privileges +! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(datadir)/bacula/drop_bacula_database + +! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup +! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database) diff --git a/sysutils/bacula-server/files/patch-stored.c b/sysutils/bacula-server/files/patch-stored.c deleted file mode 100644 index cba5419..0000000 --- a/sysutils/bacula-server/files/patch-stored.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/stored/stored.c 23 Dec 2003 20:23:15 -0000 1.25 -+++ src/stored/stored.c 2 Jan 2004 17:21:21 -0000 1.26 -@@ -185,9 +185,9 @@ - init_stack_dump(); /* pick up new pid */ - } - -- drop(uid, gid); -- - create_pid_file(me->pid_directory, "bacula-sd", me->SDport); -+ -+ drop(uid, gid); - - /* Ensure that Volume Session Time and Id are both - * set and are both non-zero. diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist index 924447d..4a701526 100644 --- a/sysutils/bacula-server/pkg-plist +++ b/sysutils/bacula-server/pkg-plist @@ -1,21 +1,31 @@ -%%SERVER%%etc/query.sql +%%SERVER%%share/bacula/query.sql %%SERVER%%etc/rc.d/bacula.sh.sample %%SERVER%%sbin/chio-bacula %%SERVER%%sbin/bacula-dir sbin/bacula-fd +etc/rc.d/fd.sh.sample %%SERVER%%sbin/bacula-sd %%SERVER%%sbin/bextract %%SERVER%%sbin/bls %%SERVER%%sbin/bscan %%SERVER%%sbin/btape -%%SERVER%%sbin/console +%%SERVER%%sbin/bconsole +%%WXCONS%%sbin/wx-console +%%GNOMECONS%%sbin/gnome-console %%SERVER%%sbin/dbcheck -%%SERVER%%sbin/smtp +%%SERVER%%sbin/bsmtp +%%SERVER%%share/bacula/create_bacula_database %%SERVER%%share/bacula/create_%%DBTYPE%%_database -%%SERVER%%share/bacula/delete_catalog_backup +%%SERVER%%share/bacula/drop_bacula_database +%%SERVER%%share/bacula/drop_%%DBTYPE%%_database %%SERVER%%share/bacula/drop_bacula_tables %%SERVER%%share/bacula/drop_%%DBTYPE%%_tables +%%SERVER%%share/bacula/grant_bacula_privileges +%%SERVER%%share/bacula/grant_%%DBTYPE%%_privileges %%SERVER%%share/bacula/make_bacula_tables %%SERVER%%share/bacula/make_%%DBTYPE%%_tables +%%SERVER%%share/bacula/update_bacula_tables +%%SERVER%%share/bacula/update_%%DBTYPE%%_tables +%%SERVER%%share/bacula/delete_catalog_backup %%SERVER%%share/bacula/make_catalog_backup %%SERVER%%@dirrm share/bacula diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 874154c..767b360 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -6,12 +6,11 @@ # PORTNAME= bacula -PORTVERSION= 1.32f5 +PORTVERSION= 1.34.2 #PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula -DISTNAME= ${PORTNAME}-1.32f-5 MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE COMMENT= The network backup solution @@ -26,37 +25,73 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tcp-wrappers=/usr/lib \ --enable-smartalloc \ --with-working-dir=${BACULA_DIR} \ + --with-scriptdir=${PREFIX}/share/bacula \ --with-fd-user=root \ --with-fd-group=wheel \ --with-dir-user=bacula \ --with-dir-group=bacula \ --with-sd-user=bacula \ - --with-sd-group=operator + --with-sd-group=operator \ + --with-readline=yes \ + --disable-conio -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= CLIENT_ONLY "Build bacule file daemon only" off -OPTIONS+= MYSQL "Build for MySQL database instead of SqLite" off +OPTIONS+= WXCONSOLE "Build with wxGTK based GUI console" off +OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console" off +OPTIONS+= MYSQL "Use MySQL database instead of SqLite" off +OPTIONS+= POSTGRESQL7 "Use PostgreSQL 7.X database instead of SqLite" off + +# Prepare if gnome-console is selected this must be happen before +# include of bsd.port.pre.mk! +WANT_GNOME= yes +.if defined(WITH_GNOMECONSOLE) +USE_GNOME= libgnome +.endif .include <bsd.port.pre.mk> -# Default is full build with sqlite +# Build gnome-console +.if defined(WITH_GNOMECONSOLE) +CONFIGURE_ARGS+= --enable-gnome +.else +# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) +WITHOUT_GNOME= yes +PLIST_SUB+= GNOMECONS="@comment " +.endif + +# Build wx-console +.if defined(WITH_WXCONSOLE) +CONFIGURE_ARGS+= --enable-wx-console +LIB_DEPENDS+= wx_gtk-2.4:${PORTSDIR}/x11-toolkits/wxgtk +.else +# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) +WITHOUT_GNOME= yes +PLIST_SUB+= WXCONS="@comment " +.endif + +# Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFIGURE_ARGS+= --enable-client-only PLIST_SUB+= SERVER="@comment " .else .if defined(WITH_MYSQL) -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -DBTYPE= mysql +CONFIGURE_ARGS+= --with-mysql=yes +USE_MYSQL= yes +DBTYPE= mysql +.elif defined(WITH_POSTGRESQL7) +CONFIGURE_ARGS+= --with-postgresql=yes +LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql7 +DBTYPE= postgresql .else CONFIGURE_ARGS+= --with-sqlite=yes -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite -DBTYPE= sqlite +LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite +DBTYPE= sqlite .endif -PLIST_SUB+= DBTYPE=${DBTYPE} -PLIST_SUB+= SERVER="" +PLIST_SUB+= DBTYPE=${DBTYPE} +PLIST_SUB+= SERVER="" .endif PORTDOCS= bacula.pdf html-manual/* @@ -64,20 +99,28 @@ PORTDOCS= bacula.pdf html-manual/* pre-everything:: .if !defined(WITH_CLIENT_ONLY) @${ECHO_MSG} "=======> ATTENTION <=======" + @${ECHO_MSG} "######################################################" + @${ECHO_MSG} "===> READ the file ReleaseNotes for upgrade procedure!" + @${ECHO_MSG} "===> IF YOU IGNORE, it is possible to !! LOOSE DATA !!" + @${ECHO_MSG} "######################################################" @${ECHO_MSG} "===> Note that there is a pthreads problem, which leads to the loss of 500kB" - @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in FreeBSD" - @${ECHO_MSG} "===> 4.9-RELEASE and 5.2-RELEASE or use the -stable or -current tree." + @${ECHO_MSG} "===> of data at the end of an tape. This is corrected in newer versinon of FreeBSD" + @${ECHO_MSG} "===> READ ${WRKDIR}/bacula-1.34.1/platforms/freebsd/pthreads-fix.txt" @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options (or make config):" @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." -.if !defined(WITH_MYSQL) + @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console." + @${ECHO_MSG} " WITH_GNOMECONSOLE=yes if you only want a GNOME based GUI console." +.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL7) @${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL instead of SqLite as the database." -.else + @${ECHO_MSG} " WITH_POSTGRESQL=yes if you want PostgeSQL 7.X instead of SqLite as the database." @${ECHO_MSG} "" - @${ECHO_MSG} "===> Using MySQL as the bacula database." + @${ECHO_MSG} "The default DB is SQLite!" .endif @${ECHO_MSG} "" + @${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database." + @${ECHO_MSG} "" .else @${ECHO_MSG} "===> Building file daemon only." .endif @@ -110,8 +153,21 @@ post-install: elif [ -f ${PREFIX}/etc/console.conf ]; then \ ${ECHO_CMD} "etc/console.conf" >> ${TMPPLIST}; \ fi - # chmod of smtp program so bacula can use it with dropped down permissions - ${CHMOD} o+x ${PREFIX}/sbin/smtp +.if defined(WITH_WXCONSOLE) + if [ -f ${PREFIX}/etc/wx-console.conf.new ]; then \ + ${ECHO_CMD} "etc/wx-console.conf.new" >> ${TMPPLIST}; \ + elif [ -f ${PREFIX}/etc/wx-console.conf ]; then \ + ${ECHO_CMD} "etc/wx-console.conf" >> ${TMPPLIST}; \ + fi +.endif +.if defined(WITH_GNOMECONSOLE) + if [ -f ${PREFIX}/etc/gnome-console.conf.new ]; then \ + ${ECHO_CMD} "etc/gnome-console.conf.new" >> ${TMPPLIST}; \ + elif [ -f ${PREFIX}/etc/gnome-console.conf ]; then \ + ${ECHO_CMD} "etc/gnome-console.conf" >> ${TMPPLIST}; \ + fi +.endif # chmod of bsmtp program so bacula can use it with dropped down permissions + ${CHMOD} o+x ${PREFIX}/sbin/bsmtp ${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula .endif # Install leaves existing conf files untouched. Respect this here! @@ -157,6 +213,7 @@ post-install: @${ECHO_MSG} " Hardware End of Medium = no;" @${ECHO_MSG} " Fast Forward Space File = no;" @${ECHO_MSG} " BSF at EOM = yes;" + @${ECHO_MSG} " TWOEOF = yes;" @${ECHO_MSG} "" @${ECHO_MSG} "It is also important that all the scripts accessed" @${ECHO_MSG} "by RunBeforeJob and RunAfterJob could be executed by" diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 1a9abf2..d586323 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,2 +1,2 @@ -MD5 (bacula-1.32f-5.tar.gz) = 20fe32f7849723c8717ba59121eb6f99 -SIZE (bacula-1.32f-5.tar.gz) = 3337763 +MD5 (bacula-1.34.2.tar.gz) = 138aab493a9508800b6cd42c92fb6001 +SIZE (bacula-1.34.2.tar.gz) = 4437245 diff --git a/sysutils/bacula/files/chio-bacula b/sysutils/bacula/files/chio-bacula index d832c19..5ac65fe 100644 --- a/sysutils/bacula/files/chio-bacula +++ b/sysutils/bacula/files/chio-bacula @@ -8,11 +8,11 @@ # Changer Command = "path-to-this-script/chio-bacula" %c %o %S %a # you will have the following input to this script: # -# chio-bacula "changer-device" "command" "slot" "archive-device" -# +# chio-bacula "changer-device" "command" "slot" "archive-device" "drive-index" +# $1 $2 $3 $4 $5 # for example: # -# chio-bacula /dev/sg0 load 1 /dev/nst0 (on a FreeBSD system) +# chio-bacula /dev/sg0 load 1 /dev/nst0 0 (on a FreeBSD system) # # If you need to to an offline, refer to the drive as $4 # e.g. mt -f $f offline @@ -29,37 +29,53 @@ # The labes of the virtual barcode reader are located in the BARCODE_FILE SIMULATE_BARCODE=true BARCODE_FILE=/usr/local/etc/bacula-barcodes +MTX=/bin/chio +# Set default values (see case statement below for +# free mapping of drive index and tape device +TAPE=/dev/nrsa0 +DRIVE=0 +# Time to wait for (un)loading +SLEEP=20 me=$(basename $0) # Debug logger -p user.err "$me $@" +# The changer device if [ -z "$1" ] ; then usage; +else + CHANGER=$1 fi - +# The command if [ -z "$2" ] ; then usage; +else + COMMAND=$2 fi - -MTX=/bin/chio -CHANGER=$1 -COMMAND=$2 +# The slot number if [ ! -z "$3" ]; then SLOT=$3 fi +# Set tape device if [ ! -z "$4" ]; then TAPE=$4 -else - TAPE=/dev/nrsa2 fi - -# Time to wait for loading -SLEEP=20 -# What drive of the autochanger should be used primary -# At the moment bacula (1.31a) could not deal with more than one drive -DRIVE=1 +# Set drive for chio as you need +# here you can also map to any tape device +case $5 in + 0) + DRIVE=0 + #DRIVE=1 + #TAPE=/dev/nrsa2 + ;; + 1) + DRIVE=1 + #DRIVE=0 + #TAPE=/dev/nrsa1 + ;; +esac usage() { @@ -67,7 +83,7 @@ usage() echo "The $me script for bacula" echo "--------------------------------------" echo "" - echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive]" + echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive] [drive index]" echo "" echo "Valid commands:" echo "" diff --git a/sysutils/bacula/files/patch-Makefile.in b/sysutils/bacula/files/patch-Makefile.in new file mode 100644 index 0000000..63cad52 --- /dev/null +++ b/sysutils/bacula/files/patch-Makefile.in @@ -0,0 +1,20 @@ +*** Makefile.in.orig Thu Apr 29 13:36:45 2004 +--- Makefile.in Thu Apr 29 13:37:22 2004 +*************** +*** 16,22 **** + dummy: + + fd_subdirs = src scripts doc src/lib src/findlib src/filed \ +! @READLINE_SRC@ src/console rescue rescue/linux + + + subdirs = src/cats src/dird src/stored @GNOME_DIR@ @WX_DIR@ src/tools +--- 16,23 ---- + dummy: + + fd_subdirs = src scripts doc src/lib src/findlib src/filed \ +! @READLINE_SRC@ src/console @GNOME_DIR@ @WX_DIR@ \ +! rescue rescue/linux + + + subdirs = src/cats src/dird src/stored @GNOME_DIR@ @WX_DIR@ src/tools diff --git a/sysutils/bacula/files/patch-configure b/sysutils/bacula/files/patch-configure deleted file mode 100644 index 96fc462..0000000 --- a/sysutils/bacula/files/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ -*** configure.org Thu Jan 1 18:52:12 2004 ---- configure Thu Jan 1 18:52:33 2004 -*************** -*** 19029,19038 **** - - Director User: ${dir_user} - Director Group: ${dir_group} -! Storage Daemon User: ${dir_user} -! Storage DaemonGroup: ${dir_group} -! File Daemon User: ${dir_user} -! File Daemon Group: ${dir_group} - - SQL binaries Directory ${SQL_BINDIR} - ---- 19029,19038 ---- - - Director User: ${dir_user} - Director Group: ${dir_group} -! Storage Daemon User: ${sd_user} -! Storage DaemonGroup: ${sd_group} -! File Daemon User: ${fd_user} -! File Daemon Group: ${fd_group} - - SQL binaries Directory ${SQL_BINDIR} - diff --git a/sysutils/bacula/files/patch-dird.c b/sysutils/bacula/files/patch-dird.c deleted file mode 100644 index bd5efe3..0000000 --- a/sysutils/bacula/files/patch-dird.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/dird/dird.c 27 Dec 2003 13:14:12 -0000 1.41 -+++ src/dird/dird.c 2 Jan 2004 17:21:21 -0000 1.42 -@@ -197,10 +197,10 @@ - init_stack_dump(); /* grab new pid */ - } - -- drop(uid, gid); /* reduce priveleges if requested */ -- - /* Create pid must come after we are a daemon -- so we have our final pid */ - create_pid_file(director->pid_directory, "bacula-dir", director->DIRport); -+ -+ drop(uid, gid); /* reduce priveleges if requested */ - - /* signal(SIGHUP, reload_config); */ diff --git a/sysutils/bacula/files/patch-filed.c b/sysutils/bacula/files/patch-filed.c deleted file mode 100644 index d52d994..0000000 --- a/sysutils/bacula/files/patch-filed.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/filed/filed.c 23 Dec 2003 20:23:15 -0000 1.21 -+++ src/filed/filed.c 2 Jan 2004 17:21:21 -0000 1.22 -@@ -211,10 +211,10 @@ - init_stack_dump(); /* set new pid */ - } - -- drop(uid, gid); -- - /* Maximum 1 daemon at a time */ - create_pid_file(me->pid_directory, "bacula-fd", me->FDport); -+ -+ drop(uid, gid); - - #ifdef BOMB - me += 1000000; diff --git a/sysutils/bacula/files/patch-scripts-Makefile.in b/sysutils/bacula/files/patch-scripts-Makefile.in index 34b3278..f3bb312 100644 --- a/sysutils/bacula/files/patch-scripts-Makefile.in +++ b/sysutils/bacula/files/patch-scripts-Makefile.in @@ -1,27 +1,35 @@ ---- scripts/Makefile.in~ Thu May 8 07:27:37 2003 -+++ scripts/Makefile.in Thu May 8 07:34:21 2003 -@@ -32,15 +32,15 @@ - $(MKDIR) $(DESTDIR)$(scriptdir) - - install: installdirs -- $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql -- $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql -- $(INSTALL_SCRIPT) console $(DESTDIR)$(scriptdir)/console -- $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole -- $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula -- $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd -- $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -- $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback -- $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb -+# $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(sysconfdir)/startmysql -+# $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(syscondir)/stopmysql -+# $(INSTALL_SCRIPT) console $(DESTDIR)$(syscondir)/console -+# $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(syscondir)/gconsole -+ $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample -+ $(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample -+# $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer -+# $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback -+# $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb - - uninstall: - (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) +*** scripts/Makefile.in.orig Wed Mar 31 00:54:17 2004 +--- scripts/Makefile.in Thu Apr 8 19:56:21 2004 +*************** +*** 32,46 **** + $(MKDIR) $(DESTDIR)$(scriptdir) + + install: installdirs +! $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql +! $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql +! $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole +! $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole +! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula +! $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd +! $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer +! $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback + + uninstall: + (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) +--- 32,46 ---- + $(MKDIR) $(DESTDIR)$(scriptdir) + + install: installdirs +! # $(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql +! # $(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql +! # $(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole +! # $(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole +! $(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample +! $(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample +! # $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer +! # $(INSTALL_DATA) btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb +! # $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback + + uninstall: + (cd $(DESTDIR)$(scriptdir); $(RMF) startmysql) diff --git a/sysutils/bacula/files/patch-src-cats-Makefile.in b/sysutils/bacula/files/patch-src-cats-Makefile.in index 0c7ce27..545ba4e 100644 --- a/sysutils/bacula/files/patch-src-cats-Makefile.in +++ b/sysutils/bacula/files/patch-src-cats-Makefile.in @@ -1,43 +1,49 @@ -*** src/cats/Makefile.in.orig Sun May 11 22:39:16 2003 ---- src/cats/Makefile.in Wed Oct 1 20:59:45 2003 +*** src/cats/Makefile.in.orig Thu Apr 8 19:58:05 2004 +--- src/cats/Makefile.in Thu Apr 8 20:02:12 2004 *************** -*** 12,17 **** ---- 12,18 ---- - thisdir = src/cats - - DEBUG=@DEBUG@ -+ MKDIR=$(topdir)/autoconf/mkinstalldirs - - SQL_INC=@SQL_INCLUDE@ - -*************** -*** 73,86 **** - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) +*** 91,112 **** + (cd $(srcdir); $(RMF) Makefile) install: ! $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database -! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables +! $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables ! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables -! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables +! $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges +! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables +! $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database +! +! $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database +! $(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables ! $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables +! $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges +! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database + ! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup ! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup -! $(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database) ---- 74,87 ---- - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) +--- 91,112 ---- + (cd $(srcdir); $(RMF) Makefile) install: -! $(MKDIR) $(DESTDIR)$(datadir)/bacula ! $(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database +! $(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/update_@DB_NAME@_tables +! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula//make_@DB_NAME@_tables +! $(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(datadir)/bacula/grant_@DB_NAME@_privileges ! $(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables -! $(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables -! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_database +! +! $(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(datadir)/bacula/create_bacula_database +! $(INSTALL_SCRIPT) update_bacula_tables $$(DESTDIR)$(datadir)/bacula/update_bacula_tables ! $(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables -! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup -! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup +! $(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(datadir)/bacula/grant_bacula_privileges +! $(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables +! $(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(datadir)/bacula/drop_bacula_database + +! $(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup +! $(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup uninstall: (cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database) diff --git a/sysutils/bacula/files/patch-stored.c b/sysutils/bacula/files/patch-stored.c deleted file mode 100644 index cba5419..0000000 --- a/sysutils/bacula/files/patch-stored.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/stored/stored.c 23 Dec 2003 20:23:15 -0000 1.25 -+++ src/stored/stored.c 2 Jan 2004 17:21:21 -0000 1.26 -@@ -185,9 +185,9 @@ - init_stack_dump(); /* pick up new pid */ - } - -- drop(uid, gid); -- - create_pid_file(me->pid_directory, "bacula-sd", me->SDport); -+ -+ drop(uid, gid); - - /* Ensure that Volume Session Time and Id are both - * set and are both non-zero. diff --git a/sysutils/bacula/pkg-plist b/sysutils/bacula/pkg-plist index 924447d..4a701526 100644 --- a/sysutils/bacula/pkg-plist +++ b/sysutils/bacula/pkg-plist @@ -1,21 +1,31 @@ -%%SERVER%%etc/query.sql +%%SERVER%%share/bacula/query.sql %%SERVER%%etc/rc.d/bacula.sh.sample %%SERVER%%sbin/chio-bacula %%SERVER%%sbin/bacula-dir sbin/bacula-fd +etc/rc.d/fd.sh.sample %%SERVER%%sbin/bacula-sd %%SERVER%%sbin/bextract %%SERVER%%sbin/bls %%SERVER%%sbin/bscan %%SERVER%%sbin/btape -%%SERVER%%sbin/console +%%SERVER%%sbin/bconsole +%%WXCONS%%sbin/wx-console +%%GNOMECONS%%sbin/gnome-console %%SERVER%%sbin/dbcheck -%%SERVER%%sbin/smtp +%%SERVER%%sbin/bsmtp +%%SERVER%%share/bacula/create_bacula_database %%SERVER%%share/bacula/create_%%DBTYPE%%_database -%%SERVER%%share/bacula/delete_catalog_backup +%%SERVER%%share/bacula/drop_bacula_database +%%SERVER%%share/bacula/drop_%%DBTYPE%%_database %%SERVER%%share/bacula/drop_bacula_tables %%SERVER%%share/bacula/drop_%%DBTYPE%%_tables +%%SERVER%%share/bacula/grant_bacula_privileges +%%SERVER%%share/bacula/grant_%%DBTYPE%%_privileges %%SERVER%%share/bacula/make_bacula_tables %%SERVER%%share/bacula/make_%%DBTYPE%%_tables +%%SERVER%%share/bacula/update_bacula_tables +%%SERVER%%share/bacula/update_%%DBTYPE%%_tables +%%SERVER%%share/bacula/delete_catalog_backup %%SERVER%%share/bacula/make_catalog_backup %%SERVER%%@dirrm share/bacula |
