summaryrefslogtreecommitdiff
path: root/app-backup/burp/files
diff options
context:
space:
mode:
Diffstat (limited to 'app-backup/burp/files')
-rw-r--r--app-backup/burp/files/1.4.40-bedup-conf-path.patch33
-rw-r--r--app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch13
-rw-r--r--app-backup/burp/files/1.4.40-tinfo.patch22
-rw-r--r--app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch38
-rw-r--r--app-backup/burp/files/burp.initd7
-rw-r--r--app-backup/burp/files/burp.service1
6 files changed, 41 insertions, 73 deletions
diff --git a/app-backup/burp/files/1.4.40-bedup-conf-path.patch b/app-backup/burp/files/1.4.40-bedup-conf-path.patch
deleted file mode 100644
index 30346d466148..000000000000
--- a/app-backup/burp/files/1.4.40-bedup-conf-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur burp/manpages/bedup.8 burp.new/manpages/bedup.8
---- burp/manpages/bedup.8 2014-10-28 12:45:26.000000000 +0100
-+++ burp.new/manpages/bedup.8 2014-11-21 09:49:57.705796144 +0100
-@@ -16,7 +16,7 @@
- .SH OPTIONS
- .TP
- \fB\-c\fR \fBpath\fR
--Path to config file (default: /etc/burp/burp.conf).
-+Path to config file (default: /etc/burp/burp-server.conf).
- .TP
- \fB\-g\fR \fB<list of group names>\fR
- Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
-@@ -42,7 +42,7 @@
- \fB\-V\fR \fB\fR
- Print version and exit.\fR
- .TP
--By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
-+By default, bedup will read /etc/burp/burp-server.conf and deduplicate client storage directories using special knowledge of the structure.\fR
- .TP
- With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.
-
-diff -Naur burp/src/bedup.c burp.new/src/bedup.c
---- burp/src/bedup.c 2014-10-28 12:45:56.000000000 +0100
-+++ burp.new/src/bedup.c 2014-11-20 21:39:28.728206536 +0100
-@@ -740,7 +740,7 @@
- static char *get_config_path(void)
- {
- static char path[256]="";
-- snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp.conf");
-+ snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp-server.conf");
- return path;
- }
-
diff --git a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch b/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
deleted file mode 100644
index 2c570486ce02..000000000000
--- a/app-backup/burp/files/1.4.40-non-zero-or-build-failure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index ac22a24..f99ce96 100755
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -40,7 +40,7 @@ all: Makefile
- @for I in ${all_subdirs}; \
- do (cd $$I; echo "==>Entering directory `pwd`"; \
- $(MAKE) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
-- echo ""; echo "";)); \
-+ echo ""; echo ""; exit 1;)) || exit 1; \
- done
-
- depend:
diff --git a/app-backup/burp/files/1.4.40-tinfo.patch b/app-backup/burp/files/1.4.40-tinfo.patch
deleted file mode 100644
index 081492261685..000000000000
--- a/app-backup/burp/files/1.4.40-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur burp/configure.ac burp-new/configure.ac
---- burp/configure.ac 2014-10-28 12:45:56.000000000 +0100
-+++ burp-new/configure.ac 2014-11-10 17:40:50.996955441 +0100
-@@ -1203,13 +1203,12 @@
- fi
-
- AC_CHECK_HEADERS(ncurses.h)
--AC_CHECK_LIB(ncurses, curs_set, [NCURSES_LIBS="-lncurses"])
- have_ncurses=no
--if test x$NCURSES_LIBS = x-lncurses; then
-- AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
-- have_ncurses=yes
--fi
--AC_SUBST(NCURSES_LIBS)
-+AC_CHECK_LIB(ncurses, endwin,
-+ [NCURSES_LIBS="-lncurses"; have_ncurses=yes]
-+ AC_SEARCH_LIBS(curs_set, tinfo, [NCURSES_LIBS="$NCURSES_LIBS $ac_res"]),
-+ AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
-+ AC_SUBST(NCURSES_LIBS))
-
- dnl
- dnl Check if we have AFS on this system
diff --git a/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch b/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch
new file mode 100644
index 000000000000..3f75c878d5bb
--- /dev/null
+++ b/app-backup/burp/files/burp-2.0.54-chuser_after_getting_lock.patch
@@ -0,0 +1,38 @@
+From f765ad2c9f421eefcd3afc447ed45fa3fd2d17a0 Mon Sep 17 00:00:00 2001
+From: Graham Keeling <grke@grke.net>
+Date: Sun, 13 Aug 2017 11:50:54 +0000
+Subject: [PATCH] Drop privileges after main pidfile creation.
+
+Change-Id: I762541db55e7884531e4d869e1a86533df71b5b8
+---
+ src/prog.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/prog.c b/src/prog.c
+index 244590d3..b94df6d3 100644
+--- a/src/prog.c
++++ b/src/prog.c
+@@ -111,11 +111,6 @@ int reload(struct conf **confs, const char *conffile, bool firsttime)
+ setup_signals();
+ #endif
+
+- // Do not try to change user or group after the first time.
+- if(firsttime && chuser_and_or_chgrp(
+- get_string(confs[OPT_USER]), get_string(confs[OPT_GROUP])))
+- return -1;
+-
+ return 0;
+ }
+
+@@ -486,6 +481,11 @@ int real_main(int argc, char *argv[])
+ }
+ }
+
++ // Change privileges after having got the lock, for convenience.
++ if(chuser_and_or_chgrp(
++ get_string(confs[OPT_USER]), get_string(confs[OPT_GROUP])))
++ return -1;
++
+ set_int(confs[OPT_OVERWRITE], forceoverwrite);
+ set_int(confs[OPT_STRIP], strip);
+ set_int(confs[OPT_FORK], forking);
diff --git a/app-backup/burp/files/burp.initd b/app-backup/burp/files/burp.initd
index 201af0a97123..a0b0dccacbcc 100644
--- a/app-backup/burp/files/burp.initd
+++ b/app-backup/burp/files/burp.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
BURP_CONFIG="/etc/burp/burp-server.conf"
@@ -9,8 +9,8 @@ description="Burp is a network backup and restore program"
command="/usr/sbin/burp"
command_args="-c '${BURP_CONFIG}' -F"
command_background="yes"
-pidfile="/run/burp-server.pid"
-start_stop_daemon_arg="--make-pidfile --wait 500"
+pidfile="/run/burp.server.pid"
+start_stop_daemon_arg="--wait 500"
extra_started_commands="reload summary"
description_reload="Reloads configuration"
@@ -31,7 +31,6 @@ start_pre() {
checkpath -o root:burp -m 0775 -d /etc/burp
checkpath -o root:burp -m 0640 -f /etc/burp/burp-server.conf
checkpath -o root:burp -m 0750 -d /etc/burp/clientconfdir
- checkpath -o burp:burp -m 0775 -d /run/lock/burp
checkpath -o root:burp -m 0770 -d "$(get_backup_dir)"
}
diff --git a/app-backup/burp/files/burp.service b/app-backup/burp/files/burp.service
index 5a40b5e36781..121753629607 100644
--- a/app-backup/burp/files/burp.service
+++ b/app-backup/burp/files/burp.service
@@ -4,7 +4,6 @@ After=network.target
[Service]
Type=simple
-PIDFile=/run/burp/burp.server.pid
ExecStart=/usr/sbin/burp -F -c /etc/burp/burp-server.conf
[Install]
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 06:08:32 +0000