From 8262cee470aafbef23da9a6c618d5c4c45b7e8e6 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Thu, 20 Apr 2017 11:33:27 +0200 Subject: app-backup/burp: bump to 2.0.54 Gentoo-Bug: 615666 Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- .../burp/files/burp-2.0.54-no_mkdir_run.patch | 10 +++++ .../files/burp-2.0.54-protocol1_by_default.patch | 24 ++++++++++++ .../burp/files/burp-2.0.54-server_user.patch | 13 +++++++ app-backup/burp/files/burp.service | 11 ++++++ app-backup/burp/files/burp.tmpfiles | 1 + app-backup/burp/files/burp2.initd | 45 ++++++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch create mode 100644 app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch create mode 100644 app-backup/burp/files/burp-2.0.54-server_user.patch create mode 100644 app-backup/burp/files/burp.service create mode 100644 app-backup/burp/files/burp.tmpfiles create mode 100644 app-backup/burp/files/burp2.initd (limited to 'app-backup/burp/files') diff --git a/app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch b/app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch new file mode 100644 index 000000000000..8d1cdc0a0628 --- /dev/null +++ b/app-backup/burp/files/burp-2.0.54-no_mkdir_run.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -405,7 +405,6 @@ + + install-data-local: + $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(localstatedir)/spool/burp +- $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(runstatedir) + + clean-local: clean-local-check + diff --git a/app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch b/app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch new file mode 100644 index 000000000000..391c68a5f74b --- /dev/null +++ b/app-backup/burp/files/burp-2.0.54-protocol1_by_default.patch @@ -0,0 +1,24 @@ +--- a/configs/client/burp.conf.in ++++ b/configs/client/burp.conf.in +@@ -10,7 +10,8 @@ + # 0 to decide automatically, 1 to force protocol1 mode (file level granularity + # with a pseudo mirrored storage on the server and optional rsync). 2 forces + # protocol2 mode (inline deduplication with variable length blocks). +-# protocol = 0 ++# WARNING: as of April 2017 protocol2 is still considered experimental. ++protocol = 1 + pidfile = @runstatedir@/burp.client.pid + syslog = 0 + stdout = 1 +--- a/configs/server/burp.conf.in ++++ b/configs/server/burp.conf.in +@@ -21,7 +21,8 @@ + # protocol2 mode (inline deduplication with variable length blocks). + # Like many other settings, this can be set per client in the clientconfdir + # files. +-# protocol = 0 ++# WARNING: as of April 2017 protocol2 is still considered experimental. ++protocol = 1 + pidfile = @runstatedir@/burp.server.pid + hardlinked_archive = 0 + working_dir_recovery_method = delete diff --git a/app-backup/burp/files/burp-2.0.54-server_user.patch b/app-backup/burp/files/burp-2.0.54-server_user.patch new file mode 100644 index 000000000000..979bb4bd4c91 --- /dev/null +++ b/app-backup/burp/files/burp-2.0.54-server_user.patch @@ -0,0 +1,13 @@ +--- a/configs/server/burp.conf.in ++++ b/configs/server/burp.conf.in +@@ -68,8 +68,8 @@ + # keep = 6 + + # Run as different user/group. +-# user=graham +-# group=nogroup ++user=burp ++group=burp + + # CA options. + # If you want your server to be a certificate authority and generate its own diff --git a/app-backup/burp/files/burp.service b/app-backup/burp/files/burp.service new file mode 100644 index 000000000000..5a40b5e36781 --- /dev/null +++ b/app-backup/burp/files/burp.service @@ -0,0 +1,11 @@ +[Unit] +Description=BackUp and Restore Program server +After=network.target + +[Service] +Type=simple +PIDFile=/run/burp/burp.server.pid +ExecStart=/usr/sbin/burp -F -c /etc/burp/burp-server.conf + +[Install] +WantedBy=multi-user.target diff --git a/app-backup/burp/files/burp.tmpfiles b/app-backup/burp/files/burp.tmpfiles new file mode 100644 index 000000000000..2f04960f230e --- /dev/null +++ b/app-backup/burp/files/burp.tmpfiles @@ -0,0 +1 @@ +d /run/burp 0755 burp burp - diff --git a/app-backup/burp/files/burp2.initd b/app-backup/burp/files/burp2.initd new file mode 100644 index 000000000000..4aa07ac43fe0 --- /dev/null +++ b/app-backup/burp/files/burp2.initd @@ -0,0 +1,45 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +BURP_CONFIG="/etc/burp/burp-server.conf" + +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/burp.server.pid" +start_stop_daemon_arg="--make-pidfile --wait 500" + +extra_started_commands="reload summary" +description_reload="Reloads configuration" +description_summary="Displays main status monitor summary" + +get_backup_dir() { + grep '^directory = ' "${BURP_CONFIG}" \ + | sed -e 's/^directory = //' +} + +depend() { + need localmount + after bootmisc + use net +} + +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 root:burp -m 0770 -d "$(get_backup_dir)" +} + +reload() { + ebegin "Reloading ${SVCNAME} configuration" + start-stop-daemon --exec ${command} --signal HUP + eend $? +} + +summary() { + "${command}" -c "${BURP_CONFIG}" -a S +} -- cgit v1.2.3-65-gdbad