Merge branch 'master' into i486

2 files changed, 71 insertions, 0 deletions

diff --git a/community/dovecot/PKGBUILD b/community/dovecot/PKGBUILD
new file mode 100644
index 00000000..6a41fea4
--- /dev/null
+++ b/community/dovecot/PKGBUILD
@@ -0,0 +1,3 @@
+# PRI64 instead of lu in sprintfs in tests, already fixed upstream in git
+source+=(dovecot-2.3.4-PRIu64.patch)
+sha256sums+=('699ddd451d7f75a89797f05b910ae81e8cfc0098e11a80e83f3b440894633819')
diff --git a/community/dovecot/dovecot-2.3.4-PRIu64.patch b/community/dovecot/dovecot-2.3.4-PRIu64.patch
new file mode 100644
index 00000000..df85df47
--- /dev/null
+++ b/community/dovecot/dovecot-2.3.4-PRIu64.patch
@@ -0,0 +1,68 @@
+diff -rauN dovecot-2.3.4/src/lib-master/test-event-stats.c dovecot-2.3.4-PRIu64-patch/src/lib-master/test-event-stats.c
+--- dovecot-2.3.4/src/lib-master/test-event-stats.c	2018-11-23 12:06:49.000000000 +0100
++++ dovecot-2.3.4-PRIu64-patch/src/lib-master/test-event-stats.c	2018-12-27 14:35:51.846548380 +0100
+@@ -360,7 +360,7 @@
+ 	event_unref(&child_ev);
+ 	test_assert(
+ 		compare_test_stats_to(
+-			"EVENT	%lu	1	0	0"
++			"EVENT	%"PRIu64"	1	0	0"
+ 			"	stest-event-stats.c	%d"
+ 			"	l0	0	ctest2\n", id, l));
+ 	test_end();
+@@ -386,12 +386,12 @@
+ 	event_unref(&child_ev);
+ 	test_assert(
+ 		compare_test_stats_to(
+-			"BEGIN	%lu	0	1	0	0"
++			"BEGIN	%"PRIu64"	0	1	0	0"
+ 			"	stest-event-stats.c	%d	ctest1\n"
+-			"EVENT	%lu	1	1	0"
++			"EVENT	%"PRIu64"	1	1	0"
+ 			"	stest-event-stats.c	%d"
+ 			"	l1	0	ctest2\n"
+-			"END\t%lu\n", idp, lp, idp, l, idp));
++			"END\t%"PRIu64"\n", idp, lp, idp, l, idp));
+ 	test_end();
+ }
+ 
+@@ -451,7 +451,7 @@
+ 	event_unref(&merge_ev2);
+ 	test_assert(
+ 		compare_test_stats_to(
+-			"EVENT	%lu	1	0	0"
++			"EVENT	%"PRIu64"	1	0	0"
+ 			"	stest-event-stats.c	%d	l0	0"
+ 			"	ctest3	ctest2	ctest1	Tkey3"
+ 			"	10	0	Ikey2	20"
+@@ -483,11 +483,11 @@
+ 	event_unref(&child_ev);
+ 	test_assert(
+ 		compare_test_stats_to(
+-			"BEGIN	%lu	0	1	0	0"
++			"BEGIN	%"PRIu64"	0	1	0	0"
+ 			"	stest-event-stats.c	%d	ctest1\n"
+-			"EVENT	%lu	1	3	0	"
++			"EVENT	%"PRIu64"	1	3	0	"
+ 			"stest-event-stats.c	%d	l3	0"
+-			"	ctest2\nEND\t%lu\n", id, lp, id, l, id));
++			"	ctest2\nEND\t%"PRIu64"\n", id, lp, id, l, id));
+ 	test_end();
+ }
+ 
+@@ -525,12 +525,12 @@
+ 	event_unref(&child2_ev);
+ 	test_assert(
+ 		compare_test_stats_to(
+-			"BEGIN	%lu	0	1	0	0"
++			"BEGIN	%"PRIu64"	0	1	0	0"
+ 			"	stest-event-stats.c	%d	ctest1\n"
+-			"EVENT	%lu	1	3	0	"
++			"EVENT	%"PRIu64"	1	3	0	"
+ 			"stest-event-stats.c	%d	l3	0	"
+ 			"ctest4	ctest5	Tkey3	10	0	Skey4"
+-			"	str4\nEND\t%lu\n", id, lp, id, l, id));
++			"	str4\nEND\t%"PRIu64"\n", id, lp, id, l, id));
+ 	test_end();
+ }
+