[pkg-bacula-commits] [bacula] 02/04: Merge branch 'master' into dh11
Sven Hartge
hartge-guest at moszumanska.debian.org
Mon Dec 25 18:26:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
hartge-guest pushed a commit to branch dh11
in repository bacula.
commit a16d95e7f3de46cb3348882499dd0da48a5b7ee1
Merge: 0ec810d 563c654
Author: Sven Hartge <sven at svenhartge.de>
Date: Mon Dec 25 19:19:15 2017 +0100
Merge branch 'master' into dh11
.gitignore | 1302 +++++++++++++++++++
AUTHORS | 2 +
ChangeLog | 79 +-
ReleaseNotes | 62 +-
autoconf/config.h.in | 2 +-
autoconf/configure.in | 80 +-
configure | 39 +-
debian/TODO | 4 -
debian/changelog | 38 +-
debian/control | 5 +-
debian/gbp.conf | 12 +-
.../patches/debian-enable-hardening-for-bat.patch | 2 +-
.../upstream-fix-update_sqlite3_tables.patch | 11 -
debian/rules | 6 +-
debian/source.lintian-overrides | 3 +
debian/watch | 4 +-
platforms/osx/Makefile.in | 4 +-
src/cats/update_sqlite3_tables.in | 4 +-
src/dird/backup.c | 3 +-
src/dird/dird.c | 82 +-
src/dird/dird_conf.c | 58 +-
src/dird/dird_conf.h | 10 +-
src/dird/fd_cmds.c | 10 +-
src/dird/next_vol.c | 3 +
src/dird/snapshot.c | 10 +-
src/dird/ua.h | 2 +
src/dird/ua_cmds.c | 23 +-
src/dird/ua_dotcmds.c | 13 +-
src/dird/ua_restore.c | 7 +-
src/dird/ua_server.c | 4 +-
src/dird/ua_status.c | 11 +-
src/dird/ua_tree.c | 2 +-
src/filed/Makefile.in | 5 +-
src/filed/backup.c | 61 +-
src/filed/bacl.c | 776 ++++++++++++
src/filed/bacl.h | 195 +++
src/filed/bacl_freebsd.c | 533 ++++++++
src/filed/bacl_freebsd.h | 70 +
src/filed/bacl_linux.c | 344 +++++
src/filed/bacl_linux.h | 64 +
src/filed/bacl_osx.c | 294 +++++
src/filed/{xacl_osx.h => bacl_osx.h} | 42 +-
src/filed/bacl_solaris.c | 323 +++++
src/filed/{xacl_solaris.h => bacl_solaris.h} | 51 +-
src/filed/bxattr.c | 953 ++++++++++++++
src/filed/bxattr.h | 231 ++++
src/filed/bxattr_freebsd.c | 465 +++++++
src/filed/{xacl_freebsd.h => bxattr_freebsd.h} | 40 +-
src/filed/bxattr_linux.c | 290 +++++
src/filed/{xacl_linux.h => bxattr_linux.h} | 41 +-
src/filed/bxattr_osx.c | 291 +++++
src/filed/{xacl_osx.h => bxattr_osx.h} | 38 +-
src/filed/{xacl_solaris.c => bxattr_solaris.c} | 480 ++-----
src/filed/bxattr_solaris.h | 83 ++
src/filed/fd_plugins.c | 206 ++-
src/filed/fd_plugins.h | 67 +-
src/filed/filed.h | 3 +-
src/filed/restore.c | 69 +-
src/filed/xacl.c | 1335 --------------------
src/filed/xacl.h | 308 -----
src/filed/xacl_freebsd.c | 946 --------------
src/filed/xacl_linux.c | 583 ---------
src/filed/xacl_osx.c | 533 --------
src/filed/xattr.h | 76 --
src/jcr.h | 6 +-
src/lib/bsys.c | 14 +-
src/lib/crypto.c | 154 ++-
src/lib/ini.c | 38 +-
src/lib/message.c | 8 +
src/lib/openssl-compat.h | 43 +
src/lib/openssl.c | 35 +-
src/lib/openssl.h | 4 -
src/lib/parse_conf.h | 2 +-
src/lib/plugins.c | 7 +
src/lib/sha1.c | 510 ++++++++
src/lib/sha1.h | 107 ++
src/lib/tls.c | 24 +-
src/lib/util.c | 4 +-
src/plugins/fd/bpipe-fd.c | 58 +-
src/plugins/fd/example-plugin-fd.c | 28 +-
src/plugins/fd/test-deltaseq-fd.c | 52 +-
src/plugins/fd/test-plugin-fd.c | 50 +-
.../RegistrationWizard/RegistrationWizard.pro.in | 36 +
src/qt-console/bat.h | 4 +
src/qt-console/bat.pro.in | 4 +-
src/qt-console/bcomm/dircomm.h | 10 +-
src/qt-console/clients/clients.h | 4 +
src/qt-console/console/console.h | 4 +
src/qt-console/fileset/fileset.h | 4 +
src/qt-console/job/job.cpp | 4 +-
src/qt-console/job/job.h | 4 +
src/qt-console/jobgraphs/jobplot.cpp | 4 +
src/qt-console/jobgraphs/jobplot.h | 4 +
src/qt-console/joblist/joblist.h | 4 +
src/qt-console/joblog/joblog.h | 4 +
src/qt-console/jobs/jobs.h | 4 +
src/qt-console/label/label.h | 4 +
src/qt-console/main.cpp | 4 +-
src/qt-console/mainwin.h | 4 +
src/qt-console/mediaedit/mediaedit.h | 4 +
src/qt-console/mediainfo/mediainfo.cpp | 4 +-
src/qt-console/mediainfo/mediainfo.h | 4 +
src/qt-console/medialist/medialist.h | 4 +
src/qt-console/medialist/mediaview.cpp | 4 +-
src/qt-console/medialist/mediaview.h | 4 +
src/qt-console/mount/mount.h | 4 +
src/qt-console/pages.cpp | 2 +-
src/qt-console/pages.h | 4 +
src/qt-console/relabel/relabel.h | 4 +
src/qt-console/restore/restore.h | 4 +
src/qt-console/restore/restoretree.cpp | 4 +-
src/qt-console/restore/restoretree.h | 4 +
src/qt-console/run/run.h | 4 +
src/qt-console/select/select.h | 4 +
src/qt-console/select/textinput.h | 4 +
src/qt-console/status/clientstat.h | 4 +
src/qt-console/status/dirstat.h | 4 +
src/qt-console/status/storstat.h | 4 +
src/qt-console/storage/content.h | 4 +
src/qt-console/storage/storage.h | 4 +
src/qt-console/testprogs/putz/putz.h | 4 +
.../tray-monitor/clientselectwizardpage.cpp | 50 +
.../clientselectwizardpage.h} | 33 +-
.../tray-monitor/clientselectwizardpage.ui | 68 +
src/qt-console/tray-monitor/common.h | 4 +
.../tray-monitor/fileselectwizardpage.cpp | 82 ++
src/qt-console/tray-monitor/fileselectwizardpage.h | 57 +
.../tray-monitor/fileselectwizardpage.ui | 89 ++
src/qt-console/tray-monitor/filesmodel.h | 197 +++
.../tray-monitor/jobselectwizardpage.cpp | 69 +
src/qt-console/tray-monitor/jobselectwizardpage.h | 57 +
src/qt-console/tray-monitor/jobselectwizardpage.ui | 52 +
src/qt-console/tray-monitor/jobsmodel.cpp | 98 ++
src/qt-console/tray-monitor/jobsmodel.h | 59 +
.../tray-monitor/restoreoptionswizardpage.cpp | 112 ++
.../tray-monitor/restoreoptionswizardpage.h | 56 +
.../tray-monitor/restoreoptionswizardpage.ui | 82 ++
src/qt-console/tray-monitor/restorewizard.cpp | 123 ++
src/qt-console/tray-monitor/restorewizard.h | 64 +
src/qt-console/tray-monitor/restorewizard.ui | 109 ++
src/qt-console/tray-monitor/runjob.cpp | 1 +
src/qt-console/tray-monitor/runjob.h | 1 +
src/qt-console/tray-monitor/task.cpp | 616 ++++++++-
src/qt-console/tray-monitor/task.h | 33 +-
src/qt-console/tray-monitor/tray-monitor.pro.in | 11 +-
.../tray-monitor/tray-monitor.pro.mingw32.in | 9 +-
.../tray-monitor/tray-monitor.pro.mingw64.in | 9 +-
src/qt-console/tray-monitor/tray-ui.h | 67 +-
src/qt-console/tray-monitor/tray_conf.h | 5 +-
src/qt-console/util/fmtwidgetitem.cpp | 7 +-
src/stored/append.c | 6 +-
src/stored/block.c | 35 +-
src/stored/label.c | 4 +-
src/stored/read_records.c | 73 +-
src/streams.h | 5 +-
src/version.h | 6 +-
156 files changed, 10396 insertions(+), 4982 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list