From e0f1bea93f245a568b60ae6e9d8d00b5bcb083f5 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Wed, 7 Nov 2018 16:39:08 -0500 Subject: systemd-239.300-1.par1: updating version --- libre/systemd/lz4-test-compress-partial.patch | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 libre/systemd/lz4-test-compress-partial.patch (limited to 'libre/systemd/lz4-test-compress-partial.patch') diff --git a/libre/systemd/lz4-test-compress-partial.patch b/libre/systemd/lz4-test-compress-partial.patch new file mode 100644 index 000000000..421e186f1 --- /dev/null +++ b/libre/systemd/lz4-test-compress-partial.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 554e67e5dd..3636a0ff8c 100644 +--- a/meson.build ++++ b/meson.build +@@ -1084,6 +1084,7 @@ conf.set10('HAVE_XZ', have) + want_lz4 = get_option('lz4') + if want_lz4 != 'false' and not fuzzer_build + liblz4 = dependency('liblz4', ++ version : '>= 1.8.3', + required : want_lz4 == 'true') + have = liblz4.found() + else +diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c +index 7addf318d6..fb0db190b2 100644 +--- a/src/journal/test-compress.c ++++ b/src/journal/test-compress.c +@@ -227,13 +227,10 @@ static void test_lz4_decompress_partial(void) { + assert_se(r >= 0); + log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE, r); + +- /* We expect this to fail, because that's how current lz4 works. If this +- * call succeeds, then lz4 has been fixed, and we need to change our code. +- */ + r = LZ4_decompress_safe_partial(buf, huge, + compressed, + 12, HUGE_SIZE-1); +- assert_se(r < 0); ++ assert_se(r >= 0); + log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE-1, r); + } + #endif -- cgit v1.2.3