From b34f26a768d3fb88053d9c165dfb8050f82dfa36 Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Tue, 5 Sep 2023 00:31:28 +0200 Subject: app-backup/bareos: restore older version Signed-off-by: Marc Schiffbauer --- app-backup/bareos/Manifest | 3 + app-backup/bareos/bareos-22.0.3-r1.ebuild | 422 +++++++++++++++++++++ .../bareos/files/bareos-20.0.2-cmake-gentoo.patch | 24 ++ .../bareos/files/bareos-21-cmake-gentoo.patch | 12 + .../files/bareos-21.1.2-no-automagic-ccache.patch | 25 ++ app-backup/bareos/files/bareos-21.1.2-werror.patch | 23 ++ app-backup/bareos/files/bareos-22.0.2-werror.patch | 23 ++ app-backup/bareos/files/bareos-dir-21-r1.initd | 16 + app-backup/bareos/files/bareos-dir-21.confd | 10 + app-backup/bareos/files/bareos-dir-21.initd | 22 ++ app-backup/bareos/files/bareos-dir-21.service | 32 ++ app-backup/bareos/files/bareos-dir.confd | 17 + app-backup/bareos/files/bareos-dir.initd | 24 ++ app-backup/bareos/files/bareos-dir.service | 30 ++ app-backup/bareos/files/bareos-fd-21-r1.initd | 12 + app-backup/bareos/files/bareos-fd-21.confd | 7 + app-backup/bareos/files/bareos-fd-21.initd | 21 + app-backup/bareos/files/bareos-fd.confd | 7 + app-backup/bareos/files/bareos-fd.initd | 11 + app-backup/bareos/files/bareos-fd.service | 26 ++ app-backup/bareos/files/bareos-gcc13-fixes.patch | 124 ++++++ app-backup/bareos/files/bareos-sd-21-r1.initd | 16 + app-backup/bareos/files/bareos-sd-21.confd | 10 + app-backup/bareos/files/bareos-sd-21.initd | 21 + app-backup/bareos/files/bareos-sd.confd | 10 + app-backup/bareos/files/bareos-sd.initd | 24 ++ app-backup/bareos/files/bareos-sd.service | 31 ++ app-backup/bareos/files/tmpfiles.d-bareos.conf | 1 + app-backup/bareos/metadata.xml | 24 ++ 29 files changed, 1028 insertions(+) create mode 100644 app-backup/bareos/Manifest create mode 100644 app-backup/bareos/bareos-22.0.3-r1.ebuild create mode 100644 app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch create mode 100644 app-backup/bareos/files/bareos-21-cmake-gentoo.patch create mode 100644 app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch create mode 100644 app-backup/bareos/files/bareos-21.1.2-werror.patch create mode 100644 app-backup/bareos/files/bareos-22.0.2-werror.patch create mode 100644 app-backup/bareos/files/bareos-dir-21-r1.initd create mode 100644 app-backup/bareos/files/bareos-dir-21.confd create mode 100644 app-backup/bareos/files/bareos-dir-21.initd create mode 100644 app-backup/bareos/files/bareos-dir-21.service create mode 100644 app-backup/bareos/files/bareos-dir.confd create mode 100644 app-backup/bareos/files/bareos-dir.initd create mode 100644 app-backup/bareos/files/bareos-dir.service create mode 100644 app-backup/bareos/files/bareos-fd-21-r1.initd create mode 100644 app-backup/bareos/files/bareos-fd-21.confd create mode 100644 app-backup/bareos/files/bareos-fd-21.initd create mode 100644 app-backup/bareos/files/bareos-fd.confd create mode 100644 app-backup/bareos/files/bareos-fd.initd create mode 100644 app-backup/bareos/files/bareos-fd.service create mode 100644 app-backup/bareos/files/bareos-gcc13-fixes.patch create mode 100644 app-backup/bareos/files/bareos-sd-21-r1.initd create mode 100644 app-backup/bareos/files/bareos-sd-21.confd create mode 100644 app-backup/bareos/files/bareos-sd-21.initd create mode 100644 app-backup/bareos/files/bareos-sd.confd create mode 100644 app-backup/bareos/files/bareos-sd.initd create mode 100644 app-backup/bareos/files/bareos-sd.service create mode 100644 app-backup/bareos/files/tmpfiles.d-bareos.conf create mode 100644 app-backup/bareos/metadata.xml diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest new file mode 100644 index 0000000..78af128 --- /dev/null +++ b/app-backup/bareos/Manifest @@ -0,0 +1,3 @@ +DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75 SHA512 1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68 +DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2 SHA512 2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41 +DIST bareos-22.0.3.tar.gz 14529338 BLAKE2B 7759059f8652cf0b55a8754325b86257130695918f0b2d4672a7a21aa3ed6595da9fcba9a5a5f1c854af7994aa21c304720131ab99d577f01cd706f55184b621 SHA512 cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c diff --git a/app-backup/bareos/bareos-22.0.3-r1.ebuild b/app-backup/bareos/bareos-22.0.3-r1.ebuild new file mode 100644 index 0000000..d246f05 --- /dev/null +++ b/app-backup/bareos/bareos-22.0.3-r1.ebuild @@ -0,0 +1,422 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +CMAKE_WARN_UNUSED_CLI=no +#CMAKE_REMOVE_MODULES=yes + +inherit python-any-r1 systemd cmake tmpfiles + +DESCRIPTION="Featureful client/server network backup suite" +HOMEPAGE="https://www.bareos.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" + +# some tests still fail propably due to missing bits in src_test -> TODO +RESTRICT="mirror test" +#RESTRICT=" +# mirror +# !test? ( test ) +#" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb + logwatch ndmp readline scsi-crypto split-usr + static +storage-daemon systemd tcpd test vim-syntax vmware xattr" + +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake +DEPEND=" + !app-backup/bacula + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) + glusterfs? ( sys-cluster/glusterfs ) + lmdb? ( dev-db/lmdb ) + dev-libs/gmp:0 + !clientonly? ( + acct-user/${PN} + dev-db/postgresql:*[threads] + director? ( + virtual/mta + ) + ) + logwatch? ( sys-apps/logwatch ) + ndmp? ( net-libs/rpcsvc-proto ) + tcpd? ( sys-apps/tcp-wrappers ) + readline? ( sys-libs/readline:0 ) + static? ( + acl? ( virtual/acl[static-libs] ) + dev-libs/jansson:=[static-libs] + dev-libs/lzo[static-libs] + dev-libs/openssl:0=[static-libs] + sys-libs/ncurses:=[static-libs] + sys-libs/zlib[static-libs] + ) + !static? ( + acl? ( virtual/acl ) + dev-libs/jansson:= + dev-libs/lzo + dev-libs/openssl:0= + sys-libs/ncurses:= + sys-libs/zlib + ) + " +RDEPEND="${DEPEND} + !clientonly? ( + storage-daemon? ( + sys-block/mtx + app-arch/mt-st + ) + ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " + +BDEPEND=" + ${PYTHON_DEPS} + test? ( + dev-cpp/gtest + dev-db/postgresql:*[server,threads] + dev-db/mariadb:*[server] + ) +" + +REQUIRED_USE=" + static? ( clientonly ) + x86? ( !ceph ) +" + +S=${WORKDIR}/${PN}-Release-${PV} + +pkg_pretend() { + local active_removed_backend="" + if has_version "=21.0.0 you need to migrate to PostgreSQL" + ewarn "catalog backend using the 'bareos-dbcopy' tool of your current" + ewarn "installation first." + ewarn + die "current catalog backend not supported anymore" + fi +} + +src_test() { + # initialze catalog test database + initdb -D "${T}"/pgsql || die + pg_ctl -w -D "${T}"/pgsql start \ + -o "-h '' -k '${T}'" || die + createuser -h "${T}" bareos || die + createdb -h "${T}" --owner bareos bareos || die + export PGHOST="${T}" + + # initiale mariadb database for backup tests + # $USER must be set and != root + export USER=portage + + default + cmake_src_test + + pg_ctl -w -D "${T}"/pgsql stop || die + rm -rvf "${T}"/pgsql +} + +src_prepare() { + # fix gentoo platform support + eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch" + eapply "${FILESDIR}/${PN}-22.0.2-werror.patch" + eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch" + eapply "${FILESDIR}/${PN}-gcc13-fixes.patch" + + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=() + + cmake_comment_add_subdirectory webui + + if use clientonly; then + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) + fi + + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + + mycmakeargs+=( + -DHAVE_PYTHON=0 + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=no + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) + + # disable droplet support for now as it does not build with gcc 10 + # ... and this is a bundled lib, which should have its own package + cd core && cmake_comment_add_subdirectory "src/droplet" + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # remove some scripts we don't need at all + rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd} + rm -f "${D}"/usr/sbin/bareos + + # remove upstream init scripts and systemd units + rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service + + # remove misc stuff we do not need in production + rm -f "${D}"/etc/bareos/bareos-regress.conf + rm -f "${D}"/etc/logrotate.d/bareos-dir + + # remove duplicate binaries being installed in /usr/sbin and replace + # them by symlinks to not break systems that still use split-usr + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi + + # get rid of py2 stuff + rm -rf "$D"/usr/lib64/python2.7 || die + rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die + if ! use vmware; then + rm -f "$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py} + fi + + # rename statically linked apps + if use clientonly && use static ; then + pushd "${D}"/usr/sbin || die + mv static-bareos-fd bareos-fd || die + mv static-bconsole bconsole || die + popd || die + fi + + # extra files which 'make install' doesn't cover + if ! use clientonly; then + # the logrotate configuration + # (now unconditional wrt bug #258187) + diropts -m0755 + insinto /etc/logrotate.d + insopts -m0644 + newins "${S}"/core/scripts/logrotate bareos + + # the logwatch scripts + if use logwatch; then + diropts -m0750 + dodir /etc/log.d/scripts/services + dodir /etc/log.d/scripts/shared + dodir /etc/log.d/conf/logfiles + dodir /etc/log.d/conf/services + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + + popd >&/dev/null || die + fi + fi + + rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* + if use clientonly || ! use director; then + rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* + rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* + rm -vf "${D}"/usr/share/man/man1/bsmtp.1* + rm -vf "${D}"/usr/share/man/man8/bwild.8* + rm -vf "${D}"/usr/share/man/man8/bregex.8* + rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* + rm -vf "${D}"/usr/libexec/bareos/create_*_database + rm -vf "${D}"/usr/libexec/bareos/drop_*_database + rm -vf "${D}"/usr/libexec/bareos/make_*_tables + rm -vf "${D}"/usr/libexec/bareos/update_*_tables + rm -vf "${D}"/usr/libexec/bareos/drop_*_tables + rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges + rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup + fi + if use clientonly || ! use storage-daemon; then + rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* + rm -vf "${D}"/usr/share/man/man8/bcopy.8* + rm -vf "${D}"/usr/share/man/man8/bextract.8* + rm -vf "${D}"/usr/share/man/man8/bls.8* + rm -vf "${D}"/usr/share/man/man8/bscan.8* + rm -vf "${D}"/usr/share/man/man8/btape.8* + rm -vf "${D}"/usr/libexec/bareos/disk-changer + rm -vf "${D}"/usr/libexec/bareos/mtx-changer + rm -vf "${D}"/usr/libexec/bareos/dvd-handler + rm -vf "${D}"/etc/bareos/mtx-changer.conf + fi + if ! use scsi-crypto; then + rm -vf "${D}"/usr/share/man/man8/bscrypto.8* + fi + + # documentation + dodoc README.md + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto + + # vim-files + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins core/scripts/bareos.vim + insinto /usr/share/vim/vimfiles/ftdetect + newins core/scripts/filetype.vim bareos_ft.vim + fi + + # setup init scripts + myscripts="bareos-fd" + if ! use clientonly; then + if use director; then + myscripts+=" bareos-dir" + fi + if use storage-daemon; then + myscripts+=" bareos-sd" + fi + fi + for script in ${myscripts}; do + # install init script and config + newinitd "${FILESDIR}/${script}-21-r1".initd "${script}" + newconfd "${FILESDIR}/${script}-21".confd "${script}" + done + + # install systemd unit files + if use systemd; then + if ! use clientonly; then + use director && systemd_newunit "${FILESDIR}"/bareos-dir-21.service bareos-dir.service + use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service + fi + systemd_dounit "${FILESDIR}"/bareos-fd.service + fi + + # make sure the working directory exists + diropts -m0750 + keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + # set log directory ownership + if ! use clientonly; then + diropts -m0755 -o bareos -g bareos + fi + keepdir /var/log/bareos + + newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf + + # make sure bareos group can execute bareos libexec scripts + fowners -R root:bareos /usr/libexec/bareos +} + +pkg_postinst() { + tmpfiles_process bareos.conf + + if use clientonly; then + fowners root:bareos /var/lib/bareos + else + fowners bareos:bareos /var/lib/bareos + fi + + if ! use clientonly && use director; then + einfo + einfo "If this is a new install, you must create the database:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database'" + einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables'" + einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges'" + einfo + einfo "or run" + einfo + einfo " emerge --config app-backup/bareos" + einfo + einfo "to do this" + einfo + einfo "For major upgrades you may need to run:" + einfo + einfo " su postgres -c '/usr/libexec/bareos/update_bareos_tables'" + einfo + einfo "Please see release notes for details." + einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )" + einfo + fi +} + +pkg_config() { + su postgres -c '/usr/libexec/bareos/create_bareos_database' || die "could not create bareos database" + su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could not create bareos database tables" + su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die "could not grant bareos database privileges" +} diff --git a/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch b/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch new file mode 100644 index 0000000..9d3cf80 --- /dev/null +++ b/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch @@ -0,0 +1,24 @@ +diff -urw bareos-Release-20.0.2.orig/core/cmake/distname.sh bareos-Release-20.0.2/core/cmake/distname.sh +--- bareos-Release-20.0.2.orig/core/cmake/distname.sh 2021-06-10 06:07:18.000000000 -0930 ++++ bareos-Release-20.0.2/core/cmake/distname.sh 2021-08-15 17:07:37.168216517 -0930 +@@ -153,7 +153,7 @@ + elif test -f /etc/gentoo-release + then + PLATFORM=gentoo +- DISTVER=`awk '/version / { print $5 }' < /etc/gentoo-release` ++ DISTVER=`awk '/release / { print $5 }' < /etc/gentoo-release` + elif test -f /etc/debian_version + then + if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then +diff -urw bareos-Release-20.0.2.orig/core/platforms/CMakeLists.txt bareos-Release-20.0.2/core/platforms/CMakeLists.txt +--- bareos-Release-20.0.2.orig/core/platforms/CMakeLists.txt 2021-06-10 06:07:18.000000000 -0930 ++++ bareos-Release-20.0.2/core/platforms/CMakeLists.txt 2021-08-15 17:07:37.549226558 -0930 +@@ -30,6 +30,8 @@ + message(STATUS "adding subdirectories debian and univention") + add_subdirectory(debian) + add_subdirectory(univention) ++ elseif(${PLATFORM} STREQUAL gentoo) ++ message(STATUS "PLATFORM: " ${PLATFORM}) + elseif(${PLATFORM} STREQUAL hpux) + message(STATUS "PLATFORM: " ${PLATFORM}) + elseif(${PLATFORM} STREQUAL archlinux) diff --git a/app-backup/bareos/files/bareos-21-cmake-gentoo.patch b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch new file mode 100644 index 0000000..e42bf91 --- /dev/null +++ b/app-backup/bareos/files/bareos-21-cmake-gentoo.patch @@ -0,0 +1,12 @@ +diff -ur bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt bareos-Release-21.0.0/core/platforms/CMakeLists.txt +--- bareos-Release-21.0.0.orig/core/platforms/CMakeLists.txt 2021-12-21 01:00:49.000000000 -1000 ++++ bareos-Release-21.0.0/core/platforms/CMakeLists.txt 2022-01-30 15:09:41.949529813 -1000 +@@ -30,6 +30,8 @@ + message(STATUS "adding subdirectories debian and univention") + add_subdirectory(debian) + add_subdirectory(univention) ++ elseif(${PLATFORM} STREQUAL gentoo) ++ message(STATUS "PLATFORM: " ${PLATFORM}) + elseif(${BAREOS_PLATFORM} STREQUAL hpux) + message(STATUS "BAREOS_PLATFORM: " ${BAREOS_PLATFORM}) + elseif(${BAREOS_PLATFORM} STREQUAL archlinux) diff --git a/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch new file mode 100644 index 0000000..22cdc2a --- /dev/null +++ b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch @@ -0,0 +1,25 @@ +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -44,12 +44,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common) + + include(GNUInstallDirs) + +-find_program(CCACHE_FOUND ccache) +-if(CCACHE_FOUND) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +-endif(CCACHE_FOUND) +- + # switch on CXX 17 Support + # + set(CMAKE_CXX_STANDARD 17) +@@ -584,9 +578,6 @@ message(STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION}) + # A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). But + # there are also two variables exactly for this purpose: + +-# wheter or not +-message(STATUS "CCACHE_FOUND: " ${CCACHE_FOUND}) +- + # Choose the type of build. Example: SET(CMAKE_BUILD_TYPE Debug) + message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE}) + diff --git a/app-backup/bareos/files/bareos-21.1.2-werror.patch b/app-backup/bareos/files/bareos-21.1.2-werror.patch new file mode 100644 index 0000000..10de9f1 --- /dev/null +++ b/app-backup/bareos/files/bareos-21.1.2-werror.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/841734 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -96,7 +96,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + -Werror=format-security compiler_error_format_security + ) + if(${compiler_error_format_security}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security") + endif() + endif() + +@@ -353,8 +353,8 @@ if(developer) + add_definitions("-DDEVELOPER=1") + endif() + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + + include(BareosSetVariableDefaults) + option(ENABLE_BCONSOLE "Build bconsole binary" ON) diff --git a/app-backup/bareos/files/bareos-22.0.2-werror.patch b/app-backup/bareos/files/bareos-22.0.2-werror.patch new file mode 100644 index 0000000..43f2aa5 --- /dev/null +++ b/app-backup/bareos/files/bareos-22.0.2-werror.patch @@ -0,0 +1,23 @@ +diff -urN bareos-Release-22.0.2.orig/core/CMakeLists.txt bareos-Release-22.0.2/core/CMakeLists.txt +--- bareos-Release-22.0.2.orig/core/CMakeLists.txt 2023-02-07 15:30:01.000000000 +0530 ++++ bareos-Release-22.0.2/core/CMakeLists.txt 2023-03-01 23:06:39.577048453 +0530 +@@ -104,7 +104,7 @@ + -Werror=format-security compiler_error_format_security + ) + if(${compiler_error_format_security}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security") + endif() + endif() + +@@ -394,8 +394,8 @@ + add_definitions("-DDEVELOPER=1") + endif() + +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") + + include(BareosSetVariableDefaults) + option(ENABLE_BCONSOLE "Build bconsole binary" ON) diff --git a/app-backup/bareos/files/bareos-dir-21-r1.initd b/app-backup/bareos/files/bareos-dir-21-r1.initd new file mode 100644 index 0000000..1363833 --- /dev/null +++ b/app-backup/bareos/files/bareos-dir-21-r1.initd @@ -0,0 +1,16 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start_pre() { + checkpath --directory --owner root:root --mode 00755 /run/bareos +} + +command="/usr/sbin/bareos-dir" +command_args="-f ${DIR_OPTIONS}" +command_background="true" +pidfile="/run/bareos/bareos-dir.9101.pid" diff --git a/app-backup/bareos/files/bareos-dir-21.confd b/app-backup/bareos/files/bareos-dir-21.confd new file mode 100644 index 0000000..4e2ee55 --- /dev/null +++ b/app-backup/bareos/files/bareos-dir-21.confd @@ -0,0 +1,10 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Config file for /etc/init.d/bareos-dir + +# Options for the director daemon. +# The director can be run as a non-root user, however +# please ensure that this user has proper permissions to +# access your backup devices. +DIR_OPTIONS="-u bareos -g bareos" diff --git a/app-backup/bareos/files/bareos-dir-21.initd b/app-backup/bareos/files/bareos-dir-21.initd new file mode 100644 index 0000000..916ee13 --- /dev/null +++ b/app-backup/bareos/files/bareos-dir-21.initd @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need postgresql + use dns bareos-fd bareos-sd +} + +start() { + ebegin "Starting bareos director" + checkpath -d -m 0750 -o root:bareos /run/bareos + start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \ + -- -p /run/bareos/bareos-dir.9101.pid ${DIR_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bareos director" + start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.9101.pid + eend $? +} diff --git a/app-backup/bareos/files/bareos-dir-21.service b/app-backup/bareos/files/bareos-dir-21.service new file mode 100644 index 0000000..2f156cf --- /dev/null +++ b/app-backup/bareos/files/bareos-dir-21.service @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos Director Daemon +# +[Unit] +Description=Bareos Director Daemon +Documentation=man:bareos-dir(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target postgresql.service +ConditionPathIsDirectory=/var/lib/bareos + +[Service] +# see bug #631598 +#Type=forking +Type=simple +User=bareos +Group=bareos +WorkingDirectory=/var/lib/bareos +#PIDFile=/run/bareos/bareos-dir.9101.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-dir -t -f +#ExecStart=/usr/sbin/bareos-dir +ExecStart=/usr/sbin/bareos-dir -f +SuccessExitStatus=0 1 15 +ExecReload=/usr/sbin/bareos-dir -t -f +ExecReload=/bin/kill -HUP $MAINPID +#Restart=on-failure + +[Install] +Alias=bareos-director.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/bareos-dir.confd b/app-backup/bareos/files/bareos-dir.confd new file mode 100644 index 0000000..6d755bf --- /dev/null +++ b/app-backup/bareos/files/bareos-dir.confd @@ -0,0 +1,17 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Config file for /etc/init.d/bareos-dir + +# Bareos can use more than one catalog database and each one can +# be of any supported type. +# If a database server where you store a bareos catalog +# is on a different machine, you might want to remove the corresponding +# type from the rc_need variable. +rc_need="%databasetypes%" + +# Options for the director daemon. +# The director can be run as a non-root user, however +# please ensure that this user has proper permissions to +# access your backup devices. +DIR_OPTIONS="-u bareos -g bareos" diff --git a/app-backup/bareos/files/bareos-dir.initd b/app-backup/bareos/files/bareos-dir.initd new file mode 100644 index 0000000..a2986d1 --- /dev/null +++ b/app-backup/bareos/files/bareos-dir.initd @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns bareos-fd bareos-sd +} + +start_pre() { + checkpath --directory --owner root:bareos --mode 01775 /run/bareos + if [[ -e /run/bareos/bareos-dir.9101.pid && $(stat -c %U /run/bareos/bareos-dir.9101.pid) != "root" ]]; then + eerror "SECURITY ALERT: bareos owned pidfile found! (see #631598)" + exit 1 + fi +} + +start_post() { + ewaitfile 10 /run/bareos/bareos-dir.9101.pid + checkpath --file --owner root:bareos /run/bareos/bareos-dir.9101.pid +} + +command="/usr/sbin/bareos-dir" +command_args="${DIR_OPTIONS}" +pidfile="/run/bareos/bareos-dir.9101.pid" diff --git a/app-backup/bareos/files/bareos-dir.service b/app-backup/bareos/files/bareos-dir.service new file mode 100644 index 0000000..f0a6117 --- /dev/null +++ b/app-backup/bareos/files/bareos-dir.service @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos Director Daemon +# +[Unit] +Description=Bareos Director Daemon +Documentation=man:bareos-dir(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target postgresql.service mysql.service mariadb.service +ConditionPathIsDirectory=/var/lib/bareos + +[Service] +# see bug #631598 +#Type=forking +Type=simple +User=bareos +Group=bareos +WorkingDirectory=/var/lib/bareos +#PIDFile=/run/bareos/bareos-dir.9101.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-dir -t -f +#ExecStart=/usr/sbin/bareos-dir +ExecStart=/usr/sbin/bareos-dir -f +SuccessExitStatus=0 1 15 +#Restart=on-failure + +[Install] +Alias=bareos-director.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/bareos-fd-21-r1.initd b/app-backup/bareos/files/bareos-fd-21-r1.initd new file mode 100644 index 0000000..2b75208 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd-21-r1.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +command="/usr/sbin/bareos-fd" +command_args="-f ${DIR_OPTIONS}" +command_background="true" +pidfile="/run/bareos/bareos-fd.9102.pid" diff --git a/app-backup/bareos/files/bareos-fd-21.confd b/app-backup/bareos/files/bareos-fd-21.confd new file mode 100644 index 0000000..407f2a8 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd-21.confd @@ -0,0 +1,7 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Config file for /etc/init.d/bareos-fd + +# Options for the file daemon. +FD_OPTIONS="-u root -g bareos" diff --git a/app-backup/bareos/files/bareos-fd-21.initd b/app-backup/bareos/files/bareos-fd-21.initd new file mode 100644 index 0000000..f063226 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd-21.initd @@ -0,0 +1,21 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start() { + ebegin "Starting bareos file daemon" + checkpath -d -m 0750 -o root:bareos /run/bareos + start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \ + -- -p /run/bareos/bareos-fd.9102.pid ${FD_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bareos file daemon" + start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-fd.9102.pid + eend $? +} diff --git a/app-backup/bareos/files/bareos-fd.confd b/app-backup/bareos/files/bareos-fd.confd new file mode 100644 index 0000000..5e429a6 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd.confd @@ -0,0 +1,7 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Config file for /etc/init.d/bareos-fd + +# Options for the file daemon. +FD_OPTIONS="-u root -g bareos" diff --git a/app-backup/bareos/files/bareos-fd.initd b/app-backup/bareos/files/bareos-fd.initd new file mode 100644 index 0000000..31d9342 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +command="/usr/sbin/bareos-fd" +command_args="${FD_OPTIONS}" +pidfile="/run/bareos/bareos-fd.9102.pid" diff --git a/app-backup/bareos/files/bareos-fd.service b/app-backup/bareos/files/bareos-fd.service new file mode 100644 index 0000000..e9b4b83 --- /dev/null +++ b/app-backup/bareos/files/bareos-fd.service @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos File Daemon +# +[Unit] +Description=Bareos File Daemon +Documentation=man:bareos-fd(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target + +[Service] +Type=forking +User=root +Group=bareos +WorkingDirectory=/var/lib/bareos +PIDFile=/run/bareos/bareos-fd.9102.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-fd -f -t +ExecStart=/usr/sbin/bareos-fd +SuccessExitStatus=0 15 +#Restart=on-failure + +[Install] +Alias=bareos-filedaemon.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/bareos-gcc13-fixes.patch b/app-backup/bareos/files/bareos-gcc13-fixes.patch new file mode 100644 index 0000000..1cd1262 --- /dev/null +++ b/app-backup/bareos/files/bareos-gcc13-fixes.patch @@ -0,0 +1,124 @@ +From 2bb7d74215bf6ae4f350de11bff04b68cf3c82b3 Mon Sep 17 00:00:00 2001 +From: Bruno Friedmann +Date: Mon, 27 Mar 2023 13:22:11 +0200 +Subject: [PATCH 1/3] core: fixes for gcc-13 support + +- add explicit system_error and stdexcept +- console_conf.cc fix std::move warning + +Signed-off-by: Bruno Friedmann +--- + core/src/cats/cats.h | 2 ++ + core/src/console/console_conf.cc | 4 ++-- + core/src/lib/thread_list.cc | 3 ++- + core/src/lib/thread_specific_data.cc | 3 ++- + core/src/lib/thread_specific_data.h | 3 ++- + core/src/lib/thread_specific_data_key.h | 4 +++- + 6 files changed, 13 insertions(+), 6 deletions(-) + +diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h +index 7a6641b3f72..edb5ecbe38b 100644 +--- a/core/src/cats/cats.h ++++ b/core/src/cats/cats.h +@@ -41,6 +41,8 @@ + #include "lib/output_formatter.h" + + #include ++#include ++#include + #include + template class dlist; + +diff --git a/core/src/console/console_conf.cc b/core/src/console/console_conf.cc +index 9d3aecead2b..f0c0402744e 100644 +--- a/core/src/console/console_conf.cc ++++ b/core/src/console/console_conf.cc +@@ -203,7 +203,7 @@ static bool SaveResource(int type, ResourceItem* items, int pass) + res_dir->resource_name_); + } else { + p->tls_cert_.allowed_certificate_common_names_ +- = std::move(p->tls_cert_.allowed_certificate_common_names_); ++ = std::move(res_dir->tls_cert_.allowed_certificate_common_names_); + } + break; + } +diff --git a/core/src/lib/thread_list.cc b/core/src/lib/thread_list.cc +index 50aefb8ee2d..05607124a55 100644 +--- a/core/src/lib/thread_list.cc ++++ b/core/src/lib/thread_list.cc +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + + static constexpr int debuglevel{800}; +diff --git a/core/src/lib/thread_specific_data.cc b/core/src/lib/thread_specific_data.cc +index 0953f5c125a..22a98c4a759 100644 +--- a/core/src/lib/thread_specific_data.cc ++++ b/core/src/lib/thread_specific_data.cc +@@ -25,6 +25,7 @@ + #include "lib/thread_specific_data.h" + #include "lib/thread_specific_data_key.h" + #include "include/jcr.h" ++#include + + JobControlRecord* GetJcrFromThreadSpecificData() + { +diff --git a/core/src/lib/thread_specific_data.h b/core/src/lib/thread_specific_data.h +index 4bd4dedafae..4c427d171c0 100644 +--- a/core/src/lib/thread_specific_data.h ++++ b/core/src/lib/thread_specific_data.h +@@ -24,6 +24,7 @@ + #ifndef BAREOS_LIB_THREAD_SPECIFIC_DATA_H_ + #define BAREOS_LIB_THREAD_SPECIFIC_DATA_H_ + ++ + class JobControlRecord; + + JobControlRecord* GetJcrFromThreadSpecificData(); +diff --git a/core/src/lib/thread_specific_data_key.h b/core/src/lib/thread_specific_data_key.h +index 9c02c07f47e..c8c63c757fe 100644 +--- a/core/src/lib/thread_specific_data_key.h ++++ b/core/src/lib/thread_specific_data_key.h +@@ -22,6 +22,8 @@ + #ifndef BAREOS_LIB_THREAD_SPECIFIC_DATA_KEY_H_ + #define BAREOS_LIB_THREAD_SPECIFIC_DATA_KEY_H_ + ++ ++#include + #include "lib/berrno.h" + + #include + +From cc208707f6f4ad8c24e8ad670f10c076a27b69e4 Mon Sep 17 00:00:00 2001 +From: Philipp Storz +Date: Mon, 3 Apr 2023 12:11:57 +0200 +Subject: [PATCH 2/3] pull_request_template.md: add checkmark for backport PRs + +--- +From 55ee275873b7c2d663d280847fd517374394e43d Mon Sep 17 00:00:00 2001 +From: Marc Schiffbauer +Date: Thu, 20 Apr 2023 19:01:16 +0300 +Subject: [PATCH] add missing include required by gcc 13 + +--- + core/src/stored/dev.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/core/src/stored/dev.cc b/core/src/stored/dev.cc +index 287a323a5..7fd0c437e 100644 +--- a/core/src/stored/dev.cc ++++ b/core/src/stored/dev.cc +@@ -81,6 +81,7 @@ + #include "lib/btimers.h" + #include "include/jcr.h" + #include "lib/berrno.h" ++#include + + #ifndef HAVE_DYNAMIC_SD_BACKENDS + # ifdef HAVE_GFAPI +-- +2.39.2 + diff --git a/app-backup/bareos/files/bareos-sd-21-r1.initd b/app-backup/bareos/files/bareos-sd-21-r1.initd new file mode 100644 index 0000000..d6a5765 --- /dev/null +++ b/app-backup/bareos/files/bareos-sd-21-r1.initd @@ -0,0 +1,16 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start_pre() { + checkpath --directory --owner root:root --mode 00755 /run/bareos +} + +command="/usr/sbin/bareos-sd" +command_args="-f ${DIR_OPTIONS}" +command_background="true" +pidfile="/run/bareos/bareos-sd.9103.pid" diff --git a/app-backup/bareos/files/bareos-sd-21.confd b/app-backup/bareos/files/bareos-sd-21.confd new file mode 100644 index 0000000..2a67ae2 --- /dev/null +++ b/app-backup/bareos/files/bareos-sd-21.confd @@ -0,0 +1,10 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Config file for /etc/init.d/bareos-sd + +# Options for the storage daemon. +# The storage daemon can be run as a non-root user, however +# please ensure that this user has proper permissions to +# access your backup devices. +SD_OPTIONS="-u bareos -g bareos" diff --git a/app-backup/bareos/files/bareos-sd-21.initd b/app-backup/bareos/files/bareos-sd-21.initd new file mode 100644 index 0000000..07091db --- /dev/null +++ b/app-backup/bareos/files/bareos-sd-21.initd @@ -0,0 +1,21 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start() { + ebegin "Starting bareos storage daemon" + checkpath -d -m 0750 -o root:bareos /run/bareos + start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \ + -- -p /run/bareos/bareos-sd.9103.pid ${SD_OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping bareos storage daemon" + start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.9103.pid + eend $? +} diff --git a/app-backup/bareos/files/bareos-sd.confd b/app-backup/bareos/files/bareos-sd.confd new file mode 100644 index 0000000..d0153b2 --- /dev/null +++ b/app-backup/bareos/files/bareos-sd.confd @@ -0,0 +1,10 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Config file for /etc/init.d/bareos-sd + +# Options for the storage daemon. +# The storage daemon can be run as a non-root user, however +# please ensure that this user has proper permissions to +# access your backup devices. +SD_OPTIONS="-u bareos -g bareos" diff --git a/app-backup/bareos/files/bareos-sd.initd b/app-backup/bareos/files/bareos-sd.initd new file mode 100644 index 0000000..a4a4534 --- /dev/null +++ b/app-backup/bareos/files/bareos-sd.initd @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +depend() { + use dns +} + +start_pre() { + checkpath --directory --owner root:bareos --mode 01775 /run/bareos + if [[ -e /run/bareos/bareos-sd.9103.pid && $(stat -c %U /run/bareos/bareos-sd.9103.pid) != "root" ]]; then + eerror "SECURITY ALERT: bareos owned pidfile found! (see #631598)" + exit 1 + fi +} + +start_post() { + ewaitfile 10 /run/bareos/bareos-sd.9103.pid + checkpath --file --owner root:bareos /run/bareos/bareos-sd.9103.pid +} + +command="/usr/sbin/bareos-sd" +command_args="${SD_OPTIONS}" +pidfile="/run/bareos/bareos-sd.9103.pid" diff --git a/app-backup/bareos/files/bareos-sd.service b/app-backup/bareos/files/bareos-sd.service new file mode 100644 index 0000000..acf8cb0 --- /dev/null +++ b/app-backup/bareos/files/bareos-sd.service @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Bareos Storage Daemon +# +[Unit] +Description=Bareos Storage Daemon +Documentation=man:bareos-sd(8) +Requires=nss-lookup.target network.target remote-fs.target time-sync.target +After=nss-lookup.target network.target remote-fs.target time-sync.target + +[Service] +# see bug #631598 +#Type=forking +Type=simple +User=root +Group=bareos +WorkingDirectory=/var/lib/bareos +#PIDFile=/run/bareos/bareos-sd.9103.pid +StandardError=journal +ExecStartPre=/usr/sbin/bareos-sd -t -f +#ExecStart=/usr/sbin/bareos-sd +ExecStart=/usr/sbin/bareos-sd -f +# enable this for scsicrypto-sd +# CapabilityBoundingSet=cap_sys_rawio+ep +SuccessExitStatus=0 15 +#Restart=on-failure + +[Install] +Alias=bareos-storage.service +WantedBy=multi-user.target diff --git a/app-backup/bareos/files/tmpfiles.d-bareos.conf b/app-backup/bareos/files/tmpfiles.d-bareos.conf new file mode 100644 index 0000000..81c5756 --- /dev/null +++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf @@ -0,0 +1 @@ +d /run/bareos 0750 root bareos - diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml new file mode 100644 index 0000000..212e403 --- /dev/null +++ b/app-backup/bareos/metadata.xml @@ -0,0 +1,24 @@ + + + + + mschiff@gentoo.org + Marc Schiffbauer + + + Enable sys-cluster/ceph support + Only install file-daemon (client) + Install director + Enable sys-cluster/glusterfs storage backend + JSON API support using dev-libs/jansson for director + enable build of dev-db/lmdb support for faster accurate backup + Install support files for sys-apps/logwatch + Enable support for NDMP (Network Data Management Protocol) + Enable low level SCSI crypto support + Install storage daemon (bareos-sd) + Enable bareos-fd VMware plugin + + + bareos/bareos + + -- cgit v1.2.3-65-gdbad