Thu Feb 7 11:29:32 2019 UTC ()
bacula{,-qt*-console,-tray-monitor*}: update to 9.4.1
7 years worth of updates.
(markd)
diff -r1.77 -r1.78 pkgsrc/sysutils/bacula/Makefile
diff -r1.67 -r1.68 pkgsrc/sysutils/bacula/Makefile.common
diff -r1.18 -r1.19 pkgsrc/sysutils/bacula/PLIST.common
diff -r1.13 -r1.14 pkgsrc/sysutils/bacula/PLIST.server
diff -r1.52 -r1.53 pkgsrc/sysutils/bacula/distinfo
diff -r1.26 -r1.27 pkgsrc/sysutils/bacula-clientonly/Makefile
diff -r1.36 -r1.37 pkgsrc/sysutils/bacula-qt-console/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/bacula-qt5-console/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/bacula-qt5-console/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/bacula-qt5-console/PLIST
diff -r1.44 -r1.45 pkgsrc/sysutils/bacula-tray-monitor/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/bacula-tray-monitor-qt5/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/bacula-tray-monitor-qt5/PLIST
diff -r1.1.1.1 -r0 pkgsrc/sysutils/bacula-wx-console/DESCR
diff -r1.48 -r0 pkgsrc/sysutils/bacula-wx-console/Makefile
diff -r1.3 -r0 pkgsrc/sysutils/bacula-wx-console/PLIST
diff -r1.9 -r0 pkgsrc/sysutils/bacula/patches/patch-ah
diff -r1.6 -r0 pkgsrc/sysutils/bacula/patches/patch-ai
diff -r1.3 -r0 pkgsrc/sysutils/bacula/patches/patch-am
diff -r1.1 -r1.2 pkgsrc/sysutils/bacula/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in
diff -r1.1 -r1.2 pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in
diff -r1.1 -r1.2 pkgsrc/sysutils/bacula/patches/patch-src_findlib_attribs.c
diff -r1.1 -r1.2 pkgsrc/sysutils/bacula/patches/patch-src_stored_Makefile.in
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-scripts_baculabackupreport.in
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_console_Makefile.in
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bxattr.c
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bxattr__netbsd.c
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_filed_bxattr__netbsd.h
diff -r0 -r1.1 pkgsrc/sysutils/bacula/patches/patch-src_qt-console_tray-monitor_tray-monitor.pro.in
diff -r1.3 -r1.4 pkgsrc/sysutils/bacula/patches/patch-src_console_conio.c
diff -r1.1 -r0 pkgsrc/sysutils/bacula/patches/patch-src_lib_md5.c
diff -r1.1 -r0 pkgsrc/sysutils/bacula/patches/patch-src_plugins_fd_fd__common.h
diff -r1.2 -r1.3 pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in
--- pkgsrc/sysutils/bacula/Makefile 2018/12/09 18:52:45 1.77
+++ pkgsrc/sysutils/bacula/Makefile 2019/02/07 11:29:31 1.78
| @@ -1,16 +1,14 @@ | | | @@ -1,16 +1,14 @@ |
1 | # $NetBSD: Makefile,v 1.77 2018/12/09 18:52:45 adam Exp $ | | 1 | # $NetBSD: Makefile,v 1.78 2019/02/07 11:29:31 markd Exp $ |
2 | | | | |
3 | PKGREVISION= 21 | | | |
4 | | | 2 | |
5 | CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* | | 3 | CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* |
6 | | | 4 | |
7 | .include "options.mk" | | 5 | .include "options.mk" |
8 | | | 6 | |
9 | PLIST_SRC= PLIST.common | | 7 | PLIST_SRC= PLIST.common |
10 | PLIST_SRC+= PLIST.server | | 8 | PLIST_SRC+= PLIST.server |
11 | | | 9 | |
12 | PLIST_SUBST+= BACULA_DB=${BACULA_DB} | | 10 | PLIST_SUBST+= BACULA_DB=${BACULA_DB} |
13 | MESSAGE_SUBST+= PREFIX=${PREFIX} | | 11 | MESSAGE_SUBST+= PREFIX=${PREFIX} |
14 | MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} | | 12 | MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} |
15 | | | 13 | |
16 | # For make_catalog_backup.pl.in. | | 14 | # For make_catalog_backup.pl.in. |
--- pkgsrc/sysutils/bacula/Makefile.common 2016/02/26 10:24:10 1.67
+++ pkgsrc/sysutils/bacula/Makefile.common 2019/02/07 11:29:31 1.68
| @@ -1,21 +1,22 @@ | | | @@ -1,21 +1,22 @@ |
1 | # $NetBSD: Makefile.common,v 1.67 2016/02/26 10:24:10 jperkin Exp $ | | 1 | # $NetBSD: Makefile.common,v 1.68 2019/02/07 11:29:31 markd Exp $ |
2 | # | | 2 | # |
3 | # used by sysutils/bacula-clientonly/Makefile | | 3 | # used by sysutils/bacula-clientonly/Makefile |
4 | # used by sysutils/bacula-tray-monitor/Makefile | | 4 | # used by sysutils/bacula-tray-monitor/Makefile |
5 | # used by sysutils/bacula-wx-console/Makefile | | 5 | # used by sysutils/bacula-tray-monitor-qt5/Makefile |
6 | # used by sysutils/bacula-qt-console/Makefile | | 6 | # used by sysutils/bacula-qt-console/Makefile |
| | | 7 | # used by sysutils/bacula-qt5-console/Makefile |
7 | | | 8 | |
8 | DISTNAME= bacula-5.2.13 | | 9 | DISTNAME= bacula-9.4.1 |
9 | CATEGORIES= sysutils | | 10 | CATEGORIES= sysutils |
10 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} | | 11 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} |
11 | | | 12 | |
12 | #PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} | | 13 | #PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} |
13 | #PATCHFILES= | | 14 | #PATCHFILES= |
14 | #DIST_SUBDIR= ${DISTNAME} | | 15 | #DIST_SUBDIR= ${DISTNAME} |
15 | | | 16 | |
16 | MAINTAINER= pkgsrc-users@NetBSD.org | | 17 | MAINTAINER= pkgsrc-users@NetBSD.org |
17 | HOMEPAGE= http://www.bacula.org/ | | 18 | HOMEPAGE= http://www.bacula.org/ |
18 | COMMENT?= The Network Backup Solution | | 19 | COMMENT?= The Network Backup Solution |
19 | LICENSE= gnu-agpl-v3 | | 20 | LICENSE= gnu-agpl-v3 |
20 | | | 21 | |
21 | USE_LANGUAGES= c c++ | | 22 | USE_LANGUAGES= c c++ |
| @@ -41,43 +42,41 @@ BUILD_DEFS+= VARBASE BACULA_PIDDIR BACU | | | @@ -41,43 +42,41 @@ BUILD_DEFS+= VARBASE BACULA_PIDDIR BACU |
41 | | | 42 | |
42 | FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR} | | 43 | FILES_SUBST+= BACULA_ETCDIR=${PKG_SYSCONFDIR} |
43 | FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR} | | 44 | FILES_SUBST+= BACULA_PIDDIR=${BACULA_PIDDIR} |
44 | FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP} | | 45 | FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP} |
45 | FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER} | | 46 | FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER} |
46 | FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER} | | 47 | FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER} |
47 | | | 48 | |
48 | SUBST_CLASSES+= egdir | | 49 | SUBST_CLASSES+= egdir |
49 | SUBST_STAGE.egdir= pre-configure | | 50 | SUBST_STAGE.egdir= pre-configure |
50 | SUBST_FILES.egdir= src/dird/Makefile.in | | 51 | SUBST_FILES.egdir= src/dird/Makefile.in |
51 | SUBST_FILES.egdir+= src/console/Makefile.in | | 52 | SUBST_FILES.egdir+= src/console/Makefile.in |
52 | SUBST_FILES.egdir+= src/filed/Makefile.in | | 53 | SUBST_FILES.egdir+= src/filed/Makefile.in |
53 | SUBST_FILES.egdir+= src/stored/Makefile.in | | 54 | SUBST_FILES.egdir+= src/stored/Makefile.in |
54 | SUBST_FILES.egdir+= src/gnome2-console/Makefile.in | | | |
55 | SUBST_FILES.egdir+= src/wx-console/Makefile.in | | | |
56 | SUBST_FILES.egdir+= src/tray-monitor/Makefile.in | | | |
57 | SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' | | 55 | SUBST_SED.egdir= -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' |
58 | | | 56 | |
59 | SUBST_CLASSES+= fixwrap | | 57 | SUBST_CLASSES+= fixwrap |
60 | SUBST_STAGE.fixwrap= post-build | | 58 | SUBST_STAGE.fixwrap= post-build |
61 | SUBST_FILES.fixwrap= scripts/bacula_config | | 59 | SUBST_FILES.fixwrap= scripts/bacula_config |
62 | SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" | | 60 | SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g" |
63 | | | 61 | |
64 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | | 62 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} |
65 | CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula | | 63 | CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula |
66 | CONFIGURE_ARGS+= --with-sbin-perm=0755 | | 64 | CONFIGURE_ARGS+= --with-sbin-perm=0755 |
67 | CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR} | | 65 | CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR} |
68 | CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR} | | 66 | CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR} |
69 | CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline | | 67 | CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline |
70 | | | 68 | |
71 | CONFIGURE_ARGS.Linux+= --enable-smartalloc | | 69 | CONFIGURE_ARGS.Linux+= --enable-smartalloc |
72 | | | 70 | |
73 | CONFIGURE_ARGS.DragonFly+= --disable-xattr | | 71 | CONFIGURE_ARGS.DragonFly+= --disable-xattr |
74 | | | 72 | |
75 | PTHREAD_OPTS+= require | | 73 | PTHREAD_OPTS+= require |
76 | PTHREAD_AUTO_VARS= yes | | 74 | PTHREAD_AUTO_VARS= yes |
77 | | | 75 | |
78 | EXAMPLESDIR= ${PREFIX}/share/examples/bacula | | 76 | EXAMPLESDIR= ${PREFIX}/share/examples/bacula |
79 | INSTALLATION_DIRS+= ${EXAMPLESDIR} | | 77 | INSTALLATION_DIRS+= ${EXAMPLESDIR} |
80 | | | 78 | |
81 | .include "../../mk/readline.buildlink3.mk" | | 79 | .include "../../mk/readline.buildlink3.mk" |
| | | 80 | .include "../../archivers/lzo/buildlink3.mk" |
82 | .include "../../devel/zlib/buildlink3.mk" | | 81 | .include "../../devel/zlib/buildlink3.mk" |
83 | .include "../../mk/pthread.buildlink3.mk" | | 82 | .include "../../mk/pthread.buildlink3.mk" |
--- pkgsrc/sysutils/bacula/PLIST.common 2014/03/11 14:05:14 1.18
+++ pkgsrc/sysutils/bacula/PLIST.common 2019/02/07 11:29:31 1.19
| @@ -1,50 +1,54 @@ | | | @@ -1,50 +1,54 @@ |
1 | @comment $NetBSD: PLIST.common,v 1.18 2014/03/11 14:05:14 jperkin Exp $ | | 1 | @comment $NetBSD: PLIST.common,v 1.19 2019/02/07 11:29:31 markd Exp $ |
2 | lib/bpipe-fd.la | | 2 | lib/bpipe-fd.la |
3 | lib/libbac.la | | 3 | lib/libbac.la |
4 | lib/libbaccfg.la | | 4 | lib/libbaccfg.la |
5 | lib/libbacfind.la | | 5 | lib/libbacfind.la |
6 | lib/libbacpy.la | | | |
7 | libexec/bacula/bacula | | 6 | libexec/bacula/bacula |
8 | libexec/bacula/bacula-ctl-dir | | 7 | libexec/bacula/bacula-ctl-dir |
9 | libexec/bacula/bacula-ctl-fd | | 8 | libexec/bacula/bacula-ctl-fd |
10 | libexec/bacula/bacula-ctl-sd | | 9 | libexec/bacula/bacula-ctl-sd |
| | | 10 | libexec/bacula/bacula-tray-monitor.desktop |
11 | libexec/bacula/bacula_config | | 11 | libexec/bacula/bacula_config |
| | | 12 | libexec/bacula/baculabackupreport |
12 | libexec/bacula/bconsole | | 13 | libexec/bacula/bconsole |
13 | libexec/bacula/btraceback.dbx | | 14 | libexec/bacula/btraceback.dbx |
14 | libexec/bacula/btraceback.gdb | | 15 | libexec/bacula/btraceback.gdb |
15 | libexec/bacula/btraceback.mdb | | 16 | libexec/bacula/btraceback.mdb |
16 | libexec/bacula/disk-changer | | 17 | libexec/bacula/disk-changer |
| | | 18 | libexec/bacula/isworm |
17 | libexec/bacula/mtx-changer | | 19 | libexec/bacula/mtx-changer |
18 | libexec/bacula/mtx-changer.conf | | 20 | libexec/bacula/mtx-changer.conf |
19 | libexec/bacula/query.sql | | 21 | libexec/bacula/query.sql |
20 | man/man1/bacula-bwxconsole.1 | | 22 | libexec/bacula/tapealert |
21 | man/man1/bacula-tray-monitor.1 | | | |
22 | man/man1/bat.1 | | 23 | man/man1/bat.1 |
23 | man/man1/bsmtp.1 | | 24 | man/man1/bsmtp.1 |
24 | man/man8/bacula-dir.8 | | 25 | man/man8/bacula-dir.8 |
25 | man/man8/bacula-fd.8 | | 26 | man/man8/bacula-fd.8 |
26 | man/man8/bacula-sd.8 | | 27 | man/man8/bacula-sd.8 |
27 | man/man8/bacula.8 | | 28 | man/man8/bacula.8 |
28 | man/man8/bconsole.8 | | 29 | man/man8/bconsole.8 |
29 | man/man8/bcopy.8 | | 30 | man/man8/bcopy.8 |
30 | man/man8/bextract.8 | | 31 | man/man8/bextract.8 |
31 | man/man8/bls.8 | | 32 | man/man8/bls.8 |
32 | man/man8/bregex.8 | | 33 | man/man8/bregex.8 |
33 | man/man8/bscan.8 | | 34 | man/man8/bscan.8 |
34 | man/man8/btape.8 | | 35 | man/man8/btape.8 |
35 | man/man8/btraceback.8 | | 36 | man/man8/btraceback.8 |
36 | man/man8/bwild.8 | | 37 | man/man8/bwild.8 |
37 | man/man8/dbcheck.8 | | 38 | man/man8/dbcheck.8 |
38 | sbin/bacula | | 39 | sbin/bacula |
39 | sbin/bacula-fd | | 40 | sbin/bacula-fd |
| | | 41 | sbin/bbconsjson |
40 | sbin/bconsole | | 42 | sbin/bconsole |
| | | 43 | sbin/bfdjson |
41 | sbin/btraceback | | 44 | sbin/btraceback |
42 | share/doc/bacula/ChangeLog | | 45 | share/doc/bacula/ChangeLog |
43 | share/doc/bacula/INSTALL | | 46 | share/doc/bacula/INSTALL |
44 | share/doc/bacula/LICENSE | | 47 | share/doc/bacula/LICENSE |
| | | 48 | share/doc/bacula/LICENSE-FAQ |
| | | 49 | share/doc/bacula/LICENSE-FOSS |
45 | share/doc/bacula/README | | 50 | share/doc/bacula/README |
46 | share/doc/bacula/ReleaseNotes | | 51 | share/doc/bacula/ReleaseNotes |
47 | share/doc/bacula/VERIFYING | | 52 | share/doc/bacula/VERIFYING |
48 | share/doc/bacula/technotes | | | |
49 | share/examples/bacula/bacula-fd.conf | | 53 | share/examples/bacula/bacula-fd.conf |
50 | share/examples/bacula/bconsole.conf | | 54 | share/examples/bacula/bconsole.conf |
--- pkgsrc/sysutils/bacula/PLIST.server 2014/03/11 14:05:14 1.13
+++ pkgsrc/sysutils/bacula/PLIST.server 2019/02/07 11:29:31 1.14
| @@ -1,33 +1,36 @@ | | | @@ -1,33 +1,36 @@ |
1 | @comment $NetBSD: PLIST.server,v 1.13 2014/03/11 14:05:14 jperkin Exp $ | | 1 | @comment $NetBSD: PLIST.server,v 1.14 2019/02/07 11:29:31 markd Exp $ |
2 | lib/libbaccats.la | | 2 | lib/libbaccats.la |
3 | lib/libbaccats-${BACULA_DB}.la | | 3 | lib/libbaccats-${BACULA_DB}.la |
| | | 4 | lib/libbacsd.la |
4 | lib/libbacsql.la | | 5 | lib/libbacsql.la |
5 | libexec/bacula/chio-changer | | 6 | libexec/bacula/chio-changer |
6 | libexec/bacula/create_${BACULA_DB}_database | | 7 | libexec/bacula/create_${BACULA_DB}_database |
7 | libexec/bacula/create_bacula_database | | 8 | libexec/bacula/create_bacula_database |
8 | libexec/bacula/delete_catalog_backup | | 9 | libexec/bacula/delete_catalog_backup |
9 | libexec/bacula/drop_${BACULA_DB}_database | | 10 | libexec/bacula/drop_${BACULA_DB}_database |
10 | libexec/bacula/drop_${BACULA_DB}_tables | | 11 | libexec/bacula/drop_${BACULA_DB}_tables |
11 | libexec/bacula/drop_bacula_database | | 12 | libexec/bacula/drop_bacula_database |
12 | libexec/bacula/drop_bacula_tables | | 13 | libexec/bacula/drop_bacula_tables |
13 | libexec/bacula/grant_${BACULA_DB}_privileges | | 14 | libexec/bacula/grant_${BACULA_DB}_privileges |
14 | libexec/bacula/grant_bacula_privileges | | 15 | libexec/bacula/grant_bacula_privileges |
15 | libexec/bacula/make_${BACULA_DB}_tables | | 16 | libexec/bacula/make_${BACULA_DB}_tables |
16 | libexec/bacula/make_bacula_tables | | 17 | libexec/bacula/make_bacula_tables |
17 | libexec/bacula/make_catalog_backup | | 18 | libexec/bacula/make_catalog_backup |
18 | libexec/bacula/make_catalog_backup.pl | | 19 | libexec/bacula/make_catalog_backup.pl |
19 | libexec/bacula/update_${BACULA_DB}_tables | | 20 | libexec/bacula/update_${BACULA_DB}_tables |
20 | libexec/bacula/update_bacula_tables | | 21 | libexec/bacula/update_bacula_tables |
21 | sbin/bacula-dir | | 22 | sbin/bacula-dir |
22 | sbin/bacula-sd | | 23 | sbin/bacula-sd |
23 | sbin/bcopy | | 24 | sbin/bcopy |
| | | 25 | sbin/bdirjson |
24 | sbin/bextract | | 26 | sbin/bextract |
25 | sbin/bls | | 27 | sbin/bls |
26 | sbin/bregex | | 28 | sbin/bregex |
27 | sbin/bscan | | 29 | sbin/bscan |
| | | 30 | sbin/bsdjson |
28 | sbin/bsmtp | | 31 | sbin/bsmtp |
29 | sbin/btape | | 32 | sbin/btape |
30 | sbin/bwild | | 33 | sbin/bwild |
31 | sbin/dbcheck | | 34 | sbin/dbcheck |
32 | share/examples/bacula/bacula-dir.conf | | 35 | share/examples/bacula/bacula-dir.conf |
33 | share/examples/bacula/bacula-sd.conf | | 36 | share/examples/bacula/bacula-sd.conf |
--- pkgsrc/sysutils/bacula/distinfo 2015/11/04 01:32:06 1.52
+++ pkgsrc/sysutils/bacula/distinfo 2019/02/07 11:29:31 1.53
| @@ -1,25 +1,25 @@ | | | @@ -1,25 +1,25 @@ |
1 | $NetBSD: distinfo,v 1.52 2015/11/04 01:32:06 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.53 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | SHA1 (bacula-5.2.13.tar.gz) = 30b1eb2efb515138807163d046f675eaa29fad1c | | 3 | SHA1 (bacula-9.4.1.tar.gz) = a8094933d081b63cf8d9781c930d70200375fc04 |
4 | RMD160 (bacula-5.2.13.tar.gz) = bcc168143c0eec5cb5e983f765935534379f4fcf | | 4 | RMD160 (bacula-9.4.1.tar.gz) = 64851aada491ea13e4e1b6a08466a6360621a95c |
5 | SHA512 (bacula-5.2.13.tar.gz) = dfdff353f5b6ed4d85013dc292526706bbd67066f7057a114012172926c819c8df1eb8779166d5a90db3a49a5584f0a8daf7566cc93cf4fa3f1bdda245b55cf0 | | 5 | SHA512 (bacula-9.4.1.tar.gz) = 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee |
6 | Size (bacula-5.2.13.tar.gz) = 4243395 bytes | | 6 | Size (bacula-9.4.1.tar.gz) = 4162956 bytes |
7 | SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e | | | |
8 | SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01 | | 7 | SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01 |
9 | SHA1 (patch-ah) = 06452df1449ed6f06af00ed2cf9d736c40044dfb | | | |
10 | SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee | | | |
11 | SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 | | 8 | SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 |
12 | SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d | | 9 | SHA1 (patch-configure) = 94e6714a6d19ae07c1141c59702b546e595e0bb1 |
13 | SHA1 (patch-configure) = 710d6e4370099a5d6d23d1297864af01abcdae83 | | 10 | SHA1 (patch-scripts_baculabackupreport.in) = 58047124ad82dd5d0f2aa786251ba012ae7f07b0 |
14 | SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885 | | 11 | SHA1 (patch-src_bacula.h) = 74fed45f9d441a132f113fdfd783b8f5bb077885 |
15 | SHA1 (patch-src_console_conio.c) = bfec27296d145ab94c305cc5ffca7f892c14303e | | 12 | SHA1 (patch-src_console_Makefile.in) = f997b8f8bc8c7cca5b06a8f046558951caa14094 |
16 | SHA1 (patch-src_dird_Makefile.in) = fdce18aca972f26f16af90283756cd5bf5ad5831 | | 13 | SHA1 (patch-src_console_conio.c) = 92445b01e2ad17de5215315df916f1f1bd45108b |
17 | SHA1 (patch-src_filed_Makefile.in) = c88ee648ef33c3f7c3a02b77b1d3fc3da8da088d | | 14 | SHA1 (patch-src_dird_Makefile.in) = 0f088f3af4bcacb260fb50124723babd69f5caee |
18 | SHA1 (patch-src_findlib_attribs.c) = a0917e500d7e937164cf59917cabd992512acd1d | | 15 | SHA1 (patch-src_filed_Makefile.in) = 237c8ccf0750ef33223664e316a0533fc260371a |
| | | 16 | SHA1 (patch-src_filed_bxattr.c) = 2689b8bb6f5ddf14d7253e45353c5a40e5e9867e |
| | | 17 | SHA1 (patch-src_filed_bxattr__netbsd.c) = bc2a0417c852b76ddc4324c39ae5f6ec0387ab30 |
| | | 18 | SHA1 (patch-src_filed_bxattr__netbsd.h) = 791a2da696da049a6091c4c460aec0bd00dfa5ff |
| | | 19 | SHA1 (patch-src_findlib_attribs.c) = f3665a012e3a0cc06ff2c9ab922324b1df3b2819 |
19 | SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1 | | 20 | SHA1 (patch-src_lib_attr.c) = 287851ff2ce2a0868d597cf1d7471a6766f6f7c1 |
20 | SHA1 (patch-src_lib_md5.c) = a359bb9988538f02d5a14bf3ddac23f7ea64bea6 | | | |
21 | SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e | | 21 | SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd2e |
22 | SHA1 (patch-src_plugins_fd_fd__common.h) = 7c8419d4fa7f1fe8a07e2bc2720a4903ff324135 | | | |
23 | SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad | | 22 | SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad |
24 | SHA1 (patch-src_stored_Makefile.in) = 5bee8ea8a7c288a1e4baf372ef79da34c9e35284 | | 23 | SHA1 (patch-src_qt-console_tray-monitor_tray-monitor.pro.in) = 83b48b321de88aa766aa2fc082c95a3a8665981d |
25 | SHA1 (patch-src_tools_Makefile.in) = dca0472c31ced76b8d5a357ef968ddc3f93faf5b | | 24 | SHA1 (patch-src_stored_Makefile.in) = 2c1a2b095593f88649bd0dc21f03cfbd24894fb5 |
| | | 25 | SHA1 (patch-src_tools_Makefile.in) = f53379b99b11b673ac1d0b8ed7ff64614def49b5 |
--- pkgsrc/sysutils/bacula-clientonly/Makefile 2016/03/05 11:29:28 1.26
+++ pkgsrc/sysutils/bacula-clientonly/Makefile 2019/02/07 11:29:31 1.27
| @@ -1,17 +1,16 @@ | | | @@ -1,17 +1,16 @@ |
1 | # $NetBSD: Makefile,v 1.26 2016/03/05 11:29:28 jperkin Exp $ | | 1 | # $NetBSD: Makefile,v 1.27 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | PKGNAME= ${DISTNAME:S/-/-clientonly-/} | | 3 | PKGNAME= ${DISTNAME:S/-/-clientonly-/} |
4 | PKGREVISION= 3 | | | |
5 | COMMENT= The Network Backup Solution (client only) | | 4 | COMMENT= The Network Backup Solution (client only) |
6 | | | 5 | |
7 | CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* | | 6 | CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* |
8 | | | 7 | |
9 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo | | 8 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo |
10 | PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches | | 9 | PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches |
11 | FILESDIR= ${.CURDIR}/../../sysutils/bacula/files | | 10 | FILESDIR= ${.CURDIR}/../../sysutils/bacula/files |
12 | | | 11 | |
13 | PLIST_SRC= ${.CURDIR}/../../sysutils/bacula/PLIST.common | | 12 | PLIST_SRC= ${.CURDIR}/../../sysutils/bacula/PLIST.common |
14 | | | 13 | |
15 | CONFIGURE_ARGS+= --enable-client-only | | 14 | CONFIGURE_ARGS+= --enable-client-only |
16 | | | 15 | |
17 | OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770 | | 16 | OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} root ${BACULA_GROUP} 770 |
--- pkgsrc/sysutils/bacula-qt-console/Makefile 2018/03/12 11:17:31 1.36
+++ pkgsrc/sysutils/bacula-qt-console/Makefile 2019/02/07 11:29:31 1.37
| @@ -1,26 +1,27 @@ | | | @@ -1,26 +1,27 @@ |
1 | # $NetBSD: Makefile,v 1.36 2018/03/12 11:17:31 wiz Exp $ | | 1 | # $NetBSD: Makefile,v 1.37 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | PKGNAME= ${DISTNAME:S/-/-qt-console-/} | | 3 | PKGNAME= ${DISTNAME:S/-/-qt-console-/} |
4 | PKGREVISION= 4 | | | |
5 | COMMENT= Qt-based console for Bacula - The Network Backup Solution | | 4 | COMMENT= Qt-based console for Bacula - The Network Backup Solution |
6 | | | 5 | |
7 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo | | 6 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo |
8 | PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches | | 7 | PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches |
9 | | | 8 | |
10 | USE_TOOLS+= gmake pkg-config | | 9 | USE_TOOLS+= gmake pkg-config |
11 | CONFIGURE_ARGS+= --enable-client-only | | 10 | CONFIGURE_ARGS+= --enable-client-only |
12 | CONFIGURE_ARGS+= --enable-bat | | 11 | CONFIGURE_ARGS+= --enable-bat |
13 | | | 12 | |
| | | 13 | BUILDLINK_TRANSFORM+= opt:-std=c++98:-std=gnu++98 # typeof |
| | | 14 | |
14 | BUILD_DIRS= src/qt-console | | 15 | BUILD_DIRS= src/qt-console |
15 | | | 16 | |
16 | INSTALLATION_DIRS= bin share/examples/bacula | | 17 | INSTALLATION_DIRS= bin share/examples/bacula |
17 | | | 18 | |
18 | CONF_FILES+= ${EXAMPLESDIR}/bat.conf ${PKG_SYSCONFDIR}/bat.conf | | 19 | CONF_FILES+= ${EXAMPLESDIR}/bat.conf ${PKG_SYSCONFDIR}/bat.conf |
19 | | | 20 | |
20 | post-install: | | 21 | post-install: |
21 | ${INSTALL_DATA} ${WRKSRC}/src/qt-console/bat.conf ${DESTDIR}${EXAMPLESDIR} | | 22 | ${INSTALL_DATA} ${WRKSRC}/src/qt-console/bat.conf ${DESTDIR}${EXAMPLESDIR} |
22 | | | 23 | |
23 | .include "../../sysutils/bacula/Makefile.common" | | 24 | .include "../../sysutils/bacula/Makefile.common" |
24 | .include "../../sysutils/bacula/buildlink3.mk" | | 25 | .include "../../sysutils/bacula/buildlink3.mk" |
25 | .include "../../x11/qt4-libs/buildlink3.mk" | | 26 | .include "../../x11/qt4-libs/buildlink3.mk" |
26 | .include "../../x11/qt4-tools/buildlink3.mk" | | 27 | .include "../../x11/qt4-tools/buildlink3.mk" |
Qt-based console for Bacula - The Network Backup Solution
# $NetBSD: Makefile,v 1.1 2019/02/07 11:29:31 markd Exp $
PKGNAME= ${DISTNAME:S/-/-qt5-console-/}
COMMENT= Qt5-based console for Bacula - The Network Backup Solution
DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo
PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --enable-client-only
CONFIGURE_ARGS+= --enable-bat
BUILDLINK_TRANSFORM+= opt:-std=c++98:-std=gnu++98 # typeof
BUILD_DIRS= src/qt-console
INSTALLATION_DIRS= bin share/examples/bacula
CONF_FILES+= ${EXAMPLESDIR}/bat.conf ${PKG_SYSCONFDIR}/bat.conf
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
post-install:
${INSTALL_DATA} ${WRKSRC}/src/qt-console/bat.conf ${DESTDIR}${EXAMPLESDIR}
.include "../../sysutils/bacula/Makefile.common"
.include "../../sysutils/bacula/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@comment $NetBSD: PLIST,v 1.1 2019/02/07 11:29:31 markd Exp $
sbin/bat
share/doc/bacula/clients.html
share/doc/bacula/console.html
share/doc/bacula/filesets.html
share/doc/bacula/index.html
share/doc/bacula/joblist.html
share/doc/bacula/jobplot.html
share/doc/bacula/jobs.html
share/doc/bacula/mail-message-new.png
share/doc/bacula/media.html
share/doc/bacula/restore.html
share/doc/bacula/status.png
share/doc/bacula/storage.html
share/examples/bacula/bat.conf
--- pkgsrc/sysutils/bacula-tray-monitor/Makefile 2018/11/14 22:22:22 1.44
+++ pkgsrc/sysutils/bacula-tray-monitor/Makefile 2019/02/07 11:29:31 1.45
| @@ -1,23 +1,28 @@ | | | @@ -1,23 +1,28 @@ |
1 | # $NetBSD: Makefile,v 1.44 2018/11/14 22:22:22 kleink Exp $ | | 1 | # $NetBSD: Makefile,v 1.45 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | PKGNAME= ${DISTNAME:S/-/-tray-monitor-/} | | 3 | PKGNAME= ${DISTNAME:S/-/-tray-monitor-/} |
4 | PKGREVISION= 10 | | | |
5 | COMMENT= System tray monitor for Bacula - The Network Backup Solution | | 4 | COMMENT= System tray monitor for Bacula - The Network Backup Solution |
6 | | | 5 | |
7 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo | | 6 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo |
8 | PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches | | 7 | PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches |
9 | | | 8 | |
10 | USE_TOOLS+= pkg-config | | 9 | USE_TOOLS+= gmake pkg-config |
11 | CONFIGURE_ARGS+= --enable-client-only | | 10 | CONFIGURE_ARGS+= --enable-client-only |
12 | CONFIGURE_ARGS+= --enable-tray-monitor | | 11 | CONFIGURE_ARGS+= --enable-bat |
13 | | | 12 | |
14 | BUILD_DIRS= src/lib | | 13 | BUILDLINK_TRANSFORM+= opt:-std=c++98:-std=gnu++98 # typeof |
15 | BUILD_DIRS+= src/tray-monitor | | | |
16 | INSTALL_DIRS= src/tray-monitor | | | |
17 | | | 14 | |
18 | INSTALLATION_DIRS= sbin share/examples/bacula | | 15 | BUILD_DIRS= src/qt-console/tray-monitor |
| | | 16 | |
| | | 17 | INSTALLATION_DIRS= bin share/examples/bacula |
| | | 18 | |
| | | 19 | CONF_FILES+= ${EXAMPLESDIR}/tray-monitor.conf ${PKG_SYSCONFDIR}/tray-monitor.conf |
| | | 20 | |
| | | 21 | post-install: |
| | | 22 | ${INSTALL_DATA} ${WRKSRC}/src/qt-console/tray-monitor/tray-monitor.conf ${DESTDIR}${EXAMPLESDIR} |
19 | | | 23 | |
20 | .include "../../sysutils/bacula/Makefile.common" | | 24 | .include "../../sysutils/bacula/Makefile.common" |
21 | .include "../../sysutils/bacula/buildlink3.mk" | | 25 | .include "../../sysutils/bacula/buildlink3.mk" |
22 | .include "../../x11/gtk2/buildlink3.mk" | | 26 | .include "../../x11/qt4-libs/buildlink3.mk" |
| | | 27 | .include "../../x11/qt4-tools/buildlink3.mk" |
23 | .include "../../mk/bsd.pkg.mk" | | 28 | .include "../../mk/bsd.pkg.mk" |
System tray monitor for Bacula - The Network Backup Solution
# $NetBSD: Makefile,v 1.1 2019/02/07 11:29:32 markd Exp $
PKGNAME= ${DISTNAME:S/-/-tray-monitor-qt5-/}
COMMENT= System tray monitor for Bacula - The Network Backup Solution
DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo
PATCHDIR= ${.CURDIR}/../../sysutils/bacula/patches
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --enable-client-only
CONFIGURE_ARGS+= --enable-bat
BUILDLINK_TRANSFORM+= opt:-std=c++98:-std=gnu++98 # typeof
BUILD_DIRS= src/qt-console/tray-monitor
INSTALLATION_DIRS= bin share/examples/bacula
CONF_FILES+= ${EXAMPLESDIR}/tray-monitor.conf ${PKG_SYSCONFDIR}/tray-monitor.conf
pre-configure:
${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
post-install:
${INSTALL_DATA} ${WRKSRC}/src/qt-console/tray-monitor/tray-monitor.conf ${DESTDIR}${EXAMPLESDIR}
.include "../../sysutils/bacula/Makefile.common"
.include "../../sysutils/bacula/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@comment $NetBSD: PLIST,v 1.1 2019/02/07 11:29:32 markd Exp $
sbin/bacula-tray-monitor
share/examples/bacula/tray-monitor.conf
--- pkgsrc/sysutils/bacula/patches/patch-configure 2012/10/06 17:54:53 1.1
+++ pkgsrc/sysutils/bacula/patches/patch-configure 2019/02/07 11:29:31 1.2
--- pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in 2012/10/06 17:54:53 1.1
+++ pkgsrc/sysutils/bacula/patches/patch-src_dird_Makefile.in 2019/02/07 11:29:31 1.2
| @@ -1,54 +1,62 @@ | | | @@ -1,54 +1,62 @@ |
1 | $NetBSD: patch-src_dird_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ | | 1 | $NetBSD: patch-src_dird_Makefile.in,v 1.2 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | - use %%EXAMPLESDIR%% instead of sysconfdir | | 3 | - use %%EXAMPLESDIR%% instead of sysconfdir |
4 | - use the .la files for linking | | 4 | - use the .la files for linking |
5 | | | 5 | |
6 | --- src/dird/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 | | 6 | --- src/dird/Makefile.in.orig 2018-12-21 08:40:51.000000000 +0000 |
7 | +++ src/dird/Makefile.in 2012-10-05 11:02:06.000000000 -0400 | | 7 | +++ src/dird/Makefile.in |
8 | @@ -69,14 +69,14 @@ | | 8 | @@ -70,21 +70,21 @@ bacula-dir: Makefile $(SVROBJS) ../lib/l |
9 | ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) | | 9 | ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) |
10 | @echo "Linking $@ ..." | | 10 | @echo "Linking $@ ..." |
11 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ | | 11 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) $(ZLIBS) \ |
12 | - -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ | | 12 | - -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ |
13 | + ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ | | 13 | + ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(DLIB) $(DB_LIBS) $(LIBS) \ |
14 | $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) | | 14 | $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
15 | | | 15 | |
16 | static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ | | 16 | static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ |
17 | ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ | | 17 | ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \ |
18 | ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) | | 18 | ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) |
19 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ | | 19 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) $(ZLIBS) \ |
20 | - -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ | | 20 | - -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ |
21 | + ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \ | | 21 | + ../findlib/libbacfind.la ../cats/libbacsql.la ../cats/libbaccats.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(DLIB) $(DB_LIBS) $(LIBS) \ |
22 | $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) | | 22 | $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
23 | strip $@ | | 23 | strip $@ |
24 | | | 24 | |
25 | @@ -105,16 +105,16 @@ | | 25 | bdirjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) |
26 | install: all | | 26 | @echo "Linking $@ ..." |
| | | 27 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(JSONOBJS) \ |
| | | 28 | - -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \ |
| | | 29 | + ../lib/libbaccfg.la ../lib/libbac.la -lm $(DLIB) $(DB_LIBS) $(LIBS) \ |
| | | 30 | $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| | | 31 | |
| | | 32 | Makefile: $(srcdir)/Makefile.in $(topdir)/config.status |
| | | 33 | @@ -113,16 +113,16 @@ install: all |
27 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir | | 34 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir |
| | | 35 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bdirjson $(DESTDIR)$(sbindir)/bdirjson |
28 | @srcconf=bacula-dir.conf; \ | | 36 | @srcconf=bacula-dir.conf; \ |
29 | - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ | | 37 | - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ |
30 | + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ | | 38 | + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ |
31 | destconf=$$srcconf.new; \ | | 39 | destconf=$$srcconf.new; \ |
32 | echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ | | 40 | echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ |
33 | else \ | | 41 | else \ |
34 | destconf=$$srcconf; \ | | 42 | destconf=$$srcconf; \ |
35 | fi; \ | | 43 | fi; \ |
36 | - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ | | 44 | - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ |
37 | - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf | | 45 | - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf |
38 | + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ | | 46 | + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ |
39 | + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf | | 47 | + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf |
40 | @if test "x${dir_group}" != "x"; then \ | | 48 | @if test "x${dir_group}" != "x" -a "x${DESTDIR}" = "x" ; then \ |
41 | - chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ | | 49 | - chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ |
42 | + chgrp -f ${dir_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ | | 50 | + chgrp -f ${dir_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ |
43 | fi | | 51 | fi |
44 | @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ | | 52 | @if test -f ${DESTDIR}${scriptdir}/query.sql; then \ |
45 | echo " ==> Saving existing query.sql to query.sql.old"; \ | | 53 | echo " ==> Saving existing query.sql to query.sql.old"; \ |
46 | @@ -128,7 +128,7 @@ | | 54 | @@ -136,7 +136,7 @@ install: all |
47 | | | 55 | |
48 | uninstall: | | 56 | uninstall: |
49 | (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir) | | 57 | (cd $(DESTDIR)$(sbindir); $(RMF) bacula-dir bdirjson) |
50 | - (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new) | | 58 | - (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-dir.conf bacula-dir.conf.new) |
51 | + (cd $(DESTDIR)%%EXAMPLESDIR%%; $(RMF) bacula-dir.conf bacula-dir.conf.new) | | 59 | + (cd $(DESTDIR)%%EXAMPLESDIR%%; $(RMF) bacula-dir.conf bacula-dir.conf.new) |
52 | (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql) | | 60 | (cd $(DESTDIR)$(scriptdir); $(RMF) query.sql) |
53 | | | 61 | |
54 | | | 62 | |
--- pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in 2012/10/06 17:54:53 1.1
+++ pkgsrc/sysutils/bacula/patches/patch-src_filed_Makefile.in 2019/02/07 11:29:31 1.2
| @@ -1,43 +1,50 @@ | | | @@ -1,43 +1,50 @@ |
1 | $NetBSD: patch-src_filed_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ | | 1 | $NetBSD: patch-src_filed_Makefile.in,v 1.2 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | - use %%EXAMPLESDIR%% instead of sysconfdir | | 3 | - use %%EXAMPLESDIR%% instead of sysconfdir |
4 | - use the .la files for linking | | 4 | - use the .la files for linking |
5 | | | 5 | |
6 | --- src/filed/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 | | 6 | --- src/filed/Makefile.in.orig 2018-12-21 08:40:51.000000000 +0000 |
7 | +++ src/filed/Makefile.in 2012-10-05 11:15:25.000000000 -0400 | | 7 | +++ src/filed/Makefile.in |
8 | @@ -96,12 +96,12 @@ | | 8 | @@ -103,18 +103,18 @@ win32: $(WIN32OBJS) |
9 | bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ | | 9 | bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
10 | @echo "Linking $@ ..." | | 10 | @echo "Linking $@ ..." |
11 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ | | 11 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ |
12 | - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ | | 12 | - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ |
13 | + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ | | 13 | + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) \ |
14 | $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) | | 14 | $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
15 | | | 15 | |
16 | static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ | | 16 | bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
| | | 17 | @echo "Linking $@ ..." |
| | | 18 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \ |
| | | 19 | - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ |
| | | 20 | + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) \ |
| | | 21 | $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
| | | 22 | |
| | | 23 | static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ |
17 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ | | 24 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ |
18 | - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ | | 25 | - $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ |
19 | + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ | | 26 | + $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) \ |
20 | $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) | | 27 | $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) |
21 | strip $@ | | 28 | strip $@ |
22 | | | 29 | |
23 | @@ -139,16 +139,16 @@ | | 30 | @@ -153,16 +153,16 @@ install: all |
24 | install: all | | 31 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd |
25 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd | | 32 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bfdjson $(DESTDIR)$(sbindir)/bfdjson |
26 | @srcconf=bacula-fd.conf; \ | | 33 | @srcconf=bacula-fd.conf; \ |
27 | - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ | | 34 | - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ |
28 | + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ | | 35 | + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ |
29 | destconf=$$srcconf.new; \ | | 36 | destconf=$$srcconf.new; \ |
30 | echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ | | 37 | echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ |
31 | else \ | | 38 | else \ |
32 | destconf=$$srcconf; \ | | 39 | destconf=$$srcconf; \ |
33 | fi; \ | | 40 | fi; \ |
34 | - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ | | 41 | - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ |
35 | - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf | | 42 | - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf |
36 | + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ | | 43 | + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ |
37 | + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf | | 44 | + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf |
38 | @if test "x${fd_group}" != "x"; then \ | | 45 | @if test "x${fd_group}" != "x" -a "x${DESTDIR}" = "x" ; then \ |
39 | - chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ | | 46 | - chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ |
40 | + chgrp -f ${fd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ | | 47 | + chgrp -f ${fd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ |
41 | fi | | 48 | fi |
42 | @if test -f static-bacula-fd; then \ | | 49 | @if test -f static-bacula-fd; then \ |
43 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \ | | 50 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \ |
--- pkgsrc/sysutils/bacula/patches/patch-src_findlib_attribs.c 2012/10/06 17:54:53 1.1
+++ pkgsrc/sysutils/bacula/patches/patch-src_findlib_attribs.c 2019/02/07 11:29:31 1.2
| @@ -1,33 +1,33 @@ | | | @@ -1,33 +1,33 @@ |
1 | $NetBSD: patch-src_findlib_attribs.c,v 1.1 2012/10/06 17:54:53 christos Exp $ | | 1 | $NetBSD: patch-src_findlib_attribs.c,v 1.2 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | use intmax_t instead of int64_t | | 3 | use intmax_t instead of int64_t |
4 | | | 4 | |
5 | --- src/findlib/attribs.c.orig 2012-09-13 04:51:19.000000000 -0400 | | 5 | --- src/findlib/attribs.c.orig 2018-12-21 08:40:51.000000000 +0000 |
6 | +++ src/findlib/attribs.c 2012-10-04 23:52:49.000000000 -0400 | | 6 | +++ src/findlib/attribs.c |
7 | @@ -288,7 +288,7 @@ | | 7 | @@ -410,7 +410,7 @@ void encode_stat(char *buf, struct stat |
8 | int decode_stat(char *buf, struct stat *statp, int stat_size, int32_t *LinkFI) | | 8 | int decode_stat(char *buf, struct stat *statp, int stat_size, int32_t *LinkFI) |
9 | { | | 9 | { |
10 | char *p = buf; | | 10 | char *p = buf; |
11 | - int64_t val; | | 11 | - int64_t val; |
12 | + intmax_t val; | | 12 | + intmax_t val; |
| | | 13 | int data_stream; |
13 | | | 14 | |
14 | /* | | 15 | /* |
15 | * We store into the stat packet so make sure the caller's conception | | 16 | @@ -514,7 +514,7 @@ int decode_stat(char *buf, struct stat * |
16 | @@ -380,7 +380,7 @@ | | | |
17 | int32_t decode_LinkFI(char *buf, struct stat *statp, int stat_size) | | 17 | int32_t decode_LinkFI(char *buf, struct stat *statp, int stat_size) |
18 | { | | 18 | { |
19 | char *p = buf; | | 19 | char *p = buf; |
20 | - int64_t val; | | 20 | - int64_t val; |
21 | + intmax_t val; | | 21 | + intmax_t val; |
22 | /* | | 22 | /* |
23 | * We store into the stat packet so make sure the caller's conception | | 23 | * We store into the stat packet so make sure the caller's conception |
24 | * is the same as ours. They can be different if LARGEFILE is not | | 24 | * is the same as ours. They can be different if LARGEFILE is not |
25 | @@ -694,7 +694,7 @@ | | 25 | @@ -822,7 +822,7 @@ int encode_attribsEx(JCR *jcr, char *att |
26 | static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd) | | 26 | static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd) |
27 | { | | 27 | { |
28 | char *p = attr->attrEx; | | 28 | char *p = attr->attrEx; |
29 | - int64_t val; | | 29 | - int64_t val; |
30 | + intmax_t val; | | 30 | + intmax_t val; |
31 | WIN32_FILE_ATTRIBUTE_DATA atts; | | 31 | WIN32_FILE_ATTRIBUTE_DATA atts; |
32 | ULARGE_INTEGER li; | | 32 | ULARGE_INTEGER li; |
33 | POOLMEM *win32_ofile; | | 33 | POOLMEM *win32_ofile; |
--- pkgsrc/sysutils/bacula/patches/patch-src_stored_Makefile.in 2012/10/06 17:54:53 1.1
+++ pkgsrc/sysutils/bacula/patches/patch-src_stored_Makefile.in 2019/02/07 11:29:31 1.2
| @@ -1,88 +1,82 @@ | | | @@ -1,88 +1,82 @@ |
1 | $NetBSD: patch-src_stored_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ | | 1 | $NetBSD: patch-src_stored_Makefile.in,v 1.2 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | - use %%EXAMPLESDIR%% instead of sysconfdir | | 3 | - use %%EXAMPLESDIR%% instead of sysconfdir |
4 | - use the .la files for linking | | 4 | - use the .la files for linking |
5 | | | 5 | |
6 | --- src/stored/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 | | 6 | --- src/stored/Makefile.in.orig 2018-12-21 08:40:51.000000000 +0000 |
7 | +++ src/stored/Makefile.in 2012-10-05 11:07:09.000000000 -0400 | | 7 | +++ src/stored/Makefile.in |
8 | @@ -96,12 +96,12 @@ | | 8 | @@ -94,7 +94,7 @@ ZLIBS=@ZLIBS@ |
9 | bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) | | 9 | LZO_LIBS= @LZO_LIBS@ |
10 | @echo "Linking $@ ..." | | 10 | LZO_INC= @LZO_INC@ |
11 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ | | 11 | |
12 | - -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ | | 12 | -SD_LIBS = -lbacsd -lbaccfg -lbac |
13 | + ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ | | 13 | +SD_LIBS = libbacsd.la ../lib/libbaccfg.la ../lib/libbac.la |
14 | $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) | | | |
15 | | | | |
16 | static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) | | | |
17 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \ | | | |
18 | - -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ | | | |
19 | + ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \ | | | |
20 | $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) | | | |
21 | strip $@ | | | |
22 | | | | |
23 | @@ -112,7 +112,7 @@ | | | |
24 | | | | |
25 | btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) | | | |
26 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \ | | | |
27 | - -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | | |
28 | + ../lib/libbaccfg.la ../lib/libbac.la $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | | |
29 | | | 14 | |
30 | bls.o: bls.c | | 15 | |
31 | @echo "Compiling $<" | | 16 | .SUFFIXES: .c .o .lo |
32 | @@ -122,7 +122,7 @@ | | 17 | @@ -154,7 +154,7 @@ bacula-sd-aligned-driver.la: Makefile $( |
33 | bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) | | 18 | bsdjson: Makefile $(JSONOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
| | | 19 | @echo "Linking $@ ..." |
| | | 20 | $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(JSONOBJS) $(ZLIBS) \ |
| | | 21 | - -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ |
| | | 22 | + ../lib/libbaccfg.la ../lib/libbac.la -lm $(DLIB) $(LIBS) $(WRAPLIBS) \ |
| | | 23 | $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) |
| | | 24 | |
| | | 25 | static-bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
| | | 26 | @@ -190,7 +190,7 @@ bls.o: bls.c |
| | | 27 | bls: Makefile $(BLSOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
34 | @echo "Compiling $<" | | 28 | @echo "Compiling $<" |
35 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ | | 29 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \ |
36 | - -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 30 | - $(SD_LIBS) -lbacfind -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
37 | + ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 31 | + $(SD_LIBS) ../findlib/libbacfind.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
38 | | | 32 | |
39 | bextract.o: bextract.c | | 33 | bextract.o: bextract.c |
40 | @echo "Compiling $<" | | 34 | @echo "Compiling $<" |
41 | @@ -132,7 +132,7 @@ | | 35 | @@ -200,7 +200,7 @@ bextract.o: bextract.c |
42 | bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) | | 36 | bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) |
43 | @echo "Compiling $<" | | 37 | @echo "Compiling $<" |
44 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \ | | 38 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \ |
45 | - -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 39 | - $(SD_LIBS) -lbacfind -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
46 | + ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 40 | + $(SD_LIBS) ../findlib/libbacfind.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
47 | | | 41 | |
48 | bscan.o: bscan.c | | 42 | bscan.o: bscan.c |
49 | @echo "Compiling $<" | | 43 | @echo "Compiling $<" |
50 | @@ -142,7 +142,7 @@ | | 44 | @@ -210,7 +210,7 @@ bscan.o: bscan.c |
51 | bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ | | 45 | bscan: Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ |
52 | ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) | | 46 | ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) |
53 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ | | 47 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \ |
54 | - -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 48 | - $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
55 | + ../cats/libbacsql.la ../cats/libbaccats.la $(DB_LIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 49 | + $(SD_LIBS) ../cats/libbacsql.la ../cats/libbaccats.la $(DB_LIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) |
56 | | | 50 | |
57 | bcopy.o: bcopy.c | | 51 | bcopy.o: bcopy.c |
58 | @echo "Compiling $<" | | 52 | @echo "Compiling $<" |
59 | @@ -151,7 +151,7 @@ | | 53 | @@ -224,7 +224,7 @@ bcopy: Makefile $(COPYOBJS) libbacsd.la |
| | | 54 | cloud_parts_test: Makefile cloud_parts.c |
| | | 55 | $(RMF) cloud_parts.o |
| | | 56 | $(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) cloud_parts.c |
| | | 57 | - $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ cloud_parts.o $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS) |
| | | 58 | + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ cloud_parts.o $(DLIB) ../lib/libbac.la -lm $(LIBS) $(OPENSSL_LIBS) |
| | | 59 | rm -f cloud_parts.o |
| | | 60 | $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) cloud_parts.c |
60 | | | 61 | |
61 | bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) | | 62 | @@ -253,16 +253,16 @@ install: all @LIBTOOL_INSTALL_TARGET@ |
62 | $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \ | | 63 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \ |
63 | - -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | 64 | fi |
64 | + ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) | | | |
65 | | | | |
66 | Makefile: $(srcdir)/Makefile.in $(topdir)/config.status | | | |
67 | cd $(topdir) \ | | | |
68 | @@ -165,16 +165,16 @@ | | | |
69 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bscan $(DESTDIR)$(sbindir)/bscan | | | |
70 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape | | | |
71 | @srcconf=bacula-sd.conf; \ | | 65 | @srcconf=bacula-sd.conf; \ |
72 | - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ | | 66 | - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ |
73 | + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ | | 67 | + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ |
74 | destconf=$$srcconf.new; \ | | 68 | destconf=$$srcconf.new; \ |
75 | echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ | | 69 | echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ |
76 | else \ | | 70 | else \ |
77 | destconf=$$srcconf; \ | | 71 | destconf=$$srcconf; \ |
78 | fi; \ | | 72 | fi; \ |
79 | - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ | | 73 | - echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ |
80 | - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf | | 74 | - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf |
81 | + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ | | 75 | + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ |
82 | + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf | | 76 | + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf |
83 | @if test "x${sd_group}" != "x"; then \ | | 77 | @if test "x${sd_group}" != "x" -a "x${DESTDIR}" = "x" ; then \ |
84 | - chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \ | | 78 | - chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \ |
85 | + chgrp -f ${sd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf; \ | | 79 | + chgrp -f ${sd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf; \ |
86 | fi | | 80 | fi |
87 | @if test -f static-bacula-sd; then \ | | 81 | |
88 | $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \ | | 82 | install-cloud: bacula-sd-cloud-driver.la |
$NetBSD: patch-scripts_baculabackupreport.in,v 1.1 2019/02/07 11:29:31 markd Exp $
fixup "test =="
--- scripts/baculabackupreport.in.orig 2018-12-21 08:40:51.000000000 +0000
+++ scripts/baculabackupreport.in
@@ -544,7 +544,7 @@ numbadjobs=$?
# Do we email the job summaries?
# ------------------------------
-if [ ${emailsummaries} == "yes" ]; then
+if [ ${emailsummaries} = "yes" ]; then
# Get all of the jobids from the query results, but
# skip any running jobs because they will not have
# a summary in the DB until the job has terminated
@@ -560,7 +560,7 @@ if [ ${emailsummaries} == "yes" ]; then
# Generate the header
# -------------------
msg="${msg}"$(
- if [ ${html} == "yes" ]; then
+ if [ ${html} = "yes" ]; then
echo "<pre>====================================="
else
echo -e "\n\n\n====================================="
@@ -581,7 +581,7 @@ if [ ${emailsummaries} == "yes" ]; then
echo "======================================================================"
)
done
- if [ ${html} == "yes" ]; then
+ if [ ${html} = "yes" ]; then
msg=${msg}$(echo "</pre>")
fi
fi
@@ -590,7 +590,7 @@ fi
# Do we email the bad job logs with the report?
# ---------------------------------------------
-if [ ${emailbadlogs} == "yes" ]; then
+if [ ${emailbadlogs} = "yes" ]; then
# Get the badjobs, or the good jobs with
# JobErrors != 0 from the query results
# --------------------------------------
@@ -605,7 +605,7 @@ if [ ${emailbadlogs} == "yes" ]; then
# Generate the header
# -------------------
msg="${msg}"$(
- if [ ${html} == "yes" ]; then
+ if [ ${html} = "yes" ]; then
echo "<pre>=========================================================="
else
echo -e "\n\n\n=========================================================="
@@ -626,7 +626,7 @@ if [ ${emailbadlogs} == "yes" ]; then
echo "======================================================================"
)
done
- if [ ${html} == "yes" ]; then
+ if [ ${html} = "yes" ]; then
msg=${msg}$(echo "</pre>")
fi
fi
@@ -635,7 +635,7 @@ fi
# Prepend the header to the $msg output
# -------------------------------------
-if [ ${html} == "yes" ]; then
+if [ ${html} = "yes" ]; then
msg="<html>
<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
<style>
@@ -711,12 +711,12 @@ fi
(
echo "To: ${admin}"
echo "From: ${admin}"
-if [ ${addsubjecticon} == "yes" ]; then
+if [ ${addsubjecticon} = "yes" ]; then
echo "Subject: ${subjecticon} ${server} - ${status} in the Past ${hist} ${hour}"
else
echo "Subject: ${server} - ${status} in the Past ${hist} ${hour}"
fi
-if [ ${html} == "yes" ] && [ ${results} -ne 0 ]; then
+if [ ${html} = "yes" ] && [ ${results} -ne 0 ]; then
echo "Content-Type: text/html"
echo "MIME-Version: 1.0"
fi
$NetBSD: patch-src_console_Makefile.in,v 1.1 2019/02/07 11:29:31 markd Exp $
- use %%EXAMPLESDIR%% instead of sysconfdir
- use the .la files for linking
--- src/console/Makefile.in.orig 2018-12-21 08:40:51.000000000 +0000
+++ src/console/Makefile.in
@@ -50,12 +50,12 @@ all: Makefile bconsole @STATIC_CONS@ bbc
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
@@ -98,19 +98,19 @@ install: all
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM_ALL) bconsole $(DESTDIR)$(sbindir)/bconsole
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bbconsjson $(DESTDIR)$(sbindir)/bbconsjson
@srcconf=bconsole.conf; \
- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
destconf=$$srcconf.new; \
echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
else \
destconf=$$srcconf; \
- if test -f ${DESTDIR}${sysconfdir}/console.conf; then \
+ if test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \
echo "Existing console.conf moved to bconsole.conf"; \
- @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
+ @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \
destconf=$$srcconf.new; \
fi; \
fi; \
- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
+ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
if test -f static-bconsole; then \
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
fi
$NetBSD: patch-src_filed_bxattr.c,v 1.1 2019/02/07 11:29:31 markd Exp $
NetBSD has xattr
--- src/filed/bxattr.c.orig 2018-12-21 08:40:51.000000000 +0000
+++ src/filed/bxattr.c
@@ -922,6 +922,7 @@ bRC_BXATTR BXATTR::unserialize_xattr_str
#include "bxattr_osx.h"
#include "bxattr_linux.h"
#include "bxattr_freebsd.h"
+#include "bxattr_netbsd.h"
#include "bxattr_solaris.h"
// #include "bxattr_aix.h"
@@ -936,6 +937,8 @@ void *new_bxattr()
return new BXATTR_Linux();
#elif defined(HAVE_FREEBSD_OS)
return new BXATTR_FreeBSD();
+#elif defined(HAVE_NETBSD_OS)
+ return new BXATTR_NetBSD();
#elif defined(HAVE_HURD_OS)
return new BXATTR_Hurd();
#elif defined(HAVE_AIX_OS)
$NetBSD: patch-src_filed_bxattr__netbsd.c,v 1.1 2019/02/07 11:29:31 markd Exp $
NetBSD has xattr.
--- /dev/null 2019-02-04 11:43:19.480511265 +0000
+++ src/filed/bxattr_netbsd.c
@@ -0,0 +1,465 @@
+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2016 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+ */
+/**
+ * Major refactoring of XATTR code written by:
+ *
+ * Radosław Korzeniewski, MMXVI
+ * radoslaw@korzeniewski.net, radekk@inteos.pl
+ * Inteos Sp. z o.o. http://www.inteos.pl/
+ *
+ */
+
+#include "bacula.h"
+#include "filed.h"
+#include "bxattr_netbsd.h"
+
+#if defined(HAVE_NETBSD_OS)
+
+/* check if XATTR support is enabled */
+#if defined(HAVE_XATTR)
+
+/*
+ * Define the supported XATTR streams for this OS
+ */
+static const int os_xattr_streams[] = {
+ STREAM_XACL_NETBSD_XATTR,
+ 0
+};
+
+static const int os_xattr_namespaces[] = {
+ EXTATTR_NAMESPACE_USER,
+ EXTATTR_NAMESPACE_SYSTEM,
+ -1
+};
+
+static const char *os_xattr_acl_skiplist[] = {
+ "system.posix1e.acl_access",
+ "system.posix1e.acl_default",
+ "system.nfs4.acl",
+ NULL
+};
+
+static const char *os_xattr_skiplist[] = {
+ NULL
+};
+
+/*
+ * OS specific constructor
+ */
+BXATTR_NetBSD::BXATTR_NetBSD()
+{
+ set_xattr_streams(os_xattr_streams);
+ set_xattr_skiplists(os_xattr_skiplist, os_xattr_acl_skiplist);
+};
+
+/*
+ * Perform OS specific extended attribute backup
+ *
+ * in/out - check API at bxattr.h
+ */
+bRC_BXATTR BXATTR_NetBSD::os_backup_xattr (JCR *jcr, FF_PKT *ff_pkt){
+
+ bRC_BXATTR rc;
+ POOLMEM *xlist;
+ uint32_t xlen;
+ char *name;
+ uint32_t name_len;
+ POOLMEM *value;
+ uint32_t value_len;
+ POOLMEM *name_gen;
+ uint32_t name_gen_len;
+ char * namespace_str;
+ int namespace_len;
+ bool skip;
+ alist *xattr_list = NULL;
+ int xattr_count = 0;
+ uint32_t len = 0;
+ BXATTR_xattr *xattr;
+ int a;
+
+ for (a = 0; os_xattr_namespaces[a] != -1; a++){ // loop through all available namespaces
+ /* xlist is allocated as POOLMEM by os_get_xattr_names_local */
+ rc = os_get_xattr_names_local(jcr, os_xattr_namespaces[a], &xlist, &xlen);
+ switch (rc){
+ case bRC_BXATTR_ok:
+ /* it's ok, so go further */
+ break;
+ case bRC_BXATTR_skip:
+ case bRC_BXATTR_cont:
+ /* no xattr available, so skip rest of it */
+ return bRC_BXATTR_ok;
+ default:
+ return rc;
+ }
+
+ /* get a string representation of the namespace */
+ if (extattr_namespace_to_string(os_xattr_namespaces[a], &namespace_str) != 0){
+ Mmsg2(jcr->errmsg, _("Failed to convert %d into namespace on file \"%s\"\n"), os_xattr_namespaces[a], jcr->last_fname);
+ Dmsg2(100, "Failed to convert %d into namespace on file \"%s\"\n", os_xattr_namespaces[a], jcr->last_fname);
+ goto bail_out;
+ }
+ namespace_len = strlen(namespace_str);
+
+ /* follow the list of xattr names and get the values */
+ for (name = xlist; (name - xlist) + 1 < xlen; name = strchr(name, '\0') + 1){
+ name_len = strlen(name);
+ name_gen = get_pool_memory(PM_FNAME);
+ name_gen = check_pool_memory_size(name_gen, name_len + namespace_len + 2);
+ bsnprintf(name_gen, name_len + namespace_len + 2, "%s.%s", namespace_str, name);
+ name_gen_len = strlen(name_gen);
+
+ skip = check_xattr_skiplists(jcr, ff_pkt, name_gen);
+ if (skip || name_len == 0){
+ Dmsg1(100, "Skipping xattr named %s\n", name_gen);
+ continue;
+ }
+
+ /* value is allocated as POOLMEM by os_get_xattr_value_local */
+ rc = os_get_xattr_value_local(jcr, os_xattr_namespaces[a], name, &value, &value_len);
+ switch (rc){
+ case bRC_BXATTR_ok:
+ /* it's ok, so go further */
+ break;
+ case bRC_BXATTR_skip:
+ /* no xattr available, so skip rest of it */
+ rc = bRC_BXATTR_ok;
+ goto bail_out;
+ default:
+ /* error / fatal */
+ goto bail_out;
+ }
+
+ /*
+ * we have a name of the extended attribute in the name variable
+ * and value of the extended attribute in the value variable
+ * so we need to build a list
+ */
+ xattr = (BXATTR_xattr*)malloc(sizeof(BXATTR_xattr));
+ xattr->name_len = name_gen_len;
+ xattr->name = name_gen;
+ xattr->value_len = value_len;
+ xattr->value = value;
+ /* magic name_len name value_len value */
+ len += sizeof(uint32_t) + sizeof(uint32_t) + name_gen_len + sizeof(uint32_t) + value_len;
+
+ if (xattr_list == NULL){
+ xattr_list = New(alist(10, not_owned_by_alist));
+ }
+ xattr_list->append(xattr);
+ xattr_count++;
+ }
+ if (xattr_count > 0){
+ /* serialize the stream */
+ rc = serialize_xattr_stream(jcr, len, xattr_list);
+ if (rc != bRC_BXATTR_ok){
+ Mmsg(jcr->errmsg, _("Failed to serialize extended attributes on file \"%s\"\n"), jcr->last_fname);
+ Dmsg1(100, "Failed to serialize extended attributes on file \"%s\"\n", jcr->last_fname);
+ goto bail_out;
+ } else {
+ /* send data to SD */
+ rc = send_xattr_stream(jcr, STREAM_XACL_NETBSD_XATTR);
+ }
+ } else {
+ rc = bRC_BXATTR_ok;
+ }
+ }
+bail_out:
+ /* free allocated data */
+ if (xattr_list != NULL){
+ foreach_alist(xattr, xattr_list){
+ if (xattr == NULL){
+ break;
+ }
+ if (xattr->name){
+ free_pool_memory(name_gen);
+ }
+ if (xattr->value){
+ free(xattr->value);
+ }
+ free(xattr);
+ }
+ delete xattr_list;
+ }
+ if (xlist != NULL){
+ free(xlist);
+ }
+
+ return rc;
+};
+
+/*
+ * Perform OS specific XATTR restore. Runtime is called only when stream is supported by OS.
+ *
+ * in/out - check API at bxattr.h
+ */
+bRC_BXATTR BXATTR_NetBSD::os_restore_xattr (JCR *jcr, int stream, char *content, uint32_t length){
+ return generic_restore_xattr(jcr, stream);
+};
+
+/*
+ * Return a list of xattr names in newly allocated pool memory and a length of the allocated buffer.
+ * It allocates a memory with poolmem subroutines every time a function is called, so it must be freed
+ * when not needed.
+ *
+ * in/out - check API at bxattr.h
+ *
+ * As a FreeBSD uses a different attributes name schema/format then this method is a very different
+ * from a standard generic method because it uses a namespace (ns) value for os dependent optimization.
+ */
+bRC_BXATTR BXATTR_NetBSD::os_get_xattr_names_local (JCR *jcr, int ns, POOLMEM ** pxlist, uint32_t * xlen){
+
+ int len;
+ POOLMEM * list;
+ int a;
+ int stra;
+ POOLMEM * genlist;
+
+ /* check input data */
+ if (jcr == NULL || xlen == NULL || pxlist == NULL){
+ return bRC_BXATTR_inval;
+ }
+ /* get the length of the extended attributes */
+ len = extattr_list_link(jcr->last_fname, ns, NULL, 0);
+ switch (len){
+ case -1: {
+ berrno be;
+
+ switch (errno){
+ case ENOENT:
+ /* no file available, skip it */
+ return bRC_BXATTR_skip;
+ case EOPNOTSUPP:
+ /* no xattr supported on filesystem, clear a flag and skip it */
+ clear_flag(BXATTR_FLAG_NATIVE);
+ set_content(NULL);
+ return bRC_BXATTR_skip;
+ case EPERM:
+ if (ns == EXTATTR_NAMESPACE_SYSTEM){
+ return bRC_BXATTR_cont;
+ } /* else show error */
+ default:
+ Mmsg2(jcr->errmsg, _("extattr_list_link error on file \"%s\": ERR=%s\n"), jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "extattr_list_link error file=%s ERR=%s\n", jcr->last_fname, be.bstrerror());
+ return bRC_BXATTR_error;
+ }
+ break;
+ }
+ case 0:
+ /* xattr available but empty, skip it */
+ return bRC_BXATTR_skip;
+ default:
+ break;
+ }
+
+ /*
+ * allocate memory for the extented attribute list
+ * default size is a 4k for PM_BSOCK, which should be sufficient on almost all
+ * Linux system where xattrs a limited in size to single filesystem block ~4kB
+ * so we need to check required size
+ */
+ list = get_pool_memory(PM_BSOCK);
+ list = check_pool_memory_size(list, len + 1);
+ memset(list, 0, len + 1);
+
+ /* get the list of extended attributes names for a file */
+ len = extattr_list_link(jcr->last_fname, ns, list, len);
+ switch (len){
+ case -1: {
+ berrno be;
+
+ switch (errno){
+ case ENOENT:
+ /* no file available, skip it, first release allocated memory */
+ free_pool_memory(list);
+ return bRC_BXATTR_skip;
+ case EPERM:
+ if (ns == EXTATTR_NAMESPACE_SYSTEM){
+ return bRC_BXATTR_cont;
+ } /* else show error */
+ default:
+ Mmsg2(jcr->errmsg, _("extattr_list_link error on file \"%s\": ERR=%s\n"), jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "extattr_list_link error file=%s ERR=%s\n", jcr->last_fname, be.bstrerror());
+ free_pool_memory(list);
+ return bRC_BXATTR_error;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ /* convert FreeBSD list type to the generic one */
+ genlist = get_pool_memory(PM_BSOCK);
+ genlist = check_pool_memory_size(genlist, len + 1);
+ memset(genlist, 0, len + 1);
+ for (a = 0; a < len; a += list[a] + 1){
+ stra = list[a];
+ memcpy(genlist + a, list + a + 1, stra);
+ genlist[a + stra] = '\0';
+ }
+ free_pool_memory(list);
+ /* setup return data */
+ *pxlist = genlist;
+ *xlen = len;
+ return bRC_BXATTR_ok;
+};
+
+/*
+ * Return a value of the requested attribute name and a length of the allocated buffer.
+ * It allocates a memory with poolmem subroutines every time a function is called, so it must be freed
+ * when not needed.
+ *
+ * in/out - check API at bxattr.h
+ *
+ * As a FreeBSD uses a different attributes name schema/format then this method is a very different
+ * from a standard generic method because it uses a namespace (ns) value for os dependent optimization.
+ */
+bRC_BXATTR BXATTR_NetBSD::os_get_xattr_value_local (JCR *jcr, int ns, char * name, char ** pvalue, uint32_t * plen){
+
+ int len;
+ POOLMEM * value;
+
+ /* check input data */
+ if (jcr == NULL || name == NULL || plen == NULL || pvalue == NULL){
+ return bRC_BXATTR_inval;
+ }
+ /* get the length of the value for extended attribute */
+ len = extattr_get_link(jcr->last_fname, ns, name, NULL, 0);
+ switch (len){
+ case -1: {
+ berrno be;
+
+ switch (errno){
+ case ENOENT:
+ /* no file available, skip it */
+ return bRC_BXATTR_skip;
+ default:
+ /* XXX: what about ENOATTR error value? */
+ Mmsg2(jcr->errmsg, _("extattr_get_link error on file \"%s\": ERR=%s\n"), jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "extattr_get_link error file=%s ERR=%s\n", jcr->last_fname, be.bstrerror());
+ return bRC_BXATTR_error;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+
+ if (len > 0){
+ /*
+ * allocate memory for the extented attribute value
+ * default size is a 256B for PM_MESSAGE, so we need to check required size
+ */
+ value = get_pool_memory(PM_MESSAGE);
+ value = check_pool_memory_size(value, len + 1);
+ memset(value, 0, len + 1);
+ /* value is not empty, get a data */
+ len = extattr_get_link(jcr->last_fname, ns, name, value, len);
+ switch (len){
+ case -1: {
+ berrno be;
+
+ switch (errno){
+ case ENOENT:
+ /* no file available, skip it, first release allocated memory */
+ free_pool_memory(value);
+ return bRC_BXATTR_skip;
+ default:
+ Mmsg2(jcr->errmsg, _("extattr_get_link error on file \"%s\": ERR=%s\n"), jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "extattr_get_link error file=%s ERR=%s\n", jcr->last_fname, be.bstrerror());
+ free_pool_memory(value);
+ return bRC_BXATTR_error;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ /* ensure a value is nul terminated */
+ value[len] = '\0';
+ } else {
+ /* empty value */
+ value = NULL;
+ len = 0;
+ }
+ /* setup return data */
+ *pvalue = value;
+ *plen = len;
+ return bRC_BXATTR_ok;
+};
+
+/*
+ * Low level OS specific runtime to set extended attribute on file
+ *
+ * in/out - check API at bxattr.h
+ *
+ * xattr->name should be in '<namespace>.<name>' format which
+ * function handle without problem, otherwise it returns an error
+ * TODO: it is possible to handle a different attributes name format
+ * for OS portability where default namespace 'user' can be used
+ */
+bRC_BXATTR BXATTR_NetBSD::os_set_xattr (JCR *jcr, BXATTR_xattr *xattr){
+
+ char * name;
+ char * nspace;
+ int ns;
+ int rc;
+
+ /* check input data */
+ if (jcr == NULL || xattr == NULL){
+ return bRC_BXATTR_inval;
+ }
+
+ /* search for attribute namespace which is distinguished from attribute name by a dot '.' character */
+ if ((name = strchr(xattr->name, '.')) == (char *)NULL){
+ Mmsg2(jcr->errmsg, _("Failed to split %s into namespace and name part on file \"%s\"\n"), xattr->name, jcr->last_fname);
+ Dmsg2(100, "Failed to split %s into namespace and name part on file \"%s\"\n", xattr->name, jcr->last_fname);
+ return bRC_BXATTR_error;
+ }
+
+ /* split namespace and name of the attribute */
+ nspace = xattr->name;
+ *name++ = '\0';
+
+ /* check if namespace is valid on this system */
+ if (extattr_string_to_namespace(nspace, &ns) != 0){
+ Mmsg2(jcr->errmsg, _("Failed to convert %s into namespace on file \"%s\"\n"), nspace, jcr->last_fname);
+ Dmsg2(100, "Failed to convert %s into namespace on file \"%s\"\n", nspace, jcr->last_fname);
+ return bRC_BXATTR_error;
+ }
+
+ /* set extattr on file */
+ rc = extattr_set_link(jcr->last_fname, ns, name, xattr->value, xattr->value_len);
+ if (rc < 0 || rc != (int)xattr->value_len){
+ berrno be;
+
+ switch (errno){
+ case ENOENT:
+ break;
+ default:
+ Mmsg2(jcr->errmsg, _("extattr_set_link error on file \"%s\": ERR=%s\n"), jcr->last_fname, be.bstrerror());
+ Dmsg2(100, "extattr_set_link error file=%s ERR=%s\n", jcr->last_fname, be.bstrerror());
+ return bRC_BXATTR_error;
+ }
+ }
+ return bRC_BXATTR_ok;
+};
+
+#endif /* HAVE_XATTR */
+
+#endif /* HAVE_NETBSD_OS */
$NetBSD: patch-src_filed_bxattr__netbsd.h,v 1.1 2019/02/07 11:29:31 markd Exp $
NetBSD has xattr.
--- /dev/null 2019-02-04 11:33:03.884708092 +0000
+++ src/filed/bxattr_netbsd.h
@@ -0,0 +1,85 @@
+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2016 Kern Sibbald
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+ */
+/**
+ * Major refactoring of XATTR code written by:
+ *
+ * Radosław Korzeniewski, MMXVI
+ * radoslaw@korzeniewski.net, radekk@inteos.pl
+ * Inteos Sp. z o.o. http://www.inteos.pl/
+ *
+ */
+
+#ifndef __BXATTR_NetBSD_H_
+#define __BXATTR_NetBSD_H_
+
+#if defined(HAVE_NETBSD_OS)
+#include <sys/types.h>
+
+/* check if XATTR support is enabled */
+#if defined(HAVE_XATTR)
+
+#if (!defined(HAVE_EXTATTR_GET_LINK) && !defined(HAVE_EXTATTR_GET_FILE)) || \
+ (!defined(HAVE_EXTATTR_SET_LINK) && !defined(HAVE_EXTATTR_SET_FILE)) || \
+ (!defined(HAVE_EXTATTR_LIST_LINK) && !defined(HAVE_EXTATTR_LIST_FILE)) || \
+ !defined(HAVE_EXTATTR_NAMESPACE_TO_STRING) || \
+ !defined(HAVE_EXTATTR_STRING_TO_NAMESPACE)
+#error "Missing full support for the extattr functions."
+#endif
+
+#ifdef HAVE_SYS_EXTATTR_H
+#include <sys/types.h>
+#include <sys/extattr.h>
+#else
+#error "Missing sys/extattr.h header file"
+#endif
+
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
+
+#if !defined(HAVE_EXTATTR_GET_LINK) && defined(HAVE_EXTATTR_GET_FILE)
+#define extattr_get_link extattr_get_file
+#endif
+#if !defined(HAVE_EXTATTR_SET_LINK) && defined(HAVE_EXTATTR_SET_FILE)
+#define extattr_set_link extattr_set_file
+#endif
+#if !defined(HAVE_EXTATTR_LIST_LINK) && defined(HAVE_EXTATTR_LIST_FILE)
+#define extattr_list_link extattr_list_file
+#endif
+
+/*
+ *
+ *
+ */
+class BXATTR_NetBSD : public BXATTR {
+private:
+ bRC_BXATTR os_backup_xattr (JCR *jcr, FF_PKT *ff_pkt);
+ bRC_BXATTR os_restore_xattr (JCR *jcr, int stream, char *content, uint32_t length);
+ bRC_BXATTR os_get_xattr_names_local (JCR *jcr, const int ns, POOLMEM **list, uint32_t *length);
+ bRC_BXATTR os_get_xattr_value_local (JCR *jcr, const int ns, char * name, char ** pvalue, uint32_t * plen);
+ bRC_BXATTR os_set_xattr (JCR *jcr, BXATTR_xattr *xattr);
+public:
+ BXATTR_NetBSD ();
+};
+
+#endif /* HAVE_XATTR */
+
+#endif /* HAVE_NETBSD_OS */
+
+#endif /* __BXATTR_NetBSD_H_ */
$NetBSD: patch-src_qt-console_tray-monitor_tray-monitor.pro.in,v 1.1 2019/02/07 11:29:31 markd Exp $
- comment out the confs paths and command
- use just the compiler not libtool for QMAKE_LINK
--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2018-12-21 08:40:51.000000000 +0000
+++ src/qt-console/tray-monitor/tray-monitor.pro.in
@@ -27,8 +27,8 @@ cross-win32 {
bins.path = /$(DESTDIR)@sbindir@
bins.files = bacula-tray-monitor
-confs.path = /$(DESTDIR)@sysconfdir@
-confs.commands = ./install_conf_file
+#confs.path = /$(DESTDIR)@sysconfdir@
+#confs.commands = ./install_conf_file
TEMPLATE = app
TARGET = bacula-tray-monitor
@@ -37,7 +37,7 @@ DEPENDPATH += .
INCLUDEPATH += ../.. .
LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
-QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+QMAKE_LINK = $(CXX)
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor
QMAKE_CXXFLAGS += -DTRAY_MONITOR
--- pkgsrc/sysutils/bacula/patches/patch-src_console_conio.c 2014/01/22 10:45:21 1.3
+++ pkgsrc/sysutils/bacula/patches/patch-src_console_conio.c 2019/02/07 11:29:31 1.4
| @@ -1,32 +1,32 @@ | | | @@ -1,32 +1,32 @@ |
1 | $NetBSD: patch-src_console_conio.c,v 1.3 2014/01/22 10:45:21 jperkin Exp $ | | 1 | $NetBSD: patch-src_console_conio.c,v 1.4 2019/02/07 11:29:31 markd Exp $ |
2 | | | 2 | |
3 | - need termios.h, our term.h does not include it | | 3 | - need termios.h, our term.h does not include it |
4 | - t_insert_line and t_delete_line are macros in term.h; undef them | | 4 | - t_insert_line and t_delete_line are macros in term.h; undef them |
5 | - spell HAVE_TERM_H correctly | | 5 | - spell HAVE_TERM_H correctly |
6 | | | 6 | |
7 | --- src/console/conio.c.orig 2013-02-19 19:21:35.000000000 +0000 | | 7 | --- src/console/conio.c.orig 2018-12-21 08:40:51.000000000 +0000 |
8 | +++ src/console/conio.c | | 8 | +++ src/console/conio.c |
9 | @@ -64,11 +64,12 @@ | | 9 | @@ -54,11 +54,12 @@ |
10 | | | 10 | |
11 | #ifdef HAVE_CONIO | | 11 | #ifdef HAVE_CONIO |
12 | | | 12 | |
13 | +#include <termios.h> | | 13 | +#include <termios.h> |
14 | #include <curses.h> | | 14 | #include <curses.h> |
15 | #include <term.h> | | 15 | #include <term.h> |
16 | | | 16 | |
17 | #if defined(HAVE_SUN_OS) | | 17 | #ifdef HAVE_SUN_OS |
18 | -#if !defined(_TERM_H) | | 18 | -#ifndef _TERM_H |
19 | +#if !defined(HAVE_TERM_H) | | 19 | +#ifndef HAVE_TERM_H |
20 | extern "C" int tgetent(void *, const char *); | | 20 | extern "C" int tgetent(void *, const char *); |
21 | extern "C" int tgetnum(const char *); | | 21 | extern "C" int tgetnum(const char *); |
22 | extern "C" char *tgetstr (const char*, char**); | | 22 | extern "C" char *tgetstr (const char*, char**); |
23 | @@ -250,7 +251,9 @@ static char * getnext(void); | | 23 | @@ -235,7 +236,9 @@ static char * getnext(void); |
24 | static char * getprev(void); | | 24 | static char * getprev(void); |
25 | static void putline(char *newl, int newlen); | | 25 | static void putline(char *newl, int newlen); |
26 | static void t_honk_horn(void); | | 26 | static void t_honk_horn(void); |
27 | +#undef t_insert_line | | 27 | +#undef t_insert_line |
28 | static void t_insert_line(void); | | 28 | static void t_insert_line(void); |
29 | +#undef t_delete_line | | 29 | +#undef t_delete_line |
30 | static void t_delete_line(void); | | 30 | static void t_delete_line(void); |
31 | static void t_clrline(int pos, int width); | | 31 | static void t_clrline(int pos, int width); |
32 | void t_sendl(const char *msg, int len); | | 32 | void t_sendl(const char *msg, int len); |
--- pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in 2014/01/14 10:58:17 1.2
+++ pkgsrc/sysutils/bacula/patches/patch-src_tools_Makefile.in 2019/02/07 11:29:31 1.3