diff --git a/srcpkgs/systemd/patches/use_adm_group_in_journal.patch b/srcpkgs/systemd/patches/use_adm_group_in_journal.patch new file mode 100644 index 0000000000..85fdc700c1 --- /dev/null +++ b/srcpkgs/systemd/patches/use_adm_group_in_journal.patch @@ -0,0 +1,27 @@ +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 diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index a7ad89c1ee..d9389515cc 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,7 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=198 -revision=2 +revision=3 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux --disable-tcpwrap --with-rootprefix=/usr