From 95580151e6cfe563d6c0550936c7fd92e24a6acf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Feb 2024 17:37:38 +0000 Subject: gentoo auto-resync : 17:02:2024 - 17:37:38 --- app-backup/Manifest.gz | Bin 7867 -> 7872 bytes app-backup/bareos/Manifest | 9 -- .../bareos/files/bareos-20.0.2-cmake-gentoo.patch | 24 ---- 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.confd | 7 -- app-backup/bareos/files/bareos-fd.initd | 11 -- app-backup/bareos/files/bareos-gcc13-fixes.patch | 124 --------------------- app-backup/bareos/files/bareos-sd.confd | 10 -- app-backup/bareos/files/bareos-sd.initd | 24 ---- 11 files changed, 280 deletions(-) delete mode 100644 app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch delete mode 100644 app-backup/bareos/files/bareos-dir.confd delete mode 100644 app-backup/bareos/files/bareos-dir.initd delete mode 100644 app-backup/bareos/files/bareos-dir.service delete mode 100644 app-backup/bareos/files/bareos-fd.confd delete mode 100644 app-backup/bareos/files/bareos-fd.initd delete mode 100644 app-backup/bareos/files/bareos-gcc13-fixes.patch delete mode 100644 app-backup/bareos/files/bareos-sd.confd delete mode 100644 app-backup/bareos/files/bareos-sd.initd (limited to 'app-backup') diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index 07899bfe5319..6472b93e8b3d 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest index 2c95ce276a41..2e0b77bbf6e6 100644 --- a/app-backup/bareos/Manifest +++ b/app-backup/bareos/Manifest @@ -1,4 +1,3 @@ -AUX bareos-20.0.2-cmake-gentoo.patch 1332 BLAKE2B b84158913e0bf051013681f8583546add34d48ea56647beb057525a0da1fff57dcd06c20dd125f300e34a42adb450c3a00456077de914dedf50b5a68748ef1ae SHA512 61e2b119d12daa60bf1fa0bc1de81d4322df421c6c5d2de4e823686f8a8657f521d53256533b52b17a105a25ef8070058144620d71aa295b491d2a39bc7de2f4 AUX bareos-21-cmake-gentoo.patch 694 BLAKE2B a01f469c1f61a5887dd75779c96fdebf666989c9ec203d478291bb58d8ae974e624c6d83977247f47fdc9cdcae0761552a2864e31ec26cbd64317610bc87613f SHA512 225afe4c2d9ee7774d34776071b8b8430c0a4c28e8a2b301fb5f3963ae4b02ea6f6020082d4bcc0ba937728cd57f77ba19fbc176f8f14c0dc28fa98135fb3c80 AUX bareos-21.1.2-no-automagic-ccache.patch 837 BLAKE2B 81eea4aa487c59e5514e64e26760d5eaee4b124a2a07e7dc4098adeb0d163dcaa2986c8044b5de9f681e35a8612c3e6a72e5843454e7565747daa536a3e55711 SHA512 1c3b2b9633e7436ce4f782956c9f1722057186a0537a3c4e1f8d78e1ffc8f1afa80c532a6f06ea45a301d4580bc695684a1281b544db376462b613bcb98b803b AUX bareos-21.1.2-werror.patch 785 BLAKE2B b29c00d57818a911251b1ca487372679140131eed7844188ea98b43f654901e88ea5a592bd77330160b2bf401bac8d9118c7989e2d44e8566e847e9625d9b0dc SHA512 b050b796e2f75192b39a7540f2d5a065b97899de2159d5fb9ca5eda19cc00cfeae392550267389c7f6f85ae9106e929117bb8a62be5106b16ad30184381cd4a6 @@ -7,19 +6,11 @@ AUX bareos-22.1.2-include-algorithm.patch 1087 BLAKE2B 97938a34dd098e69c24e74a56 AUX bareos-dir-21-r1.initd 362 BLAKE2B ed28503db1f91f41f97cc0f9bf83c9f7686a79c6945e82577b7f290df516b6e7ac403023e3aab8c86ef67f67cb3a99bd699fb2d1d0534d53d164c0143cef0e2d SHA512 fc2f217020206ff43238444910555338133370fe423959ca1b5ed53704d371db9993b3a42fe5d9c2065b12ba5a853f6f216ee7418d446466c8f0175a54dc6210 AUX bareos-dir-21.confd 357 BLAKE2B 819a8c4bbf66a4a629128d3b23cc122fc340eb5672e406234d1a2960c30ed075989585e1e4801b2bde8f1edeca770d80b58e58bfcaeb45fa056afab4b610b013 SHA512 9858964a291ee9849e144f968a239758e3e6905bb5420717652114d8a583e3342e50f046efa41730f30cfc3f047b485251e93085fb13b327a6f2272d7c4c0309 AUX bareos-dir-21.service 884 BLAKE2B c0a4fb957588136cd043be2670a03e05bd5ffad4ae87275636642961e0e105ff07fb0614490a71771bb7eecfb551e6f860d8d41104e56ea8c5d434c84c5602a8 SHA512 187e331f8495d27d14434bd71baace7051d254e2886c3814493600973cd830cb01f27153321821e0a3bd2356d55f39cf0878488297079ed80bcfb2693cc77809 -AUX bareos-dir.confd 640 BLAKE2B 0c80793f66ef9f3b46995a2dcf150b3d7a8a9f53ff97896887314ab31d6082949ac3db2c260b2fc7551c035183c31558cc853f768eca5b0bebdfa483280780b5 SHA512 af71699773ade63c98e2016f48b4d108f29a419a7533444245df4507a7ad7b807948986f9f850ce1f9af58fb445ecd44a5d880f68732b371a7a87dbc5a25ec7c -AUX bareos-dir.initd 681 BLAKE2B a9c73a8e71a318746fdf8ed5894266ced8003e8cc56fa25d2b9810656875299af61862cdd58ab00ba8a241d0f4ff63fa6356eaf4d776ef836a5f12e453d0a72d SHA512 95da6492201ea5bf1b9bacce1a9dd7b2a864af4775158cbdac48f6c6feba26dbca3ea252133c7279f2be8b8220c0f5810b9fa1dd5ef5727c8d83eca64134ce90 -AUX bareos-dir.service 841 BLAKE2B e8c9508984f2823b334c3ef3c412f51e50666cd45aea1c5491a3ce6b1fadf09e7e0cb836d0658f5398209aa0a478c5a6b4fa1b67476e0fc317d6e25bc0fc54a8 SHA512 8f886d3c60959f009cf5f626f64071eb5d768ebf6c5ac0dd0c0c34d866d29563a2f0c68519363170ac35595cc743b432f46a54ce10bbfa530971f56b9914b0a9 AUX bareos-fd-21-r1.initd 277 BLAKE2B 5a7472682a53dbd752be1c3f7fe4f5efcf8fc9400b92eab12824f9ae0a524e279010e05e9908db4522a955ee09cff72f34dfa6de9227fcb96c422a5eef6cebc1 SHA512 9828b8a296ca731d3dbc04380f728fff8831232c2ff04275760147b24d457aa518a43d5daf9cb808e84dbb9a100dc624eeb0fc73f1261060eae6e4d7264ce4c6 AUX bareos-fd-21.confd 208 BLAKE2B 9bf3a34ee07741bdc22aa96f931c46349f8e3fd3147d8afe009904d171af2aabc14472f6c6a3d241ad395aaa0a1b575f37e0734eb6b10474bdc636294b32ab09 SHA512 4bdf1e9d5f2f7a85efdf9aaaa0d35daadf83e766afeccdba69a94490a2e59c0b46fbbbdb1dcd5be389603ac5a196fe35c0fb389bc241eab0bf414c9ec432451f -AUX bareos-fd.confd 208 BLAKE2B a2c4692fd2736604ebd1f12d84f300bac8df46a08859ce61cca8417d2645f75bb14f24b5f4fcad70175b11d28a4c052116a1fe99028d634a2fe1fa89cf2c4313 SHA512 8134d37f9d74ced01e769c1a04461e0141cc88cc305441079d9e672d29083ff4ab329a2c36dd2bdc9b7f07204233ff1b6ebd72af2dcbb15af63759be9d0878bc -AUX bareos-fd.initd 250 BLAKE2B 28d4f6b5ced14de5504bbb1594f72d10dbecfba81a754a2784087d6e544ef811160d711182bdb3efca9c5bc929dfa0781bc229059a8330800b587652d6748a60 SHA512 0005b20094f8e7d388455d73573243f46ba38f626d602b2b452e783a07fef66494a0bd1257d96748b4e9798f24d58788d824b2bf00fd1e13a0c2b44e415fc45e AUX bareos-fd.service 670 BLAKE2B b6a93c1ccc74d11c744783993ac68b31ec896e2bc7464fb7295677af86cd86a45c7bdae6c597c7eb2e9fb663a4757455b324260f96503e3d1632f9534b06048b SHA512 33304e148710f3ddb90d75e8803908646e43971e01ca590bb88f3ec03fd83c848123747a86c974ef4529eaadf77a31e24f833205bf810b0803cf0e46f846f5fa -AUX bareos-gcc13-fixes.patch 4047 BLAKE2B 2f572888dc6efab15b245827165fea74b1bb0819c74b8367224f6a32b2b79427180ff2562fb473c188aaf1ec63512cafa54fefee860474da5dd1d2a36a2b8058 SHA512 4c42b780666cada8c7ffe5312783e756636d5080848e1dcc85d6b59973d1ce3078abfeb8f2375bded0b9418d61027304a24e48c209644513b4ab1f79f89501ac AUX bareos-sd-21-r1.initd 360 BLAKE2B 89fcefe6044205ec1302bb01ddf2650fe81746739aa5274c86e9af97aa8251ce0a822da3d74c3bad7510f3ea70cb40aaeff085a000f850287f7920293db36529 SHA512 1c00533a7885e31c4674b0fbb6c63d2ce2289d14dc546b66712f007d44a398bf0ef63b83b06716a0913f3b007dfd5bb7d6c65ce4d75354e036dfbe80187fcad3 AUX bareos-sd-21.confd 360 BLAKE2B 36a73a27a635ec1a4c3d1592e896ba85c3c7d6e91c3c0a2e5057194b6fde8eff6576794c00c0838f27c8165fbc2c65c77f6e2e9cc684fa6c1f978b56701618a3 SHA512 eb5d942edb45d349804c90eb0379cfabca765d63277b21feb4f1937ef8b655b6ba9feb3b671b61f582996ff4f9740614c197ae990c00879731ec43d6da8f4286 -AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4cb339ce5ac4b27717db6d609a71b8e318fb297a6065c6ce0c20d6e18180a9d47843de5299a43ce6cd SHA512 4077174b5b49f425d53ec36bde039cee0dc55204c1127467c01bb57c58e6495e000b032f060c5ae6d757472934127776667a78238bcc28fbbe7a713d3da18039 -AUX bareos-sd.initd 654 BLAKE2B 9cec4086c4ee0a5bbb2643a2e9179d09094281f6f93c99d1a3feeae5fff8a9ce1fdd259e09dce5f32c487209c87291d995d10b365d4f56dfbf1eb1aa245f919f SHA512 afb360c071118f72581d45c3db66a49e65c412d9aeb68e6b7d1dedc63b1b9cee4a81f9176d1ebfe800e284ba844d1f74bcfad69eec25d3dd41dcfc51832a7171 AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646eacdf31271a0cafd63e88ac463b1d94143ccac96c289de3f88a177edab665f073e7c7692037ffedb68 SHA512 6a0fdb3af03e9f94e0d755a3286aff36b41ab1f00a82e9864f6d3de6931691f6aba79aeb7fc952cec039e4174b545f53c23e96fcfbaed71192877d201b3086ad AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B 5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311 SHA512 643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738 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 deleted file mode 100644 index 9d3cf8092e1c..000000000000 --- a/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-dir.confd b/app-backup/bareos/files/bareos-dir.confd deleted file mode 100644 index 6d755bf93344..000000000000 --- a/app-backup/bareos/files/bareos-dir.confd +++ /dev/null @@ -1,17 +0,0 @@ -# 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 deleted file mode 100644 index a2986d133cc3..000000000000 --- a/app-backup/bareos/files/bareos-dir.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100644 index f0a611715487..000000000000 --- a/app-backup/bareos/files/bareos-dir.service +++ /dev/null @@ -1,30 +0,0 @@ -# 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.confd b/app-backup/bareos/files/bareos-fd.confd deleted file mode 100644 index 5e429a6bd31c..000000000000 --- a/app-backup/bareos/files/bareos-fd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# 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 deleted file mode 100644 index 31d9342c1f0e..000000000000 --- a/app-backup/bareos/files/bareos-fd.initd +++ /dev/null @@ -1,11 +0,0 @@ -#!/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-gcc13-fixes.patch b/app-backup/bareos/files/bareos-gcc13-fixes.patch deleted file mode 100644 index 1cd12621b4e4..000000000000 --- a/app-backup/bareos/files/bareos-gcc13-fixes.patch +++ /dev/null @@ -1,124 +0,0 @@ -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.confd b/app-backup/bareos/files/bareos-sd.confd deleted file mode 100644 index d0153b2b30b5..000000000000 --- a/app-backup/bareos/files/bareos-sd.confd +++ /dev/null @@ -1,10 +0,0 @@ -# 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 deleted file mode 100644 index a4a45343d137..000000000000 --- a/app-backup/bareos/files/bareos-sd.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/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" -- cgit v1.2.3