diff options
| -rw-r--r-- | sysutils/bacula/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/bacula/Makefile.common | 6 | ||||
| -rw-r--r-- | sysutils/bacula/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ag | 158 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ah | 14 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ai | 17 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-aj | 20 |
7 files changed, 223 insertions, 10 deletions
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index e019e72b939..d0581ae669c 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.3 2005/01/16 19:34:45 kristerw Exp $ - -PKGREVISION= 1 +# $NetBSD: Makefile,v 1.4 2005/10/14 15:44:51 wiz Exp $ .include "Makefile.common" + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index 8e6ded27a1f..90a256b233c 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,7 +1,8 @@ -# $NetBSD: Makefile.common,v 1.10 2005/10/10 17:04:15 hira Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/10/14 15:44:51 wiz Exp $ # -DISTNAME= bacula-1.36.0 +DISTNAME= bacula-1.36.3 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} @@ -80,4 +81,3 @@ pre-install: .include "../../devel/zlib/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 80d4df009f6..7338ae984cb 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,9 +1,13 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:40:50 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/10/14 15:44:51 wiz Exp $ -SHA1 (bacula-1.36.0.tar.gz) = 022606a36bb5c094a8e212c57c0f41d83b458172 -RMD160 (bacula-1.36.0.tar.gz) = a005ad833f006bd5f074f973d6e2f6ef69964d62 -Size (bacula-1.36.0.tar.gz) = 6806740 bytes +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 (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 new file mode 100644 index 00000000000..1cdae3f4330 --- /dev/null +++ b/sysutils/bacula/patches/patch-ag @@ -0,0 +1,158 @@ +$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 new file mode 100644 index 00000000000..d61e70af6d4 --- /dev/null +++ b/sysutils/bacula/patches/patch-ah @@ -0,0 +1,14 @@ +$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 new file mode 100644 index 00000000000..33f5605df30 --- /dev/null +++ b/sysutils/bacula/patches/patch-ai @@ -0,0 +1,17 @@ +$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 new file mode 100644 index 00000000000..9a637c1f1d6 --- /dev/null +++ b/sysutils/bacula/patches/patch-aj @@ -0,0 +1,20 @@ +$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 |