summaryrefslogtreecommitdiff
path: root/app-backup/bareos
diff options
context:
space:
mode:
Diffstat (limited to 'app-backup/bareos')
-rw-r--r--app-backup/bareos/Manifest2
-rw-r--r--app-backup/bareos/bareos-18.2.6.ebuild23
2 files changed, 15 insertions, 10 deletions
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 80c813638341..4d812de884de 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -22,5 +22,5 @@ DIST bareos-18.2.6.tar.gz 9991951 BLAKE2B 9fdaf852e748f0c01d06e2fd72351e7b9bf18e
EBUILD bareos-16.2.7-r1.ebuild 11323 BLAKE2B 0abe24334ae68f7ef819d76cc03bce740158c0fa600850640eb907e33e32c07822e10633bf0d1bbb86d8acb5a0e2d0a37c228eb93544b256d68d43b32cea1748 SHA512 3c43211665dc550212218b87063d6094016db80ac9c620be9d88268d17141b9f08946faaf25ee1c90f2b58bb5519c6d96a4ce1960fdbf1c62664f94b9be55c44
EBUILD bareos-17.2.6.ebuild 11245 BLAKE2B 825e335734933a03ea224f90cb5d843dc99a3831f17387cf8e4129751e6c2d9b3b80b189f6b1be644ba4dd807f13b61121d65bef9449ba40f9f686c9c91caedd SHA512 1f2039ab93d3a7434acc66048cc674230dd7b5bd14c09860b5a493b677db34e8436669f7ae2f19fb70bec9b34f79eb72ee43b4cace821dcdde316c5a62bbae38
EBUILD bareos-17.2.7-r1.ebuild 11256 BLAKE2B 1c56690a9c413239ccb3a1e8654119164198af0948363328b964785aa21789c6dc5ff9c034d57aefa007c4fc307b86d9228d92e13dec10fa12a21c7eeb509b32 SHA512 e1e740c5f05b7d96b8a6b9c58d5876c99fc7773954ce2f37a3491229d72a156aa01139369a67d1826b0fc68d67eb65ae71540e401b905d605562da469eece1ad
-EBUILD bareos-18.2.6.ebuild 11909 BLAKE2B 791279efa5e64137af93102d14ef0de73e3520051e2692b1a64c502849fc3a6b3b2742fece0055c817d0e3c7069627902a5c4e3f2671579837c1f00648f54064 SHA512 82343c693339cd780c56592ece850bf41e0e12ce6f0a1d74c4a0712f034fc6436c9950a0a033eb05393c714e60c2da1a1b8b3c4f040bf352d45247f6e22c2334
+EBUILD bareos-18.2.6.ebuild 11998 BLAKE2B 25e45d8312ae7134536c0a23388f7e6285b720f67a283c5def9b701f008cfa744682a61f82a5286205f59c12179b8dd83f920273f65f4a022793eb04141b4f8a SHA512 9fa8945e4713f0f2cbd1726edca024e681dd91c30dcbd56e94351deaeb45c5a6793e0e8cb7075eff27900ee8e98e4287e89133fd63d8bcff4b30e896dfbcbcb2
MISC metadata.xml 1440 BLAKE2B 588672b8975b109eb293f8a251ea5745cbcdab83acac5b1efb3318e2b06eeecfb48114974fd0854fc98480a8607ef7603e0882a2c74d3a301023cdafc67348ff SHA512 b76bc10f031dc5ab0abd71980706a3beebfb50a8e7d273bdfbf85124309ba98ab4542d6e273691a8105c8c5a078b3886d891131a79c587ab62f361e7bba7b5b7
diff --git a/app-backup/bareos/bareos-18.2.6.ebuild b/app-backup/bareos/bareos-18.2.6.ebuild
index 6a140c54f77c..62f70274ab04 100644
--- a/app-backup/bareos/bareos-18.2.6.ebuild
+++ b/app-backup/bareos/bareos-18.2.6.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl
logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto
- sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
+ sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax"
REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
DEPEND="
@@ -152,7 +152,7 @@ src_configure() {
fi
for useflag in acl ipv6 ndmp readline scsi-crypto sql-pooling \
- fastlz mysql python lmdb glusterfs rados \
+ systemd fastlz mysql python lmdb glusterfs rados \
rados-striper cephfs jansson; do
mycmakeargs+=( -D$useflag=$(usex $useflag) )
@@ -189,7 +189,6 @@ src_configure() {
-Dfd-user=root
-Dfd-group=bareos
-Dsbin-perm=0755
- -Dsystemd=yes
-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1`
-Ddynamic-cats-backends=yes
-Ddynamic-storage-backends=yes
@@ -267,7 +266,9 @@ src_install() {
rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
if use clientonly || ! use director; then
- rm -vf "${D}"/lib/systemd/system/bareos-dir.service
+ if use systemd; then
+ rm -vf "${D}"/lib/systemd/system/bareos-dir.service
+ fi
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*
@@ -283,7 +284,9 @@ src_install() {
rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
fi
if use clientonly || ! use storage-daemon; then
- rm -vf "${D}"/lib/systemd/system/bareos-sd.service
+ if use systemd; then
+ rm -vf "${D}"/lib/systemd/system/bareos-sd.service
+ fi
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*
@@ -345,11 +348,13 @@ src_install() {
done
# install systemd unit files
- if ! use clientonly; then
- use director && systemd_dounit core/platforms/systemd/bareos-dir.service
- use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service
+ if use systemd; then
+ if ! use clientonly; then
+ use director && systemd_dounit core/platforms/systemd/bareos-dir.service
+ use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service
+ fi
+ systemd_dounit core/platforms/systemd/bareos-fd.service
fi
- systemd_dounit core/platforms/systemd/bareos-fd.service
# make sure the working directory exists
diropts -m0750