commit: 8f5aaf3f05f8d3b93ab0fb83d69afe84c3b148c2
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 17 14:35:10 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:35:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5aaf3f
app-backup/bareos: remove unused patches/files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> 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..000000000000
--- a/app-backup/bareos/files/bareos-20.0.2-cmake-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urw bareos-Release-20.0.2.orig/core/cmake/distname.sh
bareos-Release-20.0.2/core/cmake/distname.sh
---- bareos-Release-20.0.2.orig/core/cmake/distname.sh 2021-06-10
06:07:18.000000000 -0930
-+++ bareos-Release-20.0.2/core/cmake/distname.sh 2021-08-15
17:07:37.168216517 -0930
-@@ -153,7 +153,7 @@
- elif test -f /etc/gentoo-release
- then
- PLATFORM=gentoo
-- DISTVER=`awk '/version / { print $5 }' < /etc/gentoo-release`
-+ DISTVER=`awk '/release / { print $5 }' < /etc/gentoo-release`
- elif test -f /etc/debian_version
- then
- if `test -f /etc/apt/sources.list && grep -q ubuntu
/etc/apt/sources.list`; then
-diff -urw bareos-Release-20.0.2.orig/core/platforms/CMakeLists.txt
bareos-Release-20.0.2/core/platforms/CMakeLists.txt
---- bareos-Release-20.0.2.orig/core/platforms/CMakeLists.txt 2021-06-10
06:07:18.000000000 -0930
-+++ bareos-Release-20.0.2/core/platforms/CMakeLists.txt 2021-08-15
17:07:37.549226558 -0930
-@@ -30,6 +30,8 @@
- message(STATUS "adding subdirectories debian and univention")
- add_subdirectory(debian)
- add_subdirectory(univention)
-+ elseif(${PLATFORM} STREQUAL gentoo)
-+ message(STATUS "PLATFORM: " ${PLATFORM})
- elseif(${PLATFORM} STREQUAL hpux)
- message(STATUS "PLATFORM: " ${PLATFORM})
- elseif(${PLATFORM} STREQUAL archlinux)
diff --git a/app-backup/bareos/files/bareos-dir.confd
b/app-backup/bareos/files/bareos-dir.confd
deleted file mode 100644
index 6d755bf93344..000000000000
--- a/app-backup/bareos/files/bareos-dir.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bareos-dir
-
-# Bareos can use more than one catalog database and each one can
-# be of any supported type.
-# If a database server where you store a bareos catalog
-# is on a different machine, you might want to remove the corresponding
-# type from the rc_need variable.
-rc_need="%databasetypes%"
-
-# Options for the director daemon.
-# The director can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-DIR_OPTIONS="-u bareos -g bareos"
diff --git a/app-backup/bareos/files/bareos-dir.initd
b/app-backup/bareos/files/bareos-dir.initd
deleted file mode 100644
index a2986d133cc3..000000000000
--- a/app-backup/bareos/files/bareos-dir.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use dns bareos-fd bareos-sd
-}
-
-start_pre() {
- checkpath --directory --owner root:bareos --mode 01775 /run/bareos
- if [[ -e /run/bareos/bareos-dir.9101.pid && $(stat -c %U
/run/bareos/bareos-dir.9101.pid) != "root" ]]; then
- eerror "SECURITY ALERT: bareos owned pidfile found! (see
#631598)"
- exit 1
- fi
-}
-
-start_post() {
- ewaitfile 10 /run/bareos/bareos-dir.9101.pid
- checkpath --file --owner root:bareos /run/bareos/bareos-dir.9101.pid
-}
-
-command="/usr/sbin/bareos-dir"
-command_args="${DIR_OPTIONS}"
-pidfile="/run/bareos/bareos-dir.9101.pid"
diff --git a/app-backup/bareos/files/bareos-dir.service
b/app-backup/bareos/files/bareos-dir.service
deleted file mode 100644
index f0a611715487..000000000000
--- a/app-backup/bareos/files/bareos-dir.service
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# Bareos Director Daemon
-#
-[Unit]
-Description=Bareos Director Daemon
-Documentation=man:bareos-dir(8)
-Requires=nss-lookup.target network.target remote-fs.target time-sync.target
-After=nss-lookup.target network.target remote-fs.target time-sync.target
postgresql.service mysql.service mariadb.service
-ConditionPathIsDirectory=/var/lib/bareos
-
-[Service]
-# see bug #631598
-#Type=forking
-Type=simple
-User=bareos
-Group=bareos
-WorkingDirectory=/var/lib/bareos
-#PIDFile=/run/bareos/bareos-dir.9101.pid
-StandardError=journal
-ExecStartPre=/usr/sbin/bareos-dir -t -f
-#ExecStart=/usr/sbin/bareos-dir
-ExecStart=/usr/sbin/bareos-dir -f
-SuccessExitStatus=0 1 15
-#Restart=on-failure
-
-[Install]
-Alias=bareos-director.service
-WantedBy=multi-user.target
diff --git a/app-backup/bareos/files/bareos-fd.confd
b/app-backup/bareos/files/bareos-fd.confd
deleted file mode 100644
index 5e429a6bd31c..000000000000
--- a/app-backup/bareos/files/bareos-fd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bareos-fd
-
-# Options for the file daemon.
-FD_OPTIONS="-u root -g bareos"
diff --git a/app-backup/bareos/files/bareos-fd.initd
b/app-backup/bareos/files/bareos-fd.initd
deleted file mode 100644
index 31d9342c1f0e..000000000000
--- a/app-backup/bareos/files/bareos-fd.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use dns
-}
-
-command="/usr/sbin/bareos-fd"
-command_args="${FD_OPTIONS}"
-pidfile="/run/bareos/bareos-fd.9102.pid"
diff --git a/app-backup/bareos/files/bareos-gcc13-fixes.patch
b/app-backup/bareos/files/bareos-gcc13-fixes.patch
deleted file mode 100644
index 1cd12621b4e4..000000000000
--- a/app-backup/bareos/files/bareos-gcc13-fixes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 2bb7d74215bf6ae4f350de11bff04b68cf3c82b3 Mon Sep 17 00:00:00 2001
-From: Bruno Friedmann <bruno.friedm...@bareos.com>
-Date: Mon, 27 Mar 2023 13:22:11 +0200
-Subject: [PATCH 1/3] core: fixes for gcc-13 support
-
-- add explicit system_error and stdexcept
-- console_conf.cc fix std::move warning
-
-Signed-off-by: Bruno Friedmann <bruno.friedm...@bareos.com>
----
- core/src/cats/cats.h | 2 ++
- core/src/console/console_conf.cc | 4 ++--
- core/src/lib/thread_list.cc | 3 ++-
- core/src/lib/thread_specific_data.cc | 3 ++-
- core/src/lib/thread_specific_data.h | 3 ++-
- core/src/lib/thread_specific_data_key.h | 4 +++-
- 6 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
-index 7a6641b3f72..edb5ecbe38b 100644
---- a/core/src/cats/cats.h
-+++ b/core/src/cats/cats.h
-@@ -41,6 +41,8 @@
- #include "lib/output_formatter.h"
-
- #include <string>
-+#include <stdexcept>
-+#include <system_error>
- #include <vector>
- template <typename T> class dlist;
-
-diff --git a/core/src/console/console_conf.cc
b/core/src/console/console_conf.cc
-index 9d3aecead2b..f0c0402744e 100644
---- a/core/src/console/console_conf.cc
-+++ b/core/src/console/console_conf.cc
-@@ -203,7 +203,7 @@ static bool SaveResource(int type, ResourceItem* items,
int pass)
- res_dir->resource_name_);
- } else {
- p->tls_cert_.allowed_certificate_common_names_
-- = std::move(p->tls_cert_.allowed_certificate_common_names_);
-+ =
std::move(res_dir->tls_cert_.allowed_certificate_common_names_);
- }
- break;
- }
-diff --git a/core/src/lib/thread_list.cc b/core/src/lib/thread_list.cc
-index 50aefb8ee2d..05607124a55 100644
---- a/core/src/lib/thread_list.cc
-+++ b/core/src/lib/thread_list.cc
-@@ -32,6 +32,7 @@
- #include <memory>
- #include <mutex>
- #include <set>
-+#include <system_error>
- #include <thread>
-
- static constexpr int debuglevel{800};
-diff --git a/core/src/lib/thread_specific_data.cc
b/core/src/lib/thread_specific_data.cc
-index 0953f5c125a..22a98c4a759 100644
---- a/core/src/lib/thread_specific_data.cc
-+++ b/core/src/lib/thread_specific_data.cc
-@@ -25,6 +25,7 @@
- #include "lib/thread_specific_data.h"
- #include "lib/thread_specific_data_key.h"
- #include "include/jcr.h"
-+#include <system_error>
-
- JobControlRecord* GetJcrFromThreadSpecificData()
- {
-diff --git a/core/src/lib/thread_specific_data.h
b/core/src/lib/thread_specific_data.h
-index 4bd4dedafae..4c427d171c0 100644
---- a/core/src/lib/thread_specific_data.h
-+++ b/core/src/lib/thread_specific_data.h
-@@ -24,6 +24,7 @@
- #ifndef BAREOS_LIB_THREAD_SPECIFIC_DATA_H_
- #define BAREOS_LIB_THREAD_SPECIFIC_DATA_H_
-
-+
- class JobControlRecord;
-
- JobControlRecord* GetJcrFromThreadSpecificData();
-diff --git a/core/src/lib/thread_specific_data_key.h
b/core/src/lib/thread_specific_data_key.h
-index 9c02c07f47e..c8c63c757fe 100644
---- a/core/src/lib/thread_specific_data_key.h
-+++ b/core/src/lib/thread_specific_data_key.h
-@@ -22,6 +22,8 @@
- #ifndef BAREOS_LIB_THREAD_SPECIFIC_DATA_KEY_H_
- #define BAREOS_LIB_THREAD_SPECIFIC_DATA_KEY_H_
-
-+
-+#include <system_error>
- #include "lib/berrno.h"
-
- #include <mutex>
-
-From cc208707f6f4ad8c24e8ad670f10c076a27b69e4 Mon Sep 17 00:00:00 2001
-From: Philipp Storz <philipp.st...@bareos.com>
-Date: Mon, 3 Apr 2023 12:11:57 +0200
-Subject: [PATCH 2/3] pull_request_template.md: add checkmark for backport PRs
-
----
-From 55ee275873b7c2d663d280847fd517374394e43d Mon Sep 17 00:00:00 2001
-From: Marc Schiffbauer <msch...@gentoo.org>
-Date: Thu, 20 Apr 2023 19:01:16 +0300
-Subject: [PATCH] add missing include required by gcc 13
-
----
- core/src/stored/dev.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/core/src/stored/dev.cc b/core/src/stored/dev.cc
-index 287a323a5..7fd0c437e 100644
---- a/core/src/stored/dev.cc
-+++ b/core/src/stored/dev.cc
-@@ -81,6 +81,7 @@
- #include "lib/btimers.h"
- #include "include/jcr.h"
- #include "lib/berrno.h"
-+#include <stdexcept>
-
- #ifndef HAVE_DYNAMIC_SD_BACKENDS
- # ifdef HAVE_GFAPI
---
-2.39.2
-
diff --git a/app-backup/bareos/files/bareos-sd.confd
b/app-backup/bareos/files/bareos-sd.confd
deleted file mode 100644
index d0153b2b30b5..000000000000
--- a/app-backup/bareos/files/bareos-sd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/bareos-sd
-
-# Options for the storage daemon.
-# The storage daemon can be run as a non-root user, however
-# please ensure that this user has proper permissions to
-# access your backup devices.
-SD_OPTIONS="-u bareos -g bareos"
diff --git a/app-backup/bareos/files/bareos-sd.initd
b/app-backup/bareos/files/bareos-sd.initd
deleted file mode 100644
index a4a45343d137..000000000000
--- a/app-backup/bareos/files/bareos-sd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use dns
-}
-
-start_pre() {
- checkpath --directory --owner root:bareos --mode 01775 /run/bareos
- if [[ -e /run/bareos/bareos-sd.9103.pid && $(stat -c %U
/run/bareos/bareos-sd.9103.pid) != "root" ]]; then
- eerror "SECURITY ALERT: bareos owned pidfile found! (see
#631598)"
- exit 1
- fi
-}
-
-start_post() {
- ewaitfile 10 /run/bareos/bareos-sd.9103.pid
- checkpath --file --owner root:bareos /run/bareos/bareos-sd.9103.pid
-}
-
-command="/usr/sbin/bareos-sd"
-command_args="${SD_OPTIONS}"
-pidfile="/run/bareos/bareos-sd.9103.pid"
