gentoo auto-resync : 08:05:2023 - 23:39:55

3 files changed, 0 insertions, 112 deletions

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index 96eabcc33f4d..68bc7f098b4f 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -1,7 +1,5 @@
 AUX burp-2.0.54-server_user.patch 282 BLAKE2B b949a5f1b8d73048145a5efd62bcee605f77f272fe3d4759958092e0c37b14b7077e01b9c55a865728a856293b7acdae494f8583e4451cd02b9242807b05ed72 SHA512 a4cd302967deed776b663f037e509e354dcb5958d6a4c33770062e5455d2ff641d62604779d25c6bb542aa547548c39d8b529fa7787ab1b42dba262f1439fcea
 AUX burp-2.1.20-no_mkdir_run.patch 238 BLAKE2B 44ba927f8ca97386d70d52411f2fe5ca233160e85de56d58e33c9a038c542e6d8cc5a96f1e6eb60fefd5677c201a5416949742d1ba725575021cb28b0afae254 SHA512 b25ce17b66988cdcdb67d847160d7a80a8daf8470cbc5ece066a70dfae34b369e175a2ee2cf10b0e68f51b8fd99f52762dc4c429d6abbc4411fd09a8500c067c
-AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610dd918b583455fda6d13eef6292a7eeaac0d14266bf21f97caf6dba65f0a46b1534695e7b72b91c6958d86f70ac63e356b5e05691 SHA512 249a426a76a81a2582f824d2d767695bfd848a04190ee9a2f1d4296bed03f93d4eaa86c13b4b755700b1b552bb584f9b0031ec60a705f2b27b20d62eb58aef8c
-AUX burp-2.4.0-fix-musl-strptime.patch 2730 BLAKE2B 2518df052e42dd790e56776c33ae02b085a888f80faad39a9a25372f78a367eb7664a7b2b5ddf1bac37a3974179c8fcaaee005634197a2c8dfdf4e7cfa0b0c6d SHA512 d3b2df089fa0df1f65a347d90cf6896d05883c10a0828b045eacf8d5a3f911e046315aedc9eb0d74c43796eb822c96befa74c3c7da88adb954068f497844546b
 AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311
 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd
 DIST burp-3.1.4.tar.gz 549879 BLAKE2B bf70051a658700fab60182b97b7ce8540fbd85ad1264ee09c9fa5b5a99046f391b91cd8673097ef869c6b762aea6d8fecdedb38425dca9e6bcbb1f2c2afa96fb SHA512 3aa9fb1512f985fa99e7cb9a45502bbdbf513935e0c62fa4327f0e6cb68d3840f59bfe1b38a7c2419b3e69bc04aef36c223313897c2e45e94f3be3f9d41714db
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
- };
-