[arch-commits] Commit in systemd/trunk (4 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Sat Feb 8 19:30:22 UTC 2014
Date: Saturday, February 8, 2014 @ 20:30:22
Author: dreisner
Revision: 205601
upgpkg: systemd 208-11
- backport fix for FS#38788, FS#37170
- backport fix for FS#38842
Added:
systemd/trunk/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
systemd/trunk/0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
systemd/trunk/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
Modified:
systemd/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch | 45 ++++++++++
0001-do-not-accept-garbage-from-acpi-firmware-performance.patch | 33 +++++++
0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch | 26 +++++
PKGBUILD | 15 ++-
4 files changed, 116 insertions(+), 3 deletions(-)
Added: 0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
===================================================================
--- 0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch (rev 0)
+++ 0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch 2014-02-08 19:30:22 UTC (rev 205601)
@@ -0,0 +1,45 @@
+From 66a5dbdf282435403f947c2caadd04bb0cdec752 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Sat, 8 Feb 2014 12:54:58 -0500
+Subject: [PATCH] cryptsetup-generator: auto add deps for device as password
+
+If the password is a device file, we can add Requires/After dependencies
+on the device rather than requiring the user to do so.
+---
+ src/cryptsetup/cryptsetup-generator.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 9c98f0b..46ad9b8 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -130,11 +130,21 @@ static int create_disk(
+ streq(password, "/dev/random") ||
+ streq(password, "/dev/hw_random"))
+ fputs("After=systemd-random-seed.service\n", f);
+- else if (!streq(password, "-") &&
+- !streq(password, "none"))
+- fprintf(f,
+- "RequiresMountsFor=%s\n",
+- password);
++
++ else if (!streq(password, "-") && !streq(password, "none")) {
++ _cleanup_free_ char *uu = fstab_node_to_udev_node(password);
++ if (uu == NULL)
++ return log_oom();
++
++ if (is_device_path(uu)) {
++ _cleanup_free_ char *dd = unit_name_from_path(uu, ".device");
++ if (dd == NULL)
++ return log_oom();
++
++ fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
++ } else
++ fprintf(f, "RequiresMountsFor=%s\n", password);
++ }
+ }
+
+ if (is_device_path(u))
+--
+1.8.5.4
+
Added: 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
===================================================================
--- 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch (rev 0)
+++ 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch 2014-02-08 19:30:22 UTC (rev 205601)
@@ -0,0 +1,33 @@
+From 6c7980093c4e39d07bf06484f96f489e236c7c29 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay at vrfy.org>
+Date: Thu, 10 Oct 2013 01:38:11 +0200
+Subject: [PATCH] do not accept "garbage" from acpi firmware performance data
+ (FPDT)
+
+00000000 46 42 50 54 38 00 00 00 02 00 30 02 00 00 00 00 |FBPT8.....0.....|
+00000010 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |#E..............|
+00000020 f5 6a 51 00 00 00 00 00 00 00 00 00 00 00 00 00 |.jQ.............|
+00000030 00 00 00 00 00 00 00 00 70 74 61 6c 58 00 00 00 |........ptalX...|
+---
+ src/shared/acpi-fpdt.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
+index af58c7c..75648b4 100644
+--- a/src/shared/acpi-fpdt.c
++++ b/src/shared/acpi-fpdt.c
+@@ -146,6 +146,11 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
+ if (brec.type != ACPI_FPDT_BOOT_REC)
+ return -EINVAL;
+
++ if (brec.startup_start == 0 || brec.exit_services_exit < brec.startup_start)
++ return -EINVAL;
++ if (brec.exit_services_exit > NSEC_PER_HOUR)
++ return -EINVAL;
++
+ if (loader_start)
+ *loader_start = brec.startup_start / 1000;
+ if (loader_exit)
+--
+1.8.5.4
+
Added: 0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
===================================================================
--- 0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch (rev 0)
+++ 0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch 2014-02-08 19:30:22 UTC (rev 205601)
@@ -0,0 +1,26 @@
+From 7074fecf6747c9a6ad872cc87701481e8bece8b0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Wed, 2 Oct 2013 15:35:16 -0400
+Subject: [PATCH] tmpfiles.d: include setgid perms for /run/log/journal
+
+4608af4333d0f7f5 set permissions for journal storage on persistent disk
+but not the volatile storage.
+
+ref: https://bugs.archlinux.org/task/37170
+---
+ tmpfiles.d/systemd.conf | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
+index b630440..a05c657 100644
+--- a/tmpfiles.d/systemd.conf
++++ b/tmpfiles.d/systemd.conf
+@@ -26,3 +26,5 @@ F /run/nologin 0644 - - - "System is booting up. See pam_nologin(8)"
+
+ m /var/log/journal 2755 root systemd-journal - -
+ m /var/log/journal/%m 2755 root systemd-journal - -
++m /run/log/journal 2755 root systemd-journal - -
++m /run/log/journal/%m 2755 root systemd-journal - -
+--
+1.8.5.4
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-08 18:07:53 UTC (rev 205600)
+++ PKGBUILD 2014-02-08 19:30:22 UTC (rev 205601)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=208
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -29,7 +29,10 @@
'0006-efi-boot-generator-hookup-to-fsck.patch'
'0007-fsck-root-only-run-when-requested-in-fstab.patch'
'0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch'
- '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch')
+ '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch'
+ '0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch'
+ '0001-do-not-accept-garbage-from-acpi-firmware-performance.patch'
+ '0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch')
md5sums=('df64550d92afbffb4f67a434193ee165'
'29245f7a240bfba66e2b1783b63b6b40'
'8b68b0218a3897d4d37a6ccf47914774'
@@ -48,7 +51,10 @@
'c2aee634a3a6c50778968f0d5c756f40'
'ef8b8212d504bb73c10bf4e85f0703b2'
'4ba2317bf4d7708fca406f49482b1bf3'
- '078f10d6fc315b329844cd20fa742eee')
+ '078f10d6fc315b329844cd20fa742eee'
+ 'f3e4e5b840cace769556e802466574da'
+ '707d64bad7461c04d4cfce21bfddf712'
+ '13232b7f28100e40990dde1c9e411596')
prepare() {
cd "$pkgname-$pkgver"
@@ -76,6 +82,9 @@
patch -Np1 <"$srcdir"/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
# Fix FS#38403
patch -Np1 <"$srcdir"/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
+ patch -Np1 <"$srcdir"/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
+ patch -Np1 <"$srcdir"/0001-d""o-not-accept-garbage-from-acpi-firmware-performance.patch
+ patch -Np1 <"$srcdir"/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
autoreconf
}
More information about the arch-commits
mailing list