diff options
Diffstat (limited to 'libre/systemd')
| -rw-r--r-- | libre/systemd/PKGBUILD | 25 | ||||
| -rw-r--r-- | libre/systemd/lz4-test-compress-partial.patch | 31 |
2 files changed, 16 insertions, 40 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index b509b4585..613039861 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -7,13 +7,13 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat') pkgname+=('systemd-common' 'systemd-udev') -# We split Arch's libsystemd into the systemd-$X, for the following $X: +# We split Arch's libsystemd into systemd-$X, for the following $X: _libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgname+=("${_libsystemd[@]/#/systemd-}") # Can be from either systemd or systemd-stable _commit='25d1ba1173e4cce9dab8a2c2164ce60f63fc68a5' pkgver=239.300 -pkgrel=1 +pkgrel=2 pkgrel+=.par1 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') @@ -57,8 +57,7 @@ source=(# fragment is latest tag for source verification, final merge in prepare '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch' '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' - '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch' - 'lz4-test-compress-partial.patch') + '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch') sha512sums=('SKIP' 'SKIP' '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' @@ -86,13 +85,23 @@ sha512sums=('SKIP' 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c' '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30' 'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83' - '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839' - 'afc199c8d091c1b87fa0719b82bb29ff32595d51034127d1a8c7f83f539f52d0d8a4fa90cf22e286bf3e9104603ecfc9275c3527b9adc2d05d9bcb9234e3c208') + '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( + # journal: adapt for new improved LZ4_decompress_safe_partial() + 'e41ef6fd0027d3619dc1cf062100b2d224d0ee7e' + # (lukeshu) 301st commit from v239-stable, fixes nspawn and restart + # regressions in 239.300. I've added to _backports instead of + # bumpong _commit+pkgver, because I don't want to get ahead of + # Arch's pkgver + '6b4878d667737b523ea251f2d8abde9748bb295e' ) _reverts=( + # shared/sleep-config: add switches to kill specific sleep modes + '6ebddf92527b5de840f021b8672b2977c2a58af5' + # shared/sleep-config: forbid hibernation if resume= is not configured + '6789dca0a26df0c44ff8020f0a4206bf21e52a7a' ) prepare() { @@ -108,14 +117,12 @@ prepare() { for _c in "${_backports[@]}"; do git cherry-pick -n "${_c}" done - for c in "${_reverts[@]}"; do + for _c in "${_reverts[@]}"; do git revert -n "${_c}" done # Replace cdrom/dialout/tape groups with optical/uucp/storage patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch - # LZ4 test patch (FS#60239) - patch -Np1 -i ../lz4-test-compress-partial.patch # apply FSDG patches local _patch diff --git a/libre/systemd/lz4-test-compress-partial.patch b/libre/systemd/lz4-test-compress-partial.patch deleted file mode 100644 index 421e186f1..000000000 --- a/libre/systemd/lz4-test-compress-partial.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 |