subject:"\[arch\-commits\] Commit in systemd\/trunk \(3 files\)"

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

2017-08-10 Thread Christian Hesse

Date: Thursday, August 10, 2017 @ 19:10:10
  Author: eworm
Revision: 301855

upgpkg: systemd 234.11-7

systemd-{sysusers,tmpfiles}.hook: call systemd-{sysusers,tmpfiles} with
basename to search all directories as specified in sysusers.d(5) for a
matching file

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd-sysusers.hook
  systemd/trunk/systemd-tmpfiles.hook

---+
 PKGBUILD  |6 +++---
 systemd-sysusers.hook |2 +-
 systemd-tmpfiles.hook |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-10 19:04:42 UTC (rev 301854)
+++ PKGBUILD2017-08-10 19:10:10 UTC (rev 301855)
@@ -10,7 +10,7 @@
 # Bump this to latest major release for signed tag verification,
 # the commit count is handled by pkgver() function.
 pkgver=234.11
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="https://www.github.com/systemd/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -42,8 +42,8 @@
 
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
 
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
 
'2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
-
'9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
-
'0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
+
'7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30'
+
'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3'
 
'10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
 validpgpkeys=(
   '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering

Modified: systemd-sysusers.hook
===
--- systemd-sysusers.hook   2017-08-10 19:04:42 UTC (rev 301854)
+++ systemd-sysusers.hook   2017-08-10 19:10:10 UTC (rev 301855)
@@ -7,5 +7,5 @@
 [Action]
 Description = Updating system user accounts...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "$(basename 
"$f")" ; done'
 NeedsTargets

Modified: systemd-tmpfiles.hook
===
--- systemd-tmpfiles.hook   2017-08-10 19:04:42 UTC (rev 301854)
+++ systemd-tmpfiles.hook   2017-08-10 19:10:10 UTC (rev 301855)
@@ -7,5 +7,5 @@
 [Action]
 Description = Creating temporary files...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"/$f"; done'
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"$(basename "$f")"; done'
 NeedsTargets

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

2017-01-09 Thread Christian Hesse

Date: Monday, January 9, 2017 @ 14:43:41
  Author: eworm
Revision: 285569

upgpkg: systemd 232-7

implement pacman hooks 'systemd-sysusers.hook' and 'systemd-tmpfiles.hook'

Added:
  systemd/trunk/systemd-sysusers.hook
  systemd/trunk/systemd-tmpfiles.hook
Modified:
  systemd/trunk/PKGBUILD

---+
 PKGBUILD  |8 +++-
 systemd-sysusers.hook |   11 +++
 systemd-tmpfiles.hook |   11 +++
 3 files changed, 29 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-09 14:43:32 UTC (rev 285568)
+++ PKGBUILD2017-01-09 14:43:41 UTC (rev 285569)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=232
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="https://www.github.com/systemd/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -20,6 +20,8 @@
 'loader.conf'
 'splash-arch.bmp'
 'systemd-user.pam'
+'systemd-sysusers.hook'
+'systemd-tmpfiles.hook'
 'udev-hwdb.hook'
 '0001-disable-RestrictAddressFamilies-on-i686.patch'
 '0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch'
@@ -32,6 +34,8 @@
 
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
 
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
 
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
+
'9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
+
'0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
 
'888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862'
 
'89f9b2d3918c679ce4f76c2b10dc7fcb7e04f1925a5f92542f06891de2a123a91df7eb67fd4ce71506a8132f5440b3560b7bb667e1c1813944b115c1dfe35e3f'
 
'b993a42c5534582631f7b379d54f6abc37e3aaa56ecf869a6d86ff14ae5a52628f4e447b6a30751bc1c14c30cec63a5c6d0aa268362d235ed477b639cac3a219'
@@ -202,6 +206,8 @@
   install -Dm644 "$srcdir/loader.conf" 
"$pkgdir"/usr/share/systemd/bootctl/loader.conf
   install -Dm644 "$srcdir/splash-arch.bmp" 
"$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
 
+  install -Dm644 "$srcdir/systemd-sysusers.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
+  install -Dm644 "$srcdir/systemd-tmpfiles.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
   install -Dm644 "$srcdir/udev-hwdb.hook" 
"$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
 
   # overwrite the systemd-user PAM configuration with our own

Added: systemd-sysusers.hook
===
--- systemd-sysusers.hook   (rev 0)
+++ systemd-sysusers.hook   2017-01-09 14:43:41 UTC (rev 285569)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Updating system user accounts...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
+NeedsTargets

Added: systemd-tmpfiles.hook
===
--- systemd-tmpfiles.hook   (rev 0)
+++ systemd-tmpfiles.hook   2017-01-09 14:43:41 UTC (rev 285569)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/tmpfiles.d/*.conf
+
+[Action]
+Description = Creating temporary files...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"/$f"; done'
+NeedsTargets

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

2016-12-07 Thread Dave Reisner

Date: Wednesday, December 7, 2016 @ 19:40:12
  Author: dreisner
Revision: 282930

upgpkg: systemd 232-5

more backports...

- avoid hiding bind mounts in nspawn (FS#52009)
- fix build system to cope with recent lz4 (FS#52065)
- make sure to initially populate the space info cache (FS#52012)
- fix nspawn error code for --help and --version (FS#52029)
- provide our own /etc/pam.d/systemd-user (FS#52039)

Added:
  systemd/trunk/0001-nspawn-don-t-hide-bind-tmp-mounts.patch
  systemd/trunk/systemd-user.pam
Modified:
  systemd/trunk/PKGBUILD

--+
 0001-nspawn-don-t-hide-bind-tmp-mounts.patch |   26 +
 PKGBUILD |   19 +++---
 systemd-user.pam |5 
 3 files changed, 47 insertions(+), 3 deletions(-)

Added: 0001-nspawn-don-t-hide-bind-tmp-mounts.patch
===
--- 0001-nspawn-don-t-hide-bind-tmp-mounts.patch
(rev 0)
+++ 0001-nspawn-don-t-hide-bind-tmp-mounts.patch2016-12-07 19:40:12 UTC 
(rev 282930)
@@ -0,0 +1,26 @@
+From 7ec42a45410cb27140292d85ebb0e4b6dcea Mon Sep 17 00:00:00 2001
+From: Dave Reisner 
+Date: Wed, 7 Dec 2016 13:45:48 -0500
+Subject: [PATCH] nspawn: don't hide --bind=/tmp/* mounts
+
+This is a v232-applicable version of upstream c9fd987279a462e.
+---
+ src/nspawn/nspawn-mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
+index 115de64..2dabe2a 100644
+--- a/src/nspawn/nspawn-mount.c
 b/src/nspawn/nspawn-mount.c
+@@ -382,7 +382,7 @@ int mount_all(const char *dest,
+ { "tmpfs",   "/dev","tmpfs", 
"mode=755",  MS_NOSUID|MS_STRICTATIME,  true,  
false, false },
+ { "tmpfs",   "/dev/shm","tmpfs", 
"mode=1777", MS_NOSUID|MS_NODEV|MS_STRICTATIME, true,  
false, false },
+ { "tmpfs",   "/run","tmpfs", 
"mode=755",  MS_NOSUID|MS_NODEV|MS_STRICTATIME, true,  
false, false },
+-{ "tmpfs",   "/tmp","tmpfs", 
"mode=1777", MS_STRICTATIME,true,  
true,  false },
++{ "tmpfs",   "/tmp","tmpfs", 
"mode=1777", MS_STRICTATIME,true,  
false,  false },
+ #ifdef HAVE_SELINUX
+ { "/sys/fs/selinux", "/sys/fs/selinux", NULL, 
NULL,   MS_BIND,   false, 
false, false },  /* Bind mount first */
+ { NULL,  "/sys/fs/selinux", NULL, 
NULL,   MS_BIND|MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_REMOUNT, false, 
false, false },  /* Then, make it r/o */
+-- 
+2.10.2
+

Modified: PKGBUILD
===
--- PKGBUILD2016-12-07 18:38:11 UTC (rev 282929)
+++ PKGBUILD2016-12-07 19:40:12 UTC (rev 282930)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=232
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="https://www.github.com/systemd/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -19,9 +19,11 @@
 'arch.conf'
 'loader.conf'
 'splash-arch.bmp'
+'systemd-user.pam'
 'udev-hwdb.hook'
 '0001-disable-RestrictAddressFamilies-on-i686.patch'
-'0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch')
+'0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch'
+'0001-nspawn-don-t-hide-bind-tmp-mounts.patch')
 sha512sums=('SKIP'
 
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
 
'52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28'
@@ -29,9 +31,11 @@
 
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
 
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
 
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
+
'2688e8be6943aa34b4a4e2481e23d07ab7dae53cc9426260010cf6a1e2361eff4b9a8b3652a1fca65680e1f23221026c6460e04feb1cee919b24e2bbf69be5ed'
 
'888ab01bc6e09beb08d7126472c34c9e1aa35ea34e62a09e900ae34c93b1de2fcc988586efd8d0dc962393974f45c77b206d59a86cf53e370f061bf9a1b1a862'

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

2016-11-09 Thread Dave Reisner

Date: Wednesday, November 9, 2016 @ 17:51:27
  Author: dreisner
Revision: 280260

upgpkg: systemd 232-2

- Add git tag verification
- make RestrictAddressFamilies no-op on i686
- Revert nspawn changes which break DNS resolution

Added:
  systemd/trunk/0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
  systemd/trunk/0001-disable-RestrictAddressFamilies-on-i686.patch
Modified:
  systemd/trunk/PKGBUILD

-+
 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch |   62 
++
 0001-disable-RestrictAddressFamilies-on-i686.patch  |   30 
 PKGBUILD|   51 +++-
 3 files changed, 140 insertions(+), 3 deletions(-)

Added: 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch
===
--- 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch 
(rev 0)
+++ 0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch 
2016-11-09 17:51:27 UTC (rev 280260)
@@ -0,0 +1,62 @@
+From 481712d9ee88395042f0640f272c1f87142bc0a8 Mon Sep 17 00:00:00 2001
+From: Dave Reisner 
+Date: Wed, 9 Nov 2016 11:14:03 -0500
+Subject: [PATCH] Revert "nspawn: try to bind mount resolved's resolv.conf
+ snippet into the container"
+
+This reverts commit 3539724c26a1b2b00c4eb3c004b635a4b8647de6.
+---
+ src/nspawn/nspawn.c | 27 ---
+ 1 file changed, 8 insertions(+), 19 deletions(-)
+
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index c8b18bc..93df7c6 100644
+--- a/src/nspawn/nspawn.c
 b/src/nspawn/nspawn.c
+@@ -1309,35 +1309,24 @@ static int setup_resolv_conf(const char *dest) {
+ /* Fix resolv.conf, if possible */
+ where = prefix_roota(dest, "/etc/resolv.conf");
+ 
+-if (access("/usr/lib/systemd/resolv.conf", F_OK) >= 0) {
+-/* resolved is enabled on the host. In this, case bind mount 
its static resolv.conf file into the
+- * container, so that the container can use the host's 
resolver. Given that network namespacing is
+- * disabled it's only natural of the container also uses the 
host's resolver. It also has the big
+- * advantage that the container will be able to follow the 
host's DNS server configuration changes
+- * transparently. */
+-
+-r = mount_verbose(LOG_WARNING, 
"/usr/lib/systemd/resolv.conf", where, NULL, MS_BIND, NULL);
+-if (r >= 0)
+-return mount_verbose(LOG_ERR, NULL, where, NULL,
+- 
MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL);
+-}
+-
+-/* If that didn't work, let's copy the file */
+ r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644, 0);
+ if (r < 0) {
+-/* If the file already exists as symlink, let's suppress the 
warning, under the assumption that
+- * resolved or something similar runs inside and the symlink 
points there.
++/* If the file already exists as symlink, let's
++ * suppress the warning, under the assumption that
++ * resolved or something similar runs inside and the
++ * symlink points there.
+  *
+- * If the disk image is read-only, there's also no point in 
complaining.
++ * If the disk image is read-only, there's also no
++ * point in complaining.
+  */
+ log_full_errno(IN_SET(r, -ELOOP, -EROFS) ? LOG_DEBUG : 
LOG_WARNING, r,
+-   "Failed to copy /etc/resolv.conf to %s, 
ignoring: %m", where);
++   "Failed to copy /etc/resolv.conf to %s: %m", 
where);
+ return 0;
+ }
+ 
+ r = userns_lchown(where, 0, 0);
+ if (r < 0)
+-log_warning_errno(r, "Failed to chown /etc/resolv.conf, 
ignoring: %m");
++log_warning_errno(r, "Failed to chown /etc/resolv.conf: %m");
+ 
+ return 0;
+ }
+-- 
+2.10.2
+

Added: 0001-disable-RestrictAddressFamilies-on-i686.patch
===
--- 0001-disable-RestrictAddressFamilies-on-i686.patch  
(rev 0)
+++ 0001-disable-RestrictAddressFamilies-on-i686.patch  2016-11-09 17:51:27 UTC 
(rev 280260)
@@ -0,0 +1,30 @@
+From ff59e06f9423af0532aaeedf931474823f764875 Mon Sep 17 00:00:00 2001
+From: Dave Reisner 
+Date: Wed, 9 Nov 2016 08:00:26 -0500
+Subject: [PATCH] disable RestrictAddressFamilies on i686
+
+Shit's broke, yo.
+
+https://github.com/systemd/systemd/issues/4575
+---
+ src/core/execute.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git

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

2014-11-17 Thread Dave Reisner

Date: Tuesday, November 18, 2014 @ 01:40:32
  Author: dreisner
Revision: 226354

upgpkg: systemd 217-7

- backport fix to demote hwdb error back to debug
- call --boot with systemd-tmpfiles in early userspace

Added:
  systemd/trunk/0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/initcpio-hook-udev

-+
 0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch |   32 
++
 PKGBUILD|7 +-
 initcpio-hook-udev  |2 
 3 files changed, 38 insertions(+), 3 deletions(-)

Added: 0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
===
--- 0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch 
(rev 0)
+++ 0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch 
2014-11-18 00:40:32 UTC (rev 226354)
@@ -0,0 +1,32 @@
+From 8232e39e7cf32071e11b3b04839e6c98fbc81d0f Mon Sep 17 00:00:00 2001
+From: Colin Guthrie co...@mageia.org
+Date: Wed, 5 Nov 2014 15:29:41 +
+Subject: [PATCH] udev hwdb: Change error message regarding missing hwdb.bin
+ back to debug.
+
+When used in an initramfs, it's expected that the hwdb.bin file is
+not present (it makes for a very large initramfs otherwise).
+
+While it's nice to tell the user about this, as it's not strictly
+speaking an error we really shouldn't be so forceful in our
+reporting.
+---
+ src/libudev/libudev-hwdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
+index a1cfc0b..0716072 100644
+--- a/src/libudev/libudev-hwdb.c
 b/src/libudev/libudev-hwdb.c
+@@ -296,7 +296,7 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev 
*udev) {
+ }
+ 
+ if (!hwdb-f) {
+-udev_err(udev, hwdb.bin does not exist, please run udevadm 
hwdb --update);
++udev_dbg(udev, hwdb.bin does not exist, please run udevadm 
hwdb --update);
+ udev_hwdb_unref(hwdb);
+ return NULL;
+ }
+-- 
+2.1.3
+

