* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2020-05-14 4:06 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2020-05-14 4:06 UTC (permalink / raw
To: gentoo-commits
commit: d6b5a6e235b8294046cad61e14214b28bf199784
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 03:58:15 2020 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Thu May 14 04:05:38 2020 +0000
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 <mschiff <AT> 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..00000000000
--- 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.000000000 +0000
-+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000
-@@ -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..00000000000
--- 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.000000000 +0000
-+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000
-@@ -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@
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2020-08-03 21:07 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2020-08-03 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 8f569ec87bdc4c56d83adf13e630b3e92185db13
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 3 21:07:07 2020 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Aug 3 21:07:41 2020 +0000
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 <mschiff <AT> 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 00000000000..6e2dacc41ad
--- /dev/null
+++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf
@@ -0,0 +1 @@
+d /run/bareos 0770 bareos bareos -
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2021-08-20 12:36 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2021-08-20 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 2957a300fdebd1ecba8e7041ba4cf71f56729dbc
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 20 12:32:59 2021 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 12:32:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2957a300
app-bareos: harden pid directory
Signed-off-by: Marc Schiffbauer <mschiff <AT> 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 -
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2021-09-08 23:42 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2021-09-08 23:42 UTC (permalink / raw
To: gentoo-commits
commit: 98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 8 23:18:52 2021 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Wed Sep 8 23:40:13 2021 +0000
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 <mschiff <AT> 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2022-11-25 17:49 Conrad Kostecki
0 siblings, 0 replies; 9+ messages in thread
From: Conrad Kostecki @ 2022-11-25 17:49 UTC (permalink / raw
To: gentoo-commits
commit: aabd7357b827327c6e4a772cd8dcf9560ecced6b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Nov 25 15:48:32 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 17:48:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabd7357
app-backup/bareos: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28428
Signed-off-by: Conrad Kostecki <conikost <AT> 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..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-cmake-gentoo.patch b/app-backup/bareos/files/bareos-cmake-gentoo.patch
deleted file mode 100644
index 0f67a9e5d9de..000000000000
--- a/app-backup/bareos/files/bareos-cmake-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- core/cmake/distname.sh.orig 2019-01-31 12:39:26.000000000 +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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2022-12-10 18:31 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2022-12-10 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 36e288262d4a9993fe3528ca913f174cdd4de0f3
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 18:30:19 2022 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 18:31:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e28826
app-backup/bareos: improve openrc init scripts
Signed-off-by: Marc Schiffbauer <mschiff <AT> 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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2022-12-16 13:28 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2022-12-16 13:28 UTC (permalink / raw
To: gentoo-commits
commit: 5fd6f2b723cc86466420b69a487cbbe7e58571d9
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 13:27:17 2022 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 13:27:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd6f2b7
app-backup/bareos: fix pidfile name for sd
Signed-off-by: Marc Schiffbauer <mschiff <AT> 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"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2023-06-18 11:13 Marc Schiffbauer
0 siblings, 0 replies; 9+ messages in thread
From: Marc Schiffbauer @ 2023-06-18 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 81b05212537ac738d9f056cc93c23602795a5d8b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jun 11 13:03:11 2023 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 11:13:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b05212
app-backup/bareos: remove unused files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31387
Signed-off-by: Marc Schiffbauer <mschiff <AT> 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- 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 $?
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/
@ 2024-02-17 14:35 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2024-02-17 14:35 UTC (permalink / raw
To: gentoo-commits
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.friedmann@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.friedmann@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.storz@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 <mschiff@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"
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-02-17 14:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-03 21:07 [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/files/ Marc Schiffbauer
-- strict thread matches above, loose matches on Subject: below --
2024-02-17 14:35 David Seifert
2023-06-18 11:13 Marc Schiffbauer
2022-12-16 13:28 Marc Schiffbauer
2022-12-10 18:31 Marc Schiffbauer
2022-11-25 17:49 Conrad Kostecki
2021-09-08 23:42 Marc Schiffbauer
2021-08-20 12:36 Marc Schiffbauer
2020-05-14 4:06 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox