From bef7ace6da71cc0cd32b4e2e7bfcde117f025238 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 27 Mar 2013 09:38:23 +0100 Subject: [PATCH] systemd: update to 199; switch to official systemd-journal group. --- srcpkgs/libudev/patches | 1 - srcpkgs/libudev/template | 11 ++-- ...e1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch | 27 ---------- .../patches/use_adm_group_in_journal.patch | 38 -------------- srcpkgs/systemd/template | 51 +++++++++++-------- 5 files changed, 35 insertions(+), 93 deletions(-) delete mode 120000 srcpkgs/libudev/patches delete mode 100644 srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch delete mode 100644 srcpkgs/systemd/patches/use_adm_group_in_journal.patch diff --git a/srcpkgs/libudev/patches b/srcpkgs/libudev/patches deleted file mode 120000 index 6cd6fe78dd..0000000000 --- a/srcpkgs/libudev/patches +++ /dev/null @@ -1 +0,0 @@ -../systemd/patches \ No newline at end of file diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template index 742df19fb3..cfa4b8c845 100644 --- a/srcpkgs/libudev/template +++ b/srcpkgs/libudev/template @@ -1,7 +1,7 @@ # Template file for 'libudev' pkgname=libudev -version=198 -revision=5 +version=199 +revision=1 wrksrc="systemd-${version}" build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux @@ -13,7 +13,8 @@ configure_args="--libexecdir=/usr/lib --disable-selinux --disable-binfmt --disable-vconsole --disable-readahead --disable-bootchart --disable-quotacheck --disable-randomseed --disable-hostnamed --disable-timedated --disable-localed --disable-coredump - --disable-myhostname --disable-gudev --disable-keymap --without-python" + --disable-myhostname --disable-gudev --disable-keymap --without-python + --disable-efi --disable-polkit --with-sysvinit-path= --with-sysvrcnd-path=" hostmakedepends="pkg-config intltool gperf libxslt docbook-xsl" makedepends="dbus-devel libcap-devel liblzma-devel libgcrypt-devel" subpackages="libudev-devel systemd-libs systemd-devel" @@ -22,7 +23,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" license="LGPL-2.1, GPL-2, MIT" distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" -checksum=444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf +checksum=8c4462a04f3ecf7f083782e5e0687913b1d33c6444bf20fa2f31df9222965fed if [ "$XBPS_CROSS_BUILD" ]; then hostmakedepends="automake gettext-devel pkg-config intltool @@ -36,6 +37,6 @@ post_install() { # We are only interested in shlibs, headers and pc files. rm -rf ${DESTDIR}/{etc,var} rm -rf ${DESTDIR}/usr/{bin,sbin} - rm -rf ${DESTDIR}/usr/lib/{udev,systemd,tmpfiles.d} + rm -rf ${DESTDIR}/usr/lib/{udev,systemd,sysctl.d,tmpfiles.d} rm -rf ${DESTDIR}/usr/share/{bash*,doc,polkit-1,dbus-1} } diff --git a/srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch b/srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch deleted file mode 100644 index a45ca5fa2c..0000000000 --- a/srcpkgs/systemd/patches/c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Thu, 14 Mar 2013 20:36:38 +0000 -Subject: main: don't mount /sys, /dev and friends when we run with PID != 1 - -Back from old times when we developed systemd on non-systemd hosts we -still mounted the missing directories such as the cgroup stuff even when -running with a PID != 1. There's no point for that anymore, so let's -just do that if we are actually PID 1, and never otherwise. - -https://bugs.freedesktop.org/show_bug.cgi?id=62354 ---- -diff --git a/src/core/main.c b/src/core/main.c -index 7b03983..01a6d41 100644 ---- src/core/main.c -+++ src/core/main.c -@@ -1437,7 +1437,7 @@ int main(int argc, char *argv[]) { - - /* Mount /proc, /sys and friends, so that /proc/cmdline and - * /proc/$PID/fd is available. */ -- if (geteuid() == 0 && !getenv("SYSTEMD_SKIP_API_MOUNTS")) { -+ if (getpid() == 1) { - r = mount_setup(loaded_policy); - if (r < 0) - goto finish; --- -cgit v0.9.0.2-2-gbebe diff --git a/srcpkgs/systemd/patches/use_adm_group_in_journal.patch b/srcpkgs/systemd/patches/use_adm_group_in_journal.patch deleted file mode 100644 index 007cfdb3c8..0000000000 --- a/srcpkgs/systemd/patches/use_adm_group_in_journal.patch +++ /dev/null @@ -1,38 +0,0 @@ -I prefer to use the "adm" group for now. - ---- src/journal/journalctl.c.orig 2013-03-08 14:14:13.671806583 +0100 -+++ src/journal/journalctl.c 2013-03-08 14:14:44.462969574 +0100 -@@ -881,16 +881,16 @@ static int verify(sd_journal *j) { - static int access_check(void) { - - #ifdef HAVE_ACL -- if (access("/var/log/journal", F_OK) < 0 && geteuid() != 0 && in_group("systemd-journal") <= 0) { -- log_error("Unprivileged users can't see messages unless persistent log storage is enabled. Users in the group 'systemd-journal' can always see messages."); -+ if (access("/var/log/journal", F_OK) < 0 && geteuid() != 0 && in_group("adm") <= 0) { -+ log_error("Unprivileged users can't see messages unless persistent log storage is enabled. Users in the group 'adm' can always see messages."); - return -EACCES; - } - -- if (!arg_quiet && geteuid() != 0 && in_group("systemd-journal") <= 0) -- log_warning("Showing user generated messages only. Users in the group 'systemd-journal' can see all messages. Pass -q to turn this notice off."); -+ if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0) -+ log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this notice off."); - #else -- if (geteuid() != 0 && in_group("systemd-journal") <= 0) { -- log_error("No access to messages. Only users in the group 'systemd-journal' can see messages."); -+ if (geteuid() != 0 && in_group("adm") <= 0) { -+ log_error("No access to messages. Only users in the group 'adm' can see messages."); - return -EACCES; - } - #endif ---- src/journal/journald-server.c.orig 2013-03-08 14:42:35.535110912 +0100 -+++ src/journal/journald-server.c 2013-03-08 14:42:43.846230680 +0100 -@@ -174,7 +174,7 @@ static uint64_t available_space(Server * - } - - static void server_read_file_gid(Server *s) { -- const char *g = "systemd-journal"; -+ const char *g = "adm"; - int r; - - assert(s); diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index e1fb27b98c..074f32b337 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,38 +1,45 @@ # Template file for 'systemd' pkgname=systemd -version=198 -revision=6 +version=199 +revision=1 +short_desc="A system and service manager for Linux" +maintainer="Juan RP " +homepage="http://www.freedesktop.org/wiki/Software/systemd" +license="LGPL-2.1, GPL-2, MIT" +distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" +checksum=8c4462a04f3ecf7f083782e5e0687913b1d33c6444bf20fa2f31df9222965fed + build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux --disable-tcpwrap --with-rootprefix=/usr --with-sysvinit-path= --with-sysvrcnd-path= --disable-audit --disable-static --disable-ima" -depends="dbus kbd libcap-progs libudev>=${version} systemd-libs>=${version}" + +depends="xbps-triggers>=0.64 dbus kbd libcap-progs + libudev>=${version} systemd-libs>=${version}" + hostmakedepends="which pkg-config intltool gperf libxslt docbook-xsl" -makedepends="acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel - cryptsetup-devel libblkid-devel glib-devel libgcrypt-devel python-devel - gobject-introspection" -short_desc="A system and service manager for Linux" -maintainer="Juan RP " -homepage="http://www.freedesktop.org/wiki/Software/systemd" -license="LGPL-2.1, GPL-2, MIT" -#distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" -distfiles="http://pkgs.fedoraproject.org/repo/pkgs/systemd/systemd-${version}.tar.xz/26a75e2a310f8c1c1ea9ec26ddb171c5/systemd-${version}.tar.xz" -checksum=444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf + +makedepends="acl-devel pam-devel dbus-devel libcap-devel libkmod-devel + liblzma-devel cryptsetup-devel libblkid-devel glib-devel libgcrypt-devel + python-devel gobject-introspection" + +# Create systemd-journal (gid 24) system group. +system_groups="systemd-journal:24" replaces="nss-myhostname>=0 systemd-analyze>0" subpackages="libgudev libgudev-devel systemd-python" conf_files=" -/etc/hostname -/etc/vconsole.conf -/etc/locale.conf -/etc/systemd/system.conf -/etc/systemd/user.conf -/etc/systemd/journald.conf -/etc/systemd/logind.conf -/etc/systemd/bootchart.conf -/etc/udev/udev.conf" + /etc/hostname + /etc/vconsole.conf + /etc/locale.conf + /etc/systemd/system.conf + /etc/systemd/user.conf + /etc/systemd/journald.conf + /etc/systemd/logind.conf + /etc/systemd/bootchart.conf + /etc/udev/udev.conf" if [ "$XBPS_CROSS_BUILD" ]; then # XXX add support to gudev, introspection and python.