Modified: PKGBUILD
===
--- PKGBUILD2014-11-17 19:53:25 UTC (rev 226353)
+++ PKGBUILD2014-11-18 00:40:32 UTC (rev 226354)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=217
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -21,6 +21,7 @@
 '0001-units-order-sd-journal-flush-after-sd-remount-fs.patch'
 '0001-units-make-systemd-journald.service-Type-notify.patch'
 '0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch'
+'0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch'
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev')
@@ -33,7 +34,8 @@
  '92497d06e0af615be4b368fe615109c0'
  'a321d62d6ffada9e6976bdd339fa3219'
  'f72e8d086172177c224f0ce48ef54222'
- '29245f7a240bfba66e2b1783b63b6b40'
+ '6326988822e9d18217525b2cb25cec1d'
+ '90ea67a7bb237502094914622a39e281'
  '107c489f27c667be4101aecd3369b355'
  'bde43090d4ac0ef048e3eaee8202a407')
 
@@ -49,6 +51,7 @@
   patch -Np1 ../0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
   patch -Np1 ../0001-units-make-systemd-journald.service-Type-notify.patch
   patch -Np1 ../0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
+  patch -Np1 
../0001-udev-hwdb-Change-error-message-regarding-missing-hwd.patch
 }
 
 build() {

Modified: initcpio-hook-udev
===
--- initcpio-hook-udev  2014-11-17 19:53:25 UTC (rev 226353)
+++ initcpio-hook-udev  2014-11-18 00:40:32 UTC (rev 226354)
@@ -2,7 +2,7 @@
 
 run_earlyhook() {
 kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-systemd-tmpfiles --prefix=/dev --create
+systemd-tmpfiles --prefix=/dev --create --boot
 /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
 udevd_running=1
 }

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

2014-11-09 Thread Dave Reisner

Date: Sunday, November 9, 2014 @ 23:03:50
  Author: dreisner
Revision: 225804

upgpkg: systemd 217-6

- backport fix for shutdown sometimes rebooting (FS#42612)
- install ctrl-alt-del.target as a symlink, not a file (FS#42510)
- add missing targets in initramfs (FS#42301)

Added:
  systemd/trunk/0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/initcpio-install-systemd

-+
 0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch |   68 ++
 PKGBUILD|7 -
 initcpio-install-systemd|   17 +-
 3 files changed, 83 insertions(+), 9 deletions(-)

Added: 0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch
===
--- 0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch 
(rev 0)
+++ 0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch 2014-11-09 
22:03:50 UTC (rev 225804)
@@ -0,0 +1,68 @@
+From 4b5d8d0f22ae61ceb45a25391354ba53b43ee992 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt mschm...@redhat.com
+Date: Thu, 6 Nov 2014 22:24:13 +0100
+Subject: [PATCH] shutdown: fix arguments to /run/initramfs/shutdown
+
+Our initrd interface specifies that the verb is in argv[1].
+This is where systemd passes it to systemd-shutdown, but getopt
+permutes argv[]. This confuses dracut's shutdown script:
+  Shutdown called with argument '--log-level'. Rebooting!
+
+getopt can be convinced to not permute argv[] by having '-' as the first
+character of optstring. Let's use it. This requires changing the way
+non-option arguments (in our case, the verb) are processed.
+
+This fixes a bug where the system would reboot instead of powering off.
+---
+ src/core/shutdown.c | 17 +++--
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/shutdown.c b/src/core/shutdown.c
+index dd11ae3..48ed7fa 100644
+--- a/src/core/shutdown.c
 b/src/core/shutdown.c
+@@ -75,7 +75,9 @@ static int parse_argv(int argc, char *argv[]) {
+ assert(argc = 1);
+ assert(argv);
+ 
+-while ((c = getopt_long(argc, argv, , options, NULL)) = 0)
++/* - prevents getopt from permuting argv[] and moving the verb away
++ * from argv[1]. Our interface to initrd promises it'll be there. */
++while ((c = getopt_long(argc, argv, -, options, NULL)) = 0)
+ switch (c) {
+ 
+ case ARG_LOG_LEVEL:
+@@ -113,6 +115,13 @@ static int parse_argv(int argc, char *argv[]) {
+ 
+ break;
+ 
++case '\001':
++if (!arg_verb)
++arg_verb = optarg;
++else
++log_error(Excess arguments, ignoring);
++break;
++
+ case '?':
+ return -EINVAL;
+ 
+@@ -120,15 +129,11 @@ static int parse_argv(int argc, char *argv[]) {
+ assert_not_reached(Unhandled option code.);
+ }
+ 
+-if (optind = argc) {
++if (!arg_verb) {
+ log_error(Verb argument missing.);
+ return -EINVAL;
+ }
+ 
+-arg_verb = argv[optind];
+-
+-if (optind + 1  argc)
+-log_error(Excess arguments, ignoring);
+ return 0;
+ }
+ 
+-- 
+2.1.3
+

Modified: PKGBUILD
===
--- PKGBUILD2014-11-09 21:30:28 UTC (rev 225803)
+++ PKGBUILD2014-11-09 22:03:50 UTC (rev 225804)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=217
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -20,6 +20,7 @@
 '0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch'
 '0001-units-order-sd-journal-flush-after-sd-remount-fs.patch'
 '0001-units-make-systemd-journald.service-Type-notify.patch'
+'0001-shutdown-fix-arguments-to-run-initramfs-shutdown.patch'
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev')
@@ -31,8 +32,9 @@
  '42ff9d59bb057637355b202157d59991'
  '92497d06e0af615be4b368fe615109c0'
  'a321d62d6ffada9e6976bdd339fa3219'
+ 'f72e8d086172177c224f0ce48ef54222'
  '29245f7a240bfba66e2b1783b63b6b40'
- '455b68a9a15f634dcfdaff2463010d4e'
+ '107c489f27c667be4101aecd3369b355'
  'bde43090d4ac0ef048e3eaee8202a407')
 
 
@@ -46,6 +48,7 @@
   patch -Np1 
../0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch
   patch -Np1 ../0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
   patch -Np1

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

2014-11-04 Thread Evangelos Foutras

Date: Tuesday, November 4, 2014 @ 21:31:36
  Author: foutrelis
Revision: 225621

upgpkg: systemd 217-5

Fix systemd-journal-flush.service hang at boot (FS#42678).

Added:
  systemd/trunk/0001-units-make-systemd-journald.service-Type-notify.patch
  systemd/trunk/0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
Modified:
  systemd/trunk/PKGBUILD

-+
 0001-units-make-systemd-journald.service-Type-notify.patch  |   35 ++
 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch |   29 
 PKGBUILD|8 ++
 3 files changed, 71 insertions(+), 1 deletion(-)

Added: 0001-units-make-systemd-journald.service-Type-notify.patch
===
--- 0001-units-make-systemd-journald.service-Type-notify.patch  
(rev 0)
+++ 0001-units-make-systemd-journald.service-Type-notify.patch  2014-11-04 
20:31:36 UTC (rev 225621)
@@ -0,0 +1,35 @@
+From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt mschm...@redhat.com
+Date: Tue, 4 Nov 2014 20:28:08 +0100
+Subject: [PATCH] units: make systemd-journald.service Type=notify
+
+It already calls sd_notify(), so it looks like an oversight.
+
+Without it, its ordering to systemd-journal-flush.service is
+non-deterministic and the SIGUSR1 from flushing may kill journald before
+it has its signal handlers set up.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=85871
+https://bugzilla.redhat.com/show_bug.cgi?id=1159641
+---
+(foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to
+apply to systemd 217)
+
+ units/systemd-journald.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-journald.service.in 
b/units/systemd-journald.service.in
+index 7ee67fd..8d380c8 100644
+--- a/units/systemd-journald.service.in
 b/units/systemd-journald.service.in
+@@ -14,6 +14,7 @@ After=systemd-journald.socket 
systemd-journald-dev-log.socket systemd-journald-a
+ Before=sysinit.target
+ 
+ [Service]
++Type=notify
+ Sockets=systemd-journald.socket systemd-journald-dev-log.socket
+ ExecStart=@rootlibexecdir@/systemd-journald
+ Restart=always
+-- 
+2.1.3
+

Added: 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch
===
--- 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch 
(rev 0)
+++ 0001-units-order-sd-journal-flush-after-sd-remount-fs.patch 2014-11-04 
20:31:36 UTC (rev 225621)
@@ -0,0 +1,29 @@
+From 1f1926aa5e836caa3bd6df43704aecd606135103 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbys...@in.waw.pl
+Date: Sun, 2 Nov 2014 21:45:42 -0500
+Subject: [PATCH] units: order sd-journal-flush after sd-remount-fs
+
+Otherwise we could attempt to flush the journal while /var/log/ was
+still ro, and silently skip journal flushing.
+
+The way that errors in flushing are handled should still be changed to
+be more transparent and robust.
+---
+ units/systemd-journal-flush.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-journal-flush.service.in 
b/units/systemd-journal-flush.service.in
+index fa29089..98c91b4 100644
+--- a/units/systemd-journal-flush.service.in
 b/units/systemd-journal-flush.service.in
+@@ -11,6 +11,7 @@ Documentation=man:systemd-journald.service(8) 
man:journald.conf(5)
+ DefaultDependencies=no
+ Requires=systemd-journald.service
+ After=systemd-journald.service
++After=systemd-remount-fs.service
+ Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
+ RequiresMountsFor=/var/log/journal
+ 
+-- 
+2.1.3
+

Modified: PKGBUILD
===
--- PKGBUILD2014-11-04 14:57:54 UTC (rev 225620)
+++ PKGBUILD2014-11-04 20:31:36 UTC (rev 225621)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=217
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -18,6 +18,8 @@
 '0001-shared-install-avoid-prematurely-rejecting-missing-u.patch'
 '0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch'
 '0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch'
+'0001-units-order-sd-journal-flush-after-sd-remount-fs.patch'
+'0001-units-make-systemd-journald.service-Type-notify.patch'
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev')
@@ -27,6 +29,8 @@
  '7aaf44ce842deb449fca0f2595bbc1e4'
  '4adc3ddce027693bafa53089322e859b'
  '42ff9d59bb057637355b202157d59991'
+ '92497d06e0af615be4b368fe615109c0'
+ 'a321d62d6ffada9e6976bdd339fa3219'

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

2014-10-29 Thread Dave Reisner

Date: Thursday, October 30, 2014 @ 00:32:10
  Author: dreisner
Revision: 225459

upgpkg: systemd 217-1

- use Arch NTP server pool
- drop --with-firmware-path (since udev fw loader is gone)
- add libidn as a dependency for systemd-resolved
- add arch=('any') for systemd-sysvcompat
- backport fix for systemd-nspawn failures with --bind

Added:
  systemd/trunk/0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch
Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/0001-networkd-properly-track-addresses-when-first-added.patch

---+
 0001-networkd-properly-track-addresses-when-first-added.patch |  104 --
 0001-nspawn-ignore-EEXIST-when-creating-mount-point.patch |   33 +++
 PKGBUILD  |   26 +-
 3 files changed, 52 insertions(+), 111 deletions(-)

Deleted: 0001-networkd-properly-track-addresses-when-first-added.patch
===
--- 0001-networkd-properly-track-addresses-when-first-added.patch   
2014-10-29 23:30:40 UTC (rev 225458)
+++ 0001-networkd-properly-track-addresses-when-first-added.patch   
2014-10-29 23:32:10 UTC (rev 225459)
@@ -1,104 +0,0 @@
-From 4958aee4977f325be19f0e1e4b424922c3cada5f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen t...@jklm.no
-Date: Thu, 3 Jul 2014 22:47:51 +0200
-Subject: [PATCH] networkd: properly track addresses when first added
-
-When doing a NEWADDR, the reply we get back is the NEWADDR itself, rather
-than just an empty ack (unlike how NEWLINK works). For this reason, the
-process that did the NEWADDR does not get the broadcast message.
-
-We were only listening for broadcast messages, and hence not tracking the
-addresses we added ourselves. This went unnoticed as the kernel will usually
-send NEWADDR messages from time to time anyway, so things would mostly work,
-but in the worst case we would not notice that a routable address was available
-and consider ourselves offline.

- src/network/networkd-link.c | 54 +
- 1 file changed, 30 insertions(+), 24 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 961c1ab..6257372 100644
 a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -599,10 +599,35 @@ static int route_drop_handler(sd_rtnl *rtnl, 
sd_rtnl_message *m, void *userdata)
- return 0;
- }
- 
-+static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void 
*userdata) {
-+_cleanup_link_unref_ Link *link = userdata;
-+int r;
-+
-+assert(rtnl);
-+assert(m);
-+assert(link);
-+assert(link-manager);
-+
-+for (; m; m = sd_rtnl_message_next(m)) {
-+r = sd_rtnl_message_get_errno(m);
-+if (r  0) {
-+log_debug_link(link, getting address failed: %s, 
strerror(-r));
-+continue;
-+}
-+
-+r = link_rtnl_process_address(rtnl, m, link-manager);
-+if (r  0)
-+log_warning_link(link, could not process address: 
%s, strerror(-r));
-+}
-+
-+return 1;
-+}
-+
- static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) 
{
- _cleanup_link_unref_ Link *link = userdata;
- int r;
- 
-+assert(rtnl);
- assert(m);
- assert(link);
- assert(link-ifname);
-@@ -623,6 +648,11 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message 
*m, void *userdata) {
- link-ifname, strerror(-r),
- ERRNO=%d, -r,
- NULL);
-+if (r = 0) {
-+/* calling handler directly so take a ref */
-+link_ref(link);
-+link_get_address_handler(rtnl, m, link);
-+}
- 
- if (link-addr_messages == 0) {
- log_debug_link(link, addresses set);
-@@ -2233,30 +2263,6 @@ int link_rtnl_process_address(sd_rtnl *rtnl, 
sd_rtnl_message *message, void *use
- return 1;
- }
- 
--static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void 
*userdata) {
--_cleanup_link_unref_ Link *link = userdata;
--int r;
--
--assert(rtnl);
--assert(m);
--assert(link);
--assert(link-manager);
--
--for (; m; m = sd_rtnl_message_next(m)) {
--r = sd_rtnl_message_get_errno(m);
--if (r  0) {
--log_debug_link(link, getting address failed: %s, 
strerror(-r));
--continue;
--}
--
--r = link_rtnl_process_address(rtnl, m, link-manager);
--if (r  0)
--log_warning_link(link, could not process address: 
%s, strerror(-r));
--}
--
--return

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

2014-06-10 Thread Dave Reisner

Date: Tuesday, June 10, 2014 @ 16:49:02
  Author: dreisner
Revision: 214780

upgpkg: systemd 213-9

- backport more fixes for LVM boot issues (FS#40765)

Added:
  systemd/trunk/0001-udev-always-close-lock-file-descriptor.patch
  systemd/trunk/0001-udev-really-exclude-device-mapper-from-block-device-.patch
Modified:
  systemd/trunk/PKGBUILD

-+
 0001-udev-always-close-lock-file-descriptor.patch   |   48 
++
 0001-udev-really-exclude-device-mapper-from-block-device-.patch |   33 ++
 PKGBUILD|   13 ++
 3 files changed, 91 insertions(+), 3 deletions(-)

Added: 0001-udev-always-close-lock-file-descriptor.patch
===
--- 0001-udev-always-close-lock-file-descriptor.patch   
(rev 0)
+++ 0001-udev-always-close-lock-file-descriptor.patch   2014-06-10 14:49:02 UTC 
(rev 214780)
@@ -0,0 +1,48 @@
+From 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
+From: Kay Sievers k...@vrfy.org
+Date: Tue, 3 Jun 2014 10:46:51 +0200
+Subject: [PATCH] udev: always close lock file descriptor
+
+https://bugs.freedesktop.org/show_bug.cgi?id=79576
+---
+ src/udev/udevd.c | 10 --
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 1c9488e..819ea3b 100644
+--- a/src/udev/udevd.c
 b/src/udev/udevd.c
+@@ -301,6 +301,7 @@ static void worker_new(struct event *event)
+ if (fd_lock = 0  flock(fd_lock, 
LOCK_SH|LOCK_NB)  0) {
+ log_debug(Unable to 
flock(%s), skipping event handling: %m, udev_device_get_devnode(d));
+ err = -EWOULDBLOCK;
++fd_lock = safe_close(fd_lock);
+ goto skip;
+ }
+ }
+@@ -317,8 +318,7 @@ static void worker_new(struct event *event)
+ udev_device_update_db(dev);
+ }
+ 
+-if (fd_lock = 0)
+-close(fd_lock);
++safe_close(fd_lock);
+ 
+ /* send processed event back to libudev listeners */
+ udev_monitor_send_device(worker_monitor, NULL, dev);
+@@ -377,10 +377,8 @@ skip:
+ }
+ out:
+ udev_device_unref(dev);
+-if (fd_signal = 0)
+-close(fd_signal);
+-if (fd_ep = 0)
+-close(fd_ep);
++safe_close(fd_signal);
++safe_close(fd_ep);
+ close(fd_inotify);
+ close(worker_watch[WRITE_END]);
+ udev_rules_unref(rules);
+-- 
+2.0.0
+

Added: 0001-udev-really-exclude-device-mapper-from-block-device-.patch
===
--- 0001-udev-really-exclude-device-mapper-from-block-device-.patch 
(rev 0)
+++ 0001-udev-really-exclude-device-mapper-from-block-device-.patch 
2014-06-10 14:49:02 UTC (rev 214780)
@@ -0,0 +1,33 @@
+From 638ca89c53e2b897cfb3f627f4acbc7d09af2f4c Mon Sep 17 00:00:00 2001
+From: Christian Hesse m...@eworm.de
+Date: Tue, 10 Jun 2014 15:51:15 +0200
+Subject: [PATCH] udev: really exclude device-mapper from block device
+ ownership event locking
+
+Arguments were wrong order, no?
+This fixes commits:
+
+e918a1b5a94f270186dca59156354acd2a596494
+3d06f4183470d42361303086ed9dedd29c0ffc1b
+---
+* dreisner: avoid second hunk of patch which doesn't apply to v213
+
+ src/udev/udevd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 0f3f3f0..160360e 100644
+--- a/src/udev/udevd.c
 b/src/udev/udevd.c
+@@ -304,7 +304,7 @@ static void worker_new(struct event *event)
+  * kabi_ IMHO this sounds like a good plan for this 
moment
+  */
+ if (streq_ptr(block, 
udev_device_get_subsystem(dev)) 
+-!startswith(dm-, udev_device_get_sysname(dev))) 
{
++!startswith(udev_device_get_sysname(dev), dm-)) 
{
+ struct udev_device *d = dev;
+ 
+ if (streq_ptr(partition, 
udev_device_get_devtype(d)))
+-- 
+2.0.0
+

Modified: PKGBUILD
===
--- PKGBUILD2014-06-10 14:45:54 UTC (rev 214779)
+++ PKGBUILD2014-06-10 14:49:02 UTC (rev 214780)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=8
+pkgrel=9
 arch=('i686'

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

2014-06-09 Thread Dave Reisner

Date: Monday, June 9, 2014 @ 19:27:21
  Author: dreisner
Revision: 214756

upgpkg: systemd 213-8

- backport fix to ignore DM devices for udev locking (FS#40765)

Added:
  systemd/trunk/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-+
 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch |   38 
++
 PKGBUILD|5 +
 systemd.install |2 
 3 files changed, 43 insertions(+), 2 deletions(-)

Added: 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
===
--- 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch 
(rev 0)
+++ 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch 
2014-06-09 17:27:21 UTC (rev 214756)
@@ -0,0 +1,38 @@
+From e918a1b5a94f270186dca59156354acd2a596494 Mon Sep 17 00:00:00 2001
+From: Kay Sievers k...@vrfy.org
+Date: Tue, 3 Jun 2014 16:49:38 +0200
+Subject: [PATCH] udev: exclude device-mapper from block device ownership event
+ locking
+
+---
+ src/udev/udevd.c | 14 +-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 819ea3b..6c05104 100644
+--- a/src/udev/udevd.c
 b/src/udev/udevd.c
+@@ -290,7 +290,19 @@ static void worker_new(struct event *event)
+  * acquired the lock, the external process will block 
until
+  * udev has finished its event handling.
+  */
+-if (streq_ptr(block, 
udev_device_get_subsystem(dev))) {
++
++/*
++ * kabi_ since we make check - device seems unused 
- we try
++ * ioctl to deactivate - and device is found 
to be opened
++ * kay sure, you try to take a write lock
++ * kay if you get it udev is out
++ * kay if you can't get it, udev is busy
++ * kabi_ we cannot deactivate openned device  (as 
it is in-use)
++ * kay maybe we should just exclude dm from that 
thing entirely
++ * kabi_ IMHO this sounds like a good plan for this 
moment
++ */
++if (streq_ptr(block, 
udev_device_get_subsystem(dev)) 
++!startswith(dm-, udev_device_get_sysname(dev))) 
{
+ struct udev_device *d = dev;
+ 
+ if (streq_ptr(partition, 
udev_device_get_devtype(d)))
+-- 
+2.0.0
+

Modified: PKGBUILD
===
--- PKGBUILD2014-06-09 16:30:08 UTC (rev 214755)
+++ PKGBUILD2014-06-09 17:27:21 UTC (rev 214756)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -18,6 +18,7 @@
 'initcpio-install-udev'
 '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
 '0001-fsck-disable-l-option-for-now.patch'
+'0001-udev-exclude-device-mapper-from-block-device-ownersh.patch'
 '0001-networkd-link-intialize-mac-address.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
  '29245f7a240bfba66e2b1783b63b6b40'
@@ -25,6 +26,7 @@
  'bde43090d4ac0ef048e3eaee8202a407'
  '5f8ad7126970855614c7fa34b317728d'
  '888cf85a92dd28bcf80e18539fef3915'
+ 'f26803dda8811196c0564f928bfe69d1'
  '3d53d3bcd85ca0b2ff9f4e79d012808d')
 
 prepare() {
@@ -33,6 +35,7 @@
   patch -Np1 
$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
   patch -Np1 $srcdir/0001-networkd-link-intialize-mac-address.patch
   patch -Np1 $srcdir/0001-fsck-disable-l-option-for-now.patch
+  patch -Np1 
$srcdir/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
 }
 
 build() {

Modified: systemd.install
===
--- systemd.install 2014-06-09 16:30:08 UTC (rev 214755)
+++ systemd.install 2014-06-09 17:27:21 UTC (rev 214756)
@@ -64,7 +64,7 @@
 
 _208_1_changes() {
   chown root:systemd-journal var/log/journal
-  chmod 2755 var/log/journal
+  chmod 2750 var/log/journal
 
   if [[ -e var/lib/backlight  ! -e var/lib/systemd/backlight ]]; then
 mv -T var/lib/backlight var/lib/systemd/backlight

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

2014-06-06 Thread Dave Reisner

Date: Saturday, June 7, 2014 @ 00:54:35
  Author: dreisner
Revision: 214342

upgpkg: systemd 213-6

- backport fix for faily MACAddress matching (FS#40675)
- backport fix for fsck/udev mess (FS#40706)
- re-enable LTO

Added:
  systemd/trunk/0001-fsck-disable-l-option-for-now.patch
  systemd/trunk/0001-networkd-link-intialize-mac-address.patch
Modified:
  systemd/trunk/PKGBUILD

+
 0001-fsck-disable-l-option-for-now.patch   |   58 +++
 0001-networkd-link-intialize-mac-address.patch |   33 +
 PKGBUILD   |   15 +++--
 3 files changed, 101 insertions(+), 5 deletions(-)

Added: 0001-fsck-disable-l-option-for-now.patch
===
--- 0001-fsck-disable-l-option-for-now.patch(rev 0)
+++ 0001-fsck-disable-l-option-for-now.patch2014-06-06 22:54:35 UTC (rev 
214342)
@@ -0,0 +1,58 @@
+From c343be283b7152554bac0c02493a4e1759c163f7 Mon Sep 17 00:00:00 2001
+From: Kay Sievers k...@vrfy.org
+Date: Wed, 4 Jun 2014 11:14:48 +0200
+Subject: [PATCH] fsck: disable -l option for now
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
+---
+ TODO|  4 +++-
+ src/fsck/fsck.c | 13 -
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/TODO b/TODO
+index 8169a57..fb118f1 100644
+--- a/TODO
 b/TODO
+@@ -1,4 +1,7 @@
+ Bugfixes:
++* Re-enable fsck -l when it is ready:
++   https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
++
+ * Should systemctl status \* work on all unit types, not just .service?
+ 
+ * enabling an instance unit creates a pointless link, and
+@@ -20,7 +23,6 @@ Bugfixes:
+   See the comment in sd_bus_unref() for more..
+ 
+ External:
+-
+ * Fedora: when installing fedora with yum --installroot /var/run is a 
directory, not a symlink
+https://bugzilla.redhat.com/show_bug.cgi?id=975864
+ 
+diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
+index 56cb52d..cb2f573 100644
+--- a/src/fsck/fsck.c
 b/src/fsck/fsck.c
+@@ -319,7 +319,18 @@ int main(int argc, char *argv[]) {
+ cmdline[i++] = /sbin/fsck;
+ cmdline[i++] =  arg_repair;
+ cmdline[i++] = -T;
+-cmdline[i++] = -l;
++
++/*
++ * Disable locking which conflict with udev's event
++ * ownershipi, until util-linux moves the flock
++ * synchronization file which prevents multiple fsck running
++ * on the same rotationg media, from the disk device
++ * node to a privately owned regular file.
++ *
++ * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
++ *
++ * cmdline[i++] = -l;
++ */
+ 
+ if (!root_directory)
+ cmdline[i++] = -M;
+-- 
+2.0.0
+

Added: 0001-networkd-link-intialize-mac-address.patch
===
--- 0001-networkd-link-intialize-mac-address.patch  
(rev 0)
+++ 0001-networkd-link-intialize-mac-address.patch  2014-06-06 22:54:35 UTC 
(rev 214342)
@@ -0,0 +1,33 @@
+From 2ae6cda520f5c925ba313b8e83ea8b58bc00112c Mon Sep 17 00:00:00 2001
+From: Tom Gundersen t...@jklm.no
+Date: Wed, 4 Jun 2014 21:29:08 +0200
+Subject: [PATCH] networkd: link - intialize mac address
+
+Otherwise .netwrok matching on MAC address will not work.
+
+Based on patch by Dave Reisner, and bug originally reported by Max Pray.
+
+Conflicts:
+   src/network/networkd-link.c
+---
+ src/network/networkd-link.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 6677b94..9afb871 100644
+--- a/src/network/networkd-link.c
 b/src/network/networkd-link.c
+@@ -75,6 +75,10 @@ static int link_new(Manager *manager, sd_rtnl_message 
*message, Link **ret) {
+ if (!link-ifname)
+ return -ENOMEM;
+ 
++r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, 
link-mac);
++if (r  0)
++return r;
++
+ r = asprintf(link-state_file, /run/systemd/network/links/%PRIu64,
+  link-ifindex);
+ if (r  0)
+-- 
+2.0.0
+

Modified: PKGBUILD
===
--- PKGBUILD2014-06-06 22:03:53 UTC (rev 214341)
+++ PKGBUILD2014-06-06 22:54:35 UTC (rev 214342)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -16,24 +16,29 @@
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev'
-'0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch')
+'0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
+

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

2014-06-02 Thread Dave Reisner

Date: Tuesday, June 3, 2014 @ 06:33:18
  Author: dreisner
Revision: 214047

upgpkg: systemd 213-4

- backport fix for networkd dir ownership
- re-enable systemd-resolved on upgrade if /etc/resolv.conf is a symlink

Added:
  systemd/trunk/0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-+
 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch |   29 
++
 PKGBUILD|9 ++-
 systemd.install |   15 -
 3 files changed, 49 insertions(+), 4 deletions(-)

Added: 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch
===
--- 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch 
(rev 0)
+++ 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch 
2014-06-03 04:33:18 UTC (rev 214047)
@@ -0,0 +1,29 @@
+From 01501939d5f608541c1ea98fe2da84d841f9c9bc Mon Sep 17 00:00:00 2001
+From: Tom Gundersen t...@jklm.no
+Date: Mon, 2 Jun 2014 15:05:05 +0200
+Subject: [PATCH] tmpfiles: systemd.conf - fix ownership of network directories
+
+---
+ tmpfiles.d/systemd.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
+index 7efab0e..1fce514 100644
+--- a/tmpfiles.d/systemd.conf
 b/tmpfiles.d/systemd.conf
+@@ -21,9 +21,9 @@ d /run/systemd/sessions 0755 root root -
+ d /run/systemd/users 0755 root root -
+ d /run/systemd/machines 0755 root root -
+ d /run/systemd/shutdown 0755 root root -
+-d /run/systemd/network 0755 root root -
+-d /run/systemd/network/links 0755 root root -
+-d /run/systemd/network/leases 0755 root root -
++d /run/systemd/network 0755 systemd-network systemd-network -
++d /run/systemd/network/links 0755 systemd-network systemd-network -
++d /run/systemd/network/leases 0755 systemd-network systemd-network -
+ 
+ m /var/log/journal 2755 root systemd-journal - -
+ Z /var/log/journal/%m 2755 root systemd-journal - -
+-- 
+2.0.0
+

Modified: PKGBUILD
===
--- PKGBUILD2014-06-03 04:12:30 UTC (rev 214046)
+++ PKGBUILD2014-06-03 04:33:18 UTC (rev 214047)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -16,17 +16,20 @@
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev'
-'0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch')
+'0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
+'0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
  '29245f7a240bfba66e2b1783b63b6b40'
  '66cca7318e13eaf37c5b7db2efa69846'
  'bde43090d4ac0ef048e3eaee8202a407'
- '5f8ad7126970855614c7fa34b317728d')
+ '5f8ad7126970855614c7fa34b317728d'
+ 'd778cbbe8adb9651979da58cfe1c2dde')
 
 prepare() {
   cd $pkgname-$pkgver
 
   patch -Np1 
$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
+  patch -Np1 
$srcdir/0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch
 }
 
 build() {

Modified: systemd.install
===
--- systemd.install 2014-06-03 04:12:30 UTC (rev 214046)
+++ systemd.install 2014-06-03 04:33:18 UTC (rev 214047)
@@ -38,6 +38,8 @@
 post_common() {
   systemd-machine-id-setup
 
+  # TODO: drop this for 214
+  # http://cgit.freedesktop.org/systemd/systemd/commit/?id=fdd2531170
   add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep'
 
   udevadm hwdb --update
@@ -111,6 +113,16 @@
   fi
 }
 
+_213_4_changes() {
+  if sd_booted; then
+# if /etc/resolv.conf is a symlink, just assume that it was being managed
+# by systemd-networkd, and re-enable systemd-resolved.
+if [[ -L etc/resolv.conf ]]; then
+  systemctl enable systemd-resolved
+fi
+  fi
+}
+
 post_install() {
   post_common $@
 
@@ -134,7 +146,8 @@
 208-1
 208-8
 209-1
-210-1)
+210-1
+213-4)
 
   for v in ${upgrades[@]}; do
 if [[ $(vercmp $v $2) -eq 1 ]]; then

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

2014-02-25 Thread Dave Reisner

Date: Tuesday, February 25, 2014 @ 16:27:59
  Author: dreisner
Revision: 206417

upgpkg: systemd 210-1

- purge obsolete per-version upgrade logic
- fix sd_booted function
- ship systemd-networkd as disabled (conditionally enable for 209 users)
- print warning about need to reboot for upgrade from 208-*

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install
Deleted:
  systemd/trunk/0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch

--+
 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch |   30 ---
 PKGBUILD |   29 ---
 systemd.install  |   91 +++---
 3 files changed, 43 insertions(+), 107 deletions(-)

Deleted: 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
===
--- 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
2014-02-25 15:19:35 UTC (rev 206416)
+++ 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
2014-02-25 15:27:59 UTC (rev 206417)
@@ -1,30 +0,0 @@
-From 9ac441c0f40a10a6c498398e5876a5256b833e31 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= tho...@archlinux.org
-Date: Fri, 21 Feb 2014 11:20:24 +0100
-Subject: [PATCH] sd-event: Fix systemd crash when using timer units.
-
-There was a copy-paste error introduced in commit 
c2ba3ad6604ef2e189d7e0a36d696e84d3ab
-which causes the following error when using timer units:
-
-Assertion '(x-type == SOURCE_MONOTONIC  y-type == SOURCE_MONOTONIC) || 
(x-type == SOURCE_REALTIME  y-type == SOURCE_REALTIME)'
-failed at src/libsystemd/sd-event/sd-event.c:264, function 
latest_time_prioq_compare(). Aborting.

- src/libsystemd/sd-event/sd-event.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libsystemd/sd-event/sd-event.c 
b/src/libsystemd/sd-event/sd-event.c
-index 25dfd17..1f039bc 100644
 a/src/libsystemd/sd-event/sd-event.c
-+++ b/src/libsystemd/sd-event/sd-event.c
-@@ -771,7 +771,7 @@ _public_ int sd_event_add_realtime(sd_event *e,
-sd_event_time_handler_t callback,
-void *userdata) {
- 
--return event_add_time_internal(e, ret, SOURCE_REALTIME, 
e-realtime_fd, CLOCK_REALTIME, e-realtime_earliest, e-monotonic_latest, 
usec, accuracy, callback, userdata);
-+return event_add_time_internal(e, ret, SOURCE_REALTIME, 
e-realtime_fd, CLOCK_REALTIME, e-realtime_earliest, e-realtime_latest, 
usec, accuracy, callback, userdata);
- }
- 
- static int event_update_signal_fd(sd_event *e) {
--- 
-1.9.0
-

Modified: PKGBUILD
===
--- PKGBUILD2014-02-25 15:19:35 UTC (rev 206416)
+++ PKGBUILD2014-02-25 15:27:59 UTC (rev 206417)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=209
-pkgrel=3
+pkgver=210
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -12,22 +12,14 @@
  'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools' 
'xz')
 options=('strip' 'debug')
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
-'0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch'
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev')
-md5sums=('2c7a7c8ffede079a3e1b241565bd4ed7'
- 'bd3f3d91daf425bf76e55682a7274622'
+md5sums=('03efddf8c9eca36d4d590f9967e7e818'
  '29245f7a240bfba66e2b1783b63b6b40'
  '8b68b0218a3897d4d37a6ccf47914774'
  'bde43090d4ac0ef048e3eaee8202a407')
 
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -Np1 ../0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
-}
-
 build() {
   cd $pkgname-$pkgver
 
@@ -84,11 +76,10 @@
 
   make -C $pkgname-$pkgver DESTDIR=$pkgdir install
 
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  # TODO(dreisner): handle systemd-networkd in the same way in 210 since it'll
-  # have the same auto opt-in behavior.
+  # don't write units to /etc by default -- we'll enable the getty on
+  # post_install as a sane default.
   rm $pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service
+  rm 
$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
   rmdir $pkgdir/etc/systemd/system/getty.target.wants
 
   # get rid of RPM macros
@@ -107,13 +98,9 @@
   install -Dm644 $srcdir/initcpio-install-udev 
$pkgdir/usr/lib/initcpio/install/udev
   install -Dm644 $srcdir/initcpio-hook-udev 
$pkgdir/usr/lib/initcpio/hooks/udev
 
-  # BUG(dreisner): v209 doesn't ship /var/log/journal, but this is fixed
-  # upstream. carry the patch in the PKGBUILD rather than patching

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

2014-01-06 Thread 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 conscrip...@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
===
--- PKGBUILD2014-01-07 03:18:01 UTC (rev 203264)
+++ PKGBUILD2014-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() {

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

2013-12-24 Thread Dave Reisner

Date: Tuesday, December 24, 2013 @ 21:57:53
  Author: dreisner
Revision: 202688

upgpkg: systemd 208-8

- add /var/log/journal ACLs at install (and one time post_upgrade)
- keep sd_booted install scriptlet definition in line with upstream
- backport trivial fix for remote FS ordering from /proc/self/mountinfo

Added:
  systemd/trunk/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-+
 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch |   41 
++
 PKGBUILD|6 +
 systemd.install |   16 +++
 3 files changed, 61 insertions(+), 2 deletions(-)

Added: 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
===
--- 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch 
(rev 0)
+++ 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch 
2013-12-24 20:57:53 UTC (rev 202688)
@@ -0,0 +1,41 @@
+From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= zbys...@in.waw.pl
+Date: Thu, 3 Oct 2013 22:15:08 -0400
+Subject: [PATCH] systemd: order remote mounts from mountinfo before
+ remote-fs.target
+
+Usually the network is stopped before filesystems are umounted.
+Ordering network filesystems before remote-fs.target means that their
+unmounting will be performed earlier, and can terminate sucessfully.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=70002
+---
+ src/core/mount.c | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 3d46557..93bfa99 100644
+--- a/src/core/mount.c
 b/src/core/mount.c
+@@ -1440,6 +1440,9 @@ static int mount_add_one(
+ 
+ u = manager_get_unit(m, e);
+ if (!u) {
++const char* const target =
++fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET 
: SPECIAL_LOCAL_FS_TARGET;
++
+ delete = true;
+ 
+ u = unit_new(m, sizeof(Mount));
+@@ -1466,7 +1469,7 @@ static int mount_add_one(
+ goto fail;
+ }
+ 
+-r = unit_add_dependency_by_name(u, UNIT_BEFORE, 
SPECIAL_LOCAL_FS_TARGET, NULL, true);
++r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, 
true);
+ if (r  0)
+ goto fail;
+ 
+-- 
+1.8.5.2
+

Modified: PKGBUILD
===
--- PKGBUILD2013-12-24 18:48:56 UTC (rev 202687)
+++ PKGBUILD2013-12-24 20:57:53 UTC (rev 202688)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 
'gobject-introspection' 'gperf'
@@ -15,6 +15,7 @@
 'initcpio-hook-udev'
 'initcpio-install-systemd'
 'initcpio-install-udev'
+'0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch'
 '0001-Make-hibernation-test-work-for-swap-files.patch'
 '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
 '0001-mount-check-for-NULL-before-reading-pm-what.patch'
@@ -32,6 +33,7 @@
  '29245f7a240bfba66e2b1783b63b6b40'
  '8b68b0218a3897d4d37a6ccf47914774'
  'bde43090d4ac0ef048e3eaee8202a407'
+ '8f1182afa1156f0076a912b23e761e02'
  'a5c6564d5435ee99814effd2aa9baf93'
  '1b191c4e7a209d322675fd199e3abc66'
  'a693bef63548163ffc165f4c4801ebf7'
@@ -68,6 +70,8 @@
   patch -Np1  
$srcdir/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
   # Fix FS#38123
   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
 
   autoreconf
 }

Modified: systemd.install
===
--- systemd.install 2013-12-24 18:48:56 UTC (rev 202687)
+++ systemd.install 2013-12-24 20:57:53 UTC (rev 202688)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
+  [[ -d /run/systemd/systemd/ ]]
 }
 
 add_privs() {
@@ -11,6 +11,14 @@
   fi
 }
 
+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
+}
+
 post_common() {
   systemd-machine-id-setup
 
@@ -54,6 +62,8 @@
 post_install() {
   post_common
 
+  add_journal_acls
+
   # enable getty@tty1 by default, but don't track the file
   systemctl enable

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

2013-09-16 Thread Dave Reisner

Date: Monday, September 16, 2013 @ 21:06:28
  Author: dreisner
Revision: 194482

upgpkg: systemd 207-2

- backport fixes for auto swap activation

Added:
  systemd/trunk/0001-swap-fix-reverse-dependencies.patch
  systemd/trunk/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
Modified:
  systemd/trunk/PKGBUILD

+
 0001-swap-fix-reverse-dependencies.patch   |   30 +++
 0002-swap-create-.wants-symlink-to-auto-swap-devices.patch |   90 +++
 PKGBUILD   |   17 +-
 3 files changed, 134 insertions(+), 3 deletions(-)

Added: 0001-swap-fix-reverse-dependencies.patch
===
--- 0001-swap-fix-reverse-dependencies.patch(rev 0)
+++ 0001-swap-fix-reverse-dependencies.patch2013-09-16 19:06:28 UTC (rev 
194482)
@@ -0,0 +1,30 @@
+From 90060fa6605446bef7078867423b691e4effa575 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen t...@jklm.no
+Date: Fri, 13 Sep 2013 14:46:18 +0200
+Subject: [PATCH] swap: fix reverse dependencies
+
+Make sure swap.target correctly requires/wants the swap units.
+
+This fixes https://bugs.freedesktop.org/show_bug.cgi?id=69291.
+
+Reported-by: Hussam Al-Tayeb
+---
+ src/core/swap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/swap.c b/src/core/swap.c
+index 57d15eb..3950860 100644
+--- a/src/core/swap.c
 b/src/core/swap.c
+@@ -220,7 +220,7 @@ static int swap_add_default_dependencies(Swap *s) {
+ }
+ 
+ if (!noauto) {
+-r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, 
(nofail ? UNIT_WANTED_BY : UNIT_REQUIRED_BY),
++r = unit_add_two_dependencies_by_name_inverse(UNIT(s), 
UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES),
+   SPECIAL_SWAP_TARGET, 
NULL, true);
+ if (r  0)
+ return r;
+-- 
+1.8.4
+

Added: 0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
===
--- 0002-swap-create-.wants-symlink-to-auto-swap-devices.patch  
(rev 0)
+++ 0002-swap-create-.wants-symlink-to-auto-swap-devices.patch  2013-09-16 
19:06:28 UTC (rev 194482)
@@ -0,0 +1,90 @@
+From 4e82fe5213bedcb70e25c0270e516d5f2706d8c8 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen t...@jklm.no
+Date: Mon, 16 Sep 2013 01:08:32 +0200
+Subject: [PATCH] swap: create .wants symlink to 'auto' swap devices
+
+As we load unit files lazily, we need to make sure something pulls in swap
+units that should be started automatically, otherwise the default dependencies
+will never be applied.
+
+This partially reinstates code removed in
+commit 64347fc2b983f33e7efb0fd2bb44e133fb9f30f4.
+
+Also don't order swap devices after swap.target when they are 'nofail'.
+---
+ src/core/swap.c   |  8 ++--
+ src/fstab-generator/fstab-generator.c | 18 --
+ 2 files changed, 22 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/swap.c b/src/core/swap.c
+index 3950860..76c7d45 100644
+--- a/src/core/swap.c
 b/src/core/swap.c
+@@ -220,8 +220,12 @@ static int swap_add_default_dependencies(Swap *s) {
+ }
+ 
+ if (!noauto) {
+-r = unit_add_two_dependencies_by_name_inverse(UNIT(s), 
UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES),
+-  SPECIAL_SWAP_TARGET, 
NULL, true);
++if (nofail)
++r = unit_add_dependency_by_name_inverse(UNIT(s),
++UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true);
++else
++r = unit_add_two_dependencies_by_name_inverse(UNIT(s),
++UNIT_AFTER, UNIT_REQUIRES, 
SPECIAL_SWAP_TARGET, NULL, true);
+ if (r  0)
+ return r;
+ }
+diff --git a/src/fstab-generator/fstab-generator.c 
b/src/fstab-generator/fstab-generator.c
+index 6ebe8aa..b73dfa4 100644
+--- a/src/fstab-generator/fstab-generator.c
 b/src/fstab-generator/fstab-generator.c
+@@ -66,6 +66,7 @@ static int mount_find_pri(struct mntent *me, int *ret) {
+ static int add_swap(const char *what, struct mntent *me) {
+ _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *device 
= NULL;
+ _cleanup_fclose_ FILE *f = NULL;
++bool noauto;
+ int r, pri = -1;
+ 
+ assert(what);
+@@ -77,6 +78,8 @@ static int add_swap(const char *what, struct mntent *me) {
+ return pri;
+ }
+ 
++noauto = !!hasmntopt(me, noauto);
++
+ name = unit_name_from_path(what, .swap);
+ if (!name)
+ return log_oom();
+@@ -97,8 +100,7 @@ static int add_swap(const char *what, struct mntent *me) {
+

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

2013-05-30 Thread Dave Reisner

Date: Thursday, May 30, 2013 @ 14:50:16
  Author: dreisner
Revision: 186678

upgpkg: systemd 204-2

- move everything to /usr/bin, drop split usr patch
- backport journal ACL fix

Added:
  systemd/trunk/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/use-split-usr-path.patch

-+
 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch |   87 
++
 PKGBUILD|   24 +-
 use-split-usr-path.patch|   14 -
 3 files changed, 97 insertions(+), 28 deletions(-)

Added: 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
===
--- 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 
(rev 0)
+++ 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 
2013-05-30 12:50:16 UTC (rev 186678)
@@ -0,0 +1,87 @@
+From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001
+From: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+Date: Tue, 28 May 2013 20:45:34 +0200
+Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't
+ exist
+
+Since 11ec7ce, journald isn't setting the ACLs properly anymore if
+the files had no ACLs to begin with: acl_set_fd fails with EINVAL.
+
+An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is
+invalid, so make sure a mask exists before trying to set the ACL.
+---
+ src/journal/journald-server.c |  6 --
+ src/shared/acl-util.c | 28 
+ src/shared/acl-util.h |  1 +
+ 3 files changed, 33 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index b717b92..da5b725 100644
+--- a/src/journal/journald-server.c
 b/src/journal/journald-server.c
+@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t 
uid) {
+ }
+ }
+ 
+-/* We do not recalculate the mask here, so that the fchmod() mask 
above stays intact. */
++/* We do not recalculate the mask unconditionally here,
++ * so that the fchmod() mask above stays intact. */
+ if (acl_get_permset(entry, permset)  0 ||
+-acl_add_perm(permset, ACL_READ)  0) {
++acl_add_perm(permset, ACL_READ)  0 ||
++calc_acl_mask_if_needed(acl)  0) {
+ log_warning(Failed to patch ACL on %s, ignoring: %m, 
f-path);
+ goto finish;
+ }
+diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
+index 48bb12f..fb04e49 100644
+--- a/src/shared/acl-util.c
 b/src/shared/acl-util.c
+@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
+ return 0;
+ }
+ 
++int calc_acl_mask_if_needed(acl_t *acl_p) {
++acl_entry_t i;
++int found;
++
++assert(acl_p);
++
++for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, i);
++ found  0;
++ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, i)) {
++
++acl_tag_t tag;
++
++if (acl_get_tag_type(i, tag)  0)
++return -errno;
++
++if (tag == ACL_MASK)
++return 0;
++}
++
++if (found  0)
++return -errno;
++
++if (acl_calc_mask(acl_p)  0)
++return -errno;
++
++return 0;
++}
++
+ int search_acl_groups(char*** dst, const char* path, bool* belong) {
+ acl_t acl;
+ 
+diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
+index 23090d9..36ef490 100644
+--- a/src/shared/acl-util.h
 b/src/shared/acl-util.h
+@@ -24,4 +24,5 @@
+ #include stdbool.h
+ 
+ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
++int calc_acl_mask_if_needed(acl_t *acl_p);
+ int search_acl_groups(char*** dst, const char* path, bool* belong);
+-- 
+1.8.3
+

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 12:45:22 UTC (rev 186677)
+++ PKGBUILD2013-05-30 12:50:16 UTC (rev 186678)
@@ -14,24 +14,24 @@
 options=('!libtool')
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
+0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
 'initcpio-hook-udev'
 'initcpio-install-udev'
-'initcpio-install-timestamp'
-'use-split-usr-path.patch')
+'initcpio-install-timestamp')
 md5sums=('a07619bb19f48164fbf0761d12fd39a8'
  '7f39f9fde1ff7b48293ed1e3d0a6c213'
+ '66e3162856ded8eb7dc7383405c6e0d6'
  'e99e9189aa2f6084ac28b8ddf605aeb8'
  'fb37e34ea006c79be1c54cbb0f803414'
- 'df69615503ad293c9ddf9d8b7755282d'
-

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

2013-05-07 Thread Evangelos Foutras

Date: Tuesday, May 7, 2013 @ 16:19:43
  Author: foutrelis
Revision: 184610

upgpkg: systemd 203-1

New upstream release.

Added:
  systemd/trunk/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch

---+
 0001-login-add-missing-_public_-to-sd_get_machine_names.patch |   25 ++
 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch  |   36 --
 PKGBUILD  |   15 ++--
 3 files changed, 33 insertions(+), 43 deletions(-)

Added: 0001-login-add-missing-_public_-to-sd_get_machine_names.patch
===
--- 0001-login-add-missing-_public_-to-sd_get_machine_names.patch   
(rev 0)
+++ 0001-login-add-missing-_public_-to-sd_get_machine_names.patch   
2013-05-07 14:19:43 UTC (rev 184610)
@@ -0,0 +1,25 @@
+From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering lenn...@poettering.net
+Date: Tue, 7 May 2013 12:47:30 +0200
+Subject: [PATCH] login: add missing _public_ to sd_get_machine_names()
+
+---
+ src/login/sd-login.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/sd-login.c b/src/login/sd-login.c
+index 66c4487..d0dc42f 100644
+--- a/src/login/sd-login.c
 b/src/login/sd-login.c
+@@ -591,7 +591,7 @@ _public_ int sd_get_uids(uid_t **users) {
+ return r;
+ }
+ 
+-int sd_get_machine_names(char ***machines) {
++_public_ int sd_get_machine_names(char ***machines) {
+ _cleanup_closedir_ DIR *d = NULL;
+ _cleanup_strv_free_ char **l = NULL;
+ _cleanup_free_ char *md = NULL;
+-- 
+1.8.2.2
+

Deleted: 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
===
--- 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
2013-05-07 13:30:44 UTC (rev 184609)
+++ 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
2013-05-07 14:19:43 UTC (rev 184610)
@@ -1,36 +0,0 @@
-From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001
-From: Dave Reisner dreis...@archlinux.org
-Date: Fri, 19 Apr 2013 16:31:25 -0400
-Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used
-

- src/nss-myhostname/nss-myhostname.c | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/nss-myhostname/nss-myhostname.c 
b/src/nss-myhostname/nss-myhostname.c
-index 16ccb3e..8699098 100644
 a/src/nss-myhostname/nss-myhostname.c
-+++ b/src/nss-myhostname/nss-myhostname.c
-@@ -25,7 +25,6 @@
- #include netdb.h
- #include errno.h
- #include string.h
--#include assert.h
- #include unistd.h
- #include net/if.h
- #include stdlib.h
-@@ -35,6 +34,11 @@
- #include macro.h
- #include util.h
- 
-+/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
-+ * libnss_myhostname will be linked into arbitrary programs which will, in 
turn
-+ * attempt to write to the journal via log_dispatch() */
-+#include assert.h
-+
- /* We use 127.0.0.2 as IPv4 address. This has the advantage over
-  * 127.0.0.1 that it can be translated back to the local hostname. For
-  * IPv6 we use ::1 which unfortunately will not translate back to the
--- 
-1.8.2.1
-

Modified: PKGBUILD
===
--- PKGBUILD2013-05-07 13:30:44 UTC (rev 184609)
+++ PKGBUILD2013-05-07 14:19:43 UTC (rev 184610)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=202
-pkgrel=2
+pkgver=203
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,13 +16,13 @@
 'initcpio-hook-udev'
 'initcpio-install-udev'
 'initcpio-install-timestamp'
-'0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch'
+'0001-login-add-missing-_public_-to-sd_get_machine_names.patch'
 'use-split-usr-path.patch')
-md5sums=('3136c6912d3ee1f6d4deb16234783731'
+md5sums=('b5a124ae8aee2b9fa357f912e87e9048'
  'e99e9189aa2f6084ac28b8ddf605aeb8'
  'fb37e34ea006c79be1c54cbb0f803414'
  'df69615503ad293c9ddf9d8b7755282d'
- '3090c0b9b19b76731b4cf9c01c10c534'
+ '8504a59afaa5d52fa6b5b26fc89873cf'
  '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -31,7 +31,7 @@
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 $srcdir/use-split-usr-path.patch
 
-  patch -Np1 
$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
+  patch -Np1 
$srcdir/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
 }
 
 build() {
@@ -54,7 +54,8 @@
 }
 
 check() {
-  make -C $pkgname-$pkgver check
+  # two tests fail due to running under nspawn
+  make -C

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

2012-09-21 Thread Dave Reisner

Date: Friday, September 21, 2012 @ 19:46:54
  Author: dreisner
Revision: 166913

upgpkg: systemd 191-1

- add quota-tools as makedep/optdep (FS#31502, FS#31391)
- backport patch for i686 build failure

Added:
  systemd/trunk/0001-journal-bring-mmap-cache-prototype-in-sync.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/use-split-usr-path.patch

---+
 0001-journal-bring-mmap-cache-prototype-in-sync.patch |   24 
 PKGBUILD  |   19 
 use-split-usr-path.patch  |   10 +++---
 3 files changed, 42 insertions(+), 11 deletions(-)

Added: 0001-journal-bring-mmap-cache-prototype-in-sync.patch
===
--- 0001-journal-bring-mmap-cache-prototype-in-sync.patch   
(rev 0)
+++ 0001-journal-bring-mmap-cache-prototype-in-sync.patch   2012-09-21 
23:46:54 UTC (rev 166913)
@@ -0,0 +1,24 @@
+From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering lenn...@poettering.net
+Date: Sat, 22 Sep 2012 00:16:13 +0200
+Subject: [PATCH] journal: bring mmap cache prototype in sync
+
+---
+ src/journal/mmap-cache.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
+index de34634..0c42fb8 100644
+--- a/src/journal/mmap-cache.h
 b/src/journal/mmap-cache.h
+@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
+ MMapCache* mmap_cache_ref(MMapCache *m);
+ MMapCache* mmap_cache_unref(MMapCache *m);
+ 
+-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool 
keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool 
keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
+ void mmap_cache_close_fd(MMapCache *m, int fd);
+ void mmap_cache_close_context(MMapCache *m, unsigned context);
+-- 
+1.7.12.1
+

Modified: PKGBUILD
===
--- PKGBUILD2012-09-21 20:29:18 UTC (rev 166912)
+++ PKGBUILD2012-09-21 23:46:54 UTC (rev 166913)
@@ -3,27 +3,29 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=189
-pkgrel=4
+pkgver=191
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 license=('GPL2' 'LGPL2.1' 'MIT')
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 
'gobject-introspection' 'gperf'
  'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 
'linux-api-headers'
- 'pam' 'xz')
+ 'pam' 'quota-tools' 'xz')
 options=('!libtool')
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
 'initcpio-hook-udev'
 'initcpio-install-udev'
 'initcpio-install-timestamp'
 '0001-Reinstate-TIMEOUT-handling.patch'
+'0001-journal-bring-mmap-cache-prototype-in-sync.patch'
 'use-split-usr-path.patch')
-md5sums=('ac2eb313f5dce79622f60aac56bca66d'
+md5sums=('a5e4bfaf900a9e2480827feaf58556cb'
  'e99e9189aa2f6084ac28b8ddf605aeb8'
  '59e91c4d7a69b7bf12c86a9982e37ced'
  'df69615503ad293c9ddf9d8b7755282d'
  '5543be25f205f853a21fa5ee68e03f0d'
- '482dba45a783f06c2239f1355f4ce72f')
+ 'ab42d779d640c6f986f48d326b7f0555'
+ 'fd5b5f04ab0a847373d357555129d4c0')
 
 build() {
   cd $pkgname-$pkgver
@@ -34,6 +36,10 @@
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 $srcdir/use-split-usr-path.patch
 
+  # i686 build fail
+  # upstream commit: e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb
+  patch -Np1 $srcdir/0001-journal-bring-mmap-cache-prototype-in-sync.patch
+
   ./configure \
   --libexecdir=/usr/lib \
   --localstatedir=/var \
@@ -60,7 +66,8 @@
   'python2-cairo: systemd-analyze'
   'python2-dbus: systemd-analyze'
   'systemd-sysvcompat: symlink package to provide sysvinit 
binaries'
-  'cryptsetup: required for encrypted block devices')
+  'cryptsetup: required for encrypted block devices'
+  'quota-tools: kernel-level quota management')
   backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
   etc/dbus-1/system.d/org.freedesktop.hostname1.conf
   etc/dbus-1/system.d/org.freedesktop.login1.conf

Modified: use-split-usr-path.patch
===
--- use-split-usr-path.patch2012-09-21 20:29:18 UTC (rev 166912)
+++ use-split-usr-path.patch2012-09-21 23:46:54 UTC (rev 166913)
@@ -1,6 +1,6 @@
 a/src/core/main.c  2012-07-17 19:46:24.0 -0400
-+++ b/src/core/main.c  2012-07-27 10:04:13.0 -0400
-@@ -1379,11 +1379,7 @@
+--- a/src/core/main.c  2012-09-20 23:02:54.0 -0400
 b/src/core/main.c  2012-09-20

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

2012-08-10 Thread Dave Reisner

Date: Friday, August 10, 2012 @ 19:21:30
  Author: dreisner
Revision: 165101

upgpkg: systemd 188-2

- backport fix for pivot_root failure on shutdown FS#31092
- backport fix to hide expected dbus disconnect on upgrade FS#31089

Added:
  systemd/trunk/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
  systemd/trunk/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
Modified:
  systemd/trunk/PKGBUILD

-+
 0001-shutdown-recursively-mark-root-as-private-before-piv.patch |   31 
 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch |   73 
++
 PKGBUILD|   16 +-
 3 files changed, 118 insertions(+), 2 deletions(-)

Added: 0001-shutdown-recursively-mark-root-as-private-before-piv.patch
===
--- 0001-shutdown-recursively-mark-root-as-private-before-piv.patch 
(rev 0)
+++ 0001-shutdown-recursively-mark-root-as-private-before-piv.patch 
2012-08-10 23:21:30 UTC (rev 165101)
@@ -0,0 +1,31 @@
+From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Fri, 10 Aug 2012 11:02:03 -0400
+Subject: [PATCH] shutdown: recursively mark root as private before pivot
+
+Because root is now recursively marked as shared on bootup, we need to
+recursively mark root as private. This prevents a pivot_root failure on
+shutdown:
+
+  Cannot finalize remaining file systems and devices, giving up.
+  pivot failed: Invalid argument
+---
+ src/core/shutdown.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/shutdown.c b/src/core/shutdown.c
+index 105a604..0b7cbd8 100644
+--- a/src/core/shutdown.c
 b/src/core/shutdown.c
+@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) {
+   It works for pivot_root, but the ref count for the root device
+   is not decreasing :-/
+ */
+-if (mount(NULL, /, NULL, MS_PRIVATE, NULL)  0) {
++if (mount(NULL, /, NULL, MS_REC|MS_PRIVATE, NULL)  0) {
+ log_error(Failed to make \/\ private mount %m);
+ return -errno;
+ }
+-- 
+1.7.11.4
+

Added: 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
===
--- 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 
(rev 0)
+++ 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 2012-08-10 
23:21:30 UTC (rev 165101)
@@ -0,0 +1,73 @@
+From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001
+From: Simon Peeters peeters.si...@gmail.com
+Date: Fri, 10 Aug 2012 17:32:19 +0200
+Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec
+
+---
+ src/shared/dbus-common.c  |  3 ++-
+ src/systemctl/systemctl.c | 11 ---
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
+index 7f0dce5..da2dc2e 100644
+--- a/src/shared/dbus-common.c
 b/src/shared/dbus-common.c
+@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus,
+ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
+ dbus_message_unref(m);
+ if (!reply) {
+-log_error(Failed to issue method call: %s, 
bus_error_message(error));
++if (!return_error)
++log_error(Failed to issue method call: %s, 
bus_error_message(error));
+ if (bus_error_is_no_service(error))
+ r = -ENOENT;
+ else if (dbus_error_has_name(error, 
DBUS_ERROR_ACCESS_DENIED))
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index 2e0..13e0f91 100644
+--- a/src/systemctl/systemctl.c
 b/src/systemctl/systemctl.c
+@@ -1537,11 +1537,12 @@ static int start_unit_one(
+ DBUS_TYPE_INVALID);
+ free(n);
+ if (r) {
+-if (r == -ENOENT  arg_action != ACTION_SYSTEMCTL ) {
++if (r == -ENOENT  arg_action != ACTION_SYSTEMCTL )
+ /* There's always a fallback possible for
+  * legacy actions. */
+ r = -EADDRNOTAVAIL;
+-}
++else
++log_error(Failed to issue method call: %s, 
bus_error_message(error));
+ goto finish;
+ }
+ 
+@@ -3143,6 +3144,7 @@ finish:
+ static int daemon_reload(DBusConnection *bus, char **args) {
+ int r;
+ const char *method;
++DBusError error;
+ 
+ if (arg_action == ACTION_RELOAD)
+ method = Reload;
+@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char 
**args) {
+ org.freedesktop.systemd1.Manager,
+

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

2012-07-03 Thread Dave Reisner

Date: Tuesday, July 3, 2012 @ 20:56:01
  Author: dreisner
Revision: 162937

upgpkg: systemd 186-1

- drop backported patches
- adjust optdeps to run systemd-analyze against py3k

Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/0001-udev-systemd-udev-settle.service-fix-After.patch
  systemd/trunk/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch

+
 0001-udev-systemd-udev-settle.service-fix-After.patch  |   26 
 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch |   79 ---
 PKGBUILD   |   23 
 3 files changed, 5 insertions(+), 123 deletions(-)

Deleted: 0001-udev-systemd-udev-settle.service-fix-After.patch
===
--- 0001-udev-systemd-udev-settle.service-fix-After.patch   2012-07-04 
00:50:10 UTC (rev 162936)
+++ 0001-udev-systemd-udev-settle.service-fix-After.patch   2012-07-04 
00:56:01 UTC (rev 162937)
@@ -1,26 +0,0 @@
-From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
-From: Kay Sievers k...@vrfy.org
-Date: Wed, 6 Jun 2012 14:30:16 +0200
-Subject: [PATCH] udev: systemd-udev-settle.service fix After=
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50779

- units/systemd-udev-settle.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/units/systemd-udev-settle.service.in 
b/units/systemd-udev-settle.service.in
-index d637700..2c4c129 100644
 a/units/systemd-udev-settle.service.in
-+++ b/units/systemd-udev-settle.service.in
-@@ -21,7 +21,7 @@ Documentation=man:udev(7)
- Documentation=man:systemd-udevd(8)
- DefaultDependencies=no
- Wants=systemd-udev.service
--After=udev-trigger.service
-+After=systemd-udev-trigger.service
- Before=basic.target
- ConditionCapability=CAP_MKNOD
- 
--- 
-1.7.11
-

Deleted: 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
===
--- 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch  2012-07-04 
00:50:10 UTC (rev 162936)
+++ 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch  2012-07-04 
00:56:01 UTC (rev 162937)
@@ -1,79 +0,0 @@
-From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen t...@jklm.no
-Date: Sun, 10 Jun 2012 20:37:14 +0200
-Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rather than assuming the console is in utf-8 mode if nothing else is
-specified, be a bit more robust and enable it explicitly.
-
-This fixes a regression compared with Arch's initscripts when not
-using a framebuffer as the old VGA console would not be in utf-8
-mode by default.
-
-Furthermore, this would allow vconsole-setup to be used after boot
-to change the vconsole into utf-8 mode in case it has been set to
-non-utf-8 mode for whatever reason. I.e, the following would leave
-the console in utf-8 mode as expected:
-
- # export LANG=en_US.ISO-8859-1
- # /usr/lib/systemd/systemd-vconsole-setup
- # export LANG=en_US.UTF-8
- # /usr/lib/systemd/systemd-vconsole-setup
-
-Reported-by: Xyne x...@archlinx.ca
-Reported-by: Thomas Bächler tho...@archlinux.org
-Cc: Dave Reisner dreis...@archlinux.org

- src/vconsole/vconsole-setup.c | 24 +++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index d04fab4..aa5fa18 100644
 a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -80,6 +80,25 @@ static int disable_utf8(int fd) {
- return r;
- }
- 
-+static int enable_utf8(int fd) {
-+int r = 0, k;
-+
-+if (ioctl(fd, KDSKBMODE, K_UNICODE)  0)
-+r = -errno;
-+
-+if (loop_write(fd, \033%G, 3, false)  0)
-+r = -errno;
-+
-+k = write_one_line_file(/sys/module/vt/parameters/default_utf8, 
1);
-+if (k  0)
-+r = k;
-+
-+if (r  0)
-+log_warning(Failed to enable UTF-8: %s, strerror(-r));
-+
-+return r;
-+}
-+
- static int load_keymap(const char *vc, const char *map, const char 
*map_toggle, bool utf8, pid_t *_pid) {
- const char *args[8];
- int i = 0;
-@@ -418,9 +437,12 @@ int main(int argc, char **argv) {
- 
- r = EXIT_FAILURE;
- 
--if (!utf8)
-+if (utf8)
-+enable_utf8(fd);
-+else
- disable_utf8(fd);
- 
-+
- if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, keymap_pid) 
= 0 
- load_font(vc, vc_font, vc_font_map, vc_font_unimap, font_pid) = 
0)
- r = EXIT_SUCCESS;
--- 
-1.7.11
-

Modified: PKGBUILD
===
--- PKGBUILD2012-07-04 00:50:10 UTC (rev 162936)
+++ PKGBUILD2012-07-04 00:56:01 UTC

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

2012-06-24 Thread Dave Reisner

Date: Sunday, June 24, 2012 @ 21:10:30
  Author: dreisner
Revision: 162317

upgpkg: systemd 185-3

- move systemd-machine-id-setup to systemd-tools: this takes over for 
dbus-uuidgen

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd-tools.install
  systemd/trunk/systemd.install

---+
 PKGBUILD  |5 +++--
 systemd-tools.install |6 ++
 systemd.install   |4 
 3 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-24 22:30:50 UTC (rev 162316)
+++ PKGBUILD2012-06-25 01:10:30 UTC (rev 162317)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
 pkgver=185
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -132,6 +132,7 @@
   mv $pkgdir/etc/udev etc
   mv $pkgdir/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
   mv $pkgdir/usr/bin/udevadm usr/bin
+  mv $pkgdir/usr/bin/systemd-machine-id-setup usr/bin
   mv $pkgdir/usr/lib/pkgconfig usr/lib
   mv $pkgdir/usr/lib/systemd/systemd-udevd usr/lib/systemd
   mv $pkgdir/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
@@ -147,7 +148,7 @@
   mv $pkgdir/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
   mv $pkgdir/usr/share/man/man7/udev.7 usr/share/man/man7
   mv $pkgdir/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 
usr/share/man/man8
-  mv $pkgdir/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 
usr/share/man/man1
+  mv 
$pkgdir/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1
 usr/share/man/man1
   mv $pkgdir/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 
usr/share/man/man5
   mv $pkgdir/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 
usr/share/man/man5
   mv 
$pkgdir/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent}
 usr/bin

Modified: systemd-tools.install
===
--- systemd-tools.install   2012-06-24 22:30:50 UTC (rev 162316)
+++ systemd-tools.install   2012-06-25 01:10:30 UTC (rev 162317)
@@ -1,7 +1,13 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
+post_install() {
+  systemd-machine-id-setup
+}
+
 post_upgrade() {
+  systemd-machine-id-setup
+
   if [ $(vercmp $2 174) -lt 0 ]; then
 echo  * We now use upstream rules for assigning devices to the 'disk', 
'optical',
 echo'scanner' and 'video' groups. Beware of any changes.

Modified: systemd.install
===
--- systemd.install 2012-06-24 22:30:50 UTC (rev 162316)
+++ systemd.install 2012-06-25 01:10:30 UTC (rev 162317)
@@ -5,8 +5,6 @@
 }
 
 post_install() {
-  systemd-machine-id-setup
-
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@.service
 
@@ -15,8 +13,6 @@
 }
 
 post_upgrade() {
-  systemd-machine-id-setup
-
   if sd_booted; then
 # we moved the binary in 44-2 to /usr, so a reexec leads to a
 # coredump. refuse this reexec and warn the user that they should

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

2012-06-22 Thread Dave Reisner

Date: Friday, June 22, 2012 @ 09:50:40
  Author: dreisner
Revision: 162168

upgpkg: systemd 185-2

- backport upstream fix for vconsole-setup
- move systemd-tmpfiles(8) to systemd-tools subpkg
- avoid mangling tmpfiles.d/legacy.conf
- remove legacy symlink in /usr/lib/udev/udevd

Added:
  systemd/trunk/0001-udev-systemd-udev-settle.service-fix-After.patch
  systemd/trunk/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
Modified:
  systemd/trunk/PKGBUILD

+
 0001-udev-systemd-udev-settle.service-fix-After.patch  |   26 
 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch |   79 +++
 PKGBUILD   |   20 ++-
 3 files changed, 118 insertions(+), 7 deletions(-)

Added: 0001-udev-systemd-udev-settle.service-fix-After.patch
===
--- 0001-udev-systemd-udev-settle.service-fix-After.patch   
(rev 0)
+++ 0001-udev-systemd-udev-settle.service-fix-After.patch   2012-06-22 
13:50:40 UTC (rev 162168)
@@ -0,0 +1,26 @@
+From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
+From: Kay Sievers k...@vrfy.org
+Date: Wed, 6 Jun 2012 14:30:16 +0200
+Subject: [PATCH] udev: systemd-udev-settle.service fix After=
+
+https://bugs.freedesktop.org/show_bug.cgi?id=50779
+---
+ units/systemd-udev-settle.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/systemd-udev-settle.service.in 
b/units/systemd-udev-settle.service.in
+index d637700..2c4c129 100644
+--- a/units/systemd-udev-settle.service.in
 b/units/systemd-udev-settle.service.in
+@@ -21,7 +21,7 @@ Documentation=man:udev(7)
+ Documentation=man:systemd-udevd(8)
+ DefaultDependencies=no
+ Wants=systemd-udev.service
+-After=udev-trigger.service
++After=systemd-udev-trigger.service
+ Before=basic.target
+ ConditionCapability=CAP_MKNOD
+ 
+-- 
+1.7.11
+

Added: 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
===
--- 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch  
(rev 0)
+++ 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch  2012-06-22 
13:50:40 UTC (rev 162168)
@@ -0,0 +1,79 @@
+From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen t...@jklm.no
+Date: Sun, 10 Jun 2012 20:37:14 +0200
+Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Rather than assuming the console is in utf-8 mode if nothing else is
+specified, be a bit more robust and enable it explicitly.
+
+This fixes a regression compared with Arch's initscripts when not
+using a framebuffer as the old VGA console would not be in utf-8
+mode by default.
+
+Furthermore, this would allow vconsole-setup to be used after boot
+to change the vconsole into utf-8 mode in case it has been set to
+non-utf-8 mode for whatever reason. I.e, the following would leave
+the console in utf-8 mode as expected:
+
+ # export LANG=en_US.ISO-8859-1
+ # /usr/lib/systemd/systemd-vconsole-setup
+ # export LANG=en_US.UTF-8
+ # /usr/lib/systemd/systemd-vconsole-setup
+
+Reported-by: Xyne x...@archlinx.ca
+Reported-by: Thomas Bächler tho...@archlinux.org
+Cc: Dave Reisner dreis...@archlinux.org
+---
+ src/vconsole/vconsole-setup.c | 24 +++-
+ 1 file changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
+index d04fab4..aa5fa18 100644
+--- a/src/vconsole/vconsole-setup.c
 b/src/vconsole/vconsole-setup.c
+@@ -80,6 +80,25 @@ static int disable_utf8(int fd) {
+ return r;
+ }
+ 
++static int enable_utf8(int fd) {
++int r = 0, k;
++
++if (ioctl(fd, KDSKBMODE, K_UNICODE)  0)
++r = -errno;
++
++if (loop_write(fd, \033%G, 3, false)  0)
++r = -errno;
++
++k = write_one_line_file(/sys/module/vt/parameters/default_utf8, 
1);
++if (k  0)
++r = k;
++
++if (r  0)
++log_warning(Failed to enable UTF-8: %s, strerror(-r));
++
++return r;
++}
++
+ static int load_keymap(const char *vc, const char *map, const char 
*map_toggle, bool utf8, pid_t *_pid) {
+ const char *args[8];
+ int i = 0;
+@@ -418,9 +437,12 @@ int main(int argc, char **argv) {
+ 
+ r = EXIT_FAILURE;
+ 
+-if (!utf8)
++if (utf8)
++enable_utf8(fd);
++else
+ disable_utf8(fd);
+ 
++
+ if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, keymap_pid) 
= 0 
+ load_font(vc, vc_font, vc_font_map, vc_font_unimap, font_pid) = 
0)
+ r = EXIT_SUCCESS;
+-- 
+1.7.11
+

Modified: PKGBUILD
===
---

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

2012-05-26 Thread Dave Reisner

Date: Saturday, May 26, 2012 @ 21:00:36
  Author: dreisner
Revision: 159785

upgpkg: systemd 183-2

- move more bins to systemd-tools
- add timestamp mkinitcpio hook
- fix udev rules dir in udev.pc

Added:
  systemd/trunk/initcpio-install-timestamp
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

+
 PKGBUILD   |   42 --
 initcpio-install-timestamp |   14 ++
 systemd.install|4 +++-
 3 files changed, 45 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-26 23:49:07 UTC (rev 159784)
+++ PKGBUILD2012-05-27 01:00:36 UTC (rev 159785)
@@ -3,7 +3,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'udev')
 pkgver=183
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://www.freedesktop.org/wiki/Software/systemd;
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,19 +13,25 @@
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
 'initcpio-hook-udev'
 'initcpio-install-udev'
+'initcpio-install-timestamp'
 '0001-Reinstate-TIMEOUT-handling.patch'
 'os-release')
 md5sums=('e1e5e0f376fa2a4cb4bc31a2161c09f2'
  'e99e9189aa2f6084ac28b8ddf605aeb8'
  '59e91c4d7a69b7bf12c86a9982e37ced'
+ 'df69615503ad293c9ddf9d8b7755282d'
  '5543be25f205f853a21fa5ee68e03f0d'
  '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd $pkgname-$pkgver
 
+  # still waiting on ipw2x00 to get fixed...
   patch -Np1 $srcdir/0001-Reinstate-TIMEOUT-handling.patch
 
+  # fix udev rules dir
+  sed -i 's/pkglibexecdir/udevlibexecdir/' src/udev/udev.pc.in
+
   ./configure \
   --libexecdir=/usr/lib \
   --localstatedir=/var \
@@ -122,16 +128,16 @@
   ### split out udev
   rm -rf $srcdir/_udev
   install -dm755 \
-$srcdir/_udev/etc/udev \
-$srcdir/_udev/usr/bin \
-$srcdir/_udev/usr/include \
-$srcdir/_udev/usr/lib/{systemd/system,udev} \
-$srcdir/_udev/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
-$srcdir/_udev/usr/lib/girepository-1.0 \
-$srcdir/_udev/usr/{lib,share}/pkgconfig \
-$srcdir/_udev/usr/share/gir-1.0 \
-$srcdir/_udev/usr/share/gtk-doc/html/{g,lib}udev \
-$srcdir/_udev/usr/share/man/man{7,8}
+  $srcdir/_udev/etc/udev \
+  $srcdir/_udev/usr/bin \
+  $srcdir/_udev/usr/include \
+  $srcdir/_udev/usr/lib/{systemd/system,udev} \
+  $srcdir/_udev/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
+  $srcdir/_udev/usr/lib/girepository-1.0 \
+  $srcdir/_udev/usr/{lib,share}/pkgconfig \
+  $srcdir/_udev/usr/share/gir-1.0 \
+  $srcdir/_udev/usr/share/gtk-doc/html/{g,lib}udev \
+  $srcdir/_udev/usr/share/man/man{7,8}
 
   cd $srcdir/_udev
   mv $pkgdir/etc/udev etc
@@ -153,10 +159,16 @@
 
   ### split out systemd-tools
   rm -rf $srcdir/_tools
-  install -dm755 $srcdir/_tools/usr/lib/systemd $srcdir/_tools/usr/bin 
$srcdir/_tools/usr/share/man/man5
+  install -dm755 \
+  $srcdir/_tools/usr/lib/systemd \
+  $srcdir/_tools/usr/bin \
+  $srcdir/_tools/etc/{binfmt,modules-load,sysctl}.d \
+  $srcdir/_tools/usr/share/man/man{1,5}
+
   cd $srcdir/_tools
-  mv $pkgdir/usr/bin/systemd-tmpfiles usr/bin
-  mv 
$pkgdir/usr/lib/systemd/systemd-{binfmt,modules-load,random-seed,sysctl,vconsole-setup}
 usr/lib/systemd
+  mv 
$pkgdir/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent}
 usr/bin
+  mv 
$pkgdir/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup}
 usr/lib/systemd
+  mv $pkgdir/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 
usr/share/man/man1
   mv $pkgdir/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 
usr/share/man/man5
   mv $pkgdir/usr/share/man/man5/systemd.vconsole.conf.5 usr/share/man/man5
 }
@@ -172,8 +184,10 @@
   pkgdesc='standalone tools from systemd'
   url='http://www.freedesktop.org/wiki/Software/systemd'
   depends=('glibc' 'kmod')
+  conflicts=('systemd183')
 
   mv $srcdir/_tools/* $pkgdir
+  install -Dm644 $srcdir/initcpio-install-timestamp 
$pkgdir/usr/lib/initcpio/install/timestamp
 }
 
 package_udev() {

Added: initcpio-install-timestamp
===
--- initcpio-install-timestamp  (rev 0)
+++ initcpio-install-timestamp  2012-05-27 01:00:36 UTC (rev 159785)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+build() {
+add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
+}
+
+help() {
+cat HELPEOF
+Provides support for RD_TIMESTAMP in early userspace, which can be read by a
+program such as systemd-analyze to determine boot time.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Modified: systemd.install

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

2012-01-14 Thread Dave Reisner

Date: Saturday, January 14, 2012 @ 16:33:26
  Author: dreisner
Revision: 146630

upgpkg: systemd 38-2

backport bugfixes:
- fix parsing of /proc/net/unix on 32-bit
- fix dep cycle on shutdown with rsyslog

Added:
  systemd/trunk/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
  systemd/trunk/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
Modified:
  systemd/trunk/PKGBUILD

-+
 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch |   87 
++
 0001-units-make-sure-syslog-socket-goes-away-early-during.patch |   26 ++
 PKGBUILD|   19 +-
 3 files changed, 125 insertions(+), 7 deletions(-)

Added: 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
===
--- 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch 
(rev 0)
+++ 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch 
2012-01-14 21:33:26 UTC (rev 146630)
@@ -0,0 +1,87 @@
+From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
+From: Lennart Poettering lenn...@poettering.net
+Date: Wed, 11 Jan 2012 22:07:35 +0100
+Subject: [PATCH] tmpfiles: fix parsing of /proc/net/unix on 32Bit machines
+
+Tracked down by Michael Meeks
+---
+ src/tmpfiles.c |   30 --
+ 1 files changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/tmpfiles.c b/src/tmpfiles.c
+index 19a7c08..44e5c9d 100644
+--- a/src/tmpfiles.c
 b/src/tmpfiles.c
+@@ -117,41 +117,50 @@ static void load_unix_sockets(void) {
+ /* We maintain a cache of the sockets we found in
+  * /proc/net/unix to speed things up a little. */
+ 
+-if (!(unix_sockets = set_new(string_hash_func, string_compare_func)))
++unix_sockets = set_new(string_hash_func, string_compare_func);
++if (!unix_sockets)
+ return;
+ 
+-if (!(f = fopen(/proc/net/unix, re)))
++f = fopen(/proc/net/unix, re);
++if (!f)
+ return;
+ 
+-if (!(fgets(line, sizeof(line), f)))
++/* Skip header */
++if (!fgets(line, sizeof(line), f))
+ goto fail;
+ 
+ for (;;) {
+ char *p, *s;
+ int k;
+ 
+-if (!(fgets(line, sizeof(line), f)))
++if (!fgets(line, sizeof(line), f))
+ break;
+ 
+ truncate_nl(line);
+ 
+-if (strlen(line)  53)
++p = strchr(line, ':');
++if (!p)
++continue;
++
++if (strlen(p)  37)
+ continue;
+ 
+-p = line + 53;
++p += 37;
+ p += strspn(p, WHITESPACE);
+-p += strcspn(p, WHITESPACE);
++p += strcspn(p, WHITESPACE); /* skip one more word */
+ p += strspn(p, WHITESPACE);
+ 
+ if (*p != '/')
+ continue;
+ 
+-if (!(s = strdup(p)))
++s = strdup(p);
++if (!s)
+ goto fail;
+ 
+ path_kill_slashes(s);
+ 
+-if ((k = set_put(unix_sockets, s))  0) {
++k = set_put(unix_sockets, s);
++if (k  0) {
+ free(s);
+ 
+ if (k != -EEXIST)
+@@ -1059,7 +1068,8 @@ int main(int argc, char *argv[]) {
+ Item *i;
+ Iterator iterator;
+ 
+-if ((r = parse_argv(argc, argv)) = 0)
++r = parse_argv(argc, argv);
++if (r = 0)
+ return r  0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ 
+ log_set_target(LOG_TARGET_AUTO);
+-- 
+1.7.8.3
+

Added: 0001-units-make-sure-syslog-socket-goes-away-early-during.patch
===
--- 0001-units-make-sure-syslog-socket-goes-away-early-during.patch 
(rev 0)
+++ 0001-units-make-sure-syslog-socket-goes-away-early-during.patch 
2012-01-14 21:33:26 UTC (rev 146630)
@@ -0,0 +1,26 @@
+From ead51eb4ed55981f290e40a871ffbca6480c4cd3 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering lenn...@poettering.net
+Date: Thu, 12 Jan 2012 04:34:50 +0100
+Subject: [PATCH] units: make sure syslog socket goes away early during
+ shutdown
+
+---
+ units/syslog.socket |2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/units/syslog.socket b/units/syslog.socket
+index 323fa86..657e791 100644
+--- a/units/syslog.socket
 b/units/syslog.socket
+@@ -11,6 +11,8 @@
+ Description=Syslog Socket
+ DefaultDependencies=no
+ Before=sockets.target syslog.target
++Conflicts=shutdown.target
++Before=shutdown.target
+ 
+ # Pull in syslog.target to tell people that /dev/log is now accessible
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

25 matches

Site Navigation

Mail list logo

Footer information