From 54f622c30c17779f0baf224dd61b765f84213c04 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 7 Nov 2018 07:22:49 +0100
Subject: core/systemd: removed temporary patch for debug in meson

---
 core/systemd/PKGBUILD | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 core/systemd/PKGBUILD

(limited to 'core/systemd/PKGBUILD')

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
deleted file mode 100644
index baf567fc..00000000
--- a/core/systemd/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-source+=('meson-rename-Ddebug-to-Ddebug-extra.patch')
-sha512sums+=('d310e7ea099bd371eb12fb4f474f1518ddc1013612d6a53c3f5777e6a3509eb58c4b5989d31bb04784be70db5d8ca39bff47414456c3fe322194cd7b341ae70c')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /patch.*0001.*/a patch -Np1 -i ../meson-rename-Ddebug-to-Ddebug-extra.patch
-    '
-)"
-
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
-  # temporary, as there is no systemd-journal user for some reason!?
-  eval "$(
-    declare -f package_systemd | \
-      sed '
-        /install.*systemd-journal/d
-      '
-  )"
-
-  # tempoary failure, known upstream, see FS#60239
-  unset check
-fi
-- 
cgit v1.2.3-70-g09d2


From c362651f62627e6b52da741d7e84b1312650d786 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Wed, 7 Nov 2018 08:22:46 +0100
Subject: core/systemd: added LZ4 test patch (FS#60239)

---
 core/systemd/PKGBUILD                        | 11 ++++++++++
 core/systemd/lz4-test-compress-partial.patch | 31 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 core/systemd/PKGBUILD
 create mode 100644 core/systemd/lz4-test-compress-partial.patch

(limited to 'core/systemd/PKGBUILD')

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
new file mode 100644
index 00000000..be057de8
--- /dev/null
+++ b/core/systemd/PKGBUILD
@@ -0,0 +1,11 @@
+# LZ4 test fails, see upstream FS#60239
+
+source+=(lz4-test-compress-partial.patch)
+sha512sums+=('afc199c8d091c1b87fa0719b82bb29ff32595d51034127d1a8c7f83f539f52d0d8a4fa90cf22e286bf3e9104603ecfc9275c3527b9adc2d05d9bcb9234e3c208')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      /patch.*/a patch -Np1 -i ../lz4-test-compress-partial.patch
+    '
+)"
diff --git a/core/systemd/lz4-test-compress-partial.patch b/core/systemd/lz4-test-compress-partial.patch
new file mode 100644
index 00000000..421e186f
--- /dev/null
+++ b/core/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-70-g09d2