[arch-commits] Commit in systemd/repos (10 files)
Date: Sunday, June 1, 2014 @ 06:02:26
Author: dreisner
Revision: 213938
archrelease: copy trunk to testing-i686, testing-x86_64
Deleted:
systemd/repos/testing-i686/PKGBUILD
systemd/repos/testing-i686/initcpio-hook-udev
systemd/repos/testing-i686/initcpio-install-systemd
systemd/repos/testing-i686/initcpio-install-udev
systemd/repos/testing-i686/systemd.install
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/initcpio-hook-udev
systemd/repos/testing-x86_64/initcpio-install-systemd
systemd/repos/testing-x86_64/initcpio-install-udev
systemd/repos/testing-x86_64/systemd.install
-+
testing-i686/PKGBUILD | 162 --
testing-i686/initcpio-hook-udev | 22
testing-i686/initcpio-install-systemd | 160 -
testing-i686/initcpio-install-udev | 29 -
testing-i686/systemd.install| 144 --
testing-x86_64/PKGBUILD | 162 --
testing-x86_64/initcpio-hook-udev | 22
testing-x86_64/initcpio-install-systemd | 160 -
testing-x86_64/initcpio-install-udev| 29 -
testing-x86_64/systemd.install | 144 --
10 files changed, 1034 deletions(-)
Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD 2014-06-01 04:01:42 UTC (rev 213937)
+++ testing-i686/PKGBUILD 2014-06-01 04:02:26 UTC (rev 213938)
@@ -1,162 +0,0 @@
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Maintainer: Tom Gundersen t...@jklm.no
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=213
-pkgrel=2
-arch=('i686' 'x86_64')
-url=http://www.freedesktop.org/wiki/Software/systemd;
-makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
- 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd'
'libxslt'
- 'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml'
'quota-tools'
- 'shadow' 'xz')
-options=('strip' 'debug')
-source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
-'initcpio-hook-udev'
-'initcpio-install-systemd'
-'initcpio-install-udev'
-'0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch')
-md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
- '29245f7a240bfba66e2b1783b63b6b40'
- '66cca7318e13eaf37c5b7db2efa69846'
- 'bde43090d4ac0ef048e3eaee8202a407'
- '5f8ad7126970855614c7fa34b317728d')
-
-prepare() {
- cd $pkgname-$pkgver
-
- patch -Np1
$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- # LTO currently breaks the build because of libtool failures
- CFLAGS+=' -fno-lto'
-
- ./configure \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --enable-introspection \
- --enable-gtk-doc \
- --enable-compat-libs \
- --disable-audit \
- --disable-ima \
- --disable-kdbus \
- --with-sysvinit-path= \
- --with-sysvrcnd-path= \
- --with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware
-
- make
-}
-
-check() {
- make -C $pkgname-$pkgver check || :
-}
-
-package_systemd() {
- pkgdesc=system and service manager
- license=('GPL2' 'LGPL2.1' 'MIT')
- depends=('acl' 'bash' 'dbus' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap'
'libgcrypt'
- 'libsystemd' 'pam' 'libseccomp' 'util-linux' 'xz')
- provides=('nss-myhostname' systemd-tools=$pkgver udev=$pkgver)
- replaces=('nss-myhostname' 'systemd-tools' 'udev')
- conflicts=('nss-myhostname' 'systemd-tools' 'udev')
- optdepends=('python: systemd library bindings'
- 'cryptsetup: required for encrypted block devices'
- 'libmicrohttpd: remote journald capabilities'
- 'quota-tools: kernel-level quota management'
- '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.machine1.conf
- etc/dbus-1/system.d/org.freedesktop.timedate1.conf
- etc/pam.d/systemd-user
- etc/systemd/bootchart.conf
- etc/systemd/journald.conf
- etc/systemd/logind.conf
- etc/systemd/system.conf
- etc/systemd/user.conf
- etc/udev/udev.conf)
- install=systemd.install
-
- make -C $pkgname-$pkgver DESTDIR=$pkgdir install
-
- # don't write units to /etc by default -- we'll enable the getty on
- # post_install as a sane default.
- rm
[arch-commits] Commit in systemd/repos (10 files)
Date: Wednesday, September 18, 2013 @ 19:19:27
Author: dreisner
Revision: 194573
archrelease: copy trunk to testing-i686, testing-x86_64
Deleted:
systemd/repos/testing-i686/PKGBUILD
systemd/repos/testing-i686/initcpio-hook-udev
systemd/repos/testing-i686/initcpio-install-systemd
systemd/repos/testing-i686/initcpio-install-udev
systemd/repos/testing-i686/systemd.install
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/initcpio-hook-udev
systemd/repos/testing-x86_64/initcpio-install-systemd
systemd/repos/testing-x86_64/initcpio-install-udev
systemd/repos/testing-x86_64/systemd.install
-+
testing-i686/PKGBUILD | 143 ---
testing-i686/initcpio-hook-udev | 20 ---
testing-i686/initcpio-install-systemd | 156 --
testing-i686/initcpio-install-udev | 28 -
testing-i686/systemd.install| 103 ---
testing-x86_64/PKGBUILD | 143 ---
testing-x86_64/initcpio-hook-udev | 20 ---
testing-x86_64/initcpio-install-systemd | 156 --
testing-x86_64/initcpio-install-udev| 28 -
testing-x86_64/systemd.install | 103 ---
10 files changed, 900 deletions(-)
Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD 2013-09-18 17:18:41 UTC (rev 194572)
+++ testing-i686/PKGBUILD 2013-09-18 17:19:27 UTC (rev 194573)
@@ -1,143 +0,0 @@
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Maintainer: Tom Gundersen t...@jklm.no
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=207
-pkgrel=2
-arch=('i686' 'x86_64')
-url=http://www.freedesktop.org/wiki/Software/systemd;
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl'
'gobject-introspection' 'gperf'
- 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd'
'libxslt'
- 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
-source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
-'initcpio-hook-udev'
-'initcpio-install-systemd'
-'initcpio-install-udev'
-0001-swap-fix-reverse-dependencies.patch
-0002-swap-create-.wants-symlink-to-auto-swap-devices.patch)
-md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88'
- '2de72238ed5c0df62a7c3b6bdaf8cb7c'
- '9027b31a875e74a45623954b3b23d09f'
- 'd83d45e67cd75cdbafb81c96a7485319'
- '182be4c729aaecde249b7b05b48a481f'
- 'b54fbe35e2689ac36cda9ac4a5a86f24')
-
-prepare() {
- cd $pkgname-$pkgver
-
- patch -Np1 $srcdir/0001-swap-fix-reverse-dependencies.patch
- patch -Np1
$srcdir/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
-}
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --enable-introspection \
- --enable-gtk-doc \
- --disable-audit \
- --disable-ima \
- --with-sysvinit-path= \
- --with-sysvrcnd-path= \
- --with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware
-
- make
-}
-
-check() {
- # two tests fail due to running under nspawn
- make -C $pkgname-$pkgver check || true
-}
-
-package_systemd() {
- pkgdesc=system and service manager
- license=('GPL2' 'LGPL2.1' 'MIT')
- depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap'
'libgcrypt'
- 'pam' 'util-linux' 'xz')
- provides=(libsystemd=$pkgver 'nss-myhostname' systemd-tools=$pkgver
udev=$pkgver
-'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
-'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
- replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
- conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
- optdepends=('cryptsetup: required for encrypted block devices'
- 'libmicrohttpd: systemd-journal-gatewayd'
- 'quota-tools: kernel-level quota management'
- 'python: systemd library bindings'
- '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.machine1.conf
- etc/dbus-1/system.d/org.freedesktop.timedate1.conf
- etc/systemd/bootchart.conf
- etc/systemd/journald.conf
- etc/systemd/logind.conf
- etc/systemd/system.conf
- etc/systemd/user.conf
- etc/udev/udev.conf)
- install=systemd.install
-
- make -C $pkgname-$pkgver DESTDIR=$pkgdir install
-
- printf d
[arch-commits] Commit in systemd/repos (10 files)
Date: Sunday, May 27, 2012 @ 09:11:08
Author: dreisner
Revision: 159981
db-move: moved systemd from [staging] to [testing] (i686)
Added:
systemd/repos/testing-i686/
systemd/repos/testing-i686/0001-Reinstate-TIMEOUT-handling.patch
(from rev 159958,
systemd/repos/staging-i686/0001-Reinstate-TIMEOUT-handling.patch)
systemd/repos/testing-i686/PKGBUILD
(from rev 159958, systemd/repos/staging-i686/PKGBUILD)
systemd/repos/testing-i686/initcpio-hook-udev
(from rev 159958, systemd/repos/staging-i686/initcpio-hook-udev)
systemd/repos/testing-i686/initcpio-install-timestamp
(from rev 159958, systemd/repos/staging-i686/initcpio-install-timestamp)
systemd/repos/testing-i686/initcpio-install-udev
(from rev 159958, systemd/repos/staging-i686/initcpio-install-udev)
systemd/repos/testing-i686/os-release
(from rev 159958, systemd/repos/staging-i686/os-release)
systemd/repos/testing-i686/systemd.install
(from rev 159958, systemd/repos/staging-i686/systemd.install)
systemd/repos/testing-i686/udev.install
(from rev 159958, systemd/repos/staging-i686/udev.install)
Deleted:
systemd/repos/staging-i686/
---+
0001-Reinstate-TIMEOUT-handling.patch | 124 +
PKGBUILD | 221
initcpio-hook-udev| 20 ++
initcpio-install-timestamp| 14 ++
initcpio-install-udev | 28
os-release|5
systemd.install | 61
udev.install | 29
8 files changed, 502 insertions(+)
Copied: systemd/repos/testing-i686/0001-Reinstate-TIMEOUT-handling.patch (from
rev 159958, systemd/repos/staging-i686/0001-Reinstate-TIMEOUT-handling.patch)
===
--- testing-i686/0001-Reinstate-TIMEOUT-handling.patch
(rev 0)
+++ testing-i686/0001-Reinstate-TIMEOUT-handling.patch 2012-05-27 13:11:08 UTC
(rev 159981)
@@ -0,0 +1,124 @@
+From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Fri, 25 May 2012 19:43:24 -0400
+Subject: [PATCH] Reinstate TIMEOUT= handling
+
+This is mostly to deal with ipw2?00 drivers which have yet to be fixed
+in the kernel.
+---
+ src/libudev/libudev-device.c | 19 +++
+ src/libudev/libudev-private.h |1 +
+ src/udev/udevd.c | 13 ++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
+index a8277d1..5966189 100644
+--- a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+ struct udev_list tags_list;
+ unsigned long long int seqnum;
+ unsigned long long int usec_initialized;
++int timeout;
+ int devlink_priority;
+ int refcount;
+ dev_t devnum;
+@@ -89,6 +90,21 @@ struct udev_device {
+ bool db_persist;
+ };
+
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++return udev_device-timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int
timeout)
++{
++char num[32];
++
++udev_device-timeout = timeout;
++snprintf(num, sizeof(num), %u, timeout);
++udev_device_add_property(udev_device, TIMEOUT, num);
++return 0;
++}
++
+ /**
+ * udev_device_get_seqnum:
+ * @udev_device: udev device
+@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct
udev_device *udev_device,
+
+ util_strscpyl(path, sizeof(path), TEST_PREFIX /sys,
property[8], NULL);
+ udev_device_set_syspath(udev_device, path);
++} else if (strncmp(property, TIMEOUT=, 8) == 0) {
++udev_device_set_timeout(udev_device, strtoull(property[8],
NULL, 10));
+ } else if (startswith(property, SUBSYSTEM=)) {
+ udev_device_set_subsystem(udev_device, property[10]);
+ } else if (startswith(property, DEVTYPE=)) {
+@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+ udev_list_init(udev, udev_device-sysattr_value_list, true);
+ udev_list_init(udev, udev_device-sysattr_list, false);
+ udev_list_init(udev, udev_device-tags_list, true);
++udev_device-timeout = -1;
+ udev_device-watch_handle = -1;
+ /* copy global properties */
+ udev_list_entry_foreach(list_entry,
udev_get_properties_list_entry(udev))
+diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
+index 4eb4a59..99aefeb 100644
+--- a/src/libudev/libudev-private.h
b/src/libudev/libudev-private.h
+@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device
*udev_device);
+ void udev_device_set_is_initialized(struct
[arch-commits] Commit in systemd/repos (10 files)
Date: Sunday, May 27, 2012 @ 09:11:10
Author: dreisner
Revision: 159982
db-move: moved systemd from [staging] to [testing] (x86_64)
Added:
systemd/repos/testing-x86_64/
systemd/repos/testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch
(from rev 159958,
systemd/repos/staging-x86_64/0001-Reinstate-TIMEOUT-handling.patch)
systemd/repos/testing-x86_64/PKGBUILD
(from rev 159958, systemd/repos/staging-x86_64/PKGBUILD)
systemd/repos/testing-x86_64/initcpio-hook-udev
(from rev 159958, systemd/repos/staging-x86_64/initcpio-hook-udev)
systemd/repos/testing-x86_64/initcpio-install-timestamp
(from rev 159958, systemd/repos/staging-x86_64/initcpio-install-timestamp)
systemd/repos/testing-x86_64/initcpio-install-udev
(from rev 159958, systemd/repos/staging-x86_64/initcpio-install-udev)
systemd/repos/testing-x86_64/os-release
(from rev 159958, systemd/repos/staging-x86_64/os-release)
systemd/repos/testing-x86_64/systemd.install
(from rev 159958, systemd/repos/staging-x86_64/systemd.install)
systemd/repos/testing-x86_64/udev.install
(from rev 159958, systemd/repos/staging-x86_64/udev.install)
Deleted:
systemd/repos/staging-x86_64/
---+
0001-Reinstate-TIMEOUT-handling.patch | 124 +
PKGBUILD | 221
initcpio-hook-udev| 20 ++
initcpio-install-timestamp| 14 ++
initcpio-install-udev | 28
os-release|5
systemd.install | 61
udev.install | 29
8 files changed, 502 insertions(+)
Copied: systemd/repos/testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch
(from rev 159958,
systemd/repos/staging-x86_64/0001-Reinstate-TIMEOUT-handling.patch)
===
--- testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch
(rev 0)
+++ testing-x86_64/0001-Reinstate-TIMEOUT-handling.patch2012-05-27
13:11:10 UTC (rev 159982)
@@ -0,0 +1,124 @@
+From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
+From: Dave Reisner dreis...@archlinux.org
+Date: Fri, 25 May 2012 19:43:24 -0400
+Subject: [PATCH] Reinstate TIMEOUT= handling
+
+This is mostly to deal with ipw2?00 drivers which have yet to be fixed
+in the kernel.
+---
+ src/libudev/libudev-device.c | 19 +++
+ src/libudev/libudev-private.h |1 +
+ src/udev/udevd.c | 13 ++---
+ 3 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
+index a8277d1..5966189 100644
+--- a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
+@@ -68,6 +68,7 @@ struct udev_device {
+ struct udev_list tags_list;
+ unsigned long long int seqnum;
+ unsigned long long int usec_initialized;
++int timeout;
+ int devlink_priority;
+ int refcount;
+ dev_t devnum;
+@@ -89,6 +90,21 @@ struct udev_device {
+ bool db_persist;
+ };
+
++int udev_device_get_timeout(struct udev_device *udev_device)
++{
++return udev_device-timeout;
++}
++
++static int udev_device_set_timeout(struct udev_device *udev_device, int
timeout)
++{
++char num[32];
++
++udev_device-timeout = timeout;
++snprintf(num, sizeof(num), %u, timeout);
++udev_device_add_property(udev_device, TIMEOUT, num);
++return 0;
++}
++
+ /**
+ * udev_device_get_seqnum:
+ * @udev_device: udev device
+@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct
udev_device *udev_device,
+
+ util_strscpyl(path, sizeof(path), TEST_PREFIX /sys,
property[8], NULL);
+ udev_device_set_syspath(udev_device, path);
++} else if (strncmp(property, TIMEOUT=, 8) == 0) {
++udev_device_set_timeout(udev_device, strtoull(property[8],
NULL, 10));
+ } else if (startswith(property, SUBSYSTEM=)) {
+ udev_device_set_subsystem(udev_device, property[10]);
+ } else if (startswith(property, DEVTYPE=)) {
+@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
+ udev_list_init(udev, udev_device-sysattr_value_list, true);
+ udev_list_init(udev, udev_device-sysattr_list, false);
+ udev_list_init(udev, udev_device-tags_list, true);
++udev_device-timeout = -1;
+ udev_device-watch_handle = -1;
+ /* copy global properties */
+ udev_list_entry_foreach(list_entry,
udev_get_properties_list_entry(udev))
+diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
+index 4eb4a59..99aefeb 100644
+--- a/src/libudev/libudev-private.h
b/src/libudev/libudev-private.h
+@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device
[arch-commits] Commit in systemd/repos (10 files)
Date: Friday, March 16, 2012 @ 22:44:41
Author: dreisner
Revision: 153640
db-move: moved systemd from [testing] to [extra] (i686)
Added:
systemd/repos/extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153639,
systemd/repos/testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
systemd/repos/extra-i686/PKGBUILD
(from rev 153639, systemd/repos/testing-i686/PKGBUILD)
systemd/repos/extra-i686/cpp-compat.patch
(from rev 153639, systemd/repos/testing-i686/cpp-compat.patch)
systemd/repos/extra-i686/os-release
(from rev 153639, systemd/repos/testing-i686/os-release)
systemd/repos/extra-i686/systemd.install
(from rev 153639, systemd/repos/testing-i686/systemd.install)
Deleted:
systemd/repos/extra-i686/PKGBUILD
systemd/repos/extra-i686/cpp-compat.patch
systemd/repos/extra-i686/os-release
systemd/repos/extra-i686/systemd.install
systemd/repos/testing-i686/
-+
0001-util-never-follow-symlinks-in-rm_rf_children.patch | 32 ++
PKGBUILD| 212 +++---
cpp-compat.patch| 38 +-
os-release | 10
systemd.install | 106 +++
5 files changed, 215 insertions(+), 183 deletions(-)
Copied:
systemd/repos/extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153639,
systemd/repos/testing-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===
--- extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(rev 0)
+++ extra-i686/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-03-17 02:44:41 UTC (rev 153640)
@@ -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: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-03-17 02:01:43 UTC (rev 153639)
+++ extra-i686/PKGBUILD 2012-03-17 02:44:41 UTC (rev 153640)
@@ -1,106 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=4
-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 cpp-compat.patch)
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
- '752636def0db3c03f121f8b4f44a63cd'
- '414968aa314ced0b0ab4b2207e46aa69')
-
-build() {
- cd $pkgname-$pkgver
-
- # Fix C++ compile error when including sd-login.h
- # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
- patch -p1 -i ../cpp-compat.patch
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --with-pamlibdir=/lib/security \
- --localstatedir=/var \
- --with-rootprefix= \
- --with-distro=arch
-
- make
-}
-
-package_systemd() {
- pkgdesc=systemd 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
[arch-commits] Commit in systemd/repos (10 files)
Date: Friday, March 16, 2012 @ 22:44:42
Author: dreisner
Revision: 153641
db-move: moved systemd from [testing] to [extra] (x86_64)
Added:
systemd/repos/extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153639,
systemd/repos/testing-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
systemd/repos/extra-x86_64/PKGBUILD
(from rev 153639, systemd/repos/testing-x86_64/PKGBUILD)
systemd/repos/extra-x86_64/cpp-compat.patch
(from rev 153639, systemd/repos/testing-x86_64/cpp-compat.patch)
systemd/repos/extra-x86_64/os-release
(from rev 153639, systemd/repos/testing-x86_64/os-release)
systemd/repos/extra-x86_64/systemd.install
(from rev 153639, systemd/repos/testing-x86_64/systemd.install)
Deleted:
systemd/repos/extra-x86_64/PKGBUILD
systemd/repos/extra-x86_64/cpp-compat.patch
systemd/repos/extra-x86_64/os-release
systemd/repos/extra-x86_64/systemd.install
systemd/repos/testing-x86_64/
-+
0001-util-never-follow-symlinks-in-rm_rf_children.patch | 32 ++
PKGBUILD| 212 +++---
cpp-compat.patch| 38 +-
os-release | 10
systemd.install | 106 +++
5 files changed, 215 insertions(+), 183 deletions(-)
Copied:
systemd/repos/extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(from rev 153639,
systemd/repos/testing-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch)
===
--- extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
(rev 0)
+++ extra-x86_64/0001-util-never-follow-symlinks-in-rm_rf_children.patch
2012-03-17 02:44:42 UTC (rev 153641)
@@ -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: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2012-03-17 02:44:41 UTC (rev 153640)
+++ extra-x86_64/PKGBUILD 2012-03-17 02:44:42 UTC (rev 153641)
@@ -1,106 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd')
-pkgver=43
-pkgrel=4
-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 cpp-compat.patch)
-md5sums=('446cc6db7625617af67e2d8e5f503a49'
- '752636def0db3c03f121f8b4f44a63cd'
- '414968aa314ced0b0ab4b2207e46aa69')
-
-build() {
- cd $pkgname-$pkgver
-
- # Fix C++ compile error when including sd-login.h
- # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514
- patch -p1 -i ../cpp-compat.patch
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --with-pamlibdir=/lib/security \
- --localstatedir=/var \
- --with-rootprefix= \
- --with-distro=arch
-
- make
-}
-
-package_systemd() {
- pkgdesc=systemd 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
