[arch-commits] Commit in systemd/repos (18 files)
Dave Reisner
dreisner at archlinux.org
Thu Jan 26 13:47:39 UTC 2012
Date: Thursday, January 26, 2012 @ 08:47:39
Author: dreisner
Revision: 147677
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
systemd/repos/testing-i686/0001-mount-fix-automount-regression.patch
(from rev 147676, systemd/trunk/0001-mount-fix-automount-regression.patch)
systemd/repos/testing-i686/PKGBUILD
(from rev 147676, systemd/trunk/PKGBUILD)
systemd/repos/testing-i686/os-release
(from rev 147676, systemd/trunk/os-release)
systemd/repos/testing-i686/systemd.install
(from rev 147676, systemd/trunk/systemd.install)
systemd/repos/testing-x86_64/0001-mount-fix-automount-regression.patch
(from rev 147676, systemd/trunk/0001-mount-fix-automount-regression.patch)
systemd/repos/testing-x86_64/PKGBUILD
(from rev 147676, systemd/trunk/PKGBUILD)
systemd/repos/testing-x86_64/os-release
(from rev 147676, systemd/trunk/os-release)
systemd/repos/testing-x86_64/systemd.install
(from rev 147676, systemd/trunk/systemd.install)
Deleted:
systemd/repos/testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
systemd/repos/testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
systemd/repos/testing-i686/PKGBUILD
systemd/repos/testing-i686/os-release
systemd/repos/testing-i686/systemd.install
systemd/repos/testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
systemd/repos/testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/os-release
systemd/repos/testing-x86_64/systemd.install
--------------------------------------------------------------------------------+
testing-i686/0001-mount-fix-automount-regression.patch | 45 ++
testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch | 87 -----
testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch | 26 -
testing-i686/PKGBUILD | 166 +++++-----
testing-i686/os-release | 10
testing-i686/systemd.install | 106 +++---
testing-x86_64/0001-mount-fix-automount-regression.patch | 45 ++
testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch | 87 -----
testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch | 26 -
testing-x86_64/PKGBUILD | 166 +++++-----
testing-x86_64/os-release | 10
testing-x86_64/systemd.install | 106 +++---
12 files changed, 380 insertions(+), 500 deletions(-)
Copied: systemd/repos/testing-i686/0001-mount-fix-automount-regression.patch (from rev 147676, systemd/trunk/0001-mount-fix-automount-regression.patch)
===================================================================
--- testing-i686/0001-mount-fix-automount-regression.patch (rev 0)
+++ testing-i686/0001-mount-fix-automount-regression.patch 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,45 @@
+From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Thu, 26 Jan 2012 01:19:19 +0100
+Subject: [PATCH] mount: fix automount regression
+
+Tom Gundersen noticed a regression where comment=systemd.automount in
+fstab no longer prevented the adding of the After=foo.mount dependency
+into local-fs.target. He bisected it to commit 9ddc4a26.
+
+It turns out that clearing the default_dependencies flag is necessary
+after all, in order to avoid complementing of Wants= with After= in the
+target unit. We still want to add the dependencies on quota units and
+umount.target though.
+---
+ src/mount.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/mount.c b/src/mount.c
+index 6d0af4e..965f705 100644
+--- a/src/mount.c
++++ b/src/mount.c
+@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
+
+ if (UNIT(m)->fragment_path)
+ m->from_fragment = true;
++ else if (m->from_etc_fstab)
++ /* We always add several default dependencies to fstab mounts,
++ * but we do not want the implicit complementing of Wants= with After=
++ * in the target unit that this mount unit will be hooked into. */
++ UNIT(m)->default_dependencies = false;
+
+ if (!m->where)
+ if (!(m->where = unit_name_to_path(u->id)))
+@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
+ if ((r = mount_add_fstab_links(m)) < 0)
+ return r;
+
+- if (UNIT(m)->default_dependencies)
++ if (UNIT(m)->default_dependencies || m->from_etc_fstab)
+ if ((r = mount_add_default_dependencies(m)) < 0)
+ return r;
+
+--
+1.7.8.4
+
Deleted: testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
===================================================================
--- testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-i686/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,87 +0,0 @@
-From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at 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
-
Deleted: testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
===================================================================
--- testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-i686/0001-units-make-sure-syslog-socket-goes-away-early-during.patch 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,26 +0,0 @@
-From ead51eb4ed55981f290e40a871ffbca6480c4cd3 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at 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
- Wants=syslog.target
---
-1.7.8.3
-
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-i686/PKGBUILD 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=systemd
-pkgver=39
-pkgrel=1
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
-makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
- 'dbus-python: systemd-analyze'
- 'initscripts: legacy support for hostname and vconsole setup'
- 'initscripts-systemd: native boot and initialization scripts'
- 'python2-cairo: systemd-analyze'
- 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-options=('!libtool')
-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
- etc/dbus-1/system.d/org.freedesktop.locale1.conf
- etc/dbus-1/system.d/org.freedesktop.timedate1.conf
- etc/systemd/system.conf
- etc/systemd/user.conf
- etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- "os-release")
-md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
- '752636def0db3c03f121f8b4f44a63cd')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Don't unset locale in getty
- # https://bugzilla.redhat.com/show_bug.cgi?id=663900
- sed -i -e '/^Environ.*LANG/s/^/#/' \
- -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --localstatedir=/var \
- --with-rootprefix= \
- --with-rootlibdir=/lib
-
- make
-
- # fix .so links in manpages
- sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
- sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # rename man pages to avoid conflicts with sysvinit and initscripts
- cd "$pkgdir/usr/share/man"
-
- manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
- man5/{hostname,{vconsole,locale}.conf}.5)
-
- for manpage in "${manpages[@]}"; do
- IFS='/' read section page <<< "$manpage"
- mv "$manpage" "$section/systemd.$page"
- done
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/testing-i686/PKGBUILD (from rev 147676, systemd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=systemd
+pkgver=39
+pkgrel=2
+pkgdesc="Session and Startup manager"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
+makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
+optdepends=('cryptsetup: required for encrypted block devices'
+ 'dbus-python: systemd-analyze'
+ 'initscripts: legacy support for hostname and vconsole setup'
+ 'initscripts-systemd: native boot and initialization scripts'
+ 'python2-cairo: systemd-analyze'
+ 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
+options=('!libtool')
+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
+ etc/dbus-1/system.d/org.freedesktop.locale1.conf
+ etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/systemd/system.conf
+ etc/systemd/user.conf
+ etc/systemd/systemd-logind.conf)
+install=systemd.install
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+ "os-release"
+ "0001-mount-fix-automount-regression.patch")
+md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
+ '752636def0db3c03f121f8b4f44a63cd'
+ '6e42637c1b1d4589909329dab777631b')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Don't unset locale in getty
+ # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+ sed -i -e '/^Environ.*LANG/s/^/#/' \
+ -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
+
+ # fix default dependencies for automounts in /etc/fstab
+ patch -Np1 < "$srcdir/0001-mount-fix-automount-regression.patch"
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --libdir=/usr/lib \
+ --localstatedir=/var \
+ --with-rootprefix= \
+ --with-rootlibdir=/lib
+
+ make
+
+ # fix .so links in manpages
+ sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
+ sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # needed by systemd-loginctl for enable-linger
+ install -dm755 "$pkgdir/var/lib/systemd"
+
+ install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+ printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+ # fix systemd-analyze for python2
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+ # rename man pages to avoid conflicts with sysvinit and initscripts
+ cd "$pkgdir/usr/share/man"
+
+ manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ man5/{hostname,{vconsole,locale}.conf}.5)
+
+ for manpage in "${manpages[@]}"; do
+ IFS='/' read section page <<< "$manpage"
+ mv "$manpage" "$section/systemd.$page"
+ done
+}
+
+# vim: ft=sh syn=sh et
Deleted: testing-i686/os-release
===================================================================
--- testing-i686/os-release 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-i686/os-release 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
Copied: systemd/repos/testing-i686/os-release (from rev 147676, systemd/trunk/os-release)
===================================================================
--- testing-i686/os-release (rev 0)
+++ testing-i686/os-release 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
Deleted: testing-i686/systemd.install
===================================================================
--- testing-i686/systemd.install 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-i686/systemd.install 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
- if ! getent group lock >/dev/null; then
- groupadd -g 54 lock
- fi
-}
-
-sd_booted() {
- [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- echo "systemd has been installed to /bin/systemd. Please ensure you append"
- echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- if sd_booted; then
- systemctl daemon-reexec >/dev/null
- fi
-
- newpkgver=${1%-*}
- oldpkgver=${2%-*}
-
- # catch v31 need for restarting systemd-logind.service
- if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
- # but only if systemd is running
- if sd_booted; then
- systemctl try-restart systemd-logind.service
- fi
- fi
-}
-
-post_remove() {
- if getent group lock >/dev/null; then
- groupdel lock
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-i686/systemd.install (from rev 147676, systemd/trunk/systemd.install)
===================================================================
--- testing-i686/systemd.install (rev 0)
+++ testing-i686/systemd.install 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+ if ! getent group lock >/dev/null; then
+ groupadd -g 54 lock
+ fi
+}
+
+sd_booted() {
+ [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ echo "systemd has been installed to /bin/systemd. Please ensure you append"
+ echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ if sd_booted; then
+ systemctl daemon-reexec >/dev/null
+ fi
+
+ newpkgver=${1%-*}
+ oldpkgver=${2%-*}
+
+ # catch v31 need for restarting systemd-logind.service
+ if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+ # but only if systemd is running
+ if sd_booted; then
+ systemctl try-restart systemd-logind.service
+ fi
+ fi
+}
+
+post_remove() {
+ if getent group lock >/dev/null; then
+ groupdel lock
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-x86_64/0001-mount-fix-automount-regression.patch (from rev 147676, systemd/trunk/0001-mount-fix-automount-regression.patch)
===================================================================
--- testing-x86_64/0001-mount-fix-automount-regression.patch (rev 0)
+++ testing-x86_64/0001-mount-fix-automount-regression.patch 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,45 @@
+From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt at redhat.com>
+Date: Thu, 26 Jan 2012 01:19:19 +0100
+Subject: [PATCH] mount: fix automount regression
+
+Tom Gundersen noticed a regression where comment=systemd.automount in
+fstab no longer prevented the adding of the After=foo.mount dependency
+into local-fs.target. He bisected it to commit 9ddc4a26.
+
+It turns out that clearing the default_dependencies flag is necessary
+after all, in order to avoid complementing of Wants= with After= in the
+target unit. We still want to add the dependencies on quota units and
+umount.target though.
+---
+ src/mount.c | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/mount.c b/src/mount.c
+index 6d0af4e..965f705 100644
+--- a/src/mount.c
++++ b/src/mount.c
+@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
+
+ if (UNIT(m)->fragment_path)
+ m->from_fragment = true;
++ else if (m->from_etc_fstab)
++ /* We always add several default dependencies to fstab mounts,
++ * but we do not want the implicit complementing of Wants= with After=
++ * in the target unit that this mount unit will be hooked into. */
++ UNIT(m)->default_dependencies = false;
+
+ if (!m->where)
+ if (!(m->where = unit_name_to_path(u->id)))
+@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
+ if ((r = mount_add_fstab_links(m)) < 0)
+ return r;
+
+- if (UNIT(m)->default_dependencies)
++ if (UNIT(m)->default_dependencies || m->from_etc_fstab)
+ if ((r = mount_add_default_dependencies(m)) < 0)
+ return r;
+
+--
+1.7.8.4
+
Deleted: testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
===================================================================
--- testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-x86_64/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,87 +0,0 @@
-From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at 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
-
Deleted: testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
===================================================================
--- testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-x86_64/0001-units-make-sure-syslog-socket-goes-away-early-during.patch 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,26 +0,0 @@
-From ead51eb4ed55981f290e40a871ffbca6480c4cd3 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at 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
- Wants=syslog.target
---
-1.7.8.3
-
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-x86_64/PKGBUILD 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,79 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=systemd
-pkgver=39
-pkgrel=1
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
-makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
- 'dbus-python: systemd-analyze'
- 'initscripts: legacy support for hostname and vconsole setup'
- 'initscripts-systemd: native boot and initialization scripts'
- 'python2-cairo: systemd-analyze'
- 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-options=('!libtool')
-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
- etc/dbus-1/system.d/org.freedesktop.locale1.conf
- etc/dbus-1/system.d/org.freedesktop.timedate1.conf
- etc/systemd/system.conf
- etc/systemd/user.conf
- etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- "os-release")
-md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
- '752636def0db3c03f121f8b4f44a63cd')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Don't unset locale in getty
- # https://bugzilla.redhat.com/show_bug.cgi?id=663900
- sed -i -e '/^Environ.*LANG/s/^/#/' \
- -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --localstatedir=/var \
- --with-rootprefix= \
- --with-rootlibdir=/lib
-
- make
-
- # fix .so links in manpages
- sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
- sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # rename man pages to avoid conflicts with sysvinit and initscripts
- cd "$pkgdir/usr/share/man"
-
- manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
- man5/{hostname,{vconsole,locale}.conf}.5)
-
- for manpage in "${manpages[@]}"; do
- IFS='/' read section page <<< "$manpage"
- mv "$manpage" "$section/systemd.$page"
- done
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 147676, systemd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=systemd
+pkgver=39
+pkgrel=2
+pkgdesc="Session and Startup manager"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
+makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
+optdepends=('cryptsetup: required for encrypted block devices'
+ 'dbus-python: systemd-analyze'
+ 'initscripts: legacy support for hostname and vconsole setup'
+ 'initscripts-systemd: native boot and initialization scripts'
+ 'python2-cairo: systemd-analyze'
+ 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
+options=('!libtool')
+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
+ etc/dbus-1/system.d/org.freedesktop.locale1.conf
+ etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/systemd/system.conf
+ etc/systemd/user.conf
+ etc/systemd/systemd-logind.conf)
+install=systemd.install
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+ "os-release"
+ "0001-mount-fix-automount-regression.patch")
+md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
+ '752636def0db3c03f121f8b4f44a63cd'
+ '6e42637c1b1d4589909329dab777631b')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Don't unset locale in getty
+ # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+ sed -i -e '/^Environ.*LANG/s/^/#/' \
+ -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
+
+ # fix default dependencies for automounts in /etc/fstab
+ patch -Np1 < "$srcdir/0001-mount-fix-automount-regression.patch"
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --libdir=/usr/lib \
+ --localstatedir=/var \
+ --with-rootprefix= \
+ --with-rootlibdir=/lib
+
+ make
+
+ # fix .so links in manpages
+ sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
+ sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # needed by systemd-loginctl for enable-linger
+ install -dm755 "$pkgdir/var/lib/systemd"
+
+ install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+ printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+ # fix systemd-analyze for python2
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+ # rename man pages to avoid conflicts with sysvinit and initscripts
+ cd "$pkgdir/usr/share/man"
+
+ manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ man5/{hostname,{vconsole,locale}.conf}.5)
+
+ for manpage in "${manpages[@]}"; do
+ IFS='/' read section page <<< "$manpage"
+ mv "$manpage" "$section/systemd.$page"
+ done
+}
+
+# vim: ft=sh syn=sh et
Deleted: testing-x86_64/os-release
===================================================================
--- testing-x86_64/os-release 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-x86_64/os-release 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
Copied: systemd/repos/testing-x86_64/os-release (from rev 147676, systemd/trunk/os-release)
===================================================================
--- testing-x86_64/os-release (rev 0)
+++ testing-x86_64/os-release 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
Deleted: testing-x86_64/systemd.install
===================================================================
--- testing-x86_64/systemd.install 2012-01-26 13:47:15 UTC (rev 147676)
+++ testing-x86_64/systemd.install 2012-01-26 13:47:39 UTC (rev 147677)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
- if ! getent group lock >/dev/null; then
- groupadd -g 54 lock
- fi
-}
-
-sd_booted() {
- [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- echo "systemd has been installed to /bin/systemd. Please ensure you append"
- echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- if sd_booted; then
- systemctl daemon-reexec >/dev/null
- fi
-
- newpkgver=${1%-*}
- oldpkgver=${2%-*}
-
- # catch v31 need for restarting systemd-logind.service
- if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
- # but only if systemd is running
- if sd_booted; then
- systemctl try-restart systemd-logind.service
- fi
- fi
-}
-
-post_remove() {
- if getent group lock >/dev/null; then
- groupdel lock
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-x86_64/systemd.install (from rev 147676, systemd/trunk/systemd.install)
===================================================================
--- testing-x86_64/systemd.install (rev 0)
+++ testing-x86_64/systemd.install 2012-01-26 13:47:39 UTC (rev 147677)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+ if ! getent group lock >/dev/null; then
+ groupadd -g 54 lock
+ fi
+}
+
+sd_booted() {
+ [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ echo "systemd has been installed to /bin/systemd. Please ensure you append"
+ echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ if sd_booted; then
+ systemctl daemon-reexec >/dev/null
+ fi
+
+ newpkgver=${1%-*}
+ oldpkgver=${2%-*}
+
+ # catch v31 need for restarting systemd-logind.service
+ if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+ # but only if systemd is running
+ if sd_booted; then
+ systemctl try-restart systemd-logind.service
+ fi
+ fi
+}
+
+post_remove() {
+ if getent group lock >/dev/null; then
+ groupdel lock
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list