[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2024-02-17 Thread David Seifert 
commit: 8f5aaf3f05f8d3b93ab0fb83d69afe84c3b148c2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Feb 17 14:35:10 2024 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 17 14:35:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5aaf3f

app-backup/bareos: remove unused patches/files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 .../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 
 9 files changed, 271 deletions(-)

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..
--- 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.0 -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.0 -0930
-+++ bareos-Release-20.0.2/core/platforms/CMakeLists.txt2021-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..
--- 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..
--- 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..
--- 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
-

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2023-06-18 Thread Marc Schiffbauer 
commit: 81b05212537ac738d9f056cc93c23602795a5d8b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jun 11 13:03:11 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Jun 18 11:13:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b05212

app-backup/bareos: remove unused files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31387
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/bareos-dir-21.initd | 22 --
 app-backup/bareos/files/bareos-fd-21.initd  | 21 -
 app-backup/bareos/files/bareos-sd-21.initd  | 21 -
 3 files changed, 64 deletions(-)

diff --git a/app-backup/bareos/files/bareos-dir-21.initd 
b/app-backup/bareos/files/bareos-dir-21.initd
deleted file mode 100644
index 916ee13b36ce..
--- a/app-backup/bareos/files/bareos-dir-21.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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-fd-21.initd 
b/app-backup/bareos/files/bareos-fd-21.initd
deleted file mode 100644
index f0632261a0c5..
--- a/app-backup/bareos/files/bareos-fd-21.initd
+++ /dev/null
@@ -1,21 +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() {
-   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-sd-21.initd 
b/app-backup/bareos/files/bareos-sd-21.initd
deleted file mode 100644
index 07091dbd74c5..
--- a/app-backup/bareos/files/bareos-sd-21.initd
+++ /dev/null
@@ -1,21 +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() {
-   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 $?
-}

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2023-04-20 Thread Marc Schiffbauer 
commit: 6727fea1fac8cf7523aa734a047c25b70fb710b9
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Apr 20 16:44:17 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Apr 20 20:22:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6727fea1

app-backup/bareos: fix gcc13 compile error in 20.0.8

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/bareos-20.0.8-r1.ebuild| 394 +++
 app-backup/bareos/files/bareos-gcc13-fixes.patch | 124 +++
 2 files changed, 518 insertions(+)

diff --git a/app-backup/bareos/bareos-20.0.8-r1.ebuild 
b/app-backup/bareos/bareos-20.0.8-r1.ebuild
new file mode 100644
index ..7261e6e6745f
--- /dev/null
+++ b/app-backup/bareos/bareos-20.0.8-r1.ebuild
@@ -0,0 +1,394 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..10} )
+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"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+   logwatch mysql ndmp +postgres readline scsi-crypto
+   sqlite static +storage-daemon systemd tcpd 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}
+   postgres? ( dev-db/postgresql:*[threads] )
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   director? (
+   virtual/mta
+   jansson? ( dev-libs/jansson:= )
+   )
+   )
+   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] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   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}"
+
+REQUIRED_USE="
+   !clientonly? ( || ( mysql postgres sqlite ) )
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+   use mysql&& export mydbtypes+=( mysql )
+   use postgres && export mydbtypes+=( postgresql )
+   use sqlite   && export mydbtypes+=( sqlite )
+
+   # enables default database driver in catalog
+   pushd core/src/defaultconfigs >&/dev/null || die
+   sed -i -e 's/#dbdriver/dbdriver/' -e 
'/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' \
+   $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) || die 
"sed on MyCatalog.conf.in failed"
+   popd >&/dev/null || die
+
+   # fix gentoo platform support
+   eapply -p1 "${FILESDIR}/${PN}-20.0.2-cmake-gentoo.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"
+
+   # disable dird and stored plugins, because of
+   # py2 dependency
+   cd "${S}/core/src/plugins"
+   cmake_comment_add_subdirectory dird
+   cmake_comment_add_subdirectory stored
+   cd -
+
+   CMAKE_USE_DIR="$S/core"
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=()
+
+   CMAKE_USE_DIR="$S/core"
+
+   pushd core/platforms >&/dev/null || die
+   cmake_comment_add_subdirectory '${DISTNAME}'
+   popd >&/dev/null || die
+
+   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 mysql lmdb; do
+   mycmakeargs+=( -D$useflag=$(usex $useflag) )
+

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2022-12-16 Thread Marc Schiffbauer 
commit: 5fd6f2b723cc86466420b69a487cbbe7e58571d9
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Dec 16 13:27:17 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Dec 16 13:27:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd6f2b7

