Date: Sunday, April 1, 2012 @ 15:21:24
Author: tomegun
Revision: 155313
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
systemd/repos/staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 155312,
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
systemd/repos/staging-i686/PKGBUILD
(from rev 155312, systemd/trunk/PKGBUILD)
systemd/repos/staging-i686/cpp-compat.patch
(from rev 155312, systemd/trunk/cpp-compat.patch)
systemd/repos/staging-i686/os-release
(from rev 155312, systemd/trunk/os-release)
systemd/repos/staging-i686/systemd.install
(from rev 155312, systemd/trunk/systemd.install)
systemd/repos/staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 155312,
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
systemd/repos/staging-x86_64/PKGBUILD
(from rev 155312, systemd/trunk/PKGBUILD)
systemd/repos/staging-x86_64/cpp-compat.patch
(from rev 155312, systemd/trunk/cpp-compat.patch)
systemd/repos/staging-x86_64/os-release
(from rev 155312, systemd/trunk/os-release)
systemd/repos/staging-x86_64/systemd.install
(from rev 155312, systemd/trunk/systemd.install)
Deleted:
systemd/repos/staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
systemd/repos/staging-i686/PKGBUILD
systemd/repos/staging-i686/cpp-compat.patch
systemd/repos/staging-i686/os-release
systemd/repos/staging-i686/systemd.install
systemd/repos/staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
systemd/repos/staging-x86_64/PKGBUILD
systemd/repos/staging-x86_64/cpp-compat.patch
systemd/repos/staging-x86_64/os-release
systemd/repos/staging-x86_64/systemd.install
------------------------------------------------------------------------+
staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch | 64
+-
staging-i686/PKGBUILD | 216
+++++-----
staging-i686/cpp-compat.patch | 38 -
staging-i686/os-release | 10
staging-i686/systemd.install | 108
++---
staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch | 64
+-
staging-x86_64/PKGBUILD | 216
+++++-----
staging-x86_64/cpp-compat.patch | 38 -
staging-x86_64/os-release | 10
staging-x86_64/systemd.install | 108
++---
10 files changed, 436 insertions(+), 436 deletions(-)
Deleted: staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
===================================================================
--- staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,32 +0,0 @@
-From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschm...@redhat.com>
-Date: Fri, 2 Mar 2012 10:39:10 +0100
-Subject: [PATCH] util: never follow symlinks in rm_rf_children()
-
-The function checks if the entry is a directory before recursing, but
-there is a window between the check and the open, during which the
-directory could be replaced with a symlink.
-
-CVE-2012-1174
-https://bugzilla.redhat.com/show_bug.cgi?id=803358
----
- src/util.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util.c b/src/util.c
-index 20cbc2b..dfc1dc6 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool
honour_sticky) {
- if (is_dir) {
- int subdir_fd;
-
-- if ((subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
-+ subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
-+ if (subdir_fd < 0) {
- if (ret == 0 && errno != ENOENT)
- ret = -errno;
- continue;
---
-1.7.9.4
-
Copied:
systemd/repos/staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 155312,
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===================================================================
--- staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(rev 0)
+++ staging-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschm...@redhat.com>
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool
honour_sticky) {
+ if (is_dir) {
+ int subdir_fd;
+
+- if ((subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++ subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++ if (subdir_fd < 0) {
+ if (ret == 0 && errno != ENOENT)
+ ret = -errno;
+ continue;
+--
+1.7.9.4
+
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-i686/PKGBUILD 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreis...@archlinux.org>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=44
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd";
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
- 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
- "os-release"
- 0001-util-never-follow-symlinks-in-rm_rf_children.patch)
-md5sums=('11f44ff74c87850064e4351518bcff17'
- '752636def0db3c03f121f8b4f44a63cd'
- 'b5863d6d4b47e2b5bda8eb57bde0d327')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=803358
- patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --with-pamlibdir=/lib/security \
- --localstatedir=/var \
- --with-distro=arch \
- --enable-split-usr
-
- make
-}
-
-package_systemd() {
- pkgdesc="system and service manager"
- depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam'
'util-linux' 'udev' 'xz')
- 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'
- 'systemd-sysvcompat: symlink package to provide sysvinit
binaries')
- 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
- etc/systemd/systemd-journald.conf)
- install="$pkgname.install"
-
- 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"
- chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- # symlink to /bin/systemd for compat and sanity
- mkdir -p "$pkgdir/bin"
- ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
- mkdir -p "$pkgdir/lib/systemd"
- ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
-
- # use python2 for systemd-analyze
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # didn't build this...
- rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
-
- # fix .so links in manpage stubs
- find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
- -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
-
- # rename man pages to avoid conflicts with sysvinit and initscripts
- manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
- man5/{hostname,{vconsole,locale}.conf}.5)
- cd "$pkgdir/usr/share/man"
- for manpage in "${manpages[@]}"; do
- IFS='/' read section page <<< "$manpage"
- mv "$manpage" "$section/systemd.$page"
- done
-
- ### split off libsystemd (libs, includes, pkgconfig, man3)
- install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
-
- cd "$srcdir"/libsystemd
- mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
- mv "$pkgdir/usr/include/systemd" usr/include
- mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('libcap' 'xz')
-
- mv "$srcdir/libsystemd"/* "$pkgdir"
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/staging-i686/PKGBUILD (from rev 155312,
systemd/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Dave Reisner <dreis...@archlinux.org>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
+pkgver=44
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd";
+license=('GPL2')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+ 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
+ "os-release"
+ 0001-util-never-follow-symlinks-in-rm_rf_children.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
+ '752636def0db3c03f121f8b4f44a63cd'
+ 'b5863d6d4b47e2b5bda8eb57bde0d327')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # https://bugzilla.redhat.com/show_bug.cgi?id=803358
+ patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --with-pamlibdir=/lib/security \
+ --localstatedir=/var \
+ --with-distro=arch \
+ --enable-split-usr
+
+ make
+}
+
+package_systemd() {
+ pkgdesc="system and service manager"
+ depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam'
'util-linux' 'udev' 'xz')
+ 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'
+ 'systemd-sysvcompat: symlink package to provide sysvinit
binaries')
+ 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
+ etc/systemd/systemd-journald.conf)
+ install="$pkgname.install"
+
+ 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"
+ chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+ # symlink to /bin/systemd for compat and sanity
+ mkdir -p "$pkgdir/bin"
+ ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+ mkdir -p "$pkgdir/lib/systemd"
+ ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
+
+ # use python2 for systemd-analyze
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+ # didn't build this...
+ rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
+
+ # fix .so links in manpage stubs
+ find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+ -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
+
+ # rename man pages to avoid conflicts with sysvinit and initscripts
+ manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ man5/{hostname,{vconsole,locale}.conf}.5)
+ cd "$pkgdir/usr/share/man"
+ for manpage in "${manpages[@]}"; do
+ IFS='/' read section page <<< "$manpage"
+ mv "$manpage" "$section/systemd.$page"
+ done
+
+ ### split off libsystemd (libs, includes, pkgconfig, man3)
+ install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
+
+ cd "$srcdir"/libsystemd
+ mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+ mv "$pkgdir/usr/include/systemd" usr/include
+ mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+}
+
+package_libsystemd() {
+ pkgdesc="systemd client libraries"
+ depends=('libcap' 'xz')
+
+ mv "$srcdir/libsystemd"/* "$pkgdir"
+}
+
+# vim: ft=sh syn=sh et
Deleted: staging-i686/cpp-compat.patch
===================================================================
--- staging-i686/cpp-compat.patch 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-i686/cpp-compat.patch 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,19 +0,0 @@
-commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
-Author: Lennart Poettering <lenn...@poettering.net>
-Date: 2012-03-05 15:16:10 +0100
-
- sd-login: c++ compatibility
-
-diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
-index 2f3c90c..6e99cfc 100644
---- a/src/systemd/sd-login.h
-+++ b/src/systemd/sd-login.h
-@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char
**service);
- int sd_session_get_type(const char *session, char **type);
-
- /* Determine the class of this session, i.e. one of "user", "greeter" or
"lock-screen". */
--int sd_session_get_class(const char *session, char **class);
-+int sd_session_get_class(const char *session, char **clazz);
-
- /* Determine the X11 display of this session. */
- int sd_session_get_display(const char *session, char **display);
Copied: systemd/repos/staging-i686/cpp-compat.patch (from rev 155312,
systemd/trunk/cpp-compat.patch)
===================================================================
--- staging-i686/cpp-compat.patch (rev 0)
+++ staging-i686/cpp-compat.patch 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,19 @@
+commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
+Author: Lennart Poettering <lenn...@poettering.net>
+Date: 2012-03-05 15:16:10 +0100
+
+ sd-login: c++ compatibility
+
+diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
+index 2f3c90c..6e99cfc 100644
+--- a/src/systemd/sd-login.h
++++ b/src/systemd/sd-login.h
+@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char
**service);
+ int sd_session_get_type(const char *session, char **type);
+
+ /* Determine the class of this session, i.e. one of "user", "greeter" or
"lock-screen". */
+-int sd_session_get_class(const char *session, char **class);
++int sd_session_get_class(const char *session, char **clazz);
+
+ /* Determine the X11 display of this session. */
+ int sd_session_get_display(const char *session, char **display);
Deleted: staging-i686/os-release
===================================================================
--- staging-i686/os-release 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-i686/os-release 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
Copied: systemd/repos/staging-i686/os-release (from rev 155312,
systemd/trunk/os-release)
===================================================================
--- staging-i686/os-release (rev 0)
+++ staging-i686/os-release 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
Deleted: staging-i686/systemd.install
===================================================================
--- staging-i686/systemd.install 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-i686/systemd.install 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,54 +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
- systemctl daemon-reload >/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/staging-i686/systemd.install (from rev 155312,
systemd/trunk/systemd.install)
===================================================================
--- staging-i686/systemd.install (rev 0)
+++ staging-i686/systemd.install 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+checkgroups() {
+ if ! getent group lock >/dev/null; then
+ groupadd -g 54 lock
+ fi
+}
+
+sd_booted() {
+ [ -e sys/fs/cgroup/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-reload
+ systemctl daemon-reexec
+ 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:
Deleted: staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
===================================================================
--- staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,32 +0,0 @@
-From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschm...@redhat.com>
-Date: Fri, 2 Mar 2012 10:39:10 +0100
-Subject: [PATCH] util: never follow symlinks in rm_rf_children()
-
-The function checks if the entry is a directory before recursing, but
-there is a window between the check and the open, during which the
-directory could be replaced with a symlink.
-
-CVE-2012-1174
-https://bugzilla.redhat.com/show_bug.cgi?id=803358
----
- src/util.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util.c b/src/util.c
-index 20cbc2b..dfc1dc6 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool
honour_sticky) {
- if (is_dir) {
- int subdir_fd;
-
-- if ((subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
-+ subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
-+ if (subdir_fd < 0) {
- if (ret == 0 && errno != ENOENT)
- ret = -errno;
- continue;
---
-1.7.9.4
-
Copied:
systemd/repos/staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 155312,
systemd/trunk/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===================================================================
--- staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(rev 0)
+++ staging-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,32 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschm...@redhat.com>
+Date: Fri, 2 Mar 2012 10:39:10 +0100
+Subject: [PATCH] util: never follow symlinks in rm_rf_children()
+
+The function checks if the entry is a directory before recursing, but
+there is a window between the check and the open, during which the
+directory could be replaced with a symlink.
+
+CVE-2012-1174
+https://bugzilla.redhat.com/show_bug.cgi?id=803358
+---
+ src/util.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util.c b/src/util.c
+index 20cbc2b..dfc1dc6 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool
honour_sticky) {
+ if (is_dir) {
+ int subdir_fd;
+
+- if ((subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) {
++ subdir_fd = openat(fd, de->d_name,
O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
++ if (subdir_fd < 0) {
+ if (ret == 0 && errno != ENOENT)
+ ret = -errno;
+ continue;
+--
+1.7.9.4
+
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-x86_64/PKGBUILD 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreis...@archlinux.org>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=44
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd";
-license=('GPL2')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
- 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
- "os-release"
- 0001-util-never-follow-symlinks-in-rm_rf_children.patch)
-md5sums=('11f44ff74c87850064e4351518bcff17'
- '752636def0db3c03f121f8b4f44a63cd'
- 'b5863d6d4b47e2b5bda8eb57bde0d327')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=803358
- patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --with-pamlibdir=/lib/security \
- --localstatedir=/var \
- --with-distro=arch \
- --enable-split-usr
-
- make
-}
-
-package_systemd() {
- pkgdesc="system and service manager"
- depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam'
'util-linux' 'udev' 'xz')
- 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'
- 'systemd-sysvcompat: symlink package to provide sysvinit
binaries')
- 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
- etc/systemd/systemd-journald.conf)
- install="$pkgname.install"
-
- 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"
- chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- # symlink to /bin/systemd for compat and sanity
- mkdir -p "$pkgdir/bin"
- ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
- mkdir -p "$pkgdir/lib/systemd"
- ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
-
- # use python2 for systemd-analyze
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # didn't build this...
- rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
-
- # fix .so links in manpage stubs
- find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
- -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
-
- # rename man pages to avoid conflicts with sysvinit and initscripts
- manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
- man5/{hostname,{vconsole,locale}.conf}.5)
- cd "$pkgdir/usr/share/man"
- for manpage in "${manpages[@]}"; do
- IFS='/' read section page <<< "$manpage"
- mv "$manpage" "$section/systemd.$page"
- done
-
- ### split off libsystemd (libs, includes, pkgconfig, man3)
- install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
-
- cd "$srcdir"/libsystemd
- mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
- mv "$pkgdir/usr/include/systemd" usr/include
- mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('libcap' 'xz')
-
- mv "$srcdir/libsystemd"/* "$pkgdir"
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/staging-x86_64/PKGBUILD (from rev 155312,
systemd/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Dave Reisner <dreis...@archlinux.org>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd')
+pkgver=44
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd";
+license=('GPL2')
+makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
+ 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
+options=('!libtool')
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz";
+ "os-release"
+ 0001-util-never-follow-symlinks-in-rm_rf_children.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
+ '752636def0db3c03f121f8b4f44a63cd'
+ 'b5863d6d4b47e2b5bda8eb57bde0d327')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # https://bugzilla.redhat.com/show_bug.cgi?id=803358
+ patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --with-pamlibdir=/lib/security \
+ --localstatedir=/var \
+ --with-distro=arch \
+ --enable-split-usr
+
+ make
+}
+
+package_systemd() {
+ pkgdesc="system and service manager"
+ depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam'
'util-linux' 'udev' 'xz')
+ 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'
+ 'systemd-sysvcompat: symlink package to provide sysvinit
binaries')
+ 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
+ etc/systemd/systemd-journald.conf)
+ install="$pkgname.install"
+
+ 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"
+ chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+ # symlink to /bin/systemd for compat and sanity
+ mkdir -p "$pkgdir/bin"
+ ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+ mkdir -p "$pkgdir/lib/systemd"
+ ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
+
+ # use python2 for systemd-analyze
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+ # didn't build this...
+ rm -f "$pkgdir/usr/share/man/man1/systemadm.1"
+
+ # fix .so links in manpage stubs
+ find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
+ -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} +
+
+ # rename man pages to avoid conflicts with sysvinit and initscripts
+ manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ man5/{hostname,{vconsole,locale}.conf}.5)
+ cd "$pkgdir/usr/share/man"
+ for manpage in "${manpages[@]}"; do
+ IFS='/' read section page <<< "$manpage"
+ mv "$manpage" "$section/systemd.$page"
+ done
+
+ ### split off libsystemd (libs, includes, pkgconfig, man3)
+ install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
+
+ cd "$srcdir"/libsystemd
+ mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
+ mv "$pkgdir/usr/include/systemd" usr/include
+ mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
+}
+
+package_libsystemd() {
+ pkgdesc="systemd client libraries"
+ depends=('libcap' 'xz')
+
+ mv "$srcdir/libsystemd"/* "$pkgdir"
+}
+
+# vim: ft=sh syn=sh et
Deleted: staging-x86_64/cpp-compat.patch
===================================================================
--- staging-x86_64/cpp-compat.patch 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-x86_64/cpp-compat.patch 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,19 +0,0 @@
-commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
-Author: Lennart Poettering <lenn...@poettering.net>
-Date: 2012-03-05 15:16:10 +0100
-
- sd-login: c++ compatibility
-
-diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
-index 2f3c90c..6e99cfc 100644
---- a/src/systemd/sd-login.h
-+++ b/src/systemd/sd-login.h
-@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char
**service);
- int sd_session_get_type(const char *session, char **type);
-
- /* Determine the class of this session, i.e. one of "user", "greeter" or
"lock-screen". */
--int sd_session_get_class(const char *session, char **class);
-+int sd_session_get_class(const char *session, char **clazz);
-
- /* Determine the X11 display of this session. */
- int sd_session_get_display(const char *session, char **display);
Copied: systemd/repos/staging-x86_64/cpp-compat.patch (from rev 155312,
systemd/trunk/cpp-compat.patch)
===================================================================
--- staging-x86_64/cpp-compat.patch (rev 0)
+++ staging-x86_64/cpp-compat.patch 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,19 @@
+commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82
+Author: Lennart Poettering <lenn...@poettering.net>
+Date: 2012-03-05 15:16:10 +0100
+
+ sd-login: c++ compatibility
+
+diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h
+index 2f3c90c..6e99cfc 100644
+--- a/src/systemd/sd-login.h
++++ b/src/systemd/sd-login.h
+@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char
**service);
+ int sd_session_get_type(const char *session, char **type);
+
+ /* Determine the class of this session, i.e. one of "user", "greeter" or
"lock-screen". */
+-int sd_session_get_class(const char *session, char **class);
++int sd_session_get_class(const char *session, char **clazz);
+
+ /* Determine the X11 display of this session. */
+ int sd_session_get_display(const char *session, char **display);
Deleted: staging-x86_64/os-release
===================================================================
--- staging-x86_64/os-release 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-x86_64/os-release 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
Copied: systemd/repos/staging-x86_64/os-release (from rev 155312,
systemd/trunk/os-release)
===================================================================
--- staging-x86_64/os-release (rev 0)
+++ staging-x86_64/os-release 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
Deleted: staging-x86_64/systemd.install
===================================================================
--- staging-x86_64/systemd.install 2012-04-01 19:20:44 UTC (rev 155312)
+++ staging-x86_64/systemd.install 2012-04-01 19:21:24 UTC (rev 155313)
@@ -1,54 +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
- systemctl daemon-reload >/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/staging-x86_64/systemd.install (from rev 155312,
systemd/trunk/systemd.install)
===================================================================
--- staging-x86_64/systemd.install (rev 0)
+++ staging-x86_64/systemd.install 2012-04-01 19:21:24 UTC (rev 155313)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+checkgroups() {
+ if ! getent group lock >/dev/null; then
+ groupadd -g 54 lock
+ fi
+}
+
+sd_booted() {
+ [ -e sys/fs/cgroup/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-reload
+ systemctl daemon-reexec
+ 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:
