summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch27
-rw-r--r--libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch155
-rw-r--r--libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch31
-rw-r--r--libre/systemd/PKGBUILD123
-rw-r--r--libre/systemd/os-release (renamed from libre/systemd/trunk/os-release)0
-rw-r--r--libre/systemd/rePKGBUILD52
-rw-r--r--libre/systemd/systemd.install (renamed from libre/systemd/trunk/systemd.install)25
-rw-r--r--libre/systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch123
-rw-r--r--libre/systemd/trunk/PKGBUILD211
-rw-r--r--libre/systemd/trunk/initcpio-hook-udev20
-rw-r--r--libre/systemd/trunk/initcpio-install-timestamp14
-rw-r--r--libre/systemd/trunk/initcpio-install-udev28
-rw-r--r--libre/systemd/trunk/locale.sh59
-rw-r--r--libre/systemd/trunk/systemd-tools.install29
14 files changed, 400 insertions, 497 deletions
diff --git a/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
new file mode 100644
index 000000000..06fc30944
--- /dev/null
+++ b/libre/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
@@ -0,0 +1,27 @@
+From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 2 Apr 2012 08:20:34 -0400
+Subject: [PATCH] check for proper return from dirent_ensure_type
+
+Fixes 'systemctl list-unit-files', which previously returned only:
+
+ Failed to issue method call: No such file or directory
+---
+ src/install.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/install.c b/src/install.c
+index 174d79b..9256116 100644
+--- a/src/install.c
++++ b/src/install.c
+@@ -1853,7 +1853,7 @@ int unit_file_get_list(
+
+ r = dirent_ensure_type(d, de);
+ if (r < 0) {
+- if (errno == ENOENT)
++ if (r == -ENOENT)
+ continue;
+
+ goto finish;
+--
+1.7.9.5
diff --git a/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
new file mode 100644
index 000000000..692d93356
--- /dev/null
+++ b/libre/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
@@ -0,0 +1,155 @@
+From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 22 Mar 2012 02:06:40 +0100
+Subject: [PATCH] logind: close FIFO before ending sessions cleanly
+
+For clean session endings ask logind explicitly to get rid of the FIFO
+before closing it so that the FIFO logic doesn't result in su/sudo to be
+terminated immediately.
+---
+ src/login/logind-dbus.c | 30 ++++++++++++++++++++
+ src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 98 insertions(+), 3 deletions(-)
+
+diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
+index d8f4d89..ea6b89f 100644
+--- a/src/login/logind-dbus.c
++++ b/src/login/logind-dbus.c
+@@ -80,6 +80,9 @@
+ " <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n" \
+ " <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n" \
+ " </method>\n" \
++ " <method name=\"ReleaseSession\">\n" \
++ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \
++ " </method>\n" \
+ " <method name=\"ActivateSession\">\n" \
+ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \
+ " </method>\n" \
+@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler(
+ if (r < 0)
+ return bus_send_error_reply(connection, message, &error, r);
+
++ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) {
++ const char *name;
++ Session *session;
++
++ if (!dbus_message_get_args(
++ message,
++ &error,
++ DBUS_TYPE_STRING, &name,
++ DBUS_TYPE_INVALID))
++ return bus_send_error_reply(connection, message, &error, -EINVAL);
++
++ session = hashmap_get(m->sessions, name);
++ if (!session)
++ return bus_send_error_reply(connection, message, &error, -ENOENT);
++
++ /* We use the FIFO to detect stray sessions where the
++ process invoking PAM dies abnormally. We need to make
++ sure that that process is not killed if at the clean
++ end of the session it closes the FIFO. Hence, with
++ this call explicitly turn off the FIFO logic, so that
++ the PAM code can finish clean up on its own */
++ session_remove_fifo(session);
++
++ reply = dbus_message_new_method_return(message);
++ if (!reply)
++ goto oom;
++
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) {
+ const char *name;
+ Session *session;
+diff --git a/src/login/pam-module.c b/src/login/pam-module.c
+index 8544413..4106d2b 100644
+--- a/src/login/pam-module.c
++++ b/src/login/pam-module.c
+@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+ "CreateSession");
+-
+ if (!m) {
+ pam_syslog(handle, LOG_ERR, "Could not allocate create session message.");
+ r = PAM_BUF_ERR;
+@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session(
+ int argc, const char **argv) {
+
+ const void *p = NULL;
++ const char *id;
++ DBusConnection *bus = NULL;
++ DBusMessage *m = NULL, *reply = NULL;
++ DBusError error;
++ int r;
+
+- pam_get_data(handle, "systemd.session-fd", &p);
++ assert(handle);
++
++ dbus_error_init(&error);
++
++ id = pam_getenv(handle, "XDG_SESSION_ID");
++ if (id) {
++
++ /* Before we go and close the FIFO we need to tell
++ * logind that this is a clean session shutdown, so
++ * that it doesn't just go and slaughter us
++ * immediately after closing the fd */
++
++ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
++ if (!bus) {
++ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
++ r = PAM_SESSION_ERR;
++ goto finish;
++ }
++
++ m = dbus_message_new_method_call(
++ "org.freedesktop.login1",
++ "/org/freedesktop/login1",
++ "org.freedesktop.login1.Manager",
++ "ReleaseSession");
++ if (!m) {
++ pam_syslog(handle, LOG_ERR, "Could not allocate release session message.");
++ r = PAM_BUF_ERR;
++ goto finish;
++ }
++
++ if (!dbus_message_append_args(m,
++ DBUS_TYPE_STRING, &id,
++ DBUS_TYPE_INVALID)) {
++ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message.");
++ r = PAM_BUF_ERR;
++ goto finish;
++ }
+
++ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
++ if (!reply) {
++ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error));
++ r = PAM_SESSION_ERR;
++ goto finish;
++ }
++ }
++
++ r = PAM_SUCCESS;
++
++finish:
++ pam_get_data(handle, "systemd.session-fd", &p);
+ if (p)
+ close_nointr(PTR_TO_INT(p) - 1);
+
+- return PAM_SUCCESS;
++ dbus_error_free(&error);
++
++ if (bus) {
++ dbus_connection_close(bus);
++ dbus_connection_unref(bus);
++ }
++
++ if (m)
++ dbus_message_unref(m);
++
++ if (reply)
++ dbus_message_unref(reply);
++
++ return r;
+ }
+--
+1.7.9.5
diff --git a/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
new file mode 100644
index 000000000..9bf84dda6
--- /dev/null
+++ b/libre/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch
@@ -0,0 +1,31 @@
+From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@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
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
new file mode 100644
index 000000000..d4f08f7d5
--- /dev/null
+++ b/libre/systemd/PKGBUILD
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgbase=systemd
+pkgname=('systemd')
+pkgver=44
+pkgrel=7
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2' 'LGPL2.1' 'MIT')
+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
+ 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
+ 0001-check-for-proper-return-from-dirent_ensure_type.patch)
+md5sums=('11f44ff74c87850064e4351518bcff17'
+ 'd0210754762d923d36c9452a1648d550'
+ 'b5863d6d4b47e2b5bda8eb57bde0d327'
+ 'd37833358ef6c23fad622ea4a0941d1f'
+ '11f930fd0a3966abc794bf9127a7dde0')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375)
+ patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+
+ # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd)
+ patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch"
+
+ # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49)
+ patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch"
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --with-pamlibdir=/usr/lib/security \
+ --localstatedir=/var \
+ --with-distro=arch \
+ --enable-split-usr \
+ --disable-ima
+
+ make
+}
+
+package_systemd() {
+ pkgdesc="system and service manager"
+ depends=('acl' '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
+ install -dm755 "$pkgdir/bin"
+ ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/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
+ sed -i '1s|/\([^/]\+\)|/systemd.\1|' "$pkgdir"/usr/share/man/man8/systemd.{poweroff,reboot}.8
+
+ # move bash-completion and symlink for loginctl
+ install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
+ "$pkgdir/usr/share/bash-completion/completions/systemctl"
+ ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
+ rm -rf "$pkgdir/etc/bash_completion.d"
+
+ # fix systemctl where
+ find "$pkgdir" -type f -name '*.service' -exec \
+ sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} +
+
+ ### 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
+}
+
+# vim: ft=sh syn=sh et
diff --git a/libre/systemd/trunk/os-release b/libre/systemd/os-release
index 65253e9c3..65253e9c3 100644
--- a/libre/systemd/trunk/os-release
+++ b/libre/systemd/os-release
diff --git a/libre/systemd/rePKGBUILD b/libre/systemd/rePKGBUILD
new file mode 100644
index 000000000..f825ee579
--- /dev/null
+++ b/libre/systemd/rePKGBUILD
@@ -0,0 +1,52 @@
+# This is an example rePKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+source PKGBUILD
+unset build package md5sums source check
+_repo=extra
+pkgname='systemd'
+options=(!strip)
+source=(PKGBUILD
+ http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+ # files for pkg modifications
+ os-release)
+
+build() {
+ cd "${srcdir}/"
+ rm -v .{INSTALL,PKGINFO} $pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT || true
+ # put actions for package modifications below this line
+
+ rm -v etc/os-release
+}
+
+package_systemd() {
+ pkgdesc="system and service manager (Parabola rebranded)"
+ depends=('acl' '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"
+
+ # Install Parabola os-release
+ install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+
+ find ${srcdir} -maxdepth 1 -type l -delete
+ cp -a ${srcdir}/* ${pkgdir}
+}
diff --git a/libre/systemd/trunk/systemd.install b/libre/systemd/systemd.install
index 0b10f9537..0c3e9abee 100644
--- a/libre/systemd/trunk/systemd.install
+++ b/libre/systemd/systemd.install
@@ -1,22 +1,29 @@
#!/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
- # enable getty@tty1 by default, but don't track the file
- systemctl enable getty@.service
-
- echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd"
+ 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
@@ -32,14 +39,6 @@ post_upgrade() {
systemctl daemon-reexec
fi
fi
-
- # getty@tty1.service is no longer enabled by default, but we don't want to break
- # existing setups.
- if [ "$(vercmp 183 "$2")" -eq 1 ]; then
- # systemctl seems to be whiny on sysvinit. this will succeed unless something
- # horrific happens, so just mask the error.
- systemctl -q enable getty@.service || true
- fi
}
post_remove() {
diff --git a/libre/systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch b/libre/systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 2092fef90..000000000
--- a/libre/systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@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 udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
- }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
- struct udev_list_node *loop;
-
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
- return;
- }
-
-- if (children >= children_max) {
-+ if (!force && children >= children_max) {
- if (children_max > 1)
- log_debug("maximum number (%i) of children reached\n", children);
- return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
-
- event->state = EVENT_QUEUED;
- udev_list_node_append(&event->node, &event_list);
-+
-+ /* run all events with a timeout set immediately */
-+ if (udev_device_get_timeout(dev) > 0) {
-+ event_run(event, true);
-+ return 0;
-+ }
-+
- return 0;
- }
-
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
- if (is_devpath_busy(event))
- continue;
-
-- event_run(event);
-+ event_run(event, false);
- }
- }
-
---
-1.7.10.2
diff --git a/libre/systemd/trunk/PKGBUILD b/libre/systemd/trunk/PKGBUILD
deleted file mode 100644
index 900d67dd2..000000000
--- a/libre/systemd/trunk/PKGBUILD
+++ /dev/null
@@ -1,211 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=183
-pkgrel=6
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
- 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- 'initcpio-hook-udev'
- 'initcpio-install-udev'
- 'initcpio-install-timestamp'
- '0001-Reinstate-TIMEOUT-handling.patch'
- 'os-release'
- 'locale.sh')
-md5sums=('e1e5e0f376fa2a4cb4bc31a2161c09f2'
- 'e99e9189aa2f6084ac28b8ddf605aeb8'
- '59e91c4d7a69b7bf12c86a9982e37ced'
- 'df69615503ad293c9ddf9d8b7755282d'
- '744838ed4089964a646b1e7324419760'
- 'd0210754762d923d36c9452a1648d550'
- 'e9cffe627316b2044174003a4db32501')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # still waiting on ipw2x00 to get fixed...
- patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
- # fix udev rules dir (upstream 392f9c8404e42f7dd6e5b5adf488d87838515981)
- sed -i 's/pkglibexecdir/udevlibexecdir/' src/udev/udev.pc.in
-
- ./configure \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --enable-split-usr \
- --enable-introspection \
- --enable-gtk-doc \
- --disable-audit \
- --disable-ima \
- --with-pamlibdir=/usr/lib/security \
- --with-distro=arch \
- --with-usb-ids-path=/usr/share/hwdata/usb.ids \
- --with-pci-ids-path=/usr/share/hwdata/pci.ids \
- --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
-
- make
-}
-
-package_systemd() {
- pkgdesc="system and service manager"
- depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kbd' 'kmod' 'libcap' 'pam'
- "systemd-tools=$pkgver" 'util-linux' '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/logind.conf
- etc/systemd/journald.conf)
- install="systemd.install"
-
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- install -dm755 "$pkgdir/bin"
- ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # move bash-completion and symlink for loginctl
- install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
- "$pkgdir/usr/share/bash-completion/completions/systemctl"
- ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
- rm -rf "$pkgdir/etc/bash_completion.d"
-
- # don't write units to /etc by default -- we'll enable this on post_install
- # as a sane default
- rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
- rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
- ### split off libsystemd (libs, includes, pkgconfig, man3)
- rm -rf "$srcdir/_libsystemd"
- 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
-
- ### split out manpages for sysvcompat
- rm -rf "$srcdir/_sysvcompat"
- install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
- mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
- "$srcdir"/_sysvcompat/usr/share/man/man8
-
- ### split out systemd-tools/udev
- rm -rf "$srcdir/_tools"
- install -dm755 \
- "$srcdir"/_tools/etc/udev \
- "$srcdir"/_tools/usr/bin \
- "$srcdir"/_tools/usr/include \
- "$srcdir"/_tools/usr/lib/{systemd/system,udev} \
- "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
- "$srcdir"/_tools/usr/lib/girepository-1.0 \
- "$srcdir"/_tools/usr/share/pkgconfig \
- "$srcdir"/_tools/usr/share/gir-1.0 \
- "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \
- "$srcdir"/_tools/usr/share/man/man{1,5,7,8}
-
- cd "$srcdir/_tools"
- mv "$pkgdir"/etc/udev etc
- mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
- mv "$pkgdir"/usr/bin/udevadm usr/bin
- mv "$pkgdir"/usr/lib/pkgconfig usr/lib
- mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
- mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
- mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants
- mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants
- mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib
- mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib
- mv "$pkgdir"/usr/lib/udev usr/lib
- mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include
- mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib
- mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig
- mv "$pkgdir"/usr/share/gir-1.0 usr/share
- mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
- mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
- mv "$pkgdir"/usr/share/man/man8/{systemd-udevd,udevadm}.8 usr/share/man/man8
- mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
- mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
- mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
- mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
- mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
-}
-
-package_systemd-sysvcompat() {
- pkgdesc="sysvinit compat for systemd"
- conflicts=('sysvinit' 'initscripts')
-
- mv "$srcdir/_sysvcompat"/* "$pkgdir"
-
- install -dm755 "$pkgdir/sbin"
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
- done
-
- ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-
- install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh"
-}
-
-package_libsystemd() {
- pkgdesc="systemd client libraries"
- depends=('xz')
-
- mv "$srcdir/_libsystemd"/* "$pkgdir"
-}
-
-package_systemd-tools() {
- pkgdesc='standalone tools from systemd'
- url='http://www.freedesktop.org/wiki/Software/systemd'
- depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux')
- provides=("udev=$pkgver")
- conflicts=('udev')
- replaces=('udev')
- install='systemd-tools.install'
-
- mv "$srcdir/_tools/"* "$pkgdir"
-
- # the path to udevadm is hardcoded in some places
- install -d "$pkgdir/sbin"
- ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
- # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
- ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
- ln -s ../systemd/systemd-udevd "$pkgdir/usr/lib/udev/udevd"
-
- # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
- sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
- s#GROUP="tape"#GROUP="storage"#g;
- s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
- # get rid of unneded lock directories
- sed -ri '/\/run\/lock\/(subsys|lockdev)/d' "$pkgdir"/usr/lib/tmpfiles.d/legacy.conf
-
- # add mkinitcpio hooks
- install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
- install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
- install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/libre/systemd/trunk/initcpio-hook-udev b/libre/systemd/trunk/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/libre/systemd/trunk/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- udevd --daemon --resolve-names=never
- udevd_running=1
-}
-
-run_hook() {
- msg ":: Triggering uevents..."
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- udevadm settle
-}
-
-run_cleanuphook() {
- udevadm control --exit
- udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre/systemd/trunk/initcpio-install-timestamp b/libre/systemd/trunk/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/libre/systemd/trunk/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
- add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
- cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre/systemd/trunk/initcpio-install-udev b/libre/systemd/trunk/initcpio-install-udev
deleted file mode 100644
index 762429983..000000000
--- a/libre/systemd/trunk/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
- local rules tool
-
- add_file "/etc/udev/udev.conf"
- add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
- add_binary /usr/bin/udevadm
-
- for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
- add_file "/usr/lib/udev/rules.d/$rules"
- done
- for tool in ata_id scsi_id; do
- add_file "/usr/lib/udev/$tool"
- done
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre/systemd/trunk/locale.sh b/libre/systemd/trunk/locale.sh
deleted file mode 100644
index 11f1bbbee..000000000
--- a/libre/systemd/trunk/locale.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
- return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
- export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
- export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
- export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
- export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
- export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
- export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
- export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
- export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
- export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
- export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
- export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
- export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
- export LC_IDENTIFICATION
-fi
diff --git a/libre/systemd/trunk/systemd-tools.install b/libre/systemd/trunk/systemd-tools.install
deleted file mode 100644
index c1c19d15d..000000000
--- a/libre/systemd/trunk/systemd-tools.install
+++ /dev/null
@@ -1,29 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_upgrade() {
- if [ "$(vercmp $2 174)" -lt 0 ]; then
- echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
- echo " 'scanner' and 'video' groups. Beware of any changes."
- echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
- echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
- echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
- echo " this functionality back."
- echo " * We no longer create the static nodes on install needed for an initrd-less"
- echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh"
- echo " installs."
- fi
- if [ "$(vercmp $2 175)" -lt 0 ]; then
- echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
- echo " kernels have this enabled."
- fi
- if [ "$(vercmp $2 181)" -lt 0 ]; then
- echo " * udev-compat has been removed, and should be uninstalled."
- echo " * Framebuffers are no longer blacklisted by default."
- echo " * binaries moved from /sbin to /usr/bin"
- fi
- if [ "$(vercmp $2 181-3)" -lt 0 ]; then
- echo " * if your kernel does not provide /dev/loop-control, you need to manually"
- echo " load the 'loop' module before using losetup"
- fi
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 00:26:25 +0000