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

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

[Amadeusz Żołnowski]

commit:     693963fc42b75e3b157aa481471a58db867c2fed
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 21:47:17 2015 +0000
Commit:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 21:47:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693963fc

app-backup/burp: Remove orphaned patches

Package-Manager: portage-2.2.20.1

 app-backup/burp/files/1.4.26-bedup-conf-path.patch | 33 ----------------------
 app-backup/burp/files/1.4.26-tinfo.patch           | 22 ---------------
 2 files changed, 55 deletions(-)

diff --git a/app-backup/burp/files/1.4.26-bedup-conf-path.patch b/app-backup/burp/files/1.4.26-bedup-conf-path.patch
deleted file mode 100644
index 30346d4..0000000
--- a/app-backup/burp/files/1.4.26-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.26-tinfo.patch b/app-backup/burp/files/1.4.26-tinfo.patch
deleted file mode 100644
index 0814922..0000000
--- a/app-backup/burp/files/1.4.26-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

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

[Marek Szuba]

commit:     f9d2da2e5f0a5245cad02880e354f579cec8a012
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 08:56:56 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 09:17:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d2da2e

app-backup/burp: prevent OpenRC init stript from writing the PID file

Burp manages its PID file by itself and refuses to start if it already exists,
therefore start-stop-daemon shouldn't write one.

Gentoo-Bug: 620654

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 app-backup/burp/files/burp2.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/burp/files/burp2.initd b/app-backup/burp/files/burp2.initd
index 4aa07ac43fe..02a7ea856c4 100644
--- a/app-backup/burp/files/burp2.initd
+++ b/app-backup/burp/files/burp2.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"
@@ -10,7 +10,7 @@ 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"
+start_stop_daemon_arg="--wait 500"
 
 extra_started_commands="reload summary"
 description_reload="Reloads configuration"

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

[Marek Szuba]

commit:     4b3a76d6d58d796effed0fbd84ee6d9ee8f627e9
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 14:07:19 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 14:11:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3a76d6

app-backup/burp: fix /etc/burp permissions in the OpenRC init script

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 app-backup/burp/files/burp.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/burp/files/burp.initd b/app-backup/burp/files/burp.initd
index a0b0dccacbc..f9af311e461 100644
--- a/app-backup/burp/files/burp.initd
+++ b/app-backup/burp/files/burp.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 BURP_CONFIG="/etc/burp/burp-server.conf"
@@ -28,7 +28,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath -o root:burp -m 0775 -d /etc/burp
+	checkpath -o root:burp -m 0750 -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)"

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

[Conrad Kostecki]

commit:     882308822094235a846b4848bf315c99382d6f52
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May  8 16:21:32 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May  8 18:41:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88230882

app-backup/burp: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30935
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/burp-2.1.20-protocol1_by_default.patch   | 24 ------
 .../burp/files/burp-2.4.0-fix-musl-strptime.patch  | 86 ----------------------
 2 files changed, 110 deletions(-)

diff --git a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch b/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
deleted file mode 100644
index db9e9b6a9de5..000000000000
--- a/app-backup/burp/files/burp-2.1.20-protocol1_by_default.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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 September 2017 protocol2 is still considered experimental.
-+protocol = 1
- pidfile = @runstatedir@/@name@.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 September 2017 protocol2 is still considered experimental.
-+protocol = 1
- pidfile = @runstatedir@/@name@.server.pid
- hardlinked_archive = 0
- working_dir_recovery_method = delete

diff --git a/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch b/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch
deleted file mode 100644
index e8afca8fefa7..000000000000
--- a/app-backup/burp/files/burp-2.4.0-fix-musl-strptime.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://github.com/grke/burp/commit/76b7f1ba9f4445108059b13f3d79a7fde8a292a3
-https://github.com/grke/burp/issues/908
-https://bugs.gentoo.org/862019
-
-From 76b7f1ba9f4445108059b13f3d79a7fde8a292a3 Mon Sep 17 00:00:00 2001
-From: Graham Keeling <grke@grke.net>
-Date: Mon, 8 Aug 2022 07:53:38 +1000
-Subject: [PATCH] 908: Only glibc supports %z in strptime()
-
-Change-Id: I220e4529073c92df856b892559725b323dc84334
----
- src/times.h                            |  8 ++++----
- utest/client/monitor/test_json_input.c | 15 +++++++++++----
- utest/test_times.c                     |  7 ++++---
- 3 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/times.h b/src/times.h
-index 325419c2b..b0fd3876f 100644
---- a/src/times.h
-+++ b/src/times.h
-@@ -3,11 +3,11 @@
- 
- #define DEFAULT_TIMESTAMP_FORMAT_OLD	"%Y-%m-%d %H:%M:%S"
- 
--// Windows does not seem to support %z.
--#ifdef HAVE_WIN32
--#define DEFAULT_TIMESTAMP_FORMAT DEFAULT_TIMESTAMP_FORMAT_OLD
--#else
-+#ifdef __GLIBC__
- #define DEFAULT_TIMESTAMP_FORMAT	"%Y-%m-%d %H:%M:%S %z"
-+#else
-+// Only glibc supports %z in strptime.
-+#define DEFAULT_TIMESTAMP_FORMAT DEFAULT_TIMESTAMP_FORMAT_OLD
- #endif
- 
- extern const char *getdatestr(const time_t t);
-diff --git a/utest/client/monitor/test_json_input.c b/utest/client/monitor/test_json_input.c
-index 516fc779b..aea2a4154 100644
---- a/utest/client/monitor/test_json_input.c
-+++ b/utest/client/monitor/test_json_input.c
-@@ -162,13 +162,20 @@ static struct sd sd1[] = {
- 
- static void assert_bu_minimal(struct bu *bu, struct sd *s)
- {
--	const char *sd_timestamp;
-+	const char *cp;
-+	const char *cp_end;
- 	fail_unless(bu!=NULL);
- 	fail_unless(s->bno==bu->bno);
- 	fail_unless(s->flags==bu->flags);
--	fail_unless((sd_timestamp=strchr(s->timestamp, ' '))!=NULL);
--	sd_timestamp++;
--	ck_assert_str_eq(sd_timestamp, bu->timestamp);
-+	fail_unless((cp=strchr(s->timestamp, ' '))!=NULL);
-+	cp++;
-+#ifdef __GLIBC__
-+	cp_end=s->timestamp+strlen(s->timestamp)-1;
-+#else
-+	// Only glibc supports %z in strptime.
-+	fail_unless((cp_end=strrchr(s->timestamp, ' '))!=NULL);
-+#endif
-+	fail_unless(strncmp(cp, bu->timestamp, cp_end-cp)==0);
- }
- 
- static void do_test_json_clients_with_backup(const char *path,
-diff --git a/utest/test_times.c b/utest/test_times.c
-index 98be11fd1..5a68203a6 100644
---- a/utest/test_times.c
-+++ b/utest/test_times.c
-@@ -35,12 +35,13 @@ struct ds
- 
- static struct ds ds[] = {
- 	{ 0, "", "never" },
--#ifdef HAVE_WIN32
--	{ 1000, "", "1970-01-01 00:16:40" },
--#else
-+#ifdef __GLIBC__
- 	{ 1000, "", "1970-01-01 00:16:40 +0000" },
- 	{ 1000, "UTC+10", "1969-12-31 14:16:40 -1000" },
- 	{ 1000, "UTC+10", "1969-12-31 14:16:40 -1000" },
-+#else
-+	// Only glibc supports %z in strptime.
-+	{ 1000, "", "1970-01-01 00:16:40" },
- #endif
- };
-