app-backup/bareos: fix pidfile name for sd

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/bareos-sd-21-r1.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/files/bareos-sd-21-r1.initd 
b/app-backup/bareos/files/bareos-sd-21-r1.initd
index 9eaed8025d0a..d6a5765a74a4 100644
--- a/app-backup/bareos/files/bareos-sd-21-r1.initd
+++ b/app-backup/bareos/files/bareos-sd-21-r1.initd
@@ -13,4 +13,4 @@ start_pre() {
 command="/usr/sbin/bareos-sd"
 command_args="-f ${DIR_OPTIONS}"
 command_background="true"
-pidfile="/run/bareos/bareos-dir.9103.pid"
+pidfile="/run/bareos/bareos-sd.9103.pid"

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2022-12-10 Thread Marc Schiffbauer 
commit: 36e288262d4a9993fe3528ca913f174cdd4de0f3
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Dec 10 18:30:19 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Dec 10 18:31:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e28826

app-backup/bareos: improve openrc init scripts

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/bareos-dir.initd | 4 
 app-backup/bareos/files/bareos-sd.initd  | 4 
 2 files changed, 8 insertions(+)

diff --git a/app-backup/bareos/files/bareos-dir.initd 
b/app-backup/bareos/files/bareos-dir.initd
index 0bb566582f4c..a2986d133cc3 100644
--- a/app-backup/bareos/files/bareos-dir.initd
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -8,6 +8,10 @@ depend() {
 
 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() {

diff --git a/app-backup/bareos/files/bareos-sd.initd 
b/app-backup/bareos/files/bareos-sd.initd
index 222dc95f47d5..a4a45343d137 100644
--- a/app-backup/bareos/files/bareos-sd.initd
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -8,6 +8,10 @@ depend() {
 
 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() {

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2022-12-10 Thread Marc Schiffbauer 
commit: 664fb6333ce395cd075283c7b975af3ae128d5d3
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Dec 10 18:02:40 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Dec 10 18:09:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664fb633

app-backup/bareos: add 20.0.8

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-20.0.8.ebuild | 393 +
 .../bareos/files/bareos-20.0.2-cmake-gentoo.patch  |  24 ++
 app-backup/bareos/files/bareos-dir.initd   |  30 +-
 app-backup/bareos/files/bareos-fd.initd|  16 +-
 app-backup/bareos/files/bareos-sd.initd|  30 +-
 app-backup/bareos/metadata.xml |   1 +
 7 files changed, 442 insertions(+), 53 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 0325b45696fd..e9d91ab26b15 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,2 +1,3 @@
+DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 
5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75
 SHA512 
1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B 
e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941
 SHA512 
acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1
 DIST bareos-21.1.5.tar.gz 11655244 BLAKE2B 
18ef42669cfdd7a663910fa1ce9b46f12eab0aa3a2106e9877dc3d341e9a7b309c21bc1768d4873d626938fcbb2084884a85d6dcef0aa2834b117aef1034d28f
 SHA512 
637c6c0500ff31bb2c87f27d87f908d49836191afb880de4b636432b9c20433ec6f32f5805aaa7fb57f2f99a0201c51802c8d213ee5573642698f74da4cb06b7

diff --git a/app-backup/bareos/bareos-20.0.8.ebuild 
b/app-backup/bareos/bareos-20.0.8.ebuild
new file mode 100644
index ..df9da51888cc
--- /dev/null
+++ b/app-backup/bareos/bareos-20.0.8.ebuild
@@ -0,0 +1,393 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+   logwatch mysql ndmp +postgres readline scsi-crypto
+   sqlite static +storage-daemon systemd tcpd 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}
+   postgres? ( dev-db/postgresql:*[threads] )
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   director? (
+   virtual/mta
+   jansson? ( dev-libs/jansson:= )
+   )
+   )
+   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] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   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}"
+
+REQUIRED_USE="
+   !clientonly? ( || ( mysql postgres sqlite ) )
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+   use mysql&& export mydbtypes+=( mysql )
+   use postgres && export mydbtypes+=( postgresql )
+   use sqlite   && export mydbtypes+=( sqlite )
+
+   # enables default database driver in catalog
+   pushd core/src/defaultconfigs >&/dev/null || die
+   sed -i -e 's/#dbdriver

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2022-11-25 Thread Conrad Kostecki 
commit: aabd7357b827327c6e4a772cd8dcf9560ecced6b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Nov 25 15:48:32 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Nov 25 17:48:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabd7357

app-backup/bareos: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28428
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../bareos/files/bareos-20.0.2-cmake-gentoo.patch  | 24 --
 app-backup/bareos/files/bareos-cmake-gentoo.patch  | 11 --
 2 files changed, 35 deletions(-)

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..
--- 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.0 -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.0 -0930
-+++ bareos-Release-20.0.2/core/platforms/CMakeLists.txt2021-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-cmake-gentoo.patch 
b/app-backup/bareos/files/bareos-cmake-gentoo.patch
deleted file mode 100644
index 0f67a9e5d9de..
--- a/app-backup/bareos/files/bareos-cmake-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 core/cmake/distname.sh.orig2019-01-31 12:39:26.0 +0100
-+++ core/cmake/distname.sh 2019-02-05 10:26:43.258936535 +0100
-@@ -134,7 +134,7 @@
-   elif test -f /etc/gentoo-release
-   then
-  DISTNAME=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

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2022-03-25 Thread Marc Schiffbauer 
commit: 30f8233e70e490096f9412e42eb55af66159ae97
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Mar 25 07:29:35 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Mar 25 07:30:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f8233e

app-backup/bareos: rm old USE flags and patches

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/bareos-cmake-rados.patch| 21 -
 .../bareos-cmake-symlink-default-db-backend.patch   |  9 -
 app-backup/bareos/metadata.xml  |  6 --
 3 files changed, 36 deletions(-)

diff --git a/app-backup/bareos/files/bareos-cmake-rados.patch 
b/app-backup/bareos/files/bareos-cmake-rados.patch
deleted file mode 100644
index c9a0c176692e..
--- a/app-backup/bareos/files/bareos-cmake-rados.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 core/cmake/BareosCheckSymbols.cmake.orig   2018-12-05 23:39:37.307627387 
+0100
-+++ core/cmake/BareosCheckSymbols.cmake2018-12-05 23:40:00.999464771 
+0100
-@@ -21,7 +21,7 @@
- 
- 
- CHECK_SYMBOL_EXISTS(__stub_lchmod features.h LCHMOD_IS_A_STUB1)
--CHECK_SYMBOL_EXISTS(__stub___lchmod  features_h LCHMOD_IS_A_STUB2)
-+#CHECK_SYMBOL_EXISTS(__stub___lchmod  features_h LCHMOD_IS_A_STUB2)
- 
- 
- 
-@@ -43,7 +43,9 @@
- 
- cmake_push_check_state()
- SET(CMAKE_REQUIRED_LIBRARIES ${RADOS_LIBRARIES})
-+if ("${HAVE_RADOS}")
- CHECK_SYMBOL_EXISTS(rados_ioctx_set_namespace rados/librados.h  
HAVE_RADOS_NAMESPACES)
- CHECK_SYMBOL_EXISTS(rados_nobjects_list_open rados/librados.h 
HAVE_RADOS_NOBJECTS_LIST)
-+endif()
- cmake_pop_check_state()
- 

diff --git 
a/app-backup/bareos/files/bareos-cmake-symlink-default-db-backend.patch 
b/app-backup/bareos/files/bareos-cmake-symlink-default-db-backend.patch
deleted file mode 100644
index 8c46fdf0dc86..
--- a/app-backup/bareos/files/bareos-cmake-symlink-default-db-backend.patch
+++ /dev/null
@@ -1,9 +0,0 @@
 
work/bareos-Release-18.2.5/core/cmake/bareos-symlink-default-db-backend.cmake.orig
 2019-01-31 12:39:26.0 +0100
-+++ 
work/bareos-Release-18.2.5/core/cmake/bareos-symlink-default-db-backend.cmake   
   2019-02-05 11:00:24.559983661 +0100
-@@ -19,5 +19,5 @@
- MESSAGE(STATUS "${CMAKE_COMMAND} -E create_symlink 
${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} 
${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}")
- execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-
${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
--   
${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
-+   
$ENV{DESTDIR}/${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
-)

diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index a2d98845f1a5..74fcd0331c3a 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -7,20 +7,14 @@
   
   
 Enable ceph support
-Enable cephfs storage backend
 Only install file-daemon (client)
 Install director
-Enable support vor lz4, lz4hc and lzfast using 
dev-libs/bareos-fastlzlib
 Enable glusterfs storage backend
-When ssl is enabled, use GnuTLS instead of 
OpenSSL
 JSON API support using JANSSON for director
 enable build of LMDB support for faster accurate 
backup
 Install support files for logwatch
 Enable support for NDMP (Network Data Management 
Protocol)
-Enable rados storage backend
-Enable use of rados-striper
 Enable low level SCSI crypto support
-Enable SQL pooling support
 Install storage daemon (bareos-sd)
 Enable bareos-fd VMware plugin

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2022-02-06 Thread Marc Schiffbauer 
commit: f9aa2491329e3b770bfa24a8139c8fde245f1867
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Feb  7 07:23:25 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Feb  7 07:30:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9aa2491

app-backup/bareos: fix pid file creation

Closes: https://bugs.gentoo.org/832805
Signed-off-by: Marc Schiffbauer  gentoo.org>

 ...eos-21.0.0-r1.ebuild => bareos-21.0.0-r2.ebuild} | 11 +++
 app-backup/bareos/files/bareos-dir-21.confd |  2 +-
 app-backup/bareos/files/bareos-dir-21.initd | 17 -
 app-backup/bareos/files/bareos-fd-21.confd  |  7 +++
 app-backup/bareos/files/bareos-fd-21.initd  | 21 +
 app-backup/bareos/files/bareos-sd-21.confd  | 10 ++
 app-backup/bareos/files/bareos-sd-21.initd  | 21 +
 7 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/app-backup/bareos/bareos-21.0.0-r1.ebuild 
b/app-backup/bareos/bareos-21.0.0-r2.ebuild
similarity index 96%
rename from app-backup/bareos/bareos-21.0.0-r1.ebuild
rename to app-backup/bareos/bareos-21.0.0-r2.ebuild
index 787a7074b9fc..4baeaaf6c0ec 100644
--- a/app-backup/bareos/bareos-21.0.0-r1.ebuild
+++ b/app-backup/bareos/bareos-21.0.0-r2.ebuild
@@ -332,21 +332,16 @@ src_install() {
myscripts="bareos-fd"
if ! use clientonly; then
if use director; then
-   myscripts+=" bareos-dir-21"
+   myscripts+=" bareos-dir"
fi
if use storage-daemon; then
myscripts+=" bareos-sd"
fi
fi
for script in ${myscripts}; do
-   # copy over init script and config to a temporary location
-   # so we can modify them as needed
-   cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die 
"failed to copy ${script}.confd"
-   cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die 
"failed to copy ${script}.initd"
-
# install init script and config
-   newinitd "${T}/${script}".initd "${script/-21/}"
-   newconfd "${T}/${script}".confd "${script/-21/}"
+   newinitd "${FILESDIR}/${script}-21".initd "${script}"
+   newconfd "${FILESDIR}/${script}-21".confd "${script}"
done
 
# install systemd unit files

diff --git a/app-backup/bareos/files/bareos-dir-21.confd 
b/app-backup/bareos/files/bareos-dir-21.confd
index 3ad4b7482f93..4e2ee55d8924 100644
--- a/app-backup/bareos/files/bareos-dir-21.confd
+++ b/app-backup/bareos/files/bareos-dir-21.confd
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Config file for /etc/init.d/bareos-dir

diff --git a/app-backup/bareos/files/bareos-dir-21.initd 
b/app-backup/bareos/files/bareos-dir-21.initd
index 7100b615105c..916ee13b36ce 100644
--- a/app-backup/bareos/files/bareos-dir-21.initd
+++ b/app-backup/bareos/files/bareos-dir-21.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -9,23 +9,14 @@ depend() {
 
 start() {
ebegin "Starting bareos director"
-   # g+w until #631598 is resolved
-   checkpath -d -m 0770 -o root:bareos /run/bareos
+   checkpath -d -m 0750 -o root:bareos /run/bareos
start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
-   -- ${DIR_OPTIONS}
-   # harden pid file until #631598 is resolved
-   ewaitfile 10 /run/bareos/bareos-dir.9101.pid
-   chown root:bareos /run/bareos/bareos-dir.9101.pid
+   -- -p /run/bareos/bareos-dir.9101.pid ${DIR_OPTIONS}
eend $?
 }
 
 stop() {
ebegin "Stopping bareos director"
-   # check pid file until #631598 is resolved
-   if [[ $(stat -c %U /run/bareos/bareos-dir.9101.pid) != "root" ]]; then
-   eerror "SECURITY ALERT: pid file is not root owned anymore?! 
(see #631598)"
-   else
-   start-stop-daemon --stop --quiet --pidfile 
/run/bareos/bareos-dir.9101.pid
-   fi
+   start-stop-daemon --stop --quiet --pidfile 
/run/bareos/bareos-dir.9101.pid
eend $?
 }

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 ..407f2a8828eb
--- /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/fil

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2022-02-01 Thread Marc Schiffbauer 
commit: bb4196df66ab885e344a752b394142c11ae7ea67
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Feb  1 10:01:53 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Feb  1 10:02:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4196df

app-backup/bareos: add 21.0.0

Closes: https://bugs.gentoo.org/830682
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-21.0.0.ebuild | 358 +
 .../bareos/files/bareos-21-cmake-gentoo.patch  |  12 +
 app-backup/bareos/files/bareos-dir-21.confd|  10 +
 app-backup/bareos/files/bareos-dir-21.initd|  31 ++
 app-backup/bareos/files/bareos-dir-21.service  |  32 ++
 6 files changed, 444 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 406a45ba107a..b10d1c65a297 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
 DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 
765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015
 SHA512 
1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
 DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 
2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0
 SHA512 
46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
 DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B 
c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b
 SHA512 
3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
+DIST bareos-21.0.0.tar.gz 11306618 BLAKE2B 
0363465c40a8053bb5ec772c18ac0dc852f379979e3afc45dd29c79f8187238363c1f07e2f39d25613404b1b6e253700b33b274389ca2dc4655d201bc4888166
 SHA512 
0a57bccca0589f3ce8a5664afbeb1eb1b17ec7142722e2d0bb2a0bbd9007688725b39c6db59646c180ce096e55451c09934e6479a2b4deeb4d3ee738ab2c32cd

diff --git a/app-backup/bareos/bareos-21.0.0.ebuild 
b/app-backup/bareos/bareos-21.0.0.ebuild
new file mode 100644
index ..3a2b763a61dd
--- /dev/null
+++ b/app-backup/bareos/bareos-21.0.0.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+   logwatch ndmp readline scsi-crypto
+   static +storage-daemon systemd tcpd 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
+   jansson? ( dev-libs/jansson:= )
+   )
+   )
+   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] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   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}"
+
+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"
+   ew

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2021-09-08 Thread Marc Schiffbauer 
commit: 98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Sep  8 23:18:52 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Sep  8 23:40:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98caaa05

app-backup/bareos: systemd workaround for #631598

When using systemd. sd and dir services should not
depend on the PID files, so we use bareos-sd and bareos-dir as
foreground services for which systemd does not need PID files

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/bareos-dir.service | 9 ++---
 app-backup/bareos/files/bareos-sd.service  | 9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app-backup/bareos/files/bareos-dir.service 
b/app-backup/bareos/files/bareos-dir.service
index a342671d0d0..f0a61171548 100644
--- a/app-backup/bareos/files/bareos-dir.service
+++ b/app-backup/bareos/files/bareos-dir.service
@@ -11,14 +11,17 @@ After=nss-lookup.target network.target remote-fs.target 
time-sync.target postgre
 ConditionPathIsDirectory=/var/lib/bareos
 
 [Service]
-Type=forking
+# see bug #631598
+#Type=forking
+Type=simple
 User=bareos
 Group=bareos
 WorkingDirectory=/var/lib/bareos
-PIDFile=/run/bareos/bareos-dir.9101.pid
+#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
+ExecStart=/usr/sbin/bareos-dir -f
 SuccessExitStatus=0 1 15
 #Restart=on-failure
 

diff --git a/app-backup/bareos/files/bareos-sd.service 
b/app-backup/bareos/files/bareos-sd.service
index 80d9edbc973..acf8cb0156e 100644
--- a/app-backup/bareos/files/bareos-sd.service
+++ b/app-backup/bareos/files/bareos-sd.service
@@ -10,14 +10,17 @@ 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
+# see bug #631598
+#Type=forking
+Type=simple
 User=root
 Group=bareos
 WorkingDirectory=/var/lib/bareos
-PIDFile=/run/bareos/bareos-sd.9103.pid
+#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
+ExecStart=/usr/sbin/bareos-sd -f
 # enable this for scsicrypto-sd
 # CapabilityBoundingSet=cap_sys_rawio+ep
 SuccessExitStatus=0 15

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2021-08-20 Thread Marc Schiffbauer 
commit: 4f9b633db556b1e0eec81fb835b0ea9c07001b0e
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Aug 20 12:35:14 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Aug 20 12:35:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f9b633d

app-backup/bareos: cleanup 17.2 (EOL)

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest  |   1 -
 app-backup/bareos/bareos-17.2.10.ebuild | 358 
 app-backup/bareos/files/bareos-dir.confd-16 |  17 --
 app-backup/bareos/files/bareos-dir.service  |  13 -
 app-backup/bareos/files/bareos-fd.confd-16  |   7 -
 app-backup/bareos/files/bareos-fd.service   |  12 -
 app-backup/bareos/files/bareos-sd.confd-16  |  10 -
 app-backup/bareos/files/bareos-sd.service   |  12 -
 8 files changed, 430 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 54825eab2ce..4fc2c693c6b 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,3 @@
-DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B 
d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001
 SHA512 
3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
 DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B 
ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096
 SHA512 
2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
 DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 
93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626
 SHA512 
b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
 DIST bareos-20.0.2.tar.gz 1946 BLAKE2B 
f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536
 SHA512 
f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994

diff --git a/app-backup/bareos/bareos-17.2.10.ebuild 
b/app-backup/bareos/bareos-17.2.10.ebuild
deleted file mode 100644
index bcf92fecb1c..000
--- a/app-backup/bareos/bareos-17.2.10.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop systemd
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bareos.org/";
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson 
lmdb
-   logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto
-   sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax"
-REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
-
-DEPEND="
-   !app-backup/bacula
-   acct-group/${PN}
-   cephfs? ( sys-cluster/ceph )
-   rados? ( sys-cluster/ceph )
-   rados-striper? ( >=sys-cluster/ceph-0.94.2 )
-   glusterfs? ( sys-cluster/glusterfs )
-   lmdb? ( dev-db/lmdb )
-   dev-libs/gmp:0
-   !clientonly? (
-   acct-user/${PN}
-   postgres? ( dev-db/postgresql:*[threads] )
-   mysql? ( dev-db/mysql-connector-c:0= )
-   sqlite? ( dev-db/sqlite:3 )
-   director? (
-   virtual/mta
-   jansson? ( dev-libs/jansson )
-   )
-   )
-   fastlz? ( dev-libs/bareos-fastlzlib )
-   logwatch? ( sys-apps/logwatch )
-   tcpd? ( sys-apps/tcp-wrappers )
-   readline? ( sys-libs/readline:0 )
-   static? (
-   acl? ( virtual/acl[static-libs] )
-   sys-libs/zlib[static-libs]
-   dev-libs/lzo[static-libs]
-   sys-libs/ncurses:=[static-libs]
-   ssl? (
-   !gnutls? (
-   dev-libs/openssl:0=[static-libs]
-   )
-   gnutls? ( net-libs/gnutls[static-libs] )
-   )
-   )
-   !static? (
-   acl? ( virtual/acl )
-   dev-libs/lzo
-   ssl? (
-   !gnutls? (
-   dev-libs/openssl:0=
-   )
-   gnutls? ( net-libs/gnutls )
-   )
-   sys-libs/ncurses:=
-   sys-libs/zlib
-   )
-   "
-RDEPEND="${DEPEND}
-   !clientonly? (
-   storage-daemon? (

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2021-08-20 Thread Marc Schiffbauer 
commit: 2957a300fdebd1ecba8e7041ba4cf71f56729dbc
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Aug 20 12:32:59 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Aug 20 12:32:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2957a300

app-bareos: harden pid directory

Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/bareos-dir.initd   | 2 +-
 app-backup/bareos/files/bareos-fd.initd| 2 +-
 app-backup/bareos/files/bareos-sd.initd| 2 +-
 app-backup/bareos/files/tmpfiles.d-bareos.conf | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-backup/bareos/files/bareos-dir.initd 
b/app-backup/bareos/files/bareos-dir.initd
index 826d27a829c..9f17f212e4a 100644
--- a/app-backup/bareos/files/bareos-dir.initd
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -8,7 +8,7 @@ depend() {
 
 start() {
ebegin "Starting bareos director"
-   checkpath -d -m 0750 -o bareos:bareos /run/bareos
+   checkpath -d -m 0750 -o root:bareos /run/bareos
start-stop-daemon --start --quiet --exec /usr/sbin/bareos-dir \
-- ${DIR_OPTIONS}
eend $?

diff --git a/app-backup/bareos/files/bareos-fd.initd 
b/app-backup/bareos/files/bareos-fd.initd
index e272daa88ec..e65e6c80f32 100644
--- a/app-backup/bareos/files/bareos-fd.initd
+++ b/app-backup/bareos/files/bareos-fd.initd
@@ -8,7 +8,7 @@ depend() {
 
 start() {
ebegin "Starting bareos file daemon"
-   checkpath -d -m 0750 /run/bareos
+   checkpath -d -m 0750 -o root:bareos /run/bareos
start-stop-daemon --start --quiet --exec /usr/sbin/bareos-fd \
-- ${FD_OPTIONS}
eend $?

diff --git a/app-backup/bareos/files/bareos-sd.initd 
b/app-backup/bareos/files/bareos-sd.initd
index f20be4ecf56..4f7fbcb52bf 100644
--- a/app-backup/bareos/files/bareos-sd.initd
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -8,7 +8,7 @@ depend() {
 
 start() {
ebegin "Starting bareos storage daemon"
-   checkpath -d -m 0750 -o bareos:bareos /run/bareos
+   checkpath -d -m 0750 -o root:bareos /run/bareos
start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
-- ${SD_OPTIONS}
eend $?

diff --git a/app-backup/bareos/files/tmpfiles.d-bareos.conf 
b/app-backup/bareos/files/tmpfiles.d-bareos.conf
index 6e2dacc41ad..81c57569c45 100644
--- a/app-backup/bareos/files/tmpfiles.d-bareos.conf
+++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf
@@ -1 +1 @@
-d /run/bareos 0770 bareos bareos -
+d /run/bareos 0750 root bareos -

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2021-08-20 Thread Marc Schiffbauer 
commit: 1e641adb3f6db73b42ac26cb45dcfb64e4ddb07b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Aug 20 11:20:15 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Aug 20 11:20:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e641adb

app-backup/bareos: add new version

Closes: https://bugs.gentoo.org/761667
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-20.0.2.ebuild | 396 +
 .../bareos/files/bareos-20.0.2-cmake-gentoo.patch  |  24 ++
 app-backup/bareos/metadata.xml |   3 +-
 4 files changed, 423 insertions(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index ec3c6292096..54825eab2ce 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
 DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B 
d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001
 SHA512 
3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
 DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B 
ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096
 SHA512 
2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
 DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 
93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626
 SHA512 
b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
+DIST bareos-20.0.2.tar.gz 1946 BLAKE2B 
f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536
 SHA512 
f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994

diff --git a/app-backup/bareos/bareos-20.0.2.ebuild 
b/app-backup/bareos/bareos-20.0.2.ebuild
new file mode 100644
index 000..ac4113bf49b
--- /dev/null
+++ b/app-backup/bareos/bareos-20.0.2.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+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"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+   logwatch mysql ndmp +postgres readline scsi-crypto
+   sqlite static +storage-daemon systemd tcpd 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}
+   postgres? ( dev-db/postgresql:*[threads] )
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   director? (
+   virtual/mta
+   jansson? ( dev-libs/jansson )
+   )
+   )
+   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] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   vmware? ( dev-lang/python:2.7 )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+BDEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="
+   !clientonly? ( || ( mysql postgres sqlite ) )
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+src_prepare() {
+   use mysql&& export mydbtypes+=( mysql )
+

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2020-08-03 Thread Marc Schiffbauer 
commit: 8f569ec87bdc4c56d83adf13e630b3e92185db13
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Aug  3 21:07:07 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Aug  3 21:07:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f569ec8

app-backup/bareos: add missing files/tmpfiles.d-bareos.conf

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/files/tmpfiles.d-bareos.conf | 1 +
 1 file changed, 1 insertion(+)

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 000..6e2dacc41ad
--- /dev/null
+++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf
@@ -0,0 +1 @@
+d /run/bareos 0770 bareos bareos -

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/

2020-05-13 Thread Marc Schiffbauer 
commit: d6b5a6e235b8294046cad61e14214b28bf199784
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu May 14 03:58:15 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu May 14 04:05:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b5a6e2

app-backup/bareos: cleanup files

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Marc Schiffbauer  gentoo.org>

 .../bareos/files/bareos-12.4.5-Makefile.patch  | 27 --
 .../bareos/files/bareos-12.4.5-bat-ldflags.patch   | 11 -
 2 files changed, 38 deletions(-)

diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch 
b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
deleted file mode 100644
index 3cdee15d4db..000
--- a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# stop build if there are errors in subdirs
 Makefile.in.orig   2010-07-20 16:53:44.0 +
-+++ Makefile.in2010-07-20 16:55:50.0 +
-@@ -44,9 +44,8 @@
- 
- all: Makefile
-   @for I in ${all_subdirs}; \
--do (cd $$I; echo "==>Entering directory `pwd`"; \
--$(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  
== Error in `pwd` =="; \
--  echo ""; echo ""; exit 1;)); \
-+do \
-+$(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
-   done
- 
- depend:
-@@ -55,9 +54,8 @@
-   
- bacula-fd: Makefile  
-   @for I in ${fd_subdirs}; \
--do (cd $$I; echo "==>Entering directory `pwd`"; \
--$(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   
== Error in `pwd` =="; \
--  echo ""; echo ""; exit 1;)); \
-+do \
-+  $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
-   done
- 
- #-

diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch 
b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
deleted file mode 100644
index 94d8fb60120..000
--- a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# bat needs to respect LDFLAGS
 src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.0 +
-+++ src/qt-console/bat.pro.in  2010-07-20 18:29:25.0 +
-@@ -26,6 +26,7 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2019-02-14 Thread Marc Schiffbauer 
commit: 44d1f62a4b2d7bdf2a06c814f9696cdf941943a1
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Feb 14 22:17:08 2019 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Feb 14 22:17:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d1f62a

app-backup/bareos: add new version 18.2.6

Signed-off-by: Marc Schiffbauer  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-18.2.6.ebuild | 409 +
 app-backup/bareos/files/bareos-cmake-gentoo.patch  |  11 +
 app-backup/bareos/files/bareos-cmake-rados.patch   |  21 ++
 .../bareos-cmake-symlink-default-db-backend.patch  |   9 +
 app-backup/bareos/files/bareos-dir.confd   |  17 +
 app-backup/bareos/files/bareos-fd.confd|   7 +
 app-backup/bareos/files/bareos-sd.confd|  10 +
 8 files changed, 485 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 74dba976b02..c57ee6ad7ec 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
 DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 
9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294
 SHA512 
028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00
 DIST bareos-17.2.6.tar.gz 4181984 BLAKE2B 
a1666b38626228ebf00f6a42f1a5b74c78c26a7178fa5333c9c8fb24ccfda146d20c35d35cbe43b6f53ba1b0ce1dd9b8ad30309997689c39493b51a0db9f5c9b
 SHA512 
5f5ac8cfe028c97fa3120e149f1eb029406b74530517bf6e21574bd726e26c6b78740977635b45cbc2232fda0ee28f1b4338d91a8fa0a86ba05209cce82cd0b2
 DIST bareos-17.2.7.tar.gz 4184028 BLAKE2B 
dc817ca3b21ea13d9dbd1e3c5691e09bc3adff535e0032e1fbcfff8d07b96b2bf21976f020d778dd16137e51283c2a3dcab78dbe28f7fb6f3a60d43938f6b770
 SHA512 
254eddacb067ef7e82b7a54bdfcbffd5cfa033fa045f697c7e5b5c28dd064b5e1ce9f6aa946282c60f59972beae0b1b7901882b77c3f71cf16efdd73934135cc
+DIST bareos-18.2.6.tar.gz 9991951 BLAKE2B 
9fdaf852e748f0c01d06e2fd72351e7b9bf18e8fea92307fb85437441b4ce504f9c6ddbd42cd2185b6dc08158502a7db581bef662c2bd84c86c885d6b89eebba
 SHA512 
b6618173a803db4cfc3fe7edfe8c9e4e4128195f44383cd7df5b9866da4290686ed7cb42499edec957a5d9ab8bbd92d26258ce58f13fba84fb569167956768c3

diff --git a/app-backup/bareos/bareos-18.2.6.ebuild 
b/app-backup/bareos/bareos-18.2.6.ebuild
new file mode 100644
index 000..6a140c54f77
--- /dev/null
+++ b/app-backup/bareos/bareos-18.2.6.ebuild
@@ -0,0 +1,409 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+CMAKE_WARN_UNUSED_CLI=yes
+#CMAKE_REMOVE_MODULES=yes
+
+inherit eutils multilib python-single-r1 systemd user cmake-utils
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/";
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+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"
+REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+
+DEPEND="
+   !app-backup/bacula
+   cephfs? ( sys-cluster/ceph )
+   rados? ( sys-cluster/ceph )
+   rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   postgres? ( dev-db/postgresql:*[threads] )
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   director? (
+   virtual/mta
+   jansson? ( dev-libs/jansson )
+   )
+   )
+   fastlz? ( dev-libs/bareos-fastlzlib )
+   logwatch? ( sys-apps/logwatch )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
+   gnutls? ( net-libs/gnutls[static-libs] )
+   )
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/lzo
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2018-10-27 Thread Marc Schiffbauer 
commit: e8fb9eb76185b0f7d6d8484e1417f5a5a4ea0af3
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Oct 26 21:48:11 2018 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Oct 27 21:01:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fb9eb7

app-backup/bareos: added version 17.2.6

Fixes: 642658
Signed-off-by: Marc Schiffbauer  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-17.2.6.ebuild | 388 +
 app-backup/bareos/files/bareos-dir.service |  13 +
 app-backup/bareos/files/bareos-fd.service  |  12 +
 app-backup/bareos/files/bareos-sd.service  |  12 +
 5 files changed, 426 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 3805dbf289d..5943022b495 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1 +1,2 @@
 DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 
9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294
 SHA512 
028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00
+DIST bareos-17.2.6.tar.gz 4181984 BLAKE2B 
a1666b38626228ebf00f6a42f1a5b74c78c26a7178fa5333c9c8fb24ccfda146d20c35d35cbe43b6f53ba1b0ce1dd9b8ad30309997689c39493b51a0db9f5c9b
 SHA512 
5f5ac8cfe028c97fa3120e149f1eb029406b74530517bf6e21574bd726e26c6b78740977635b45cbc2232fda0ee28f1b4338d91a8fa0a86ba05209cce82cd0b2

diff --git a/app-backup/bareos/bareos-17.2.6.ebuild 
b/app-backup/bareos/bareos-17.2.6.ebuild
new file mode 100644
index 000..25469bc0f10
--- /dev/null
+++ b/app-backup/bareos/bareos-17.2.6.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 systemd user
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/";
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+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"
+REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+
+DEPEND="
+   !app-backup/bacula
+   cephfs? ( sys-cluster/ceph )
+   rados? ( sys-cluster/ceph )
+   rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   postgres? ( dev-db/postgresql:*[threads] )
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   director? (
+   virtual/mta
+   jansson? ( dev-libs/jansson )
+   )
+   )
+   fastlz? ( dev-libs/bareos-fastlzlib )
+   logwatch? ( sys-apps/logwatch )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
+   gnutls? ( net-libs/gnutls[static-libs] )
+   )
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/lzo
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   gnutls? ( net-libs/gnutls )
+   )
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   python? ( ${PYTHON_DEPS} )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="static? ( clientonly )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_setup() {
+   use mysql && export mydbtypes+="mysql"
+   use postgres && export mydbtypes+=" postgresql"
+   use sqlite && export mydbtypes+=" sqlite"
+
+   # create the daemon group and user
+   if [ -z "$(egetent g

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2018-05-12 Thread Andreas Sturmlechner 
commit: ded9d68ffacb9892262e5bc324141dcecfbfb825
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 10 19:51:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 13 06:56:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded9d68f

app-backup/bareos: Drop Qt4-based

Closes: https://bugs.gentoo.org/644568
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-backup/bareos/Manifest   |   2 -
 app-backup/bareos/bareos-15.2.2.ebuild   | 428 ---
 app-backup/bareos/bareos-16.2.4.ebuild   | 428 ---
 app-backup/bareos/bareos-16.2.7.ebuild   | 428 ---
 app-backup/bareos/files/bareos-dir.confd |  17 --
 app-backup/bareos/files/bareos-fd.confd  |   7 -
 app-backup/bareos/files/bareos-sd.confd  |  10 -
 7 files changed, 1320 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 4cabd451436..3805dbf289d 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1 @@
-DIST bareos-15.2.2.tar.gz 3928036 BLAKE2B 
ac331008e45c029bb3320a9a40264d350aedbb5550d65a606a95372241f5ec9c8a7e73f365f8b0c3972e59fa907764995b0173dcd762971cd2fdce1e025c75e2
 SHA512 
07b11c51695a6ff348317965625e5cdb8e296d4f3a4037718a98e266d94650ed1fb905c220ac791123d8ed92d0aed24854a6ab52887249849dbc00697d3300c3
-DIST bareos-16.2.4.tar.gz 4275141 BLAKE2B 
e7b8a5658a697436401659ecd24148f4f1ad982cbd6dd46c39f3d29ba461b54737950d6fe6ec2c36e7892d414306c7038af5221c28652109e047f66f2d9daa2e
 SHA512 
91f7f2b3d9889f4faa9834dc414e2250015d3d26bf8bd0c04c1f3fd882a50a4066ced145f7c8609c070e8f74b53574953e3fef344726c6863cd7bbc73c76a88c
 DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 
9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294
 SHA512 
028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00

diff --git a/app-backup/bareos/bareos-15.2.2.ebuild 
b/app-backup/bareos/bareos-15.2.2.ebuild
deleted file mode 100644
index a90878f4449..000
--- a/app-backup/bareos/bareos-15.2.2.ebuild
+++ /dev/null
@@ -1,428 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit eutils multilib python-single-r1 qt4-r2 user
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="http://www.bareos.org/";
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson 
lmdb libressl
-   logwatch mysql ndmp postgres python qt4 rados rados-striper readline 
scsi-crypto
-   sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax"
-REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
-
-DEPEND="
-   !app-backup/bacula
-   cephfs? ( sys-cluster/ceph )
-   rados? ( sys-cluster/ceph )
-   rados-striper? ( >=sys-cluster/ceph-0.94.2 )
-   glusterfs? ( sys-cluster/glusterfs )
-   lmdb? ( dev-db/lmdb )
-   dev-libs/gmp:0
-   !clientonly? (
-   postgres? ( dev-db/postgresql:*[threads] )
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   director? (
-   virtual/mta
-   jansson? ( dev-libs/jansson )
-   )
-   )
-   qt4? (
-   dev-qt/qtsvg:4
-   x11-libs/qwt:5
-   )
-   fastlz? ( dev-libs/bareos-fastlzlib )
-   logwatch? ( sys-apps/logwatch )
-   tcpd? ( sys-apps/tcp-wrappers )
-   readline? ( sys-libs/readline:0 )
-   static? (
-   acl? ( virtual/acl[static-libs] )
-   sys-libs/zlib[static-libs]
-   dev-libs/lzo[static-libs]
-   sys-libs/ncurses:=[static-libs]
-   ssl? (
-   !gnutls? (
-   !libressl? ( dev-libs/openssl:0=[static-libs] )
-   libressl? ( dev-libs/libressl:0=[static-libs] )
-   )
-   gnutls? ( net-libs/gnutls[static-libs] )
-   )
-   )
-   !static? (
-   acl? ( virtual/acl )
-   dev-libs/lzo
-   ssl? (
-   !gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   gnutls? ( net-libs/gnutls )
-   )
-   sys-libs/ncurses:=
-   sys-libs/zlib
-   )
-   python? ( ${PYTHON_DEPS} )
-   "
-RDEPEND="${DEPEND}
-   !clientonly? (
-   storage-daem

[gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/, app-backup/bareos/

2017-12-10 Thread Marc Schiffbauer 
commit: 20df458e46b2c26c7e2a6bdc47ceac4af8f1818c
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Dec 10 22:36:54 2017 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Dec 10 22:37:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20df458e

app-backup/bareos: bump version, fix #633800

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 app-backup/bareos/Manifest  |   1 +
 app-backup/bareos/bareos-16.2.7.ebuild  | 428 
 app-backup/bareos/files/bareos-dir.confd-16 |  17 ++
 app-backup/bareos/files/bareos-fd.confd-16  |   7 +
 app-backup/bareos/files/bareos-sd.confd-16  |  10 +
 5 files changed, 463 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index edf1c9d4c42..70de9426eea 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -3,3 +3,4 @@ DIST bareos-14.2.2.tar.gz 3811787 BLAKE2B 
ace5a3d25c98df852308cef0ff603e416aff2f
 DIST bareos-14.2.5.tar.gz 3820963 BLAKE2B 
7f9736be72fbf03f277e8d8460e4343e9340c7c9fb50722566f16a09e97dcf921f54eee528e0b453e4f0251a4e91ec983006cbda027597ae98beb70265b1f22b
 SHA512 
600cdf8175b1199b73ddcf8a32df7bca446c294c4c830038f93fe3f053482916745675df3a51bc494cdab00b362d57657a34a94e78bac4bae3acced06347023d
 DIST bareos-15.2.2.tar.gz 3928036 BLAKE2B 
ac331008e45c029bb3320a9a40264d350aedbb5550d65a606a95372241f5ec9c8a7e73f365f8b0c3972e59fa907764995b0173dcd762971cd2fdce1e025c75e2
 SHA512 
07b11c51695a6ff348317965625e5cdb8e296d4f3a4037718a98e266d94650ed1fb905c220ac791123d8ed92d0aed24854a6ab52887249849dbc00697d3300c3
 DIST bareos-16.2.4.tar.gz 4275141 BLAKE2B 
e7b8a5658a697436401659ecd24148f4f1ad982cbd6dd46c39f3d29ba461b54737950d6fe6ec2c36e7892d414306c7038af5221c28652109e047f66f2d9daa2e
 SHA512 
91f7f2b3d9889f4faa9834dc414e2250015d3d26bf8bd0c04c1f3fd882a50a4066ced145f7c8609c070e8f74b53574953e3fef344726c6863cd7bbc73c76a88c
+DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 
9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294
 SHA512 
028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00

diff --git a/app-backup/bareos/bareos-16.2.7.ebuild 
b/app-backup/bareos/bareos-16.2.7.ebuild
new file mode 100644
index 000..099882b6e3d
--- /dev/null
+++ b/app-backup/bareos/bareos-16.2.7.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit eutils multilib python-single-r1 qt4-r2 user
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bareos.org/";
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson 
lmdb libressl
+   logwatch mysql ndmp postgres python qt4 rados rados-striper readline 
scsi-crypto
+   sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax"
+REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
+
+DEPEND="
+   !app-backup/bacula
+   cephfs? ( sys-cluster/ceph )
+   rados? ( sys-cluster/ceph )
+   rados-striper? ( >=sys-cluster/ceph-0.94.2 )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   postgres? ( dev-db/postgresql:*[threads] )
+   mysql? ( virtual/mysql )
+   sqlite? ( dev-db/sqlite:3 )
+   director? (
+   virtual/mta
+   jansson? ( dev-libs/jansson )
+   )
+   )
+   qt4? (
+   dev-qt/qtsvg:4
+   x11-libs/qwt:5
+   )
+   fastlz? ( dev-libs/bareos-fastlzlib )
+   logwatch? ( sys-apps/logwatch )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   sys-libs/zlib[static-libs]
+   dev-libs/lzo[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
+   gnutls? ( net-libs/gnutls[static-libs] )
+   )
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/lzo
+   ssl? (
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
+   gnutls? ( net-libs/gnutls )
+