Date: Wednesday, March 20, 2013 @ 16:13:08 Author: dreisner Revision: 180329
add upstream backports for various bugs Added: systemd/trunk/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch systemd/trunk/0001-rules-move-builtin-calls-before-the-permissions-sect.patch systemd/trunk/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch Modified: systemd/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch | 25 ++++ 0001-rules-move-builtin-calls-before-the-permissions-sect.patch | 52 ++++++++++ 0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch | 25 ++++ PKGBUILD | 18 ++- 4 files changed, 117 insertions(+), 3 deletions(-) Added: 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch =================================================================== --- 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch (rev 0) +++ 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch 2013-03-20 15:13:08 UTC (rev 180329) @@ -0,0 +1,25 @@ +From 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <k...@vrfy.org> +Date: Sat, 16 Mar 2013 16:10:22 +0100 +Subject: [PATCH] journal: pass the *pid* to sd_pid_get_owner_uid() + +--- + src/journal/journald-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index ac565c7..364ab0f 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -593,7 +593,7 @@ static void dispatch_message_real( + IOVEC_SET_STRING(iovec[n++], session); + } + +- if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) { ++ if (sd_pid_get_owner_uid(ucred->pid, &owner) >= 0) { + owner_valid = true; + if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0) + IOVEC_SET_STRING(iovec[n++], owner_uid); +-- +1.8.2 + Added: 0001-rules-move-builtin-calls-before-the-permissions-sect.patch =================================================================== --- 0001-rules-move-builtin-calls-before-the-permissions-sect.patch (rev 0) +++ 0001-rules-move-builtin-calls-before-the-permissions-sect.patch 2013-03-20 15:13:08 UTC (rev 180329) @@ -0,0 +1,52 @@ +From bbb7f2ae5035105575365750592caa87213d7072 Mon Sep 17 00:00:00 2001 +From: Kay Sievers <k...@vrfy.org> +Date: Wed, 20 Mar 2013 01:26:17 +0100 +Subject: [PATCH] rules: move builtin calls before the permissions section + +<heftig> kay: systemd commit 22582bb broke cups usb printing for me +<heftig> because the "lp" group isn't applied anymore +<heftig> SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" +<heftig> moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id +--- + rules/50-udev-default.rules | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules +index 9d17cf7..1790652 100644 +--- a/rules/50-udev-default.rules ++++ b/rules/50-udev-default.rules +@@ -1,5 +1,12 @@ + # do not edit this file, it will be overwritten on update + ++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc" ++SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" ++ ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" ++SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" ++ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" ++ + ACTION!="add", GOTO="default_permissions_end" + + SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" +@@ -8,6 +15,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" + KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" + ++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644" ++ + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + + SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" +@@ -59,9 +68,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" + KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" + + LABEL="default_permissions_end" +-SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc" +-SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}" +- +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb" +-SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id" +-ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" +-- +1.8.2 + Added: 0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch =================================================================== --- 0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch (rev 0) +++ 0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch 2013-03-20 15:13:08 UTC (rev 180329) @@ -0,0 +1,25 @@ +From 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lenn...@poettering.net> +Date: Fri, 15 Mar 2013 16:41:13 +0100 +Subject: [PATCH] strv: fix STRV_FOREACH_PAIR macro definition + +--- + src/shared/strv.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/strv.h b/src/shared/strv.h +index da9fae6..49058f8 100644 +--- a/src/shared/strv.h ++++ b/src/shared/strv.h +@@ -77,7 +77,7 @@ bool strv_overlap(char **a, char **b); + for (; (l) && ((s) >= (l)); (s)--) + + #define STRV_FOREACH_PAIR(x, y, l) \ +- for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2) ++ for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1)) + + + char **strv_sort(char **l); +-- +1.8.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-20 15:10:14 UTC (rev 180328) +++ PKGBUILD 2013-03-20 15:13:08 UTC (rev 180329) @@ -16,11 +16,17 @@ 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' + '0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch' + '0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch' + '0001-rules-move-builtin-calls-before-the-permissions-sect.patch' 'use-split-usr-path.patch') md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' + 'c93785560cd33e25013224ac84689aa3' + '80db2672a49667a3add02fb07dee9dca' + '8d45beb923b06d52cc5dc2be65df6d7f' '76bf83fe34c5b40533abc5dc940576a6') build() { @@ -29,6 +35,15 @@ # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # upstream commit 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 + patch -Np1 <"$srcdir"/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch + + # upstream commit 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb + patch -Np1 <"$srcdir"/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch + + # upstream commit bbb7f2ae5035105575365750592caa87213d7072 + patch -Np1 <"$srcdir"/0001-rules-move-builtin-calls-before-the-permissions-sect.patch + ./configure \ --enable-static \ --libexecdir=/usr/lib \ @@ -112,9 +127,6 @@ 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 - - # create /var/log/journal. users can control the actual log destination via journald.conf - install -dm755 "$pkgdir/var/log/journal" } package_systemd-sysvcompat() {