[arch-commits] Commit in systemd/trunk (3 files)

[Dave Reisner]

    Date: Tuesday, January 7, 2014 @ 05:03:23
  Author: dreisner
Revision: 203265

upgpkg: systemd 208-10

- backport fix for zero length FPDT (FS#38403)

Added:
  systemd/trunk/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

------------------------------------------------------------+
 0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch |   26 +++++++++++
 PKGBUILD                                                   |   12 +++--
 systemd.install                                            |    6 --
 3 files changed, 36 insertions(+), 8 deletions(-)

Added: 0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
===================================================================
--- 0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch	                        (rev 0)
+++ 0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch	2014-01-07 04:03:23 UTC (rev 203265)
@@ -0,0 +1,26 @@
+From f576cd2092bc40f9998415cdc3caf10035d4743a Mon Sep 17 00:00:00 2001
+From: Pavel Holica <conscript89 at gmail.com>
+Date: Wed, 6 Nov 2013 23:24:16 +0100
+Subject: [PATCH] acpi-fpdt: break on zero or negative length read
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1027478
+---
+ src/shared/acpi-fpdt.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
+index 75648b4..7bae47f 100644
+--- a/src/shared/acpi-fpdt.c
++++ b/src/shared/acpi-fpdt.c
+@@ -109,6 +109,8 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
+         for (rec = (struct acpi_fpdt_header *)(buf + sizeof(struct acpi_table_header));
+              (char *)rec < buf + l;
+              rec = (struct acpi_fpdt_header *)((char *)rec + rec->length)) {
++                if (rec->length <= 0)
++                        break;
+                 if (rec->type != ACPI_FPDT_TYPE_BOOT)
+                         continue;
+                 if (rec->length != sizeof(struct acpi_fpdt_header))
+-- 
+1.8.5.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-07 03:18:01 UTC (rev 203264)
+++ PKGBUILD	2014-01-07 04:03:23 UTC (rev 203265)
@@ -4,10 +4,10 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=9
+pkgrel=10
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
+makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
 options=('strip' 'debug')
@@ -28,7 +28,8 @@
         '0005-mount-service-drop-FsckPassNo-support.patch'
         '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-fstab-generator-Do-not-try-to-fsck-non-devices.patch'
+        '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch')
 md5sums=('df64550d92afbffb4f67a434193ee165'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
@@ -46,7 +47,8 @@
          'd2481a6ea199b581e243a950125b0ca6'
          'c2aee634a3a6c50778968f0d5c756f40'
          'ef8b8212d504bb73c10bf4e85f0703b2'
-         '4ba2317bf4d7708fca406f49482b1bf3')
+         '4ba2317bf4d7708fca406f49482b1bf3'
+         '078f10d6fc315b329844cd20fa742eee')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -72,6 +74,8 @@
   patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch
   # Fix FS#35671
   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
 
   autoreconf
 }

Modified: systemd.install
===================================================================
--- systemd.install	2014-01-07 03:18:01 UTC (rev 203264)
+++ systemd.install	2014-01-07 04:03:23 UTC (rev 203265)
@@ -13,10 +13,8 @@
 
 add_journal_acls() {
   # ignore errors, since the filesystem might not support ACLs
-  {
-    setfacl -nm g:adm:rx,d:g:adm:rx var/log/journal
-    setfacl -nm g:wheel:rx,d:g:wheel:rx var/log/journal
-  } 2>/dev/null
+  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal/ 2>/dev/null
+  :
 }
 
 post_common() {