summaryrefslogtreecommitdiff
path: root/sysutils/bacula
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-11-11 07:23:15 +0000
committerwiz <wiz@pkgsrc.org>2005-11-11 07:23:15 +0000
commitdf88d272e151537d439e2ceb4a7b4c4c8403359b (patch)
tree29b4e47f352a130e83dca84eb0619d33d099c032 /sysutils/bacula
parented9b1b7eddac9bc41fd0a16ccdb58e0686d28c29 (diff)
downloadpkgsrc-df88d272e151537d439e2ceb4a7b4c4c8403359b.tar.gz
Update bacula* to 1.38.0, provided by Geert Hendrickx.
Release Notes for Bacula 1.38.0 Bacula code: Total files = 420 Total lines = 138,440 (*.h *.c *.in) 20,440 additional lines of code since version 1.36.3 Major Changes: - Fixed out of order Volumes in restore. - Improved algorithm for reserving drives in multiple drive autochangers. Autochange users MUST use the new Autochanger resource in the Storage daemon. - There is a new database format that is not compatible with previous databases. You must upgrade if converting from 1.36.x. No changes from version 1.37.30. - The Director, Storage daemon, and File daemons are Deamons are not compatible with prior versions. All FDs must be upgraded at the same time. - Support for ANSI/IBM labels. - Faster database inserts due to combining the MD5/SHA1 into the attributes record, eliminating one INSERT/file backed up. - Python Event support has been added. See below for configuration and details. The implementation is somewhat minimal, so the functionality is not complete. The Python interface has not been extensively tested, so please consider it BETA. - DVD writing support, using parts, and some new directives in the Device resource of the Storage configuration file thanks to Nicolas Boichat. Please note that this code is still BETA and should be carefully tested before using in production. - Seven new options keywords in a FileSet resource: ignorecase, fstype, hfsplussupport, wilddir, wildfile, regexdir, and regexfile thanks to Pruben Guldberg). See below for details. - Restore of all files for a Job or set of jobs even if the file records have been removed from the catalog. - Restore of a directory (non-recursive, i.e. only one level). - Support for TLS (ssl) between all the daemon connections thanks to Landon Fuller. - Any Volume in the Pool named Scratch may be reassigned to any other Pool when a new Volume is needed. - You may clone a Job and thus write (almost) the same data to multiple Volumes simultaneously (see below). Actually, any Job may start any other Job with this mechanism, so it also be used to group jobs. - Unicode filename support for Win32 (thanks to Thorsten Engel) - Volume Shadow Copy support for Win32 thus the capability to backup exclusively opened files (thanks to Thorsten Engel). A VSS enabled Win32 FD is available. You must explicitly turn on VSS with "Enable VSS = yes" in your FileSet resource. - New manual format with an index (thanks to Karl Cunningham). - New Web site format (thanks to Michael Scherer). - SQLite3 support. - Web-bacula, previously a separate project by Juan Luis Frances, is now included in the Bacula GUI release. This is a management level tool for reporting the state of Bacula jobs. - The code is now Internationalized so that it can be localized in native languages. Thanks to Nicolas Boichat. New Directives: - New Job directive "Prefer Mounted Volumes = yes|no" causes the SD to select either an Autochanger or a drive with a valid Volume already mounted in preference. If none is available, it will select the first available drive. - New Run directive in Job resource of DIR. It permits cloning of jobs. To clone a copy of the current job, use Run = "job-name level=%l since=\"%s\"" Note, job-name is normally the same name as the job that is running but there is no restriction on what you put. If you want to start the job by hand and use job overrides such as storage=xxx, realize that the job will be started with the default storage values not the overrides. The level=%l guarantees that the chosen level of the job is the same, and the since=... ensures that the job uses *exactly* the same time/date for incremental and differential jobs. The since=... is ignored when level=Full. A cloned job will not start additional clones, so it is not possible to recurse. - New Options keywords in a FileSet directive (backported to 1.36.3): - WildDir xxx Will do a wild card match against directories (files will not be matched). - WildFile xxx Will do a wild card match against files (directories will not be matched). - RegexDir xxx Will do a regular expression match against directories (files will not be matched). - RegexFile xxx Will do a regular expression match against files( directories will not be matched). - IgnoreCase = yes | no Will ignore case in wild card and regular expression matches. This is handy for Windows where filename case is not significant. - FsType = string where string is a filesystem type: ext2, jfs, ntfs, proc, reiserfs, xfs, usbdevfs, sysfs, smbfs, iso9660. For ext3 systems, use ext2. You may have multiple fstype directives and thus permit multiple filesystem types. If the type specified on the fstype directive does not match the filesystem for a particular directive, that directory will not be backed up. This directive can be used to prevent backing up non-local filesystems. - HFS Plus Support = yes | no If set, Mac OS X resource forks will be saved and restored. - Label Type = ANSI | IBM | Bacula Implemented in Director Pool resource and in SD Device resource. If it is specified in the SD Device resource, it will take precedence over the value passed from the Director to the SD. - Check Labels = yes | no Implemented in the SD Device resource. If you intend to read ANSI or IBM labels, this *must* be set. Even if the volume is not ANSI labeled, you can set this to yes, and Bacula will check the label type. - Scripts Directory = <directory> name. Defines the directory from which Bacula scripts will be called for events. In fact, Bacula appends this name to the standard Python list of search directories, so the script could also be in any of the Python system directories. - In FileSet, you can exclude backing up of hardlinks (if you have a lot, it can be very expensive), by using: HardLinks = no in the Options section. Patch supplied by David R Bosso. Thanks. - MaximumPartSize = bytes (SD, Device resource) Defines the maximum part size. - Requires Mount = Yes/No (SD, Device resource) Defines if the device require to be mounted to be read, and if it must be written in a special way. If it set, the following directives must be defined in the same Device resource: + Mount Point = directory Directory where the device must be mounted. + Mount Command = name-string Command that must be executed to mount the device. Before the command is executed, %a is replaced with the Archive Device, and %m with the Mount Point. + Unmount Command = name-string Command that must be executed to unmount the device. Before the command is executed, %a is replaced with the Archive Device, and %m with the Mount Point. + Write Part Command = name-string Command that must be executed to write a part to the device. Before the command is executed, %a is replaced with the Archive Device, %m with the Mount Point, %n with the current part number (0-based), and %v with the current part filename. + Free Space Command = name-string Command that must be executed to check how much free space is left on the device. Before the command is executed, %a is replaced with the Archive Device, %m with the Mount Point, %n with the current part number (0-based), and %v with the current part filename. - Write Part After Job = Yes/No (DIR, Job Resource, and Schedule Resource) If this directive is set to yes (default no), a new part file will be created after the job is finished. - A pile of new Directives to support TLS. Please see the TLS chapter of the manual. New Commands: - "python restart" restarts the Python interpreter. Rather brutal, make sure no Python scripts are running. This permits you to change a Python script and get Bacula to use the new script. New configure options: - --with-libintl-prefix for defining alternate locations for the NLS internationalization libraries. Not normally required. - --datadir for defining where the language files will be installed required only if you do not want the default /usr/share. Items to note!!! - If you use an Autochanger, you MUST update your SD conf file to use the new Autochanger resource. Otherwise, certain commands such as "update slots" may not work. - You must add --with-python=[DIR] to the configure command line if you want Python support. Python 2.2, 2.3 and 2.4 should be automatically detected if in the standard place. - When linking with --with-python, there are a few warnings that can be ignored. - You must either create a new catalog database or upgrade your old database. After installation, run from your scripts directory: ./upgrade_bacula_tables You can also find this script in the <bacula-source>/src/cats directory. - The Director, Storage daemon, and File daemons are Deamons are not compatible with prior versions. All FDs must be upgraded at the same time. - You must add --with-openssl to the configure command line if you want TLS communications encryption support. - Disk seeking during restores does not yet work correctly in all cases, so it is turned off. - Note, with gcc (GCC) 4.0.1 20050727 (Red Hat 4.0.1-5) on an AMD64 CPU running 64 bit CentOS4, there is a compiler bug that generates bad code that causes Bacula to segment fault. Typically you will see this in the Storage daemon first. The solution is to compile Bacula ensuring that no optimization is turned on (normally it is -O2). Other Items: - Security fixes for temp files created in mtx-changer, during ./configure, and during making of Rescue disk. - A new script, dvd-handler, in the scripts directory, which is designed to be used as parameters to Write Part Command and Free Space Command. They need the dvd+rw-tools to be installed (http://fy.chalmers.se/~appro/linux/DVD+RW/) AND, the growisofs program must be patched using the <bacula-source>/patches/dvd+rw-tools-5.21.4.10.8.bacula.patch You must have Python installed to run the scripts. - Part files support: File volumes can now be split into multiple files, called "parts". - For the details of the Python scripting support, please see the new Python Scripting chapter in the manual.
Diffstat (limited to 'sysutils/bacula')
-rw-r--r--sysutils/bacula/MESSAGE13
-rw-r--r--sysutils/bacula/Makefile10
-rw-r--r--sysutils/bacula/Makefile.common7
-rw-r--r--sysutils/bacula/PLIST4
-rw-r--r--sysutils/bacula/distinfo12
-rw-r--r--sysutils/bacula/patches/patch-ag158
-rw-r--r--sysutils/bacula/patches/patch-ah14
-rw-r--r--sysutils/bacula/patches/patch-ai17
-rw-r--r--sysutils/bacula/patches/patch-aj20
9 files changed, 27 insertions, 228 deletions
diff --git a/sysutils/bacula/MESSAGE b/sysutils/bacula/MESSAGE
new file mode 100644
index 00000000000..d25ccd8b458
--- /dev/null
+++ b/sysutils/bacula/MESSAGE
@@ -0,0 +1,13 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2005/11/11 07:23:15 wiz Exp $
+
+You can find some useful scripts to create, update and drop the necessary
+databases, privileges and tables in ${PREFIX}/libexec/bacula/.
+
+If you're upgrading to bacula 1.38.0 from 1.36.x or earlier, you MUST either
+recreate your catalog database or upgrade your old database using the
+${PREFIX}/libexec/bacula/upgrade_bacula_tables script.
+
+Also you can not use an older file daemon with the newer director daemon,
+so you must upgrade any bacula-client installations as well.
+===========================================================================
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index f600d82d721..b240df4502b 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/31 09:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/11 07:23:15 wiz Exp $
CONFLICTS+= bacula-client-[0-9]*
@@ -21,16 +21,16 @@ BACULA_DB= mysql
.endif
PLIST_SUBST+= BACULA_DB=${BACULA_DB}
+MESSAGE_SUBST+= PREFIX=${PREFIX}
CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER} --with-dir-group=${BACULA_GROUP}
CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER} --with-sd-group=${BACULA_GROUP}
+BUILD_DEFS+= BACULA_DIR_USER BACULA_SD_USER BACULA_GROUP
+
PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP}
PKG_USERS+= ${BACULA_SD_USER}:${BACULA_GROUP}
-OWN_DIRS_PERMS= ${BACULA_PIDDIR} root ${BACULA_GROUP} 770
-OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770
-
CONF_FILES+= ${EXAMPLESDIR}/bacula-dir.conf ${PKG_SYSCONFDIR}/bacula-dir.conf
CONF_FILES+= ${EXAMPLESDIR}/bacula-sd.conf ${PKG_SYSCONFDIR}/bacula-sd.conf
@@ -38,6 +38,4 @@ RCD_SCRIPTS= bacula bacula-dir bacula-sd bacula-fd
.include "Makefile.common"
-PKGREVISION= 2
-
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 123bfd43649..3b090f5aa94 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.14 2005/10/31 09:52:22 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2005/11/11 07:23:15 wiz Exp $
-DISTNAME= bacula-1.36.3
+DISTNAME= bacula-1.38.0
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -12,13 +12,12 @@ USE_LANGUAGES+= c++
USE_PKGLOCALEDIR= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
+MANCOMPRESSED= yes
BACULA_GROUP?= bacula
BACULA_DIR_USER?= bacula-dir
BACULA_SD_USER?= bacula-sd
-BUILD_DEFS= BACULA_DIR_USER BACULA_SD_USER BACULA_GROUP
-
PKG_SYSCONFSUBDIR?= bacula
BACULA_PIDDIR?= ${VARBASE}/run
BACULA_WORKINGDIR?= ${VARBASE}/spool/bacula
diff --git a/sysutils/bacula/PLIST b/sysutils/bacula/PLIST
index 73223a05423..c52926998fd 100644
--- a/sysutils/bacula/PLIST
+++ b/sysutils/bacula/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/03 15:50:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/11/11 07:23:15 wiz Exp $
libexec/bacula/bacula
libexec/bacula/bconsole
libexec/bacula/btraceback.dbx
@@ -10,6 +10,7 @@ libexec/bacula/drop_${BACULA_DB}_database
libexec/bacula/drop_${BACULA_DB}_tables
libexec/bacula/drop_bacula_database
libexec/bacula/drop_bacula_tables
+libexec/bacula/dvd-handler
libexec/bacula/gconsole
libexec/bacula/grant_${BACULA_DB}_privileges
libexec/bacula/grant_bacula_privileges
@@ -22,6 +23,7 @@ libexec/bacula/startmysql
libexec/bacula/stopmysql
libexec/bacula/update_${BACULA_DB}_tables
libexec/bacula/update_bacula_tables
+man/man8/bacula.8
sbin/bacula-dir
sbin/bacula-fd
sbin/bacula-sd
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 7338ae984cb..2801bd20b93 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/10/14 15:44:51 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/11/11 07:23:15 wiz Exp $
-SHA1 (bacula-1.36.3.tar.gz) = 4b3366e43fd4a8b6cbdc23e86ea20da6933d0f75
-RMD160 (bacula-1.36.3.tar.gz) = e8fb6eee221e261ac5b927019f9e69256cfb1732
-Size (bacula-1.36.3.tar.gz) = 11153154 bytes
+SHA1 (bacula-1.38.0.tar.gz) = a080625119f999c4182dd81b977c92367a66ceed
+RMD160 (bacula-1.38.0.tar.gz) = 10db9bcffcb94ebccea69575d1a59afa5a4dce58
+Size (bacula-1.38.0.tar.gz) = 1847955 bytes
SHA1 (patch-aa) = 3369d0c37108f05828ea7c33b7aabc287e0213fd
SHA1 (patch-ac) = 295dbf7fc6d1f5104b13d37a8ff32ea8580d4019
SHA1 (patch-ae) = ad4b7d5cb83f021235c11504a034def897fffcac
SHA1 (patch-af) = 926e74b83a09f4620672ffb8419d9ea22983d231
-SHA1 (patch-ag) = 4168ce9f1ea804d0d39645a48ab4d4132a53579f
-SHA1 (patch-ah) = bc89aa134997552e82a28bf06ed3c2308fc30efd
-SHA1 (patch-ai) = edbbe7501bcaae7e6699e0a17b2d6fa4056fa810
-SHA1 (patch-aj) = 40ef8d3719e8ad2ba5c24de8d5661b3bfbbb5806
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
deleted file mode 100644
index 1cdae3f4330..00000000000
--- a/sysutils/bacula/patches/patch-ag
+++ /dev/null
@@ -1,158 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/10/14 15:44:51 wiz Exp $
-
---- configure.orig 2005-04-14 19:46:30.000000000 +0200
-+++ configure
-@@ -12858,6 +12858,153 @@ fi
- echo "$as_me:$LINENO: result: $fstype" >&5
- echo "${ECHO_T}$fstype" >&6
-
-+if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
-+echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking sys/statvfs.h usability" >&5
-+echo $ECHO_N "checking sys/statvfs.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <sys/statvfs.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking sys/statvfs.h presence" >&5
-+echo $ECHO_N "checking sys/statvfs.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/statvfs.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sys/statvfs.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
-+echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
-+if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_sys_statvfs_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
-+
-+fi
-+if test $ac_cv_header_sys_statvfs_h = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SYS_STATVFS_H 1
-+_ACEOF
-+
-+fi
-+
-+
-+
- echo "$as_me:$LINENO: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah
deleted file mode 100644
index d61e70af6d4..00000000000
--- a/sysutils/bacula/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/10/14 15:44:51 wiz Exp $
-
---- autoconf/config.h.in.orig 2005-10-13 18:29:17.000000000 +0200
-+++ autoconf/config.h.in
-@@ -97,6 +97,9 @@
- very expensive. */
- #undef CACHE_IDS
-
-+/* Define if you have the <sys/statvfs.h> header file */
-+#undef HAVE_SYS_STATVFS_H
-+
- /* Define to use SVR4 statvfs to get filesystem type. */
- #undef FSTYPE_STATVFS
-
diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai
deleted file mode 100644
index 33f5605df30..00000000000
--- a/sysutils/bacula/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/10/14 15:44:51 wiz Exp $
-
---- src/findlib/fstype.c.orig 2005-04-05 19:23:56.000000000 +0200
-+++ src/findlib/fstype.c
-@@ -80,6 +80,12 @@ bool fstype(const char *fname, char *fs,
- #include <sys/param.h>
- #include <sys/mount.h>
-
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#else
-+#define statvfs statfs
-+#endif
-+
- bool fstype(const char *fname, char *fs, int fslen)
- {
- struct statvfs st;
diff --git a/sysutils/bacula/patches/patch-aj b/sysutils/bacula/patches/patch-aj
deleted file mode 100644
index 9a637c1f1d6..00000000000
--- a/sysutils/bacula/patches/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/10/14 15:44:51 wiz Exp $
-
---- autoconf/randpass.orig 2002-11-09 16:55:22.000000000 +0100
-+++ autoconf/randpass
-@@ -8,7 +8,14 @@ if test "x$1" = "x" ; then
- else
- PWL=$1
- fi
--tmp=/tmp/p.tmp.$$
-+tmp=`mktemp randpass.XXXXXXXXXX`
-+if test x$tmp = x; then
-+ tmp=/tmp/p.tmp.$$
-+ if test -f $tmp; then
-+ echo "Temp file security problem on: $tmp"
-+ exit 1
-+ fi
-+fi
- cp autoconf/randpass.bc $tmp
- ps | sum | tr -d ':[:alpha:] ' | sed 's/^/k=/' >>$tmp
- date | tr -d ':[:alpha:] ' | sed 's/^/k=k*/' >>$tmp