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

2024-03-08 Thread Marc Schiffbauer
commit: 1b86fb962f0d22263f6d300c2d3a2ff1d7b971bb
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Mar  8 12:18:54 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Mar  8 12:19:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b86fb96

app-backup/bareos: add 23.0.2

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

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-23.0.2.ebuild | 435 +
 2 files changed, 436 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 131affc1f7b5..8206ffaf50c5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
 DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B 
5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311
 SHA512 
643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 
5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880
 SHA512 
76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
 DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B 
e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f
 SHA512 
5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75
+DIST bareos-23.0.2.tar.gz 14724410 BLAKE2B 
0fe86c10d62ad322dfbcd5ac972aec27d6f0ad31e156d359398739b2bfd784a02ce89b26b6bdfcf279265114a4e6e13efe21edab8b87cff15f1f9f3ad055c64b
 SHA512 
a8d8270c8060480fe87da9252de86a75eea1cc427db63536f848d19a2c23c499ca294a9656d9a6aac73a756f84c96a2d72f13d1cede7948e18bf93efc2ecfc29

diff --git a/app-backup/bareos/bareos-23.0.2.ebuild 
b/app-backup/bareos/bareos-23.0.2.ebuild
new file mode 100644
index ..f88f46187fe6
--- /dev/null
+++ b/app-backup/bareos/bareos-23.0.2.ebuild
@@ -0,0 +1,435 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+CMAKE_WARN_UNUSED_CLI=no
+
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
+
+if [[ ${PV} == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+   KEYWORDS="~amd64 ~x86"
+   S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads(+)]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   X? (
+   dev-qt/qtwidgets:5=
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads(+)]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+

[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/

2024-01-29 Thread Marc Schiffbauer
commit: 021c3649303238d351b464268c56a156c0322c1f
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Jan 29 10:27:29 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Jan 29 10:28:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=021c3649

app-backup/bareos: clean now unused USE flag

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

 app-backup/bareos/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index 212e403a0114..bc08ba42ba52 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -10,7 +10,6 @@
 Only install file-daemon (client)
 Install director
 Enable sys-cluster/glusterfs storage 
backend
-JSON API support using dev-libs/jansson 
for director
 enable build of dev-db/lmdb support for 
faster accurate backup
 Install support files for 
sys-apps/logwatch
 Enable support for NDMP (Network Data Management 
Protocol)



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

2024-01-29 Thread Marc Schiffbauer
commit: f73af68249583fe386df9cd03758bde20ac78583
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Jan 29 10:16:20 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Jan 29 10:16:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73af682

app-backup/bareos: fix build

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

 app-backup/bareos/bareos-23.0.1.ebuild | 6 --
 app-backup/bareos/bareos-.ebuild   | 6 --
 2 files changed, 12 deletions(-)

diff --git a/app-backup/bareos/bareos-23.0.1.ebuild 
b/app-backup/bareos/bareos-23.0.1.ebuild
index 675afe347439..24b7a4409e94 100644
--- a/app-backup/bareos/bareos-23.0.1.ebuild
+++ b/app-backup/bareos/bareos-23.0.1.ebuild
@@ -100,7 +100,6 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   # fix gentoo platform support
"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
"${FILESDIR}/${PN}-22.0.2-werror.patch"
"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
@@ -157,11 +156,6 @@ src_test() {
 }
 
 src_prepare() {
-   # fix gentoo platform support
-   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-   eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
-   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
 

diff --git a/app-backup/bareos/bareos-.ebuild 
b/app-backup/bareos/bareos-.ebuild
index 675afe347439..24b7a4409e94 100644
--- a/app-backup/bareos/bareos-.ebuild
+++ b/app-backup/bareos/bareos-.ebuild
@@ -100,7 +100,6 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-   # fix gentoo platform support
"${FILESDIR}/${PN}-21-cmake-gentoo.patch"
"${FILESDIR}/${PN}-22.0.2-werror.patch"
"${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
@@ -157,11 +156,6 @@ src_test() {
 }
 
 src_prepare() {
-   # fix gentoo platform support
-   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-   eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
-   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
 



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

2024-01-29 Thread Marc Schiffbauer
commit: 2cf303175d1c3a2850f54769f5b5b7792216344c
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Jan 29 10:11:25 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Jan 29 10:16:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf30317

app-backup/bareos: add gcc14 fixes for 21.1.8

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

 app-backup/bareos/{bareos-21.1.8.ebuild => bareos-21.1.8-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-backup/bareos/bareos-21.1.8.ebuild 
b/app-backup/bareos/bareos-21.1.8-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-21.1.8.ebuild
rename to app-backup/bareos/bareos-21.1.8-r1.ebuild
index 1ccdbe824abd..c1553eece5eb 100644
--- a/app-backup/bareos/bareos-21.1.8.ebuild
+++ b/app-backup/bareos/bareos-21.1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -145,6 +145,7 @@ src_prepare() {
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+   eapply "${FILESDIR}/${PN}-21.1.8-gcc14-fixes.patch"
 
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"



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

2024-01-29 Thread Marc Schiffbauer
commit: accb96ccd7e9fb4acc0710eec5abba7a3b0e3c7f
Author: Christopher Fore  posteo  net>
AuthorDate: Sat Jan 27 21:52:18 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Jan 29 09:50:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accb96cc

app-backup/bareos: Include  for GCC 14

Also moved eapply's to a PATCHES array for app-backup/bareos.

https://gcc.gnu.org/gcc-14/porting_to.html

Closes: https://bugs.gentoo.org/920489
Signed-off-by: Christopher Fore  posteo.net>
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/bareos-22.1.2-r1.ebuild  | 15 
 .../files/bareos-22.1.2-include-algorithm.patch| 41 ++
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/app-backup/bareos/bareos-22.1.2-r1.ebuild 
b/app-backup/bareos/bareos-22.1.2-r1.ebuild
index 3ec758c53539..d61de65c0fc7 100644
--- a/app-backup/bareos/bareos-22.1.2-r1.ebuild
+++ b/app-backup/bareos/bareos-22.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -99,6 +99,14 @@ REQUIRED_USE="
x86? ( !ceph )
 "
 
+PATCHES=(
+   # fix gentoo platform support
+   "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   "${FILESDIR}/${PN}-22.0.2-werror.patch"
+   "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+   "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch"
+)
+
 pkg_pretend() {
local active_removed_backend=""
if has_version "https://github.com/bareos/bareos/pull/1687/commits/3907be7ff9700d0328198b47c58885f5ec56546c
+https://bugs.gentoo.org/920489
+
+diff --git a/core/src/cats/sql_get.cc b/core/src/cats/sql_get.cc
+index b5d921c..150ebfc 100644
+--- a/core/src/cats/sql_get.cc
 b/core/src/cats/sql_get.cc
+@@ -31,6 +31,7 @@
+  */
+ 
+ #include "include/bareos.h"
++#include 
+ 
+ #if HAVE_SQLITE3 || HAVE_MYSQL || HAVE_POSTGRESQL || HAVE_INGRES || HAVE_DBI
+ 
+diff --git a/core/src/stored/append.cc b/core/src/stored/append.cc
+index 05f6784..32234d4 100644
+--- a/core/src/stored/append.cc
 b/core/src/stored/append.cc
+@@ -41,6 +41,8 @@
+ #include "lib/berrno.h"
+ #include "lib/berrno.h"
+ 
++#include 
++
+ namespace storagedaemon {
+ 
+ /* Responses sent to the daemon */
+diff --git a/core/src/dird/ua_prune.cc b/core/src/dird/ua_prune.cc
+index 9a0770c..15a0a56 100644
+--- a/core/src/dird/ua_prune.cc
 b/core/src/dird/ua_prune.cc
+@@ -40,6 +40,8 @@
+ #include "lib/edit.h"
+ #include "lib/parse_conf.h"
+ 
++#include 
++
+ namespace directordaemon {
+ 
+ /* Forward referenced functions */



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

2024-01-29 Thread Marc Schiffbauer
commit: ad434bbb7f0e4820834948adada2bdc7e27a3449
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Jan 29 09:49:29 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Jan 29 09:50:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad434bbb

app-backup/bareos: add 23.0.1

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

 app-backup/bareos/Manifest   |  1 +
 .../bareos/{bareos-.ebuild => bareos-23.0.1.ebuild}  | 16 +---
 app-backup/bareos/bareos-.ebuild | 16 +---
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c80b58d18e88..1eb4e935ecb7 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
 DIST bareos-20.0.9.tar.gz 13432902 BLAKE2B 
c92b7b2a3d8a78d2119cef21ea5f13ae4898d750ac15f5b91fc143b0ab057a7537d3a190ef7f910810190c275f5cf885f07d819c6165f49ded25d11a329b02c0
 SHA512 
04386ef9a6f83bc9569f42d9567951a0e06c2dcda9409d1a17a07ccafaf55ff4a22e2b49ec9cd93c0d8bad244469aa87ad8ef4f27b7c6ae6820fd2b9c98d5d22
 DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B 
5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311
 SHA512 
643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 
5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880
 SHA512 
76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
+DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B 
e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f
 SHA512 
5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75

diff --git a/app-backup/bareos/bareos-.ebuild 
b/app-backup/bareos/bareos-23.0.1.ebuild
similarity index 96%
copy from app-backup/bareos/bareos-.ebuild
copy to app-backup/bareos/bareos-23.0.1.ebuild
index 3ec758c53539..675afe347439 100644
--- a/app-backup/bareos/bareos-.ebuild
+++ b/app-backup/bareos/bareos-23.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
 
-inherit python-any-r1 systemd cmake tmpfiles
+inherit python-any-r1 systemd cmake tmpfiles flag-o-matic
 
 if [[ ${PV} == * ]] ; then
inherit git-r3
@@ -30,7 +30,7 @@ RESTRICT="mirror test"
 
 LICENSE="AGPL-3"
 SLOT="0"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+IUSE="X acl ceph clientonly cpu_flags_x86_avx +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto split-usr
static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
 
@@ -99,6 +99,14 @@ REQUIRED_USE="
x86? ( !ceph )
 "
 
+PATCHES=(
+   # fix gentoo platform support
+   "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   "${FILESDIR}/${PN}-22.0.2-werror.patch"
+   "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+   "${FILESDIR}/${PN}-22.1.2-include-algorithm.patch"
+)
+
 pkg_pretend() {
local active_removed_backend=""
if has_version "

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

2024-01-29 Thread Marc Schiffbauer
commit: e42a59be80c6ae6dbfedc98837f23b462443af94
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Jan 29 09:50:07 2024 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Jan 29 09:50:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42a59be

app-backup/bareos: drop 20.0.9

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

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-20.0.9.ebuild | 394 -
 2 files changed, 395 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 1eb4e935ecb7..131affc1f7b5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,3 @@
-DIST bareos-20.0.9.tar.gz 13432902 BLAKE2B 
c92b7b2a3d8a78d2119cef21ea5f13ae4898d750ac15f5b91fc143b0ab057a7537d3a190ef7f910810190c275f5cf885f07d819c6165f49ded25d11a329b02c0
 SHA512 
04386ef9a6f83bc9569f42d9567951a0e06c2dcda9409d1a17a07ccafaf55ff4a22e2b49ec9cd93c0d8bad244469aa87ad8ef4f27b7c6ae6820fd2b9c98d5d22
 DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B 
5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311
 SHA512 
643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738
 DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 
5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880
 SHA512 
76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327
 DIST bareos-23.0.1.tar.gz 14728566 BLAKE2B 
e5fe93f0e412fcc4b4cb31f3e7d7dbcd44b3c0f76c387f17685d97880af88949998faae502531e937201c1622350d226c2cc9f432b0dfda7893a3fb03e905b5f
 SHA512 
5e3902c33c08dedbdd8dc7c74c5a1258da22288a728ada283b541316a7bff2f7773d1875b11f8fe12368afda3fd1bb2780242ff57441ef8fd596f71ea1af1e75

diff --git a/app-backup/bareos/bareos-20.0.9.ebuild 
b/app-backup/bareos/bareos-20.0.9.ebuild
deleted file mode 100644
index be9f0830fc9f..
--- a/app-backup/bareos/bareos-20.0.9.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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 

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

2023-12-05 Thread Marc Schiffbauer
commit: e0fefc18cda5a16991bb80fbc62f6a84502fc778
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Dec  5 21:49:16 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Dec  5 21:49:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fefc18

app-backup/bareos: add tray-monitor support

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

 .../bareos/{bareos-22.1.2.ebuild => bareos-22.1.2-r1.ebuild}   | 7 ++-
 app-backup/bareos/bareos-.ebuild   | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app-backup/bareos/bareos-22.1.2.ebuild 
b/app-backup/bareos/bareos-22.1.2-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-22.1.2.ebuild
rename to app-backup/bareos/bareos-22.1.2-r1.ebuild
index e00ae9693bca..3ec758c53539 100644
--- a/app-backup/bareos/bareos-22.1.2.ebuild
+++ b/app-backup/bareos/bareos-22.1.2-r1.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
 
 inherit python-any-r1 systemd cmake tmpfiles
 
@@ -72,6 +71,9 @@ DEPEND="
sys-libs/ncurses:=
sys-libs/zlib
)
+   X? (
+   dev-qt/qtwidgets:5=
+   )
"
 RDEPEND="${DEPEND}
!clientonly? (
@@ -175,6 +177,9 @@ src_configure() {
systemd lmdb; do
mycmakeargs+=( -D$useflag=$(usex $useflag) )
done
+   if use X; then
+   mycmakeargs+=( -Dtraymonitor=yes )
+   fi
 
mycmakeargs+=(
-DHAVE_PYTHON=0

diff --git a/app-backup/bareos/bareos-.ebuild 
b/app-backup/bareos/bareos-.ebuild
index e00ae9693bca..3ec758c53539 100644
--- a/app-backup/bareos/bareos-.ebuild
+++ b/app-backup/bareos/bareos-.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
 
 inherit python-any-r1 systemd cmake tmpfiles
 
@@ -72,6 +71,9 @@ DEPEND="
sys-libs/ncurses:=
sys-libs/zlib
)
+   X? (
+   dev-qt/qtwidgets:5=
+   )
"
 RDEPEND="${DEPEND}
!clientonly? (
@@ -175,6 +177,9 @@ src_configure() {
systemd lmdb; do
mycmakeargs+=( -D$useflag=$(usex $useflag) )
done
+   if use X; then
+   mycmakeargs+=( -Dtraymonitor=yes )
+   fi
 
mycmakeargs+=(
-DHAVE_PYTHON=0



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

2023-12-05 Thread Marc Schiffbauer
commit: e00b2c47336cd8a5771fe7d7a822c002ad521a75
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Dec  5 14:48:09 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Dec  5 14:52:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00b2c47

app-backup/bareos: add 20.0.9 21.1.8 22.1.2, cleanup

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

 app-backup/bareos/Manifest  | 6 +++---
 app-backup/bareos/{bareos-20.0.8-r2.ebuild => bareos-20.0.9.ebuild} | 4 ++--
 app-backup/bareos/{bareos-21.1.7-r2.ebuild => bareos-21.1.8.ebuild} | 5 ++---
 app-backup/bareos/{bareos-22.1.0-r1.ebuild => bareos-22.1.2.ebuild} | 2 +-
 app-backup/bareos/bareos-.ebuild| 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c53f55f7b3ef..c80b58d18e88 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
-DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 
5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75
 SHA512 
1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
-DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 
8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2
 SHA512 
2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41
-DIST bareos-22.1.0.tar.gz 14719993 BLAKE2B 
38e354d3227d401c69ffb003c83ae90c2067720490af089d529da636bc300e2fb5042451ab439b8b102f6850aeadbe8dedc4311dba13f800eab0bc77d89f809d
 SHA512 
dea64c6eb34a93f1a93eb6b0ac628a75101ac8873e06800a256f226e8f3a556fe39ce4e500246f9c51de30a2b0907732f789c6394f29b7bb9d983a64c709ad2c
+DIST bareos-20.0.9.tar.gz 13432902 BLAKE2B 
c92b7b2a3d8a78d2119cef21ea5f13ae4898d750ac15f5b91fc143b0ab057a7537d3a190ef7f910810190c275f5cf885f07d819c6165f49ded25d11a329b02c0
 SHA512 
04386ef9a6f83bc9569f42d9567951a0e06c2dcda9409d1a17a07ccafaf55ff4a22e2b49ec9cd93c0d8bad244469aa87ad8ef4f27b7c6ae6820fd2b9c98d5d22
+DIST bareos-21.1.8.tar.gz 11663322 BLAKE2B 
5f8c66d44c702b187f56434925417f3eff5f9f515f52d5707d5dce2edfcf566474bae52518adab1d6f87d479fd05cc906f48350eec4f21b858720a607f9b4311
 SHA512 
643561d4bd92989e0b9356dab500083073daa2717159b5b061f5680ab96e8532c13753e94480419239bcad9938818c203d43dc72b690404ae5a143fdd3cd0738
+DIST bareos-22.1.2.tar.gz 14746158 BLAKE2B 
5d8c9c098f61bd35b11f907a3e215a7c08b504c3e529c67a4c8c5cbbf24775158966800e63efca260b4cc513417332cdf43a158d21684f09be3d89dd93258880
 SHA512 
76d53425b2a28f4f7887b323a70bf9b37df44302e0e25aff7156c1b3ee26ffa60bbfb45ed29a0f2fe763d5c38b8f7135ac2a3e405d8e2b10717f4893baf9c327

diff --git a/app-backup/bareos/bareos-20.0.8-r2.ebuild 
b/app-backup/bareos/bareos-20.0.9.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-20.0.8-r2.ebuild
rename to app-backup/bareos/bareos-20.0.9.ebuild
index 42660fdd510b..be9f0830fc9f 100644
--- a/app-backup/bareos/bareos-20.0.8-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 

diff --git a/app-backup/bareos/bareos-21.1.7-r2.ebuild 
b/app-backup/bareos/bareos-21.1.8.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-21.1.7-r2.ebuild
rename to app-backup/bareos/bareos-21.1.8.ebuild
index eb14b02e9c5f..1ccdbe824abd 100644
--- a/app-backup/bareos/bareos-21.1.7-r2.ebuild
+++ b/app-backup/bareos/bareos-21.1.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
@@ -145,7 +145,6 @@ src_prepare() {
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-   eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
 
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"

diff --git a/app-backup/bareos/bareos-22.1.0-r1.ebuild 
b/app-backup/bareos/bareos-22.1.2.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-22.1.0-r1.ebuild
rename to app-backup/bareos/bareos-22.1.2.ebuild
index 7489d84210a7..e00ae9693bca 100644
--- a/app-backup/bareos/bareos-22.1.0-r1.ebuild
+++ b/app-backup/bareos/bareos-22.1.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed 

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

2023-09-18 Thread Sam James
commit: c052809c73c645dc43115cc019c83a8c02ddbd8e
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 18 10:53:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 18 10:54:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c052809c

app-backup/bareos: prepare for postgresql to remove USE=threads

It's always available in newer versions.

Bug: https://bugs.gentoo.org/868393
Signed-off-by: Sam James  gentoo.org>

 .../bareos/{bareos-20.0.8-r1.ebuild => bareos-20.0.8-r2.ebuild}   | 2 +-
 .../bareos/{bareos-21.1.7-r1.ebuild => bareos-21.1.7-r2.ebuild}   | 4 ++--
 app-backup/bareos/{bareos-22.1.0.ebuild => bareos-22.1.0-r1.ebuild}   | 4 ++--
 app-backup/bareos/bareos-.ebuild  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-backup/bareos/bareos-20.0.8-r1.ebuild 
b/app-backup/bareos/bareos-20.0.8-r2.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-20.0.8-r1.ebuild
rename to app-backup/bareos/bareos-20.0.8-r2.ebuild
index 7261e6e6745f..42660fdd510b 100644
--- a/app-backup/bareos/bareos-20.0.8-r1.ebuild
+++ b/app-backup/bareos/bareos-20.0.8-r2.ebuild
@@ -33,7 +33,7 @@ DEPEND="
dev-libs/gmp:0
!clientonly? (
acct-user/${PN}
-   postgres? ( dev-db/postgresql:*[threads] )
+   postgres? ( dev-db/postgresql:*[threads(+)] )
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite:3 )
director? (

diff --git a/app-backup/bareos/bareos-21.1.7-r1.ebuild 
b/app-backup/bareos/bareos-21.1.7-r2.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-21.1.7-r1.ebuild
rename to app-backup/bareos/bareos-21.1.7-r2.ebuild
index b7146b145377..eb14b02e9c5f 100644
--- a/app-backup/bareos/bareos-21.1.7-r1.ebuild
+++ b/app-backup/bareos/bareos-21.1.7-r2.ebuild
@@ -39,7 +39,7 @@ DEPEND="
dev-libs/gmp:0
!clientonly? (
acct-user/${PN}
-   dev-db/postgresql:*[threads]
+   dev-db/postgresql:*[threads(+)]
director? (
virtual/mta
)
@@ -79,7 +79,7 @@ BDEPEND="
${PYTHON_DEPS}
test? (
dev-cpp/gtest
-   dev-db/postgresql:*[server,threads]
+   dev-db/postgresql:*[server,threads(+)]
dev-db/mariadb:*[server]
)
 "

diff --git a/app-backup/bareos/bareos-22.1.0.ebuild 
b/app-backup/bareos/bareos-22.1.0-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-22.1.0.ebuild
rename to app-backup/bareos/bareos-22.1.0-r1.ebuild
index cc7cccd6ca49..7489d84210a7 100644
--- a/app-backup/bareos/bareos-22.1.0.ebuild
+++ b/app-backup/bareos/bareos-22.1.0-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="
dev-libs/gmp:0
!clientonly? (
acct-user/${PN}
-   dev-db/postgresql:*[threads]
+   dev-db/postgresql:*[threads(+)]
director? (
virtual/mta
)
@@ -87,7 +87,7 @@ BDEPEND="
${PYTHON_DEPS}
test? (
dev-cpp/gtest
-   dev-db/postgresql:*[server,threads]
+   dev-db/postgresql:*[server,threads(+)]
dev-db/mariadb:*[server]
)
 "

diff --git a/app-backup/bareos/bareos-.ebuild 
b/app-backup/bareos/bareos-.ebuild
index cc7cccd6ca49..7489d84210a7 100644
--- a/app-backup/bareos/bareos-.ebuild
+++ b/app-backup/bareos/bareos-.ebuild
@@ -47,7 +47,7 @@ DEPEND="
dev-libs/gmp:0
!clientonly? (
acct-user/${PN}
-   dev-db/postgresql:*[threads]
+   dev-db/postgresql:*[threads(+)]
director? (
virtual/mta
)
@@ -87,7 +87,7 @@ BDEPEND="
${PYTHON_DEPS}
test? (
dev-cpp/gtest
-   dev-db/postgresql:*[server,threads]
+   dev-db/postgresql:*[server,threads(+)]
dev-db/mariadb:*[server]
)
 "



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

2023-06-20 Thread Marc Schiffbauer
commit: a4a75f5678aa7cefc0728c5ea448804ef068a477
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Jun 20 13:42:22 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Jun 20 13:44:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a75f56

app-backup/bareos: add 22.1.0, drop 22.0.3-r1

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

 app-backup/bareos/Manifest  |  2 +-
 .../{bareos-22.0.3-r1.ebuild => bareos-22.1.0.ebuild}   | 17 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 78af12842104..c53f55f7b3ef 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 
5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75
 SHA512 
1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
 DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 
8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2
 SHA512 
2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41
-DIST bareos-22.0.3.tar.gz 14529338 BLAKE2B 
7759059f8652cf0b55a8754325b86257130695918f0b2d4672a7a21aa3ed6595da9fcba9a5a5f1c854af7994aa21c304720131ab99d577f01cd706f55184b621
 SHA512 
cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c
+DIST bareos-22.1.0.tar.gz 14719993 BLAKE2B 
38e354d3227d401c69ffb003c83ae90c2067720490af089d529da636bc300e2fb5042451ab439b8b102f6850aeadbe8dedc4311dba13f800eab0bc77d89f809d
 SHA512 
dea64c6eb34a93f1a93eb6b0ac628a75101ac8873e06800a256f226e8f3a556fe39ce4e500246f9c51de30a2b0907732f789c6394f29b7bb9d983a64c709ad2c

diff --git a/app-backup/bareos/bareos-22.0.3-r1.ebuild 
b/app-backup/bareos/bareos-22.1.0.ebuild
similarity index 97%
rename from app-backup/bareos/bareos-22.0.3-r1.ebuild
rename to app-backup/bareos/bareos-22.1.0.ebuild
index d246f05e5727..cc7cccd6ca49 100644
--- a/app-backup/bareos/bareos-22.0.3-r1.ebuild
+++ b/app-backup/bareos/bareos-22.1.0.ebuild
@@ -3,15 +3,24 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
 inherit python-any-r1 systemd cmake tmpfiles
 
+if [[ ${PV} == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+   KEYWORDS="~amd64 ~x86"
+   S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
 
 # some tests still fail propably due to missing bits in src_test -> TODO
 RESTRICT="mirror test"
@@ -22,7 +31,6 @@ RESTRICT="mirror test"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto split-usr
static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
@@ -89,8 +97,6 @@ REQUIRED_USE="
x86? ( !ceph )
 "
 
-S=${WORKDIR}/${PN}-Release-${PV}
-
 pkg_pretend() {
local active_removed_backend=""
if has_version "

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

2023-06-20 Thread Marc Schiffbauer
commit: 301c5096932806ebc08f2c51f66306cea32f3f9a
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Jun 20 13:42:58 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Jun 20 13:44:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301c5096

app-backup/bareos: enable py3.12, rm gcc13 patch

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

 app-backup/bareos/bareos-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-backup/bareos/bareos-.ebuild 
b/app-backup/bareos/bareos-.ebuild
index 29fb6bda15a5..cc7cccd6ca49 100644
--- a/app-backup/bareos/bareos-.ebuild
+++ b/app-backup/bareos/bareos-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
@@ -151,7 +151,6 @@ src_prepare() {
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-   eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
 
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"



[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/

2023-04-20 Thread Marc Schiffbauer
commit: 3d4d4789b738496d7def0f7ff23dbd7ea1fed99a
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Apr 20 16:46:17 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Apr 20 20:22:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4d4789

app-backup/bareos: fix gcc13 compile error for 22.0.3

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

 app-backup/bareos/bareos-22.0.3-r1.ebuild | 422 ++
 1 file changed, 422 insertions(+)

diff --git a/app-backup/bareos/bareos-22.0.3-r1.ebuild 
b/app-backup/bareos/bareos-22.0.3-r1.ebuild
new file mode 100644
index ..d246f05e5727
--- /dev/null
+++ b/app-backup/bareos/bareos-22.0.3-r1.ebuild
@@ -0,0 +1,422 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+   local active_removed_backend=""
+   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
+   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
+   ewarn "installation first."
+   ewarn
+   die "current catalog backend not supported anymore"
+   fi
+}
+
+src_test() {
+   # initialze catalog test database
+   initdb -D "${T}"/pgsql || die
+   pg_ctl -w -D "${T}"/pgsql start \
+   -o "-h '' -k '${T}'" || die
+   createuser -h "${T}" bareos || die
+   createdb -h "${T}" --owner bareos bareos || die
+   export PGHOST="${T}"
+
+   # initiale mariadb database for backup tests
+   # $USER must be set and != root
+   export USER=portage
+
+   default
+   cmake_src_test
+
+   pg_ctl -w -D "${T}"/pgsql stop || die
+   rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+   # fix gentoo platform support
+   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+   eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
+
+   # fix missing DESTDIR in symlink creation
+   sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=()
+
+   cmake_comment_add_subdirectory webui
+
+   if use clientonly; then
+   mycmakeargs+=(
+   -Dclient-only=ON
+  

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

2023-04-20 Thread Marc Schiffbauer
commit: a8862601056c35345faf741391249f71a6f2b7ed
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Apr 20 16:46:50 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Apr 20 20:22:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8862601

app-backup/bareos: add 

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

 app-backup/bareos/bareos-.ebuild | 428 +++
 1 file changed, 428 insertions(+)

diff --git a/app-backup/bareos/bareos-.ebuild 
b/app-backup/bareos/bareos-.ebuild
new file mode 100644
index ..29fb6bda15a5
--- /dev/null
+++ b/app-backup/bareos/bareos-.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+if [[ ${PV} == * ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
+else
+   SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+   KEYWORDS="~amd64 ~x86"
+   S=${WORKDIR}/${PN}-Release-${PV}
+fi
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+pkg_pretend() {
+   local active_removed_backend=""
+   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
+   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
+   ewarn "installation first."
+   ewarn
+   die "current catalog backend not supported anymore"
+   fi
+}
+
+src_test() {
+   # initialze catalog test database
+   initdb -D "${T}"/pgsql || die
+   pg_ctl -w -D "${T}"/pgsql start \
+   -o "-h '' -k '${T}'" || die
+   createuser -h "${T}" bareos || die
+   createdb -h "${T}" --owner bareos bareos || die
+   export PGHOST="${T}"
+
+   # initiale mariadb database for backup tests
+   # $USER must be set and != root
+   export USER=portage
+
+   default
+   cmake_src_test
+
+   pg_ctl -w -D "${T}"/pgsql stop || die
+   rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+   # fix gentoo platform support
+   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+   eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
+
+   # fix missing DESTDIR in symlink creation
+   sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=()
+
+   cmake_comment_add_subdirectory webui
+
+   if use clientonly; then
+   

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

2023-04-20 Thread Marc Schiffbauer
commit: 9c7a956a9ee55f57f716751bb05c824944f3d8e2
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Apr 20 16:47:29 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Apr 20 20:22:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7a956a

app-backup/bareos: drop 20.0.8, 21.1.7, 22.0.3

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

 app-backup/bareos/bareos-20.0.8.ebuild | 393 --
 app-backup/bareos/bareos-21.1.7.ebuild | 413 
 app-backup/bareos/bareos-22.0.3.ebuild | 421 -
 3 files changed, 1227 deletions(-)

diff --git a/app-backup/bareos/bareos-20.0.8.ebuild 
b/app-backup/bareos/bareos-20.0.8.ebuild
deleted file mode 100644
index fcc91a207309..
--- a/app-backup/bareos/bareos-20.0.8.ebuild
+++ /dev/null
@@ -1,393 +0,0 @@
-# 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"
-
-   # 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+=( 

[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/

2023-04-20 Thread Marc Schiffbauer
commit: 2030296ba1f27c4e78d61d551345f9899505ce8a
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Apr 20 16:45:37 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Apr 20 20:22:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2030296b

app-backup/bareos: fix gcc13 compile error for 21.1.7

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

 app-backup/bareos/bareos-21.1.7-r1.ebuild | 414 ++
 1 file changed, 414 insertions(+)

diff --git a/app-backup/bareos/bareos-21.1.7-r1.ebuild 
b/app-backup/bareos/bareos-21.1.7-r1.ebuild
new file mode 100644
index ..b7146b145377
--- /dev/null
+++ b/app-backup/bareos/bareos-21.1.7-r1.ebuild
@@ -0,0 +1,414 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+   local active_removed_backend=""
+   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
+   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
+   ewarn "installation first."
+   ewarn
+   die "current catalog backend not supported anymore"
+   fi
+}
+
+src_test() {
+   # initialze catalog test database
+   initdb -D "${T}"/pgsql || die
+   pg_ctl -w -D "${T}"/pgsql start \
+   -o "-h '' -k '${T}'" || die
+   createuser -h "${T}" bareos || die
+   createdb -h "${T}" --owner bareos bareos || die
+   export PGHOST="${T}"
+
+   # initiale mariadb database for backup tests
+   # $USER must be set and != root
+   export USER=portage
+
+   default
+   cmake_src_test
+
+   pg_ctl -w -D "${T}"/pgsql stop || die
+   rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+   # fix gentoo platform support
+   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+   eapply "${FILESDIR}/${PN}-gcc13-fixes.patch"
+
+   # fix missing DESTDIR in symlink creation
+   sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=()
+
+   cmake_comment_add_subdirectory webui
+
+   if use clientonly; then
+   mycmakeargs+=(
+   -Dclient-only=ON
+  

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

2023-04-02 Thread Marc Schiffbauer
commit: 41ed3dd3f1bdbe7e928f5a40c2a1d060069fadf1
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Apr  2 22:11:49 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Apr  2 22:13:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ed3dd3

app-backup/bareos: drop 21.1.6, 22.0.2

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

 app-backup/bareos/bareos-21.1.6.ebuild | 413 
 app-backup/bareos/bareos-22.0.2.ebuild | 421 -
 2 files changed, 834 deletions(-)

diff --git a/app-backup/bareos/bareos-21.1.6.ebuild 
b/app-backup/bareos/bareos-21.1.6.ebuild
deleted file mode 100644
index 787f2a50e2f4..
--- a/app-backup/bareos/bareos-21.1.6.ebuild
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake tmpfiles
-
-DESCRIPTION="Featureful client/server network backup suite"
-HOMEPAGE="https://www.bareos.org/;
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
-
-# some tests still fail propably due to missing bits in src_test -> TODO
-RESTRICT="mirror test"
-#RESTRICT="
-#  mirror
-#  !test? ( test )
-#"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
-   logwatch ndmp readline scsi-crypto split-usr
-   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-   !app-backup/bacula
-   acct-group/${PN}
-   !x86? (
-   ceph? ( sys-cluster/ceph )
-   )
-   glusterfs? ( sys-cluster/glusterfs )
-   lmdb? ( dev-db/lmdb )
-   dev-libs/gmp:0
-   !clientonly? (
-   acct-user/${PN}
-   dev-db/postgresql:*[threads]
-   director? (
-   virtual/mta
-   )
-   )
-   logwatch? ( sys-apps/logwatch )
-   ndmp? ( net-libs/rpcsvc-proto )
-   tcpd? ( sys-apps/tcp-wrappers )
-   readline? ( sys-libs/readline:0 )
-   static? (
-   acl? ( virtual/acl[static-libs] )
-   dev-libs/jansson:=[static-libs]
-   dev-libs/lzo[static-libs]
-   dev-libs/openssl:0=[static-libs]
-   sys-libs/ncurses:=[static-libs]
-   sys-libs/zlib[static-libs]
-   )
-   !static? (
-   acl? ( virtual/acl )
-   dev-libs/jansson:=
-   dev-libs/lzo
-   dev-libs/openssl:0=
-   sys-libs/ncurses:=
-   sys-libs/zlib
-   )
-   "
-RDEPEND="${DEPEND}
-   !clientonly? (
-   storage-daemon? (
-   sys-block/mtx
-   app-arch/mt-st
-   )
-   )
-   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-   "
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   test? (
-   dev-cpp/gtest
-   dev-db/postgresql:*[server,threads]
-   dev-db/mariadb:*[server]
-   )
-"
-
-REQUIRED_USE="
-   static? ( clientonly )
-   x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-pkg_pretend() {
-   local active_removed_backend=""
-   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
-   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
-   ewarn "installation first."
-   ewarn
-   die "current catalog backend not supported anymore"
-   fi
-}
-
-src_test() {
-   # initialze catalog test database
-   initdb -D "${T}"/pgsql || die
-   pg_ctl -w -D "${T}"/pgsql start \
-   -o "-h '' -k '${T}'" || die
-   createuser -h "${T}" bareos || die
-   createdb -h "${T}" --owner bareos bareos || die
-   export PGHOST="${T}"
-
-   # initiale mariadb database for backup tests
-   # $USER must be set and != root
-   export USER=portage
-
-   default
-   cmake_src_test
-
-   pg_ctl -w -D "${T}"/pgsql stop || die
-   rm -rvf "${T}"/pgsql
-}
-
-src_prepare() {
-   # fix gentoo platform support
-   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
-   eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
-   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
-
-   # fix missing DESTDIR in symlink creation
-   sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=()
-
-   cmake_comment_add_subdirectory webui
-
-   if use clientonly; then
-   mycmakeargs+=(
-   -Dclient-only=ON
-   -Dstatic-cons=$(usex 

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

2023-04-02 Thread Marc Schiffbauer
commit: 64e50936be007a184a40c60614b7313123866f81
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Apr  2 22:11:02 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Apr  2 22:13:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e50936

app-backup/bareos: add 21.1.7

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

 app-backup/bareos/Manifest |   4 +-
 app-backup/bareos/bareos-21.1.7.ebuild | 413 +
 2 files changed, 415 insertions(+), 2 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 0cfdf2ea695c..78af12842104 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-20.0.8.tar.gz 13429247 BLAKE2B 
5576cf738fccad0ac39f7c92e8da01f4925d58e4373c8bc19f68ddb8cc8d6a07bf73dfd39bd2111766ccd20ce2da224680b8ab9adf7b84421874ae916e633f75
 SHA512 
1da30d0ff2f1fda2c4a41ec6d41ec60e3212b1bdb153c7f397931580894f31e36ab84f655d263aed47b9eb21e68ef7e59ec3b7bbd4f2c8981ae04b84733ffb68
-DIST bareos-21.1.6.tar.gz 11654525 BLAKE2B 
9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a
 SHA512 
e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36
-DIST bareos-22.0.2.tar.gz 14442217 BLAKE2B 
34b8a506b608765f803cb788a203b7556dda67ae8bdd2cb82e1c8ea1ea8a07759f381c33b25e743d296417bef1072ccfcfecf536096cc1babdf20c57767cc369
 SHA512 
924e07aafa44829730f367a29f0a17356d06d5e44bcbe511936ebfe582912439010d8376370530982dfdfe54d8a722ff257648634cea429cbfbd566d2c25e464
+DIST bareos-21.1.7.tar.gz 11666508 BLAKE2B 
8b5efffb987b53d1bc289aa104c10827c6bed630ffee16c26e8ab428ee20aa63a9e1e2fc03a7656d26f5905443b06c6a6f6d4860be413776874917e2c1cd0ef2
 SHA512 
2b7dfb16b74aa912449269efb92c85b6720f08526122c7dc9bfb648aed70b2ca81df41eacb60c53e2a154793c6ed209dd1571ecec7913a357e491064b1faab41
+DIST bareos-22.0.3.tar.gz 14529338 BLAKE2B 
7759059f8652cf0b55a8754325b86257130695918f0b2d4672a7a21aa3ed6595da9fcba9a5a5f1c854af7994aa21c304720131ab99d577f01cd706f55184b621
 SHA512 
cbdf4bfb5284104894e7fb8ddbb20d6ecedd827c8133b13913e9a27c4e3b98b550ec60a9a23c2c4efe6d566c94ed745d77946a444e5fccb56c09ab8f740d9f8c

diff --git a/app-backup/bareos/bareos-21.1.7.ebuild 
b/app-backup/bareos/bareos-21.1.7.ebuild
new file mode 100644
index ..787f2a50e2f4
--- /dev/null
+++ b/app-backup/bareos/bareos-21.1.7.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   

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

2023-04-02 Thread Marc Schiffbauer
commit: 0b9608d44474042bc09f7f592d9dee312bbdd03f
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Apr  2 22:11:16 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Apr  2 22:13:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9608d4

app-backup/bareos: add 22.0.3

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

 app-backup/bareos/bareos-22.0.3.ebuild | 421 +
 1 file changed, 421 insertions(+)

diff --git a/app-backup/bareos/bareos-22.0.3.ebuild 
b/app-backup/bareos/bareos-22.0.3.ebuild
new file mode 100644
index ..1c461fcddead
--- /dev/null
+++ b/app-backup/bareos/bareos-22.0.3.ebuild
@@ -0,0 +1,421 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+   local active_removed_backend=""
+   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
+   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
+   ewarn "installation first."
+   ewarn
+   die "current catalog backend not supported anymore"
+   fi
+}
+
+src_test() {
+   # initialze catalog test database
+   initdb -D "${T}"/pgsql || die
+   pg_ctl -w -D "${T}"/pgsql start \
+   -o "-h '' -k '${T}'" || die
+   createuser -h "${T}" bareos || die
+   createdb -h "${T}" --owner bareos bareos || die
+   export PGHOST="${T}"
+
+   # initiale mariadb database for backup tests
+   # $USER must be set and != root
+   export USER=portage
+
+   default
+   cmake_src_test
+
+   pg_ctl -w -D "${T}"/pgsql stop || die
+   rm -rvf "${T}"/pgsql
+}
+
+src_prepare() {
+   # fix gentoo platform support
+   eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   eapply "${FILESDIR}/${PN}-22.0.2-werror.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
+
+   # fix missing DESTDIR in symlink creation
+   sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=()
+
+   cmake_comment_add_subdirectory webui
+
+   if use clientonly; then
+   mycmakeargs+=(
+   -Dclient-only=ON
+   -Dstatic-cons=$(usex static)
+   -Dstatic-fd=$(usex static)
+   )
+   fi
+
+   

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

2023-03-06 Thread Marc Schiffbauer
commit: 570138dbb10cb57787f39f03088974fec8753187
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Mar  6 09:51:10 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Mar  6 09:53:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570138db

app-backup/bareos: minor pkg_postinst improvement

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

 app-backup/bareos/bareos-22.0.2.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/app-backup/bareos/bareos-22.0.2.ebuild 
b/app-backup/bareos/bareos-22.0.2.ebuild
index 4e4745015088..1c461fcddead 100644
--- a/app-backup/bareos/bareos-22.0.2.ebuild
+++ b/app-backup/bareos/bareos-22.0.2.ebuild
@@ -403,6 +403,14 @@ pkg_postinst() {
einfo " emerge --config app-backup/bareos"
einfo
einfo "to do this"
+   einfo
+   einfo "For major upgrades you may need to run:"
+   einfo
+   einfo "  su postgres -c 
'/usr/libexec/bareos/update_bareos_tables'"
+   einfo
+   einfo "Please see release notes for details."
+   einfo "( https://docs.bareos.org/Appendix/ReleaseNotes.html )"
+   einfo
fi
 }
 



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

2023-03-01 Thread Marc Schiffbauer
commit: 58eefb77789fdd35d34a68cea77b0e509c183209
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Mar  1 17:42:56 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Mar  1 17:43:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58eefb77

app-backup/bareos: add 22.0.2

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

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-22.0.2.ebuild | 413 +
 app-backup/bareos/files/bareos-22.0.2-werror.patch |  23 ++
 3 files changed, 437 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index b05f4c5d56fd..0cfdf2ea695c 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.6.tar.gz 11654525 BLAKE2B 
9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a
 SHA512 
e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36
+DIST bareos-22.0.2.tar.gz 14442217 BLAKE2B 
34b8a506b608765f803cb788a203b7556dda67ae8bdd2cb82e1c8ea1ea8a07759f381c33b25e743d296417bef1072ccfcfecf536096cc1babdf20c57767cc369
 SHA512 
924e07aafa44829730f367a29f0a17356d06d5e44bcbe511936ebfe582912439010d8376370530982dfdfe54d8a722ff257648634cea429cbfbd566d2c25e464

diff --git a/app-backup/bareos/bareos-22.0.2.ebuild 
b/app-backup/bareos/bareos-22.0.2.ebuild
new file mode 100644
index ..4e4745015088
--- /dev/null
+++ b/app-backup/bareos/bareos-22.0.2.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto split-usr
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+   local active_removed_backend=""
+   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
+   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
+   ewarn "installation first."
+   ewarn
+   die "current catalog backend not supported anymore"
+   fi
+}
+
+src_test() {
+   # initialze catalog test database
+   

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

2023-03-01 Thread Marc Schiffbauer
commit: 8008c09e73257b78a3b6ce5c357f4952cbc7ca86
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Mar  1 17:21:13 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Mar  1 17:43:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8008c09e

app-backup/bareos: drop 21.1.2

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

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-21.1.2.ebuild | 390 -
 2 files changed, 391 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 07d5acc73621..b05f4c5d56fd 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,2 @@
 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.6.tar.gz 11654525 BLAKE2B 
9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a
 SHA512 
e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36

diff --git a/app-backup/bareos/bareos-21.1.2.ebuild 
b/app-backup/bareos/bareos-21.1.2.ebuild
deleted file mode 100644
index 7005e562111e..
--- a/app-backup/bareos/bareos-21.1.2.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# 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"
-
-# some tests still fail propably due to missing bits in src_test -> TODO
-RESTRICT="mirror test"
-#RESTRICT="
-#  mirror
-#  !test? ( test )
-#"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
-   logwatch ndmp readline scsi-crypto
-   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
-
-# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
-DEPEND="
-   !app-backup/bacula
-   acct-group/${PN}
-   !x86? (
-   ceph? ( sys-cluster/ceph )
-   )
-   glusterfs? ( sys-cluster/glusterfs )
-   lmdb? ( dev-db/lmdb )
-   dev-libs/gmp:0
-   !clientonly? (
-   acct-user/${PN}
-   dev-db/postgresql:*[threads]
-   director? (
-   virtual/mta
-   )
-   )
-   logwatch? ( sys-apps/logwatch )
-   ndmp? ( net-libs/rpcsvc-proto )
-   tcpd? ( sys-apps/tcp-wrappers )
-   readline? ( sys-libs/readline:0 )
-   static? (
-   acl? ( virtual/acl[static-libs] )
-   dev-libs/jansson:=[static-libs]
-   dev-libs/lzo[static-libs]
-   dev-libs/openssl:0=[static-libs]
-   sys-libs/ncurses:=[static-libs]
-   sys-libs/zlib[static-libs]
-   )
-   !static? (
-   acl? ( virtual/acl )
-   dev-libs/jansson:=
-   dev-libs/lzo
-   dev-libs/openssl:0=
-   sys-libs/ncurses:=
-   sys-libs/zlib
-   )
-   "
-RDEPEND="${DEPEND}
-   !clientonly? (
-   storage-daemon? (
-   sys-block/mtx
-   app-arch/mt-st
-   )
-   )
-   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-   "
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   test? (
-   dev-cpp/gtest
-   dev-db/postgresql:*[server,threads]
-   dev-db/mariadb:*[server]
-   )
-"
-
-REQUIRED_USE="
-   static? ( clientonly )
-   x86? ( !ceph )
-"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-
-pkg_pretend() {
-   local active_removed_backend=""
-   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
-   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
-   ewarn "installation first."
-   ewarn
-   die "current catalog backend not supported anymore"
-   fi
-}
-
-src_test() {
-   # initialze catalog test database
-   initdb -D "${T}"/pgsql || die
-   pg_ctl -w -D "${T}"/pgsql start \
-

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

2023-03-01 Thread Marc Schiffbauer
commit: 96834a92668bd4acc93fb9a0df70a1a0c94d322b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Mar  1 17:19:21 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Mar  1 17:20:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96834a92

app-backup/bareos: add 21.1.6, drop 21.1.5-r2

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

 app-backup/bareos/Manifest  | 2 +-
 app-backup/bareos/{bareos-21.1.5-r2.ebuild => bareos-21.1.6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index e9d91ab26b15..07d5acc73621 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +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
+DIST bareos-21.1.6.tar.gz 11654525 BLAKE2B 
9b023a07e28098fd93aca57aead5b2bf993b85c52dc8f76870dc53ee88ec5995bcc908397173c7d3504c78214e37311442dd96bb563fa4382ae35904fef69e0a
 SHA512 
e9ccafd379ea2a7ede2b6852fa544e7d4b63b23e9d91e8b747c1aecf5d764b06991a57f658842d48fbbe49335a92f29eea90e56b613a3123246a9cd9e8273f36

diff --git a/app-backup/bareos/bareos-21.1.5-r2.ebuild 
b/app-backup/bareos/bareos-21.1.6.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-21.1.5-r2.ebuild
rename to app-backup/bareos/bareos-21.1.6.ebuild



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

2023-01-22 Thread Marc Schiffbauer
commit: c2ec3031fb80299c547af6025b0993a3c1673d62
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Jan 22 17:59:18 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Jan 22 17:59:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ec3031

app-backup/bareos: fix install for IUSE=merged-usr

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

 app-backup/bareos/bareos-21.1.5-r2.ebuild | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-backup/bareos/bareos-21.1.5-r2.ebuild 
b/app-backup/bareos/bareos-21.1.5-r2.ebuild
index a1086b270d5f..787f2a50e2f4 100644
--- a/app-backup/bareos/bareos-21.1.5-r2.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r2.ebuild
@@ -24,7 +24,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
-   logwatch ndmp readline scsi-crypto
+   logwatch ndmp readline scsi-crypto split-usr
static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
 
 # get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
@@ -236,10 +236,12 @@ src_install() {
 
# remove duplicate binaries being installed in /usr/sbin and replace
# them by symlinks to not break systems that still use split-usr
-   for f in bwild bregex bsmtp bconsole; do
-   rm -f "${D}/usr/sbin/$f" || die
-   ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
-   done
+   if use split-usr; then
+   for f in bwild bregex bsmtp bconsole; do
+   rm -f "${D}/usr/sbin/$f" || die
+   ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+   done
+   fi
 
# get rid of py2 stuff
rm -rf "$D"/usr/lib64/python2.7 || die



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

2023-01-18 Thread Marc Schiffbauer
commit: 8bb7c3cb5b60dcca9fff040680023bcb5fb0ad15
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Jan 18 10:49:46 2023 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Jan 18 10:51:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb7c3cb

app-backup/bareos: revbump

This revbump eliminates duplicate binaries and
replaces them by symlinks

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

 .../bareos/{bareos-21.1.5-r1.ebuild => bareos-21.1.5-r2.ebuild}| 7 +++
 1 file changed, 7 insertions(+)

diff --git a/app-backup/bareos/bareos-21.1.5-r1.ebuild 
b/app-backup/bareos/bareos-21.1.5-r2.ebuild
similarity index 97%
rename from app-backup/bareos/bareos-21.1.5-r1.ebuild
rename to app-backup/bareos/bareos-21.1.5-r2.ebuild
index 4a4080f3ed10..a1086b270d5f 100644
--- a/app-backup/bareos/bareos-21.1.5-r1.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r2.ebuild
@@ -234,6 +234,13 @@ src_install() {
rm -f "${D}"/etc/bareos/bareos-regress.conf
rm -f "${D}"/etc/logrotate.d/bareos-dir
 
+   # remove duplicate binaries being installed in /usr/sbin and replace
+   # them by symlinks to not break systems that still use split-usr
+   for f in bwild bregex bsmtp bconsole; do
+   rm -f "${D}/usr/sbin/$f" || die
+   ln -s "../bin/$f" "${D}/usr/sbin/$f" || die
+   done
+
# get rid of py2 stuff
rm -rf "$D"/usr/lib64/python2.7 || die
rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die



[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/

2022-12-14 Thread Sam James
commit: c14642b81bded5a297690d7e33059199f26c5917
Author: Petr Vaněk  atlas  cz>
AuthorDate: Sun Dec 11 15:24:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 14 09:18:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14642b8

app-backup/bareos: reference other packages with pkg tag

Signed-off-by: Petr Vaněk  atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28641
Signed-off-by: Sam James  gentoo.org>

 app-backup/bareos/metadata.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml
index 74fcd0331c3a..212e403a0114 100644
--- a/app-backup/bareos/metadata.xml
+++ b/app-backup/bareos/metadata.xml
@@ -6,13 +6,13 @@
 Marc Schiffbauer
   
   
-Enable ceph support
+Enable sys-cluster/ceph support
 Only install file-daemon (client)
 Install director
-Enable glusterfs storage backend
-JSON API support using JANSSON for director
-enable build of LMDB support for faster accurate 
backup
-Install support files for logwatch
+Enable sys-cluster/glusterfs storage 
backend
+JSON API support using dev-libs/jansson 
for director
+enable build of dev-db/lmdb support for 
faster accurate backup
+Install support files for 
sys-apps/logwatch
 Enable support for NDMP (Network Data Management 
Protocol)
 Enable low level SCSI crypto support
 Install storage daemon (bareos-sd)



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

2022-12-11 Thread Marc Schiffbauer
commit: c013afab083b259b3ab99f0048f41d2449a9046b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Dec 12 03:05:29 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Dec 12 03:05:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c013afab

Revert "app-backup/bareos: fix USE=clientonly install"

This reverts commit 022ae7af33dbe751813dcb7f133cc2931f98d00b.

Reason: Wrong bug number

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

 app-backup/bareos/bareos-21.1.5-r1.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-backup/bareos/bareos-21.1.5-r1.ebuild 
b/app-backup/bareos/bareos-21.1.5-r1.ebuild
index 724051b6d17d..1652a021f7bc 100644
--- a/app-backup/bareos/bareos-21.1.5-r1.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r1.ebuild
@@ -360,10 +360,7 @@ src_install() {
keepdir /var/lib/bareos
keepdir /var/lib/bareos/storage
 
-   # set log directory ownership
-   if ! use clientonly; then
-   diropts -m0755 -o bareos -g bareos
-   fi
+   diropts -m0755 -o bareos -g bareos
keepdir /var/log/bareos
 
newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf



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

2022-12-11 Thread Marc Schiffbauer
commit: d177f676b26123262e0012dc71c22d2065034bd2
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Dec 12 03:09:08 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Dec 12 03:09:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d177f676

app-backup/bareos: fix USE=clientonly install

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

 app-backup/bareos/bareos-21.1.5-r1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-backup/bareos/bareos-21.1.5-r1.ebuild 
b/app-backup/bareos/bareos-21.1.5-r1.ebuild
index 1652a021f7bc..724051b6d17d 100644
--- a/app-backup/bareos/bareos-21.1.5-r1.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r1.ebuild
@@ -360,7 +360,10 @@ src_install() {
keepdir /var/lib/bareos
keepdir /var/lib/bareos/storage
 
-   diropts -m0755 -o bareos -g bareos
+   # set log directory ownership
+   if ! use clientonly; then
+   diropts -m0755 -o bareos -g bareos
+   fi
keepdir /var/log/bareos
 
newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf



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

2022-12-11 Thread Marc Schiffbauer
commit: 022ae7af33dbe751813dcb7f133cc2931f98d00b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Dec 12 02:56:18 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Dec 12 02:58:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022ae7af

app-backup/bareos: fix USE=clientonly install

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

 app-backup/bareos/bareos-21.1.5-r1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-backup/bareos/bareos-21.1.5-r1.ebuild 
b/app-backup/bareos/bareos-21.1.5-r1.ebuild
index 1652a021f7bc..724051b6d17d 100644
--- a/app-backup/bareos/bareos-21.1.5-r1.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r1.ebuild
@@ -360,7 +360,10 @@ src_install() {
keepdir /var/lib/bareos
keepdir /var/lib/bareos/storage
 
-   diropts -m0755 -o bareos -g bareos
+   # set log directory ownership
+   if ! use clientonly; then
+   diropts -m0755 -o bareos -g bareos
+   fi
keepdir /var/log/bareos
 
newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf



[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 

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

2022-12-10 Thread Marc Schiffbauer
commit: 8c5bc856f43bb3718495a08f9fff31ad3f6cb752
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Dec 10 17:48:29 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Dec 10 18:09:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5bc856

app-backup/bareos: revbump 21.1.5

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

 ...bareos-21.1.5.ebuild => bareos-21.1.5-r1.ebuild} | 21 -
 app-backup/bareos/files/bareos-dir-21-r1.initd  | 16 
 app-backup/bareos/files/bareos-fd-21-r1.initd   | 12 
 app-backup/bareos/files/bareos-sd-21-r1.initd   | 16 
 4 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/app-backup/bareos/bareos-21.1.5.ebuild 
b/app-backup/bareos/bareos-21.1.5-r1.ebuild
similarity index 95%
rename from app-backup/bareos/bareos-21.1.5.ebuild
rename to app-backup/bareos/bareos-21.1.5-r1.ebuild
index 19bc1b11ce54..1652a021f7bc 100644
--- a/app-backup/bareos/bareos-21.1.5.ebuild
+++ b/app-backup/bareos/bareos-21.1.5-r1.ebuild
@@ -342,7 +342,7 @@ src_install() {
fi
for script in ${myscripts}; do
# install init script and config
-   newinitd "${FILESDIR}/${script}-21".initd "${script}"
+   newinitd "${FILESDIR}/${script}-21-r1".initd "${script}"
newconfd "${FILESDIR}/${script}-21".confd "${script}"
done
 
@@ -360,7 +360,7 @@ src_install() {
keepdir /var/lib/bareos
keepdir /var/lib/bareos/storage
 
-   diropts -m0755
+   diropts -m0755 -o bareos -g bareos
keepdir /var/log/bareos
 
newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
@@ -382,9 +382,20 @@ pkg_postinst() {
einfo
einfo "If this is a new install, you must create the database:"
einfo
-   einfo "  su postgres -c 
'/usr/libexec/bareos/create_bareos_database postgresql'"
-   einfo "  su postgres -c '/usr/libexec/bareos/make_bareos_tables 
postgresql'"
-   einfo "  su postgres -c 
'/usr/libexec/bareos/grant_bareos_privileges postgresql'"
+   einfo "  su postgres -c 
'/usr/libexec/bareos/create_bareos_database'"
+   einfo "  su postgres -c 
'/usr/libexec/bareos/make_bareos_tables'"
+   einfo "  su postgres -c 
'/usr/libexec/bareos/grant_bareos_privileges'"
einfo
+   einfo "or run"
+   einfo
+   einfo " emerge --config app-backup/bareos"
+   einfo
+   einfo "to do this"
fi
 }
+
+pkg_config() {
+   su postgres -c '/usr/libexec/bareos/create_bareos_database' || die 
"could not create bareos database"
+   su postgres -c '/usr/libexec/bareos/make_bareos_tables' || die "could 
not create bareos database tables"
+   su postgres -c '/usr/libexec/bareos/grant_bareos_privileges' || die 
"could not grant bareos database privileges"
+}

diff --git a/app-backup/bareos/files/bareos-dir-21-r1.initd 
b/app-backup/bareos/files/bareos-dir-21-r1.initd
new file mode 100644
index ..1363833e8962
--- /dev/null
+++ b/app-backup/bareos/files/bareos-dir-21-r1.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   use dns
+}
+
+start_pre() {
+   checkpath --directory --owner root:root --mode 00755 /run/bareos
+}
+
+command="/usr/sbin/bareos-dir"
+command_args="-f ${DIR_OPTIONS}"
+command_background="true"
+pidfile="/run/bareos/bareos-dir.9101.pid"

diff --git a/app-backup/bareos/files/bareos-fd-21-r1.initd 
b/app-backup/bareos/files/bareos-fd-21-r1.initd
new file mode 100644
index ..2b752085c764
--- /dev/null
+++ b/app-backup/bareos/files/bareos-fd-21-r1.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   use dns
+}
+
+command="/usr/sbin/bareos-fd"
+command_args="-f ${DIR_OPTIONS}"
+command_background="true"
+pidfile="/run/bareos/bareos-fd.9102.pid"

diff --git a/app-backup/bareos/files/bareos-sd-21-r1.initd 
b/app-backup/bareos/files/bareos-sd-21-r1.initd
new file mode 100644
index ..9eaed8025d0a
--- /dev/null
+++ b/app-backup/bareos/files/bareos-sd-21-r1.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   use dns
+}
+
+start_pre() {
+   checkpath --directory --owner root:root --mode 00755 /run/bareos
+}
+
+command="/usr/sbin/bareos-sd"
+command_args="-f ${DIR_OPTIONS}"
+command_background="true"
+pidfile="/run/bareos/bareos-dir.9103.pid"



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

2022-11-27 Thread Marc Schiffbauer
commit: 66f92a9db8fbb60983ad7483721c754b3b50acb3
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Nov 27 09:06:27 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Nov 27 10:03:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f92a9d

app-backup/bareos: add 21.1.5

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

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-21.1.5.ebuild | 390 +
 2 files changed, 391 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 5b6c99245325..0325b45696fd 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1 +1,2 @@
 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-21.1.5.ebuild 
b/app-backup/bareos/bareos-21.1.5.ebuild
new file mode 100644
index ..19bc1b11ce54
--- /dev/null
+++ b/app-backup/bareos/bareos-21.1.5.ebuild
@@ -0,0 +1,390 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake tmpfiles
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bareos.org/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> 
${P}.tar.gz"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
+   logwatch ndmp readline scsi-crypto
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
+
+# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
+DEPEND="
+   !app-backup/bacula
+   acct-group/${PN}
+   !x86? (
+   ceph? ( sys-cluster/ceph )
+   )
+   glusterfs? ( sys-cluster/glusterfs )
+   lmdb? ( dev-db/lmdb )
+   dev-libs/gmp:0
+   !clientonly? (
+   acct-user/${PN}
+   dev-db/postgresql:*[threads]
+   director? (
+   virtual/mta
+   )
+   )
+   logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
+   tcpd? ( sys-apps/tcp-wrappers )
+   readline? ( sys-libs/readline:0 )
+   static? (
+   acl? ( virtual/acl[static-libs] )
+   dev-libs/jansson:=[static-libs]
+   dev-libs/lzo[static-libs]
+   dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/jansson:=
+   dev-libs/lzo
+   dev-libs/openssl:0=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+   "
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
+
+REQUIRED_USE="
+   static? ( clientonly )
+   x86? ( !ceph )
+"
+
+S=${WORKDIR}/${PN}-Release-${PV}
+
+pkg_pretend() {
+   local active_removed_backend=""
+   if has_version "=21.0.0 you need to migrate to 
PostgreSQL"
+   ewarn "catalog backend using the 'bareos-dbcopy' tool of your 
current"
+   ewarn "installation first."
+   ewarn
+   die "current catalog backend not supported anymore"
+   fi
+}
+
+src_test() {
+   # initialze catalog test database
+   initdb -D "${T}"/pgsql || die
+   pg_ctl -w -D "${T}"/pgsql start \
+   -o "-h '' -k '${T}'" || die
+   createuser -h "${T}" bareos || die
+   createdb -h "${T}" --owner bareos bareos || die
+   export PGHOST="${T}"
+
+   # initiale mariadb database for backup tests
+   # $USER must be set and != root
+   export USER=portage
+
+   default
+   

[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/

2022-11-24 Thread John Helmert III
commit: 18ec096ffdca3b05aef98bed01308a55044efa90
Author: John Helmert III  gentoo  org>
AuthorDate: Thu Nov 24 15:04:00 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Thu Nov 24 15:04:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ec096f

app-backup/bareos: drop 19.2.12, 20.0.6

Bug: https://bugs.gentoo.org/631598
Signed-off-by: John Helmert III  gentoo.org>

 app-backup/bareos/Manifest  |   2 -
 app-backup/bareos/bareos-19.2.12.ebuild | 382 ---
 app-backup/bareos/bareos-20.0.6.ebuild  | 394 
 app-backup/bareos/metadata.xml  |   1 -
 4 files changed, 779 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index e99c04adabdc..5b6c99245325 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1 @@
-DIST bareos-19.2.12.tar.gz 12931615 BLAKE2B 
258d826e8b0e7d9d7f5ebc0d5b701ea0c34e82674f14080ec0c758eb888cf845430dab870dbae85190957d570b8b9c551db00b08a002740a7c062f7741cf7338
 SHA512 
6a5d85bf1131cb4a97879410ad8d4d3069715d8fb070e45137bb80666c9907c6db0c65ff5aa3b50ae2f44f0a2f402bf79c6b3817e3d5fa25d1e7088b495aed74
-DIST bareos-20.0.6.tar.gz 13373519 BLAKE2B 
5f75078cc9b82384e06ad2e4545ab26c045208829cb8cd001e6425961486d709b75979f2484e5a648e104f60973552916a49c271ce4024e5e152da13a9a9e72f
 SHA512 
ec83fba412f22725ed440168e62d2876e18c6ddb2ca1837c6169fb0b690118a3380d4f6cf7f9d8e1a8b9601b320ce552a7b7cf74066afb906a09fc1c26208729
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B 
e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941
 SHA512 
acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1

diff --git a/app-backup/bareos/bareos-19.2.12.ebuild 
b/app-backup/bareos/bareos-19.2.12.ebuild
deleted file mode 100644
index d722ad0369d4..
--- a/app-backup/bareos/bareos-19.2.12.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# 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 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 

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

2022-06-10 Thread Sam James
commit: e7fd214864c67de1c11ecbc39fc726b8aae89b73
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 10 11:14:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 10 11:16:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fd2148

app-backup/bareos: drop -Werror; fix build with GCC 12

Closes: https://bugs.gentoo.org/841734
Signed-off-by: Sam James  gentoo.org>

 app-backup/bareos/bareos-21.1.2.ebuild |  2 ++
 .../files/bareos-21.1.2-no-automagic-ccache.patch  | 25 ++
 app-backup/bareos/files/bareos-21.1.2-werror.patch | 23 
 3 files changed, 50 insertions(+)

diff --git a/app-backup/bareos/bareos-21.1.2.ebuild 
b/app-backup/bareos/bareos-21.1.2.ebuild
index 4baeaaf6c0ec..0b224ba4eae8 100644
--- a/app-backup/bareos/bareos-21.1.2.ebuild
+++ b/app-backup/bareos/bareos-21.1.2.ebuild
@@ -143,6 +143,8 @@ src_test() {
 src_prepare() {
# fix gentoo platform support
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-werror.patch"
+   eapply "${FILESDIR}/${PN}-21.1.2-no-automagic-ccache.patch"
 
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"

diff --git a/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch 
b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch
new file mode 100644
index ..22cdc2a41c36
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21.1.2-no-automagic-ccache.patch
@@ -0,0 +1,25 @@
+--- a/core/CMakeLists.txt
 b/core/CMakeLists.txt
+@@ -44,12 +44,6 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME common)
+ 
+ include(GNUInstallDirs)
+ 
+-find_program(CCACHE_FOUND ccache)
+-if(CCACHE_FOUND)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-endif(CCACHE_FOUND)
+-
+ # switch on CXX 17 Support
+ #
+ set(CMAKE_CXX_STANDARD 17)
+@@ -584,9 +578,6 @@ message(STATUS "CMAKE_SUPPRESS_REGENERATION: " 
${CMAKE_SUPPRESS_REGENERATION})
+ # A simple way to get switches to the compiler is to use ADD_DEFINITIONS(). 
But
+ # there are also two variables exactly for this purpose:
+ 
+-# wheter or not
+-message(STATUS "CCACHE_FOUND: " ${CCACHE_FOUND})
+-
+ # Choose the type of build.  Example: SET(CMAKE_BUILD_TYPE Debug)
+ message(STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE})
+ 

diff --git a/app-backup/bareos/files/bareos-21.1.2-werror.patch 
b/app-backup/bareos/files/bareos-21.1.2-werror.patch
new file mode 100644
index ..10de9f1415b6
--- /dev/null
+++ b/app-backup/bareos/files/bareos-21.1.2-werror.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/841734
+--- a/core/CMakeLists.txt
 b/core/CMakeLists.txt
+@@ -96,7 +96,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+ -Werror=format-security compiler_error_format_security
+   )
+   if(${compiler_error_format_security})
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format-security")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security")
+   endif()
+ endif()
+ 
+@@ -353,8 +353,8 @@ if(developer)
+   add_definitions("-DDEVELOPER=1")
+ endif()
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ 
+ include(BareosSetVariableDefaults)
+ option(ENABLE_BCONSOLE "Build bconsole binary" ON)



[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/

2022-03-25 Thread Marc Schiffbauer
commit: 7459f97b5e1463374c04948225c705a7d00bfd75
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Mar 25 07:16:35 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Mar 25 07:16:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7459f97b

app-backup/bareos: drop 18.2.12-r1

Bug: https://bugs.gentoo.org/835342
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-18.2.12-r1.ebuild | 389 -
 2 files changed, 390 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 2494af69af73..e99c04adabdc 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,3 @@
-DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 
765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015
 SHA512 
1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
 DIST bareos-19.2.12.tar.gz 12931615 BLAKE2B 
258d826e8b0e7d9d7f5ebc0d5b701ea0c34e82674f14080ec0c758eb888cf845430dab870dbae85190957d570b8b9c551db00b08a002740a7c062f7741cf7338
 SHA512 
6a5d85bf1131cb4a97879410ad8d4d3069715d8fb070e45137bb80666c9907c6db0c65ff5aa3b50ae2f44f0a2f402bf79c6b3817e3d5fa25d1e7088b495aed74
 DIST bareos-20.0.6.tar.gz 13373519 BLAKE2B 
5f75078cc9b82384e06ad2e4545ab26c045208829cb8cd001e6425961486d709b75979f2484e5a648e104f60973552916a49c271ce4024e5e152da13a9a9e72f
 SHA512 
ec83fba412f22725ed440168e62d2876e18c6ddb2ca1837c6169fb0b690118a3380d4f6cf7f9d8e1a8b9601b320ce552a7b7cf74066afb906a09fc1c26208729
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B 
e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941
 SHA512 
acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1

diff --git a/app-backup/bareos/bareos-18.2.12-r1.ebuild 
b/app-backup/bareos/bareos-18.2.12-r1.ebuild
deleted file mode 100644
index c40c79602918..
--- a/app-backup/bareos/bareos-18.2.12-r1.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit desktop systemd cmake
-
-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 systemd 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? ( 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? (
-   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? (
-   sys-block/mtx
-   app-arch/mt-st
-   )
-   )
-   vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-REQUIRED_USE="static? ( clientonly )"
-
-S=${WORKDIR}/${PN}-Release-${PV}
-

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

2022-03-21 Thread Marc Schiffbauer
commit: 850461b19c0077abc8669c9cfc2d4728d27c2d5b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Mar 21 09:53:53 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Mar 21 09:59:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=850461b1

app-backup/bareos: add 20.0.6, drop 20.0.5

Bug: https://bugs.gentoo.org/835342
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest   | 2 +-
 app-backup/bareos/{bareos-20.0.5.ebuild => bareos-20.0.6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index a6479ed770d1..a52d7f8850ff 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +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.5.tar.gz 13343612 BLAKE2B 
78fc178b021165377cb912593f56c248fed68b44deab3626087c9fc10d2eeb866730b734e0ba5982424b4bbb875d734e62351c8114c947057478d4929df2ca2c
 SHA512 
a61141944c24042f2b9f977672564923d4912756c821abe516f94a2c21f5b990236f22187c8567956edef09029f740552c3bc6c30f8c6d65c3f0b06b84ef00e7
+DIST bareos-20.0.6.tar.gz 13373519 BLAKE2B 
5f75078cc9b82384e06ad2e4545ab26c045208829cb8cd001e6425961486d709b75979f2484e5a648e104f60973552916a49c271ce4024e5e152da13a9a9e72f
 SHA512 
ec83fba412f22725ed440168e62d2876e18c6ddb2ca1837c6169fb0b690118a3380d4f6cf7f9d8e1a8b9601b320ce552a7b7cf74066afb906a09fc1c26208729
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B 
e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941
 SHA512 
acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1

diff --git a/app-backup/bareos/bareos-20.0.5.ebuild 
b/app-backup/bareos/bareos-20.0.6.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-20.0.5.ebuild
rename to app-backup/bareos/bareos-20.0.6.ebuild



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

2022-03-21 Thread Marc Schiffbauer
commit: 047dc13847ad4716c300068d0368658268c6f50a
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Mar 21 09:58:07 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Mar 21 09:59:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=047dc138

app-backup/bareos: add 19.2.12, drop 19.2.11-r1

Bug: https://bugs.gentoo.org/835342
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest| 2 +-
 app-backup/bareos/{bareos-19.2.11-r1.ebuild => bareos-19.2.12.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index a52d7f8850ff..2494af69af73 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +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-19.2.12.tar.gz 12931615 BLAKE2B 
258d826e8b0e7d9d7f5ebc0d5b701ea0c34e82674f14080ec0c758eb888cf845430dab870dbae85190957d570b8b9c551db00b08a002740a7c062f7741cf7338
 SHA512 
6a5d85bf1131cb4a97879410ad8d4d3069715d8fb070e45137bb80666c9907c6db0c65ff5aa3b50ae2f44f0a2f402bf79c6b3817e3d5fa25d1e7088b495aed74
 DIST bareos-20.0.6.tar.gz 13373519 BLAKE2B 
5f75078cc9b82384e06ad2e4545ab26c045208829cb8cd001e6425961486d709b75979f2484e5a648e104f60973552916a49c271ce4024e5e152da13a9a9e72f
 SHA512 
ec83fba412f22725ed440168e62d2876e18c6ddb2ca1837c6169fb0b690118a3380d4f6cf7f9d8e1a8b9601b320ce552a7b7cf74066afb906a09fc1c26208729
 DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B 
e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941
 SHA512 
acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1

diff --git a/app-backup/bareos/bareos-19.2.11-r1.ebuild 
b/app-backup/bareos/bareos-19.2.12.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-19.2.11-r1.ebuild
rename to app-backup/bareos/bareos-19.2.12.ebuild
index f2b7fc690b8d..d722ad0369d4 100644
--- a/app-backup/bareos/bareos-19.2.11-r1.ebuild
+++ b/app-backup/bareos/bareos-19.2.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 



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

2022-03-21 Thread Marc Schiffbauer
commit: 2ba92c7f30696ca85c33e7c62c1ba567d0c0a809
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Mar 21 09:49:11 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Mar 21 09:59:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba92c7f

app-backup/bareos: add 21.1.2, drop 21.0.0-r2

Bug: https://bugs.gentoo.org/835342
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/Manifest  | 2 +-
 app-backup/bareos/{bareos-21.0.0-r2.ebuild => bareos-21.1.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 84d21463c466..a6479ed770d1 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +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.5.tar.gz 13343612 BLAKE2B 
78fc178b021165377cb912593f56c248fed68b44deab3626087c9fc10d2eeb866730b734e0ba5982424b4bbb875d734e62351c8114c947057478d4929df2ca2c
 SHA512 
a61141944c24042f2b9f977672564923d4912756c821abe516f94a2c21f5b990236f22187c8567956edef09029f740552c3bc6c30f8c6d65c3f0b06b84ef00e7
-DIST bareos-21.0.0.tar.gz 11306618 BLAKE2B 
0363465c40a8053bb5ec772c18ac0dc852f379979e3afc45dd29c79f8187238363c1f07e2f39d25613404b1b6e253700b33b274389ca2dc4655d201bc4888166
 SHA512 
0a57bccca0589f3ce8a5664afbeb1eb1b17ec7142722e2d0bb2a0bbd9007688725b39c6db59646c180ce096e55451c09934e6479a2b4deeb4d3ee738ab2c32cd
+DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B 
e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941
 SHA512 
acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1

diff --git a/app-backup/bareos/bareos-21.0.0-r2.ebuild 
b/app-backup/bareos/bareos-21.1.2.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-21.0.0-r2.ebuild
rename to app-backup/bareos/bareos-21.1.2.ebuild



[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 

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

2022-02-02 Thread Marc Schiffbauer
commit: 0a57b84a09f8f1842b4c6cef6238969a5aaffc9e
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Feb  2 09:45:10 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Feb  2 09:47:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a57b84a

app-backup/bareos: revbump for dep and test update

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

 ...areos-21.0.0.ebuild => bareos-21.0.0-r1.ebuild} | 40 --
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/app-backup/bareos/bareos-21.0.0.ebuild 
b/app-backup/bareos/bareos-21.0.0-r1.ebuild
similarity index 92%
rename from app-backup/bareos/bareos-21.0.0.ebuild
rename to app-backup/bareos/bareos-21.0.0-r1.ebuild
index ef360cdc5a34..787a7074b9fc 100644
--- a/app-backup/bareos/bareos-21.0.0.ebuild
+++ b/app-backup/bareos/bareos-21.0.0-r1.ebuild
@@ -12,14 +12,20 @@ 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"
+
+# some tests still fail propably due to missing bits in src_test -> TODO
+RESTRICT="mirror test"
+#RESTRICT="
+#  mirror
+#  !test? ( test )
+#"
 
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto
-   static +storage-daemon systemd tcpd vim-syntax vmware xattr"
+   static +storage-daemon systemd tcpd test vim-syntax vmware xattr"
 
 # get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
 DEPEND="
@@ -68,7 +74,15 @@ RDEPEND="${DEPEND}
)
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-BDEPEND="${PYTHON_DEPS}"
+
+BDEPEND="
+   ${PYTHON_DEPS}
+   test? (
+   dev-cpp/gtest
+   dev-db/postgresql:*[server,threads]
+   dev-db/mariadb:*[server]
+   )
+"
 
 REQUIRED_USE="
static? ( clientonly )
@@ -106,6 +120,26 @@ pkg_pretend() {
fi
 }
 
+src_test() {
+   # initialze catalog test database
+   initdb -D "${T}"/pgsql || die
+   pg_ctl -w -D "${T}"/pgsql start \
+   -o "-h '' -k '${T}'" || die
+   createuser -h "${T}" bareos || die
+   createdb -h "${T}" --owner bareos bareos || die
+   export PGHOST="${T}"
+
+   # initiale mariadb database for backup tests
+   # $USER must be set and != root
+   export USER=portage
+
+   default
+   cmake_src_test
+
+   pg_ctl -w -D "${T}"/pgsql stop || die
+   rm -rvf "${T}"/pgsql
+}
+
 src_prepare() {
# fix gentoo platform support
eapply -p1 "${FILESDIR}/${PN}-21-cmake-gentoo.patch"



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

2022-02-01 Thread Marc Schiffbauer
commit: 3d721560975514e028b73d1f91ff2638299e7558
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Feb  1 10:49:15 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Feb  1 10:50:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d721560

app-backup/bareos: fix dependency

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

 app-backup/bareos/bareos-21.0.0.ebuild | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app-backup/bareos/bareos-21.0.0.ebuild 
b/app-backup/bareos/bareos-21.0.0.ebuild
index 3a2b763a61dd..ef360cdc5a34 100644
--- a/app-backup/bareos/bareos-21.0.0.ebuild
+++ b/app-backup/bareos/bareos-21.0.0.ebuild
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb
+IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb
logwatch ndmp readline scsi-crypto
static +storage-daemon systemd tcpd vim-syntax vmware xattr"
 
@@ -36,7 +36,6 @@ DEPEND="
dev-db/postgresql:*[threads]
director? (
virtual/mta
-   jansson? ( dev-libs/jansson:= )
)
)
logwatch? ( sys-apps/logwatch )
@@ -45,13 +44,15 @@ DEPEND="
readline? ( sys-libs/readline:0 )
static? (
acl? ( virtual/acl[static-libs] )
-   sys-libs/zlib[static-libs]
+   dev-libs/jansson:=[static-libs]
dev-libs/lzo[static-libs]
-   sys-libs/ncurses:=[static-libs]
dev-libs/openssl:0=[static-libs]
+   sys-libs/ncurses:=[static-libs]
+   sys-libs/zlib[static-libs]
)
!static? (
acl? ( virtual/acl )
+   dev-libs/jansson:=
dev-libs/lzo
dev-libs/openssl:0=
sys-libs/ncurses:=



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

2022-02-01 Thread Marc Schiffbauer
commit: 056577b90287fb3649886ed9eb0a75c2244fcbe1
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Feb  1 10:21:41 2022 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Feb  1 10:22:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056577b9

app-backup/bareos: add 20.0.5, drop 20.0.3-r2

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

 app-backup/bareos/Manifest  | 2 +-
 app-backup/bareos/{bareos-20.0.3-r2.ebuild => bareos-20.0.5.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index b10d1c65a297..84d21463c466 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +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-20.0.5.tar.gz 13343612 BLAKE2B 
78fc178b021165377cb912593f56c248fed68b44deab3626087c9fc10d2eeb866730b734e0ba5982424b4bbb875d734e62351c8114c947057478d4929df2ca2c
 SHA512 
a61141944c24042f2b9f977672564923d4912756c821abe516f94a2c21f5b990236f22187c8567956edef09029f740552c3bc6c30f8c6d65c3f0b06b84ef00e7
 DIST bareos-21.0.0.tar.gz 11306618 BLAKE2B 
0363465c40a8053bb5ec772c18ac0dc852f379979e3afc45dd29c79f8187238363c1f07e2f39d25613404b1b6e253700b33b274389ca2dc4655d201bc4888166
 SHA512 
0a57bccca0589f3ce8a5664afbeb1eb1b17ec7142722e2d0bb2a0bbd9007688725b39c6db59646c180ce096e55451c09934e6479a2b4deeb4d3ee738ab2c32cd

diff --git a/app-backup/bareos/bareos-20.0.3-r2.ebuild 
b/app-backup/bareos/bareos-20.0.5.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-20.0.3-r2.ebuild
rename to app-backup/bareos/bareos-20.0.5.ebuild
index 98191f5002a8..a678aef69a5f 100644
--- a/app-backup/bareos/bareos-20.0.3-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 



[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"
+   

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

2021-09-30 Thread Marc Schiffbauer
commit: fd0a4a6df9571241516e2af76d09265d369fadd5
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu Sep 30 11:14:58 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu Sep 30 11:15:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0a4a6d

app-backup/bareos: drop python2 dependency

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

 .../bareos/{bareos-20.0.3-r1.ebuild => bareos-20.0.3-r2.ebuild}   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-backup/bareos/bareos-20.0.3-r1.ebuild 
b/app-backup/bareos/bareos-20.0.3-r2.ebuild
similarity index 98%
rename from app-backup/bareos/bareos-20.0.3-r1.ebuild
rename to app-backup/bareos/bareos-20.0.3-r2.ebuild
index b46f2176016..98191f5002a 100644
--- a/app-backup/bareos/bareos-20.0.3-r1.ebuild
+++ b/app-backup/bareos/bareos-20.0.3-r2.ebuild
@@ -59,7 +59,6 @@ DEPEND="
sys-libs/ncurses:=
sys-libs/zlib
)
-   vmware? ( dev-lang/python:2.7 )
"
 RDEPEND="${DEPEND}
!clientonly? (
@@ -198,10 +197,11 @@ src_install() {
rm -f "${D}"/etc/bareos/bareos-regress.conf
rm -f "${D}"/etc/logrotate.d/bareos-dir
 
-   # get rid of py2 stuff if USE=-vmware
+   # get rid of py2 stuff
+   rm -rf "$D"/usr/lib64/python2.7
+   rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so
if ! use vmware; then
-   rm -f 
"$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py,python-fd.so}
-   rm -rf "$D"/usr/lib64/python2.7
+   rm -f 
"$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py}
fi
 
# rename statically linked apps



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

2021-09-25 Thread Sam James
commit: f90f36b517649742b0df2f05d0bdc36fa4fc5a0a
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 25 19:04:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 25 19:08:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f90f36b5

app-backup/bareos: add libjansson subslot dep

Earlier versions of libjansson lacked symbol versioning, causing crashes.

Bug: https://bugs.gentoo.org/812119
Signed-off-by: Sam James  gentoo.org>

 app-backup/bareos/{bareos-18.2.12.ebuild => bareos-18.2.12-r1.ebuild} | 2 +-
 app-backup/bareos/{bareos-19.2.11.ebuild => bareos-19.2.11-r1.ebuild} | 2 +-
 app-backup/bareos/{bareos-20.0.3.ebuild => bareos-20.0.3-r1.ebuild}   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-backup/bareos/bareos-18.2.12.ebuild 
b/app-backup/bareos/bareos-18.2.12-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-18.2.12.ebuild
rename to app-backup/bareos/bareos-18.2.12-r1.ebuild
index 996c4c35ce1..c40c7960291 100644
--- a/app-backup/bareos/bareos-18.2.12.ebuild
+++ b/app-backup/bareos/bareos-18.2.12-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
sqlite? ( dev-db/sqlite:3 )
director? (
virtual/mta
-   jansson? ( dev-libs/jansson )
+   jansson? ( dev-libs/jansson:= )
)
)
fastlz? ( dev-libs/bareos-fastlzlib )

diff --git a/app-backup/bareos/bareos-19.2.11.ebuild 
b/app-backup/bareos/bareos-19.2.11-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-19.2.11.ebuild
rename to app-backup/bareos/bareos-19.2.11-r1.ebuild
index a9e76afe101..f2b7fc690b8 100644
--- a/app-backup/bareos/bareos-19.2.11.ebuild
+++ b/app-backup/bareos/bareos-19.2.11-r1.ebuild
@@ -38,7 +38,7 @@ DEPEND="
sqlite? ( dev-db/sqlite:3 )
director? (
virtual/mta
-   jansson? ( dev-libs/jansson )
+   jansson? ( dev-libs/jansson:= )
)
)
logwatch? ( sys-apps/logwatch )

diff --git a/app-backup/bareos/bareos-20.0.3.ebuild 
b/app-backup/bareos/bareos-20.0.3-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-20.0.3.ebuild
rename to app-backup/bareos/bareos-20.0.3-r1.ebuild
index 261eb0feb12..b46f2176016 100644
--- a/app-backup/bareos/bareos-20.0.3.ebuild
+++ b/app-backup/bareos/bareos-20.0.3-r1.ebuild
@@ -38,7 +38,7 @@ DEPEND="
sqlite? ( dev-db/sqlite:3 )
director? (
virtual/mta
-   jansson? ( dev-libs/jansson )
+   jansson? ( dev-libs/jansson:= )
)
)
logwatch? ( sys-apps/logwatch )



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

2021-09-20 Thread Marc Schiffbauer
commit: 2b516fdfb598e011096c7de1e74591428f80a7e5
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep 20 10:19:15 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep 20 10:29:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b516fdf

app-backup/bareos: add 20.0.3, drop 20.0.2-r2

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

 app-backup/bareos/Manifest  | 2 +-
 app-backup/bareos/{bareos-20.0.2-r2.ebuild => bareos-20.0.3.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index a3fa684199a..7edfd651c57 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B 
ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096
 SHA512 
2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
 DIST bareos-19.2.10.tar.gz 12893797 BLAKE2B 
49493acab4fbd26a4ef9aa2f9c19df8a535460596d8206a4d15fedeaace420b7ba948505d7b74ef65aeb94bb8bfa77cf392babeb3e6509839ac418d935fa7070
 SHA512 
946b1dc5709696363d2ffa3d890fa662976690723ab8054d827c930f27757a22af44b83915ce2a4f198a7d0c2a71bb19b4597141afd31b9809bd6b214237d475
-DIST bareos-20.0.2.tar.gz 1946 BLAKE2B 
f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536
 SHA512 
f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994
+DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B 
c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b
 SHA512 
3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082

diff --git a/app-backup/bareos/bareos-20.0.2-r2.ebuild 
b/app-backup/bareos/bareos-20.0.3.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-20.0.2-r2.ebuild
rename to app-backup/bareos/bareos-20.0.3.ebuild
index 26e36562676..261eb0feb12 100644
--- a/app-backup/bareos/bareos-20.0.2-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.3.ebuild
@@ -92,7 +92,7 @@ src_prepare() {
popd >&/dev/null || die
 
# fix gentoo platform support
-   eapply -p1 "${FILESDIR}/${P}-cmake-gentoo.patch"
+   eapply -p1 "${FILESDIR}/${PN}-20.0.2-cmake-gentoo.patch"
 
# fix missing DESTDIR in symlink creation
sed -i '/bareos-symlink-default-db-backend.cmake/d' 
"${S}/core/src/cats/CMakeLists.txt"



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

2021-09-20 Thread Marc Schiffbauer
commit: 4bde48749c08fb92dc9ee550f5951a45fffc5b05
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep 20 10:21:27 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep 20 10:29:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bde4874

app-backup/bareos: add 19.2.11, drop 19.2.10-r2

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

 app-backup/bareos/Manifest| 2 +-
 app-backup/bareos/{bareos-19.2.10-r2.ebuild => bareos-19.2.11.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 7edfd651c57..0c6c0e98e76 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B 
ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096
 SHA512 
2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
-DIST bareos-19.2.10.tar.gz 12893797 BLAKE2B 
49493acab4fbd26a4ef9aa2f9c19df8a535460596d8206a4d15fedeaace420b7ba948505d7b74ef65aeb94bb8bfa77cf392babeb3e6509839ac418d935fa7070
 SHA512 
946b1dc5709696363d2ffa3d890fa662976690723ab8054d827c930f27757a22af44b83915ce2a4f198a7d0c2a71bb19b4597141afd31b9809bd6b214237d475
+DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 
2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0
 SHA512 
46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
 DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B 
c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b
 SHA512 
3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082

diff --git a/app-backup/bareos/bareos-19.2.10-r2.ebuild 
b/app-backup/bareos/bareos-19.2.11.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-19.2.10-r2.ebuild
rename to app-backup/bareos/bareos-19.2.11.ebuild



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

2021-09-20 Thread Marc Schiffbauer
commit: d1be01d5d2c8db6d0c4a0f7998aabf7b51dcd6cd
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep 20 10:28:17 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep 20 10:29:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1be01d5

app-backup/bareos: add 18.2.12, drop 18.2.10-r2

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

 app-backup/bareos/Manifest| 2 +-
 app-backup/bareos/{bareos-18.2.10-r2.ebuild => bareos-18.2.12.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 0c6c0e98e76..406a45ba107 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
-DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B 
ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096
 SHA512 
2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
+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

diff --git a/app-backup/bareos/bareos-18.2.10-r2.ebuild 
b/app-backup/bareos/bareos-18.2.12.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-18.2.10-r2.ebuild
rename to app-backup/bareos/bareos-18.2.12.ebuild



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

2021-09-20 Thread Marc Schiffbauer
commit: 52de6e4bf3c7f79431db9b3179166252f9de7739
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep 20 09:29:35 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep 20 09:34:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52de6e4b

app-backup/bareos: fix double logrotate entry

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

 app-backup/bareos/bareos-20.0.2-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-backup/bareos/bareos-20.0.2-r2.ebuild 
b/app-backup/bareos/bareos-20.0.2-r2.ebuild
index 0e4e0741a3c..26e36562676 100644
--- a/app-backup/bareos/bareos-20.0.2-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.2-r2.ebuild
@@ -194,8 +194,9 @@ src_install() {
# remove upstream init scripts and systemd units
rm -f "${D}"/etc/init.d/bareos-* 
"${D}"/lib/systemd/system/bareos-*.service
 
-   # remove misc stuffwe do not need in production
+   # remove misc stuff we do not need in production
rm -f "${D}"/etc/bareos/bareos-regress.conf
+   rm -f "${D}"/etc/logrotate.d/bareos-dir
 
# get rid of py2 stuff if USE=-vmware
if ! use vmware; then



[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/

2021-09-06 Thread Marc Schiffbauer
commit: 68520b3c114bbe7f2eae22dae8f0c2937c188014
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep  6 22:17:46 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep  6 22:26:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68520b3c

app-backup/bareos: do not install bareos-regress.conf

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

 app-backup/bareos/bareos-20.0.2-r2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-backup/bareos/bareos-20.0.2-r2.ebuild 
b/app-backup/bareos/bareos-20.0.2-r2.ebuild
index edf65d1c2d9..5a71ec95200 100644
--- a/app-backup/bareos/bareos-20.0.2-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.2-r2.ebuild
@@ -194,6 +194,9 @@ src_install() {
# remove upstream init scripts and systemd units
rm -f "${D}"/etc/init.d/bareos-* 
"${D}"/lib/systemd/system/bareos-*.service
 
+   # remove misc stuffwe do not need in production
+   rm -f "${D}"/etc/bareos/bareos-regress.conf
+
# get rid of py2 stuff if USE=-vmware
if ! use vmware; then
rm -f 
"$D"/usr/lib64/bareos/plugin/{BareosFdPluginVMware.py,bareos-fd-vmware.py,python-fd.so}



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

2021-09-06 Thread Marc Schiffbauer
commit: d035ecb963eed74703aaf9017ed3d7a10cca077d
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep  6 22:23:39 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep  6 22:26:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d035ecb9

app-backup/bareos: rm bareos-regress.conf, fix vmware USE flag

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

 app-backup/bareos/bareos-20.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/bareos-20.0.2-r2.ebuild 
b/app-backup/bareos/bareos-20.0.2-r2.ebuild
index 5a71ec95200..0e4e0741a3c 100644
--- a/app-backup/bareos/bareos-20.0.2-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.2-r2.ebuild
@@ -19,7 +19,7 @@ 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"
+   sqlite static +storage-daemon systemd tcpd vim-syntax vmware xattr"
 
 # get cmake variables from core/cmake/BareosSetVariableDefaults.cmake
 DEPEND="



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

2021-09-06 Thread Marc Schiffbauer
commit: cee394d24645d97a6904df90fd0ab960de4367ef
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Sep  6 11:58:41 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Sep  6 11:59:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee394d2

app-backup/bareos: add workaround for #631598

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

 ...{bareos-18.2.10-r1.ebuild => bareos-18.2.10-r2.ebuild} |  0
 ...{bareos-19.2.10-r1.ebuild => bareos-19.2.10-r2.ebuild} |  0
 .../{bareos-20.0.2-r1.ebuild => bareos-20.0.2-r2.ebuild}  |  0
 app-backup/bareos/files/bareos-dir.initd  | 15 ---
 app-backup/bareos/files/bareos-sd.initd   | 15 ---
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app-backup/bareos/bareos-18.2.10-r1.ebuild 
b/app-backup/bareos/bareos-18.2.10-r2.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-18.2.10-r1.ebuild
rename to app-backup/bareos/bareos-18.2.10-r2.ebuild

diff --git a/app-backup/bareos/bareos-19.2.10-r1.ebuild 
b/app-backup/bareos/bareos-19.2.10-r2.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-19.2.10-r1.ebuild
rename to app-backup/bareos/bareos-19.2.10-r2.ebuild

diff --git a/app-backup/bareos/bareos-20.0.2-r1.ebuild 
b/app-backup/bareos/bareos-20.0.2-r2.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-20.0.2-r1.ebuild
rename to app-backup/bareos/bareos-20.0.2-r2.ebuild

diff --git a/app-backup/bareos/files/bareos-dir.initd 
b/app-backup/bareos/files/bareos-dir.initd
index 9f17f212e4a..462ff07843a 100644
--- a/app-backup/bareos/files/bareos-dir.initd
+++ b/app-backup/bareos/files/bareos-dir.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -8,14 +8,23 @@ depend() {
 
 start() {
ebegin "Starting bareos director"
-   checkpath -d -m 0750 -o root:bareos /run/bareos
+   # g+w until #631598 is resolved
+   checkpath -d -m 0770 -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
eend $?
 }
 
 stop() {
ebegin "Stopping bareos director"
-   start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-dir.*.pid
+   # 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
eend $?
 }

diff --git a/app-backup/bareos/files/bareos-sd.initd 
b/app-backup/bareos/files/bareos-sd.initd
index 4f7fbcb52bf..97b9ccdc92f 100644
--- a/app-backup/bareos/files/bareos-sd.initd
+++ b/app-backup/bareos/files/bareos-sd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -8,14 +8,23 @@ depend() {
 
 start() {
ebegin "Starting bareos storage daemon"
-   checkpath -d -m 0750 -o root:bareos /run/bareos
+   # g+w until #631598 is resolved
+   checkpath -d -m 0770 -o root:bareos /run/bareos
start-stop-daemon --start --quiet --exec /usr/sbin/bareos-sd \
-- ${SD_OPTIONS}
+   # harden pid file until #631598 is resolved
+   ewaitfile 10 /run/bareos/bareos-sd.9103.pid
+   chown root:bareos /run/bareos/bareos-sd.9103.pid
eend $?
 }
 
 stop() {
ebegin "Stopping bareos storage daemon"
-   start-stop-daemon --stop --quiet --pidfile /run/bareos/bareos-sd.*.pid 
+   # check pid file until #631598 is resolved
+   if [[ $(stat -c %U /run/bareos/bareos-sd.9103.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-sd.9103.pid
+   fi
eend $?
 }



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

2021-08-21 Thread Marc Schiffbauer
commit: 3dabba831c4f4ffe807b2731de0930f69facccec
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug 21 10:00:55 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug 21 10:02:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dabba83

app-backup/bareos: revbump for improved systemd units

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

 ...eos-18.2.10.ebuild => bareos-18.2.10-r1.ebuild} | 16 -
 ...eos-19.2.10.ebuild => bareos-19.2.10-r1.ebuild} | 16 -
 ...areos-20.0.2.ebuild => bareos-20.0.2-r1.ebuild} | 16 -
 app-backup/bareos/files/bareos-dir.service | 27 +
 app-backup/bareos/files/bareos-fd.service  | 26 
 app-backup/bareos/files/bareos-sd.service  | 28 ++
 6 files changed, 96 insertions(+), 33 deletions(-)

diff --git a/app-backup/bareos/bareos-18.2.10.ebuild 
b/app-backup/bareos/bareos-18.2.10-r1.ebuild
similarity index 96%
rename from app-backup/bareos/bareos-18.2.10.ebuild
rename to app-backup/bareos/bareos-18.2.10-r1.ebuild
index a707bd84416..996c4c35ce1 100644
--- a/app-backup/bareos/bareos-18.2.10.ebuild
+++ b/app-backup/bareos/bareos-18.2.10-r1.ebuild
@@ -200,8 +200,8 @@ src_install() {
rm -f 
"${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
rm -f "${D}"/usr/sbin/bareos
 
-   # remove upstream init scripts
-   rm -f "${D}"/etc/init.d/bareos-*
+   # remove upstream init scripts and systemd units
+   rm -f "${D}"/etc/init.d/bareos-* 
"${D}"/lib/systemd/system/bareos-*.service
 
# rename statically linked apps
if use clientonly && use static ; then
@@ -247,9 +247,6 @@ src_install() {
 
rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
if use clientonly || ! use director; then
-   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*
@@ -265,9 +262,6 @@ src_install() {
rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
fi
if use clientonly || ! use storage-daemon; then
-   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*
@@ -331,10 +325,10 @@ src_install() {
# install systemd unit files
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
+   use director && systemd_dounit 
"${FILESDIR}"/bareos-dir.service
+   use storage-daemon && systemd_dounit 
"${FILESDIR}"/bareos-sd.service
fi
-   systemd_dounit core/platforms/systemd/bareos-fd.service
+   systemd_dounit "${FILESDIR}"/bareos-fd.service
fi
 
# make sure the working directory exists

diff --git a/app-backup/bareos/bareos-19.2.10.ebuild 
b/app-backup/bareos/bareos-19.2.10-r1.ebuild
similarity index 95%
rename from app-backup/bareos/bareos-19.2.10.ebuild
rename to app-backup/bareos/bareos-19.2.10-r1.ebuild
index ee87d3e36f9..a9e76afe101 100644
--- a/app-backup/bareos/bareos-19.2.10.ebuild
+++ b/app-backup/bareos/bareos-19.2.10-r1.ebuild
@@ -189,8 +189,8 @@ src_install() {
# remove timelimit to fix #778557
rm -f "${D}"/usr/{,s}bin/timelimit
 
-   # remove upstream init scripts
-   rm -f "${D}"/etc/init.d/bareos-*
+   # remove upstream init scripts and systemd units
+   rm -f "${D}"/etc/init.d/bareos-* 
"${D}"/lib/systemd/system/bareos-*.service
 
# rename statically linked apps
if use clientonly && use static ; then
@@ -236,9 +236,6 @@ src_install() {
 
rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1*
if use clientonly || ! use director; then
-   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*
@@ -254,9 +251,6 @@ src_install() {
rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup
fi
if use clientonly || ! use storage-daemon; then
-   if use systemd; then
-   

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

2021-08-21 Thread Marc Schiffbauer
commit: 00e2f9d8d2c4eee49c69b471565f08fd1e4965e6
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug 21 09:01:51 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug 21 09:15:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e2f9d8

app-backup/bareos: bump 19.2.9 -> 19.2.10

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

 app-backup/bareos/Manifest   | 2 +-
 app-backup/bareos/{bareos-19.2.9-r2.ebuild => bareos-19.2.10.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 4fc2c693c6b..a3fa684199a 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 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-19.2.10.tar.gz 12893797 BLAKE2B 
49493acab4fbd26a4ef9aa2f9c19df8a535460596d8206a4d15fedeaace420b7ba948505d7b74ef65aeb94bb8bfa77cf392babeb3e6509839ac418d935fa7070
 SHA512 
946b1dc5709696363d2ffa3d890fa662976690723ab8054d827c930f27757a22af44b83915ce2a4f198a7d0c2a71bb19b4597141afd31b9809bd6b214237d475
 DIST bareos-20.0.2.tar.gz 1946 BLAKE2B 
f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536
 SHA512 
f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994

diff --git a/app-backup/bareos/bareos-19.2.9-r2.ebuild 
b/app-backup/bareos/bareos-19.2.10.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-19.2.9-r2.ebuild
rename to app-backup/bareos/bareos-19.2.10.ebuild



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

2021-08-20 Thread Marc Schiffbauer
commit: 366803f1650c17e6d04f9c99c0623bd43aa4c4bc
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Aug 20 13:07:18 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Aug 20 13:08:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=366803f1

app-backup/bareos: disable coverage (fix #749038)

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

 app-backup/bareos/bareos-18.2.10.ebuild   | 2 +-
 app-backup/bareos/bareos-19.2.9-r2.ebuild | 2 +-
 app-backup/bareos/bareos-20.0.2.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-backup/bareos/bareos-18.2.10.ebuild 
b/app-backup/bareos/bareos-18.2.10.ebuild
index 9f8f8def176..a707bd84416 100644
--- a/app-backup/bareos/bareos-18.2.10.ebuild
+++ b/app-backup/bareos/bareos-18.2.10.ebuild
@@ -175,7 +175,7 @@ src_configure() {
-Ddynamic-storage-backends=yes
-Dbatch-insert=yes
-Dhost=${CHOST}
-   -Dcoverage=yes
+   -Dcoverage=no
-Dpython=no
-Dsmartalloc=yes
-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold 
-w 32 | head -n 1`"

diff --git a/app-backup/bareos/bareos-19.2.9-r2.ebuild 
b/app-backup/bareos/bareos-19.2.9-r2.ebuild
index ee9872b9793..ee87d3e36f9 100644
--- a/app-backup/bareos/bareos-19.2.9-r2.ebuild
+++ b/app-backup/bareos/bareos-19.2.9-r2.ebuild
@@ -138,7 +138,7 @@ src_configure() {
-Dbatch-insert=yes
-Dbsrdir=/var/lib/bareos/bsr
-Dconfdir=/etc/bareos
-   -Dcoverage=yes
+   -Dcoverage=no
-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 
16 | head -n 1`
-Ddir-group=bareos
-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold 
-w 32 | head -n 1`"

diff --git a/app-backup/bareos/bareos-20.0.2.ebuild 
b/app-backup/bareos/bareos-20.0.2.ebuild
index ac4113bf49b..2b7f4265375 100644
--- a/app-backup/bareos/bareos-20.0.2.ebuild
+++ b/app-backup/bareos/bareos-20.0.2.ebuild
@@ -139,7 +139,7 @@ src_configure() {
-Dbatch-insert=yes
-Dbsrdir=/var/lib/bareos/bsr
-Dconfdir=/etc/bareos
-   -Dcoverage=yes
+   -Dcoverage=no
-Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 
16 | head -n 1`
-Ddir-group=bareos
-Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold 
-w 32 | head -n 1`"



[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/

2021-08-20 Thread Marc Schiffbauer
commit: c59dabcf4a7f11fd022f4b6c9af391b13e424f58
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Aug 20 10:27:56 2021 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Aug 20 10:46:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59dabcf

app-backup/bareos: add dep, get rid of timelimit

add missing DEPEND with [ndmp]
do not install timelimit tool

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

 .../bareos/{bareos-19.2.9-r1.ebuild => bareos-19.2.9-r2.ebuild}   | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-backup/bareos/bareos-19.2.9-r1.ebuild 
b/app-backup/bareos/bareos-19.2.9-r2.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-19.2.9-r1.ebuild
rename to app-backup/bareos/bareos-19.2.9-r2.ebuild
index 1c9bdced2c6..ee9872b9793 100644
--- a/app-backup/bareos/bareos-19.2.9-r1.ebuild
+++ b/app-backup/bareos/bareos-19.2.9-r2.ebuild
@@ -42,6 +42,7 @@ DEPEND="
)
)
logwatch? ( sys-apps/logwatch )
+   ndmp? ( net-libs/rpcsvc-proto )
tcpd? ( sys-apps/tcp-wrappers )
readline? ( sys-libs/readline:0 )
static? (
@@ -185,6 +186,9 @@ src_install() {
rm -f 
"${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql}
rm -f "${D}"/usr/sbin/bareos
 
+   # remove timelimit to fix #778557
+   rm -f "${D}"/usr/{,s}bin/timelimit
+
# remove upstream init scripts
rm -f "${D}"/etc/init.d/bareos-*
 



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

2021-07-31 Thread Sam James
commit: 54e4cb4b94f7ede4f3bbe5e159bae3b556c9275f
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 31 03:13:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 31 22:13:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e4cb4b

app-backup/bareos: [QA] call tmpfiles_process in pkg_postinst

This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.

Revbump because the new tmpfiles inherit adds a new dependency
(virtual/tmpfiles).

Signed-off-by: Sam James  gentoo.org>

 .../bareos/{bareos-19.2.9.ebuild => bareos-19.2.9-r1.ebuild}   | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-backup/bareos/bareos-19.2.9.ebuild 
b/app-backup/bareos/bareos-19.2.9-r1.ebuild
similarity index 98%
rename from app-backup/bareos/bareos-19.2.9.ebuild
rename to app-backup/bareos/bareos-19.2.9-r1.ebuild
index e2d48fb2396..1c9bdced2c6 100644
--- a/app-backup/bareos/bareos-19.2.9.ebuild
+++ b/app-backup/bareos/bareos-19.2.9-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 CMAKE_WARN_UNUSED_CLI=no
 #CMAKE_REMOVE_MODULES=yes
 
-inherit python-any-r1 systemd cmake
+inherit python-any-r1 systemd cmake tmpfiles
 
 DESCRIPTION="Featureful client/server network backup suite"
 HOMEPAGE="https://www.bareos.org/;
@@ -330,14 +330,15 @@ src_install() {
diropts -m0755
keepdir /var/log/bareos
 
-   insinto /usr/lib/tmpfiles.d
-   newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+   newtmpfiles "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
 
# make sure bareos group can execute bareos libexec scripts
fowners -R root:bareos /usr/libexec/bareos
 }
 
 pkg_postinst() {
+   tmpfiles_process bareos.conf
+
if use clientonly; then
fowners root:bareos /var/lib/bareos
else



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

2021-04-30 Thread Mikle Kolyada
commit: 574fcf1fd08ea4b79e96037ab1a2e9078c7a4dfb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Apr 30 17:21:34 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Apr 30 17:32:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574fcf1f

app-backup/bareos: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-backup/bareos/bareos-17.2.10.ebuild | 10 --
 app-backup/bareos/bareos-18.2.10.ebuild | 10 --
 app-backup/bareos/bareos-19.2.9.ebuild  | 10 --
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app-backup/bareos/bareos-17.2.10.ebuild 
b/app-backup/bareos/bareos-17.2.10.ebuild
index f4a2b487a99..bcf92fecb1c 100644
--- a/app-backup/bareos/bareos-17.2.10.ebuild
+++ b/app-backup/bareos/bareos-17.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson 
lmdb libressl
+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 ) )"
@@ -48,8 +48,7 @@ DEPEND="
sys-libs/ncurses:=[static-libs]
ssl? (
!gnutls? (
-   !libressl? ( dev-libs/openssl:0=[static-libs] )
-   libressl? ( dev-libs/libressl:0=[static-libs] )
+   dev-libs/openssl:0=[static-libs]
)
gnutls? ( net-libs/gnutls[static-libs] )
)
@@ -59,8 +58,7 @@ DEPEND="
dev-libs/lzo
ssl? (
!gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
gnutls? ( net-libs/gnutls )
)

diff --git a/app-backup/bareos/bareos-18.2.10.ebuild 
b/app-backup/bareos/bareos-18.2.10.ebuild
index cf1622b6e1a..9f8f8def176 100644
--- a/app-backup/bareos/bareos-18.2.10.ebuild
+++ b/app-backup/bareos/bareos-18.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson 
lmdb libressl
+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 systemd tcpd vim-syntax"
 REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )"
@@ -51,8 +51,7 @@ DEPEND="
sys-libs/ncurses:=[static-libs]
ssl? (
!gnutls? (
-   !libressl? ( dev-libs/openssl:0=[static-libs] )
-   libressl? ( dev-libs/libressl:0=[static-libs] )
+   dev-libs/openssl:0=[static-libs]
)
gnutls? ( net-libs/gnutls[static-libs] )
)
@@ -62,8 +61,7 @@ DEPEND="
dev-libs/lzo
ssl? (
!gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
)
gnutls? ( net-libs/gnutls )
)

diff --git a/app-backup/bareos/bareos-19.2.9.ebuild 
b/app-backup/bareos/bareos-19.2.9.ebuild
index 7487d913600..e2d48fb2396 100644
--- a/app-backup/bareos/bareos-19.2.9.ebuild
+++ b/app-backup/bareos/bareos-19.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl
+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 xattr"
 
@@ -49,14 +49,12 @@ DEPEND="
sys-libs/zlib[static-libs]

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

2020-12-15 Thread Marc Schiffbauer
commit: 6516ac5a42a04310606ab8bc2742baeb7c31031c
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Dec 15 11:32:03 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Dec 15 11:33:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6516ac5a

app-backup/bareos: bump 18.2 to 18.2.10

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

 app-backup/bareos/Manifest| 2 +-
 app-backup/bareos/{bareos-18.2.9.ebuild => bareos-18.2.10.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index d0024070cfb..2a1a411b08c 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,3 @@
 DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B 
d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001
 SHA512 
3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
-DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 
1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1
 SHA512 
f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
+DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B 
ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096
 SHA512 
2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
 DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B 
c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302
 SHA512 
60d949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5

diff --git a/app-backup/bareos/bareos-18.2.9.ebuild 
b/app-backup/bareos/bareos-18.2.10.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-18.2.9.ebuild
rename to app-backup/bareos/bareos-18.2.10.ebuild



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

2020-12-15 Thread Marc Schiffbauer
commit: 03f49adece40799e3149eaca517dba1e740e338d
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Dec 15 11:33:03 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Dec 15 11:33:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f49ade

app-backup/bareos: bump 19.2 to 19.2.9

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

 app-backup/bareos/Manifest   | 2 +-
 app-backup/bareos/{bareos-19.2.8.ebuild => bareos-19.2.9.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 2a1a411b08c..ec3c6292096 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +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.8.tar.gz 12604929 BLAKE2B 
c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302
 SHA512 
60d949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 
93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626
 SHA512 
b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e

diff --git a/app-backup/bareos/bareos-19.2.8.ebuild 
b/app-backup/bareos/bareos-19.2.9.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-19.2.8.ebuild
rename to app-backup/bareos/bareos-19.2.9.ebuild



[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/

2020-08-01 Thread Marc Schiffbauer
commit: 1bf3093a13fb7235350edb96406ba8750968032b
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:20:44 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:20:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bf3093a

app-backup/bareos: fix bug #725508

Closes: https://bugs.gentoo.org/725508
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Marc Schiffbauer  gentoo.org>

 app-backup/bareos/bareos-19.2.8.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-backup/bareos/bareos-19.2.8.ebuild 
b/app-backup/bareos/bareos-19.2.8.ebuild
index 7f26714cb29..beb2d832467 100644
--- a/app-backup/bareos/bareos-19.2.8.ebuild
+++ b/app-backup/bareos/bareos-19.2.8.ebuild
@@ -332,6 +332,9 @@ src_install() {
diropts -m0755
keepdir /var/log/bareos
 
+   insinto /usr/lib/tmpfiles.d
+   newins "${FILESDIR}"/tmpfiles.d-bareos.conf bareos.conf
+
# make sure bareos group can execute bareos libexec scripts
fowners -R root:bareos /usr/libexec/bareos
 }



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

2020-08-01 Thread Marc Schiffbauer
commit: 883722218e177b04cc27c56b56531472eec04a01
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:04:23 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:12:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88372221

app-backup/bareos: bump 17.2 + remove py2 support

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

 app-backup/bareos/Manifest  |   1 +
 app-backup/bareos/bareos-17.2.10.ebuild | 360 
 2 files changed, 361 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index bd2570916a2..6874232e06f 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-17.2.9.tar.gz 4190637 BLAKE2B 
266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118
 SHA512 
ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
 DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B 
c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2
 SHA512 
61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-17.2.10.ebuild 
b/app-backup/bareos/bareos-17.2.10.ebuild
new file mode 100644
index 000..f4a2b487a99
--- /dev/null
+++ b/app-backup/bareos/bareos-17.2.10.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2020 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 libressl
+   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? (
+   !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
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st
+   )
+   )
+   vim-syntax? ( 

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

2020-08-01 Thread Marc Schiffbauer
commit: 3e9e7a82434a4b1766e025c4634fb548f1bee98e
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:09:01 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:12:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9e7a82

app-backup/bareos: remove old 18.2 version

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

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-18.2.8.ebuild | 397 -
 2 files changed, 398 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index bbce1692c61..cea991b17f3 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.8.tar.gz 10552800 BLAKE2B 
c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2
 SHA512 
61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
 DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 
1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1
 SHA512 
f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-18.2.8.ebuild 
b/app-backup/bareos/bareos-18.2.8.ebuild
deleted file mode 100644
index 4bf0b6c7c3b..000
--- a/app-backup/bareos/bareos-18.2.8.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-single-r1 systemd 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 systemd 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? ( 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? (
- 

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

2020-08-01 Thread Marc Schiffbauer
commit: c3ff146257f15f5ec74115adf4dac88d13913d00
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:06:13 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:12:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ff1462

app-backup/bareos: remove old 17.2 version

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

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-17.2.9.ebuild | 366 -
 2 files changed, 367 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 6874232e06f..741274fb308 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-17.2.9.tar.gz 4190637 BLAKE2B 
266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118
 SHA512 
ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
 DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B 
c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2
 SHA512 
61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-17.2.9.ebuild 
b/app-backup/bareos/bareos-17.2.9.ebuild
deleted file mode 100644
index aa5473acd45..000
--- a/app-backup/bareos/bareos-17.2.9.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 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 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
-   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? (
-   !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? (
-   

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

2020-08-01 Thread Marc Schiffbauer
commit: fe13d0c0b558ae861f14d6ceaedb1e8c18613269
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:10:42 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:12:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe13d0c0

app-backup/bareos: remove old 19.2 version

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

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-19.2.7.ebuild | 374 -
 2 files changed, 375 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 1a93cb3c16b..d0024070cfb 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.9.tar.gz 10554581 BLAKE2B 
1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1
 SHA512 
f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
-DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
 DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B 
c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302
 SHA512 
60d949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5

diff --git a/app-backup/bareos/bareos-19.2.7.ebuild 
b/app-backup/bareos/bareos-19.2.7.ebuild
deleted file mode 100644
index cb87707808e..000
--- a/app-backup/bareos/bareos-19.2.7.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_WARN_UNUSED_CLI=no
-#CMAKE_REMOVE_MODULES=yes
-
-inherit python-any-r1 systemd cmake-utils
-
-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 libressl
-   logwatch mysql ndmp +postgres readline scsi-crypto
-   sqlite static +storage-daemon systemd tcpd vim-syntax 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 )
-   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]
-   !libressl? ( dev-libs/openssl:0=[static-libs] )
-   libressl? ( dev-libs/libressl:0=[static-libs] )
-   )
-   !static? (
-   acl? ( virtual/acl )
-   dev-libs/lzo
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl: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 )
-
-   # 

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

2020-08-01 Thread Marc Schiffbauer
commit: 8af507f917aff68835950a7b8aabf8dbc70dfbd7
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:10:02 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:12:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af507f9

app-backup/bareos: bump 19.2 + remove py2 support

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

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-19.2.8.ebuild | 382 +
 2 files changed, 383 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index cea991b17f3..1a93cb3c16b 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.9.tar.gz 10554581 BLAKE2B 
1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1
 SHA512 
f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6
+DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B 
c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302
 SHA512 
60d949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5

diff --git a/app-backup/bareos/bareos-19.2.8.ebuild 
b/app-backup/bareos/bareos-19.2.8.ebuild
new file mode 100644
index 000..7f26714cb29
--- /dev/null
+++ b/app-backup/bareos/bareos-19.2.8.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake
+
+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 libressl
+   logwatch mysql ndmp +postgres readline scsi-crypto
+   sqlite static +storage-daemon systemd tcpd vim-syntax 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 )
+   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]
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/lzo
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl: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 )
+
+   

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

2020-08-01 Thread Marc Schiffbauer
commit: 3200136ffa0bdfa0ce9bbd3a4d03201af6ba75cf
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sat Aug  1 14:08:23 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sat Aug  1 14:12:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3200136f

app-backup/bareos: bump 18.2 + remove py2 support

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

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-18.2.9.ebuild | 397 +
 2 files changed, 398 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 741274fb308..bbce1692c61 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.8.tar.gz 10552800 BLAKE2B 
c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2
 SHA512 
61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
+DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 
1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1
 SHA512 
f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-18.2.9.ebuild 
b/app-backup/bareos/bareos-18.2.9.ebuild
new file mode 100644
index 000..cf1622b6e1a
--- /dev/null
+++ b/app-backup/bareos/bareos-18.2.9.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit desktop systemd cmake
+
+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 rados rados-striper readline scsi-crypto
+   sql-pooling sqlite ssl static +storage-daemon systemd 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? ( 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
+   )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+   app-arch/mt-st

[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/

2020-05-13 Thread Marc Schiffbauer
commit: 7c7515ec6ff0723858ca0cbfb1839eea8ce815af
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu May 14 03:15:24 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu May 14 04:05:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7515ec

app-backup/bareos: add new version

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

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-19.2.7.ebuild | 374 +
 app-backup/bareos/metadata.xml |   1 +
 3 files changed, 376 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 9f023e65c07..d8fbb1e4950 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,3 +1,4 @@
 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
+DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-19.2.7.ebuild 
b/app-backup/bareos/bareos-19.2.7.ebuild
new file mode 100644
index 000..cb87707808e
--- /dev/null
+++ b/app-backup/bareos/bareos-19.2.7.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_WARN_UNUSED_CLI=no
+#CMAKE_REMOVE_MODULES=yes
+
+inherit python-any-r1 systemd cmake-utils
+
+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 libressl
+   logwatch mysql ndmp +postgres readline scsi-crypto
+   sqlite static +storage-daemon systemd tcpd vim-syntax 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 )
+   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]
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
+   !static? (
+   acl? ( virtual/acl )
+   dev-libs/lzo
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl: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 

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

2020-05-13 Thread Marc Schiffbauer
commit: 8d3beddf67cfa9c92d84ef185a5fc694c4690b6c
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu May 14 03:56:12 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu May 14 04:05:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3beddf

app-backup/bareos: remove old version

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

 app-backup/bareos/Manifest|   3 -
 app-backup/bareos/bareos-17.2.6.ebuild| 384 ---
 app-backup/bareos/bareos-17.2.7-r1.ebuild | 384 ---
 app-backup/bareos/bareos-18.2.6.ebuild| 414 --
 4 files changed, 1185 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 3a1954fb9cd..bd2570916a2 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,6 +1,3 @@
-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-17.2.9.tar.gz 4190637 BLAKE2B 
266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118
 SHA512 
ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
-DIST bareos-18.2.6.tar.gz 9991951 BLAKE2B 
9fdaf852e748f0c01d06e2fd72351e7b9bf18e8fea92307fb85437441b4ce504f9c6ddbd42cd2185b6dc08158502a7db581bef662c2bd84c86c885d6b89eebba
 SHA512 
b6618173a803db4cfc3fe7edfe8c9e4e4128195f44383cd7df5b9866da4290686ed7cb42499edec957a5d9ab8bbd92d26258ce58f13fba84fb569167956768c3
 DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B 
c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2
 SHA512 
61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-17.2.6.ebuild 
b/app-backup/bareos/bareos-17.2.6.ebuild
deleted file mode 100644
index 487c29eb98e..000
--- a/app-backup/bareos/bareos-17.2.6.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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? ( 

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

2020-05-13 Thread Marc Schiffbauer
commit: dcfbfd53f84986c335f6e03270fb013aaed0d129
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Thu May 14 03:55:30 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Thu May 14 04:05:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfbfd53

app-backup/bareos: bump versions 17.2 and 18.2

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

 app-backup/bareos/Manifest |   2 +
 app-backup/bareos/bareos-17.2.9.ebuild | 366 ++
 app-backup/bareos/bareos-18.2.8.ebuild | 397 +
 3 files changed, 765 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index d8fbb1e4950..3a1954fb9cd 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,6 @@
 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-17.2.9.tar.gz 4190637 BLAKE2B 
266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118
 SHA512 
ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9
 DIST bareos-18.2.6.tar.gz 9991951 BLAKE2B 
9fdaf852e748f0c01d06e2fd72351e7b9bf18e8fea92307fb85437441b4ce504f9c6ddbd42cd2185b6dc08158502a7db581bef662c2bd84c86c885d6b89eebba
 SHA512 
b6618173a803db4cfc3fe7edfe8c9e4e4128195f44383cd7df5b9866da4290686ed7cb42499edec957a5d9ab8bbd92d26258ce58f13fba84fb569167956768c3
+DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B 
c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2
 SHA512 
61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860
 DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 
31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d
 SHA512 
cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6

diff --git a/app-backup/bareos/bareos-17.2.9.ebuild 
b/app-backup/bareos/bareos-17.2.9.ebuild
new file mode 100644
index 000..aa5473acd45
--- /dev/null
+++ b/app-backup/bareos/bareos-17.2.9.ebuild
@@ -0,0 +1,366 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 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 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
+   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? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+ 

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

2020-03-02 Thread Marc Schiffbauer
commit: dc7033ea8d857f884c3973a7e90687eea52a3b1a
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Mar  3 07:02:45 2020 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Mar  3 07:03:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc7033ea

app-backup/bareos: remove old version

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

 app-backup/bareos/Manifest|   1 -
 app-backup/bareos/bareos-16.2.7-r1.ebuild | 397 --
 2 files changed, 398 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index c57ee6ad7ec..9f023e65c07 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,3 @@
-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-16.2.7-r1.ebuild 
b/app-backup/bareos/bareos-16.2.7-r1.ebuild
deleted file mode 100644
index abcf5bd35bc..000
--- a/app-backup/bareos/bareos-16.2.7-r1.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 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
-

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

2019-04-16 Thread Marc Schiffbauer
commit: 545ba8d1a52e4ac002812475805be6cc5f790cf2
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Apr 16 06:49:13 2019 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Apr 16 06:49:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545ba8d1

app-backup/bareos: add systemd USE-flag

This fixes build on non-systemd systems
Fixes #679466

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

 app-backup/bareos/bareos-18.2.6.ebuild | 23 ++-
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app-backup/bareos/bareos-18.2.6.ebuild 
b/app-backup/bareos/bareos-18.2.6.ebuild
index 6a140c54f77..62f70274ab0 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



[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/

2019-02-08 Thread Brian Evans
commit: a79e853aa4acebeda1ce9c505dba7f94aec3c1c7
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Feb  8 16:05:12 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Feb  8 16:05:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79e853a

app-backup/bareos: Revbump to fix dependency

Closes: https://bugs.gentoo.org/665820
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 app-backup/bareos/{bareos-17.2.7.ebuild => bareos-17.2.7-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/bareos/bareos-17.2.7.ebuild 
b/app-backup/bareos/bareos-17.2.7-r1.ebuild
similarity index 99%
rename from app-backup/bareos/bareos-17.2.7.ebuild
rename to app-backup/bareos/bareos-17.2.7-r1.ebuild
index 25469bc0f10..482b98f1f33 100644
--- a/app-backup/bareos/bareos-17.2.7.ebuild
+++ b/app-backup/bareos/bareos-17.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -31,7 +31,7 @@ DEPEND="
dev-libs/gmp:0
!clientonly? (
postgres? ( dev-db/postgresql:*[threads] )
-   mysql? ( virtual/mysql )
+   mysql? ( dev-db/mysql-connector-c:0= )
sqlite? ( dev-db/sqlite:3 )
director? (
virtual/mta



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

2018-11-30 Thread Marc Schiffbauer
commit: ac9a37fdb8956439ecd00c68090e778c26904fbe
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Nov 30 13:53:03 2018 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Nov 30 13:53:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9a37fd

app-backup/bareos: Add new version 17.2.7

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.7.ebuild | 388 +
 2 files changed, 389 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 5943022b495..74dba976b02 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-backup/bareos/bareos-17.2.7.ebuild 
b/app-backup/bareos/bareos-17.2.7.ebuild
new file mode 100644
index 000..25469bc0f10
--- /dev/null
+++ b/app-backup/bareos/bareos-17.2.7.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 

[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 

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

2018-05-13 Thread Andreas Sturmlechner
commit: 304df6a54e558cdbfe368eda492feab499ce09d2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 10 19:46:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 13 06:56:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304df6a5

app-backup/bareos: Drop USE=qt4 and superfluous qt4-r2.eclass

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

 app-backup/bareos/bareos-16.2.7-r1.ebuild | 398 ++
 1 file changed, 398 insertions(+)

diff --git a/app-backup/bareos/bareos-16.2.7-r1.ebuild 
b/app-backup/bareos/bareos-16.2.7-r1.ebuild
new file mode 100644
index 000..efeb4ae8479
--- /dev/null
+++ b/app-backup/bareos/bareos-16.2.7-r1.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2018 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 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 group bareos 2>/dev/null)" ]; then
+   enewgroup bareos
+   einfo
+   einfo "The group 'bareos' has been created. Any users you add 
to this"
+   einfo "group have access to files created by the daemons."
+   einfo
+   fi
+
+   if ! use clientonly; then
+   if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then
+   enewuser bareos -1 -1 /var/lib/bareos 
bareos,disk,tape,cdrom,cdrw
+   einfo
+   einfo "The user 'bareos' has been created.  Please see 
the bareos manual"
+   einfo "for information about running bareos as a 
non-root user."
+   einfo
+   fi
+   fi
+
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # adjusts default configuration files for several binaries
+   # to /etc/bareos/ instead of ./
+   pushd src >&/dev/null || die
+   for f in 

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

2018-05-13 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? (
-   

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

2017-12-10 Thread Marc Schiffbauer
commit: f85a9a00c28484b35503d666f2630a4efe85545a
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Sun Dec 10 22:51:38 2017 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Sun Dec 10 22:51:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85a9a00

app-backup/bareos: remove old version

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 app-backup/bareos/Manifest|   3 -
 app-backup/bareos/bareos-13.2.4-r1.ebuild | 403 -
 app-backup/bareos/bareos-14.2.2.ebuild| 414 --
 app-backup/bareos/bareos-14.2.5.ebuild| 414 --
 4 files changed, 1234 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 70de9426eea..4cabd451436 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,6 +1,3 @@
-DIST bareos-13.2.4.tar.gz 3467542 BLAKE2B 
7e9ef15ad3ec86af8e60d90d27660b1e10a18eb928e76af319cc59ce6a39805874fc27dc8e62b81fb9fccfbd0b6b2e73583e54f5c9580db96469b85e48736ce6
 SHA512 
d7e4bc016993f68521f4438b56adf51e88685195693d00d34103259c3c24d1d7c03cc2b7aecbb55ff88a00d5f169e9e42accd23b17bcd3c837ca78079a9f394f
-DIST bareos-14.2.2.tar.gz 3811787 BLAKE2B 
ace5a3d25c98df852308cef0ff603e416aff2f4a437c0621732288c792fef1fb4e89f413b022586f7adf018fdae1dbe33b4124b942ed5fce24088f1caea99c4f
 SHA512 
be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156
-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-13.2.4-r1.ebuild 
b/app-backup/bareos/bareos-13.2.4-r1.ebuild
deleted file mode 100644
index 1890fd8e3bd..000
--- a/app-backup/bareos/bareos-13.2.4-r1.ebuild
+++ /dev/null
@@ -1,403 +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="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp 
postgres
-   python qt4 readline scsi-crypto sql-pooling +sqlite ssl static 
+storage-daemon
-   tcpd vim-syntax X"
-
-DEPEND="
-   !app-backup/bacula
-   dev-libs/gmp:0
-   !clientonly? (
-   postgres? ( dev-db/postgresql:*[threads] )
-   mysql? ( virtual/mysql )
-   sqlite? ( dev-db/sqlite:3 )
-   director? ( virtual/mta )
-   )
-   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? (
-   !libressl? ( dev-libs/openssl:0=[static-libs] )
-   libressl? ( dev-libs/libressl:0=[static-libs] )
-   )
-   )
-   !static? (
-   acl? ( virtual/acl )
-   dev-libs/lzo
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
-   sys-libs/ncurses:=
-   sys-libs/zlib
-   )
-   python? ( ${PYTHON_DEPS} )

[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 )
+  

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

2016-12-30 Thread Marc Schiffbauer
commit: bd9f599e8b0f487d2c6aa7f10df4f6169edc19a6
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Fri Dec 30 23:02:59 2016 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Fri Dec 30 23:03:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9f599e

app-backup/bareos: add REQUIRED_USE, fixes #578674

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-backup/bareos/bareos-15.2.2.ebuild | 1 +
 app-backup/bareos/bareos-16.2.4.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-backup/bareos/bareos-15.2.2.ebuild 
b/app-backup/bareos/bareos-15.2.2.ebuild
index 07884d3..789e4e2 100644
--- a/app-backup/bareos/bareos-15.2.2.ebuild
+++ b/app-backup/bareos/bareos-15.2.2.ebuild
@@ -20,6 +20,7 @@ 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

diff --git a/app-backup/bareos/bareos-16.2.4.ebuild 
b/app-backup/bareos/bareos-16.2.4.ebuild
index 07884d3..789e4e2 100644
--- a/app-backup/bareos/bareos-16.2.4.ebuild
+++ b/app-backup/bareos/bareos-16.2.4.ebuild
@@ -20,6 +20,7 @@ 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



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

2016-10-31 Thread Marc Schiffbauer
commit: 7f169de3fdc58e39adbee75ab0afa3274b48cb46
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Oct 31 14:27:49 2016 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Oct 31 14:28:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f169de3

app-backup/bareos: bump: added version 16.2.4

Package-Manager: portage-2.3.2

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-16.2.4.ebuild | 428 +
 2 files changed, 429 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 59faa70..f15e63e 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -2,3 +2,4 @@ DIST bareos-13.2.4.tar.gz 3467542 SHA256 
def68891d074438e55d7a3e570cfaae1c1a8c94
 DIST bareos-14.2.2.tar.gz 3811787 SHA256 
8792fe79689f7a1053ecb493ba52258acb29d0998b71d65178a311d46b7cf2bf SHA512 
be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156
 WHIRLPOOL 
384415d553d61e7aa1eaa22611cc9d9eacf8338df82d911409e52a774e756b0539810c60be3dade91eadcc679794ad7c3bb5a155d7d699171f6a4fdead5a5470
 DIST bareos-14.2.5.tar.gz 3820963 SHA256 
f42bc34afa913cfb4d6b7ef8856c7195d8b13b21c987da1039d46e6c60f06720 SHA512 
600cdf8175b1199b73ddcf8a32df7bca446c294c4c830038f93fe3f053482916745675df3a51bc494cdab00b362d57657a34a94e78bac4bae3acced06347023d
 WHIRLPOOL 
361c0edb411c824f128ccb5e27f4d637ecfdf4f2de7a428a8c4eace6d5c23a33a3868cc1b380dcbf6e06d6c7bb71ff222abad923ea9a0bfb74e78f0445c4058b
 DIST bareos-15.2.2.tar.gz 3928036 SHA256 
f314e7d3e99e92b4261af97888ddcdaaedf513b638745b07270db3e6930e9008 SHA512 
07b11c51695a6ff348317965625e5cdb8e296d4f3a4037718a98e266d94650ed1fb905c220ac791123d8ed92d0aed24854a6ab52887249849dbc00697d3300c3
 WHIRLPOOL 
e43141e1ba670cd13da716739f4e3ed2a5f63e4dd43efbeed0a781429ff3b7cc6ddcb67d8f6ec47508b036f1da4ffc5cdbd4d49887e428de55969250817d529b
+DIST bareos-16.2.4.tar.gz 4275141 SHA256 
9a96d9220150f1db643c932ac529b1e3ad179978ef6b06a2504c06db43b4ff3c SHA512 
91f7f2b3d9889f4faa9834dc414e2250015d3d26bf8bd0c04c1f3fd882a50a4066ced145f7c8609c070e8f74b53574953e3fef344726c6863cd7bbc73c76a88c
 WHIRLPOOL 
7c3192a80680240246b0fa342799fcc4bc4b71ee8255badd950ffbd570b246129e9a68340e2972e0f0e4746f537330d4ebccc3358cc840f5278562d8b97641b1

diff --git a/app-backup/bareos/bareos-16.2.4.ebuild 
b/app-backup/bareos/bareos-16.2.4.ebuild
new file mode 100644
index ..07884d3
--- /dev/null
+++ b/app-backup/bareos/bareos-16.2.4.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+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= )
+   )
+   

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

2016-03-21 Thread Anthony G. Basile
commit: fba133b98325e41ebea49019dec96e105522993d
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Tue Mar 22 00:45:25 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Tue Mar 22 00:45:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba133b9

app-backup/bareos: add libressl support

Package-Manager: portage-2.2.26

 app-backup/bareos/bareos-13.2.4-r1.ebuild | 18 --
 app-backup/bareos/bareos-14.2.2.ebuild| 18 --
 app-backup/bareos/bareos-14.2.5.ebuild| 18 --
 app-backup/bareos/bareos-15.2.2.ebuild| 18 --
 4 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/app-backup/bareos/bareos-13.2.4-r1.ebuild 
b/app-backup/bareos/bareos-13.2.4-r1.ebuild
index b27d116..3b8d01f 100644
--- a/app-backup/bareos/bareos-13.2.4-r1.ebuild
+++ b/app-backup/bareos/bareos-13.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,9 +17,9 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python 
qt4
-   readline scsi-crypto sql-pooling +sqlite ssl static 
+storage-daemon tcpd
-   vim-syntax X"
+IUSE="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp 
postgres
+   python qt4 readline scsi-crypto sql-pooling +sqlite ssl static 
+storage-daemon
+   tcpd vim-syntax X"
 
 DEPEND="
!app-backup/bacula
@@ -43,12 +43,18 @@ DEPEND="
sys-libs/zlib[static-libs]
dev-libs/lzo[static-libs]
sys-libs/ncurses:=[static-libs]
-   ssl? ( dev-libs/openssl:0[static-libs] )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
)
!static? (
acl? ( virtual/acl )
dev-libs/lzo
-   ssl? ( dev-libs/openssl:0 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
sys-libs/ncurses:=
sys-libs/zlib
)

diff --git a/app-backup/bareos/bareos-14.2.2.ebuild 
b/app-backup/bareos/bareos-14.2.2.ebuild
index 0f83dbc..4ca6821 100644
--- a/app-backup/bareos/bareos-14.2.2.ebuild
+++ b/app-backup/bareos/bareos-14.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,9 +17,9 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python 
qt4
-   readline scsi-crypto sql-pooling +sqlite ssl static 
+storage-daemon tcpd
-   vim-syntax X cephfs glusterfs lmdb rados"
+IUSE="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp 
postgres
+   python qt4 readline scsi-crypto sql-pooling +sqlite ssl static 
+storage-daemon
+   tcpd vim-syntax X cephfs glusterfs lmdb rados"
 
 DEPEND="
!app-backup/bacula
@@ -47,12 +47,18 @@ DEPEND="
sys-libs/zlib[static-libs]
dev-libs/lzo[static-libs]
sys-libs/ncurses:=[static-libs]
-   ssl? ( dev-libs/openssl:0[static-libs] )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs] )
+   libressl? ( dev-libs/libressl:0=[static-libs] )
+   )
)
!static? (
acl? ( virtual/acl )
dev-libs/lzo
-   ssl? ( dev-libs/openssl:0 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   )
sys-libs/ncurses:=
sys-libs/zlib
)

diff --git a/app-backup/bareos/bareos-14.2.5.ebuild 
b/app-backup/bareos/bareos-14.2.5.ebuild
index 0f83dbc..4ca6821 100644
--- a/app-backup/bareos/bareos-14.2.5.ebuild
+++ b/app-backup/bareos/bareos-14.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,9 +17,9 @@ RESTRICT="mirror"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl clientonly +director fastlz ipv6 logwatch mysql ndmp postgres python 
qt4
-   readline scsi-crypto sql-pooling +sqlite ssl static 
+storage-daemon tcpd
-   vim-syntax X cephfs glusterfs lmdb rados"
+IUSE="acl clientonly +director fastlz ipv6 libressl logwatch mysql ndmp 
postgres
+   

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

2015-12-29 Thread Marc Schiffbauer
commit: 54018cd9266277f066ec9e74d3503cb491ff6421
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Dec 29 15:19:36 2015 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Dec 29 15:19:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54018cd9

app-backup/bareos: fix Manifest for 5.2.2. Fixes #569854

Package-Manager: portage-2.2.26

 app-backup/bareos/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 3030c03..59faa70 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,4 +1,4 @@
 DIST bareos-13.2.4.tar.gz 3467542 SHA256 
def68891d074438e55d7a3e570cfaae1c1a8c9479d089815ba0f8f31e1d6eefc SHA512 
d7e4bc016993f68521f4438b56adf51e88685195693d00d34103259c3c24d1d7c03cc2b7aecbb55ff88a00d5f169e9e42accd23b17bcd3c837ca78079a9f394f
 WHIRLPOOL 
54b5ee5094be6569c1a7857ebcc98f1e24ee272485327397f1ab0833433a6b46e8b7e3f2cd927668600ba63f2d36a920dc64cb9dfc2f0dd69adb57a70b862848
 DIST bareos-14.2.2.tar.gz 3811787 SHA256 
8792fe79689f7a1053ecb493ba52258acb29d0998b71d65178a311d46b7cf2bf SHA512 
be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156
 WHIRLPOOL 
384415d553d61e7aa1eaa22611cc9d9eacf8338df82d911409e52a774e756b0539810c60be3dade91eadcc679794ad7c3bb5a155d7d699171f6a4fdead5a5470
 DIST bareos-14.2.5.tar.gz 3820963 SHA256 
f42bc34afa913cfb4d6b7ef8856c7195d8b13b21c987da1039d46e6c60f06720 SHA512 
600cdf8175b1199b73ddcf8a32df7bca446c294c4c830038f93fe3f053482916745675df3a51bc494cdab00b362d57657a34a94e78bac4bae3acced06347023d
 WHIRLPOOL 
361c0edb411c824f128ccb5e27f4d637ecfdf4f2de7a428a8c4eace6d5c23a33a3868cc1b380dcbf6e06d6c7bb71ff222abad923ea9a0bfb74e78f0445c4058b
-DIST bareos-15.2.2.tar.gz 3928079 SHA256 
7c7e07c877956385870475382184d39df7232ecd9791c3a3942624473410da93 SHA512 
5eb372da510e69fe75175cd6c28e1e2d65372eb0ea58193a6747fceccd4398a343a84abbb379f67849f96242d818f26f2dec3093be56c9f64ea59a1504339d6d
 WHIRLPOOL 
0a79a88fbf6087536f8442fc413f7adbe03ad5affe6dc5550a8e05ded172e15357789637e8a5e606f172a1a0e319d2af20dfbd5144331e37693bbf0543de52e2
+DIST bareos-15.2.2.tar.gz 3928036 SHA256 
f314e7d3e99e92b4261af97888ddcdaaedf513b638745b07270db3e6930e9008 SHA512 
07b11c51695a6ff348317965625e5cdb8e296d4f3a4037718a98e266d94650ed1fb905c220ac791123d8ed92d0aed24854a6ab52887249849dbc00697d3300c3
 WHIRLPOOL 
e43141e1ba670cd13da716739f4e3ed2a5f63e4dd43efbeed0a781429ff3b7cc6ddcb67d8f6ec47508b036f1da4ffc5cdbd4d49887e428de55969250817d529b



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

2015-12-29 Thread Marc Schiffbauer
commit: 20580a3ffb5e142d8a96176088d4b96edbfe42fe
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Tue Dec 29 15:13:30 2015 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Tue Dec 29 15:13:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20580a3f

app-backup/bareos: remove old version

Package-Manager: portage-2.2.26

 app-backup/bareos/Manifest |   1 -
 app-backup/bareos/bareos-15.2.1.ebuild | 420 -
 2 files changed, 421 deletions(-)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 0b50252..3030c03 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -1,5 +1,4 @@
 DIST bareos-13.2.4.tar.gz 3467542 SHA256 
def68891d074438e55d7a3e570cfaae1c1a8c9479d089815ba0f8f31e1d6eefc SHA512 
d7e4bc016993f68521f4438b56adf51e88685195693d00d34103259c3c24d1d7c03cc2b7aecbb55ff88a00d5f169e9e42accd23b17bcd3c837ca78079a9f394f
 WHIRLPOOL 
54b5ee5094be6569c1a7857ebcc98f1e24ee272485327397f1ab0833433a6b46e8b7e3f2cd927668600ba63f2d36a920dc64cb9dfc2f0dd69adb57a70b862848
 DIST bareos-14.2.2.tar.gz 3811787 SHA256 
8792fe79689f7a1053ecb493ba52258acb29d0998b71d65178a311d46b7cf2bf SHA512 
be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156
 WHIRLPOOL 
384415d553d61e7aa1eaa22611cc9d9eacf8338df82d911409e52a774e756b0539810c60be3dade91eadcc679794ad7c3bb5a155d7d699171f6a4fdead5a5470
 DIST bareos-14.2.5.tar.gz 3820963 SHA256 
f42bc34afa913cfb4d6b7ef8856c7195d8b13b21c987da1039d46e6c60f06720 SHA512 
600cdf8175b1199b73ddcf8a32df7bca446c294c4c830038f93fe3f053482916745675df3a51bc494cdab00b362d57657a34a94e78bac4bae3acced06347023d
 WHIRLPOOL 
361c0edb411c824f128ccb5e27f4d637ecfdf4f2de7a428a8c4eace6d5c23a33a3868cc1b380dcbf6e06d6c7bb71ff222abad923ea9a0bfb74e78f0445c4058b
-DIST bareos-15.2.1.tar.gz 3899227 SHA256 
8c44496e19f1bfd3e06bb886967c06db5e9c9a991511d99eefb30deb8a8391d2 SHA512 
5c03063ad27d3474431d39354a4dd217e90ad9a3c8c60742b544b33955667b62365e8b4ee5d2b773dfc11c7e154a2713bf8f7cf44d536d6a96288c9f007efb49
 WHIRLPOOL 
3498c584e8800692adfb92950124643f78bb237364fe7e00c9a4ae26083465ac01250a7fe20f98905db6080de35ec71f943739cea9f6d666e65afdf695f95871
 DIST bareos-15.2.2.tar.gz 3928079 SHA256 
7c7e07c877956385870475382184d39df7232ecd9791c3a3942624473410da93 SHA512 
5eb372da510e69fe75175cd6c28e1e2d65372eb0ea58193a6747fceccd4398a343a84abbb379f67849f96242d818f26f2dec3093be56c9f64ea59a1504339d6d
 WHIRLPOOL 
0a79a88fbf6087536f8442fc413f7adbe03ad5affe6dc5550a8e05ded172e15357789637e8a5e606f172a1a0e319d2af20dfbd5144331e37693bbf0543de52e2

diff --git a/app-backup/bareos/bareos-15.2.1.ebuild 
b/app-backup/bareos/bareos-15.2.1.ebuild
deleted file mode 100644
index 1b4325e..000
--- a/app-backup/bareos/bareos-15.2.1.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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=""
-IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson 
lmdb logwatch
-   mysql ndmp postgres python qt4 rados rados-striper readline scsi-crypto 
sql-pooling
-   +sqlite ssl static +storage-daemon tcpd vim-syntax"
-
-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? ( 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 )
-   

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

2015-12-06 Thread Marc Schiffbauer
commit: 916129ba444937de308ba1499115a051e2607809
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Mon Dec  7 00:35:38 2015 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Mon Dec  7 00:35:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916129ba

app-backup/bareos: fix sandbox violation. fixes #566834

Package-Manager: portage-2.2.26

 app-backup/bareos/bareos-15.2.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-backup/bareos/bareos-15.2.2.ebuild 
b/app-backup/bareos/bareos-15.2.2.ebuild
index 49be43d..e4ef164 100644
--- a/app-backup/bareos/bareos-15.2.2.ebuild
+++ b/app-backup/bareos/bareos-15.2.2.ebuild
@@ -146,6 +146,8 @@ src_prepare() {
 src_configure() {
local myconf=''
 
+   addpredict /var/lib/logrotate.status
+
if use clientonly; then
myconf="${myconf} \
$(use_enable clientonly client-only) \



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

2015-11-24 Thread Marc Schiffbauer
commit: 34ca9e54e509f497e6aae733cb362165b448de57
Author: Marc Schiffbauer  gentoo  org>
AuthorDate: Wed Nov 25 01:05:33 2015 +
Commit: Marc Schiffbauer  gentoo  org>
CommitDate: Wed Nov 25 01:06:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ca9e54

app-backup/bareos: bump version

Package-Manager: portage-2.2.25

 app-backup/bareos/Manifest |   1 +
 app-backup/bareos/bareos-15.2.2.ebuild | 420 +
 2 files changed, 421 insertions(+)

diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 41b9bba..0b50252 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -2,3 +2,4 @@ DIST bareos-13.2.4.tar.gz 3467542 SHA256 
def68891d074438e55d7a3e570cfaae1c1a8c94
 DIST bareos-14.2.2.tar.gz 3811787 SHA256 
8792fe79689f7a1053ecb493ba52258acb29d0998b71d65178a311d46b7cf2bf SHA512 
be490ab2f8085975f164ac554cac7d6bbef1af01c8350b5816b2033a37827de4a81bead6ce1e699fe5cc44085dce2b6a0330b91239fb87907e22f9c8dc710156
 WHIRLPOOL 
384415d553d61e7aa1eaa22611cc9d9eacf8338df82d911409e52a774e756b0539810c60be3dade91eadcc679794ad7c3bb5a155d7d699171f6a4fdead5a5470
 DIST bareos-14.2.5.tar.gz 3820963 SHA256 
f42bc34afa913cfb4d6b7ef8856c7195d8b13b21c987da1039d46e6c60f06720 SHA512 
600cdf8175b1199b73ddcf8a32df7bca446c294c4c830038f93fe3f053482916745675df3a51bc494cdab00b362d57657a34a94e78bac4bae3acced06347023d
 WHIRLPOOL 
361c0edb411c824f128ccb5e27f4d637ecfdf4f2de7a428a8c4eace6d5c23a33a3868cc1b380dcbf6e06d6c7bb71ff222abad923ea9a0bfb74e78f0445c4058b
 DIST bareos-15.2.1.tar.gz 3899227 SHA256 
8c44496e19f1bfd3e06bb886967c06db5e9c9a991511d99eefb30deb8a8391d2 SHA512 
5c03063ad27d3474431d39354a4dd217e90ad9a3c8c60742b544b33955667b62365e8b4ee5d2b773dfc11c7e154a2713bf8f7cf44d536d6a96288c9f007efb49
 WHIRLPOOL 
3498c584e8800692adfb92950124643f78bb237364fe7e00c9a4ae26083465ac01250a7fe20f98905db6080de35ec71f943739cea9f6d666e65afdf695f95871
+DIST bareos-15.2.2.tar.gz 3928079 SHA256 
7c7e07c877956385870475382184d39df7232ecd9791c3a3942624473410da93 SHA512 
5eb372da510e69fe75175cd6c28e1e2d65372eb0ea58193a6747fceccd4398a343a84abbb379f67849f96242d818f26f2dec3093be56c9f64ea59a1504339d6d
 WHIRLPOOL 
0a79a88fbf6087536f8442fc413f7adbe03ad5affe6dc5550a8e05ded172e15357789637e8a5e606f172a1a0e319d2af20dfbd5144331e37693bbf0543de52e2

diff --git a/app-backup/bareos/bareos-15.2.2.ebuild 
b/app-backup/bareos/bareos-15.2.2.ebuild
new file mode 100644
index 000..49be43d
--- /dev/null
+++ b/app-backup/bareos/bareos-15.2.2.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 logwatch
+   mysql ndmp postgres python qt4 rados rados-striper readline scsi-crypto 
sql-pooling
+   +sqlite ssl static +storage-daemon tcpd vim-syntax"
+
+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? ( 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
+   )
+   python? ( ${PYTHON_DEPS} )
+   "
+RDEPEND="${DEPEND}
+   !clientonly? (
+   storage-daemon? (
+   sys-block/mtx
+

  1   2   >