From 5abba8ccfedfb13f07a34eb4b6afbe4f30a8f767 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Apr 2013 00:54:45 -0700 Subject: Sun Apr 7 00:54:38 PDT 2013 --- core/psmisc/PKGBUILD | 6 +-- core/systemd/0001-Fix-vacuum-logic-error.patch | 40 --------------- ...rnal-pass-the-pid-to-sd_pid_get_owner_uid.patch | 25 ---------- ...builtin-calls-before-the-permissions-sect.patch | 57 ---------------------- ...rv-fix-STRV_FOREACH_PAIR-macro-definition.patch | 25 ---------- core/systemd/PKGBUILD | 36 +++----------- 6 files changed, 11 insertions(+), 178 deletions(-) delete mode 100644 core/systemd/0001-Fix-vacuum-logic-error.patch delete mode 100644 core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch delete mode 100644 core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch delete mode 100644 core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch (limited to 'core') diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index 28e7909ec..97b1a5d3b 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162759 2012-06-29 18:27:42Z eric $ +# $Id: PKGBUILD 182101 2013-04-06 21:59:09Z eric $ # Maintainer: Eric Bélanger pkgname=psmisc -pkgver=22.19 +pkgver=22.20 pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') groups=('base') depends=('ncurses') source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410') +sha1sums=('abdddc8d5c91251bba0f3190956ae9d05c058745') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/systemd/0001-Fix-vacuum-logic-error.patch b/core/systemd/0001-Fix-vacuum-logic-error.patch deleted file mode 100644 index a0a6e85ee..000000000 --- a/core/systemd/0001-Fix-vacuum-logic-error.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6c142648aaced56ab681fcc97a71b06d588122a9 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Wed, 20 Mar 2013 21:32:05 +0100 -Subject: [PATCH] Fix vacuum logic error - -The vacuum code used to stop vacuuming after one deletion, even -when max_use was still exceeded. - -Also make usage a uint64_t, as the code already pretends it is one. - -Signed-off-by: Jan Alexander Steffens (heftig) ---- - src/journal/journal-vacuum.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c -index 731f6c7..4a3a5a9 100644 ---- a/src/journal/journal-vacuum.c -+++ b/src/journal/journal-vacuum.c -@@ -36,7 +36,7 @@ - #include "util.h" - - struct vacuum_info { -- off_t usage; -+ uint64_t usage; - char *filename; - - uint64_t realtime; -@@ -293,7 +293,7 @@ int journal_directory_vacuum( - if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) { - log_debug("Deleted archived journal %s/%s.", directory, list[i].filename); - -- if ((uint64_t) list[i].usage > sum) -+ if (list[i].usage < sum) - sum -= list[i].usage; - else - sum = 0; --- -1.8.2 - diff --git a/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch b/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch deleted file mode 100644 index cd2d70756..000000000 --- a/core/systemd/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -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 - diff --git a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch b/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch deleted file mode 100644 index 88dabe9d3..000000000 --- a/core/systemd/0001-rules-move-builtin-calls-before-the-permissions-sect.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 34b99a8bf7b769b31ad59ff0d60f8572bd0adab5 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Wed, 20 Mar 2013 01:26:17 +0100 -Subject: [PATCH] rules: move builtin calls before the permissions section - - kay: systemd commit 22582bb broke cups usb printing for me - because the "lp" group isn't applied anymore - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" - moving this line to the end of 50-udev-default.rules restores correct behavior, as it's after usb_id - -Conflicts: - rules/50-udev-default.rules ---- - rules/50-udev-default.rules | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - -diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules -index 5d8bde5..ce0a4ef 100644 ---- a/rules/50-udev-default.rules -+++ b/rules/50-udev-default.rules -@@ -1,5 +1,13 @@ - # 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" -+SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" -+ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" -+ - ACTION!="add", GOTO="default_permissions_end" - - SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" -@@ -8,6 +16,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,10 +69,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" --SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware" --ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}" --- -1.8.2 - diff --git a/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch b/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch deleted file mode 100644 index 6d8d9aad4..000000000 --- a/core/systemd/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 961e4526925b7b1e1d3582f2fc9fb38035e2b5fb Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -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 - diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 0e03a7707..3c77f53ed 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=198 -pkgrel=2 +pkgver=200 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,19 +16,11 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" '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' - '0001-Fix-vacuum-logic-error.patch' 'use-split-usr-path.patch') -md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5' +md5sums=('5584b96e55c46217dab4c1768d10a472' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' - 'c93785560cd33e25013224ac84689aa3' - '80db2672a49667a3add02fb07dee9dca' - 'a0d3aca35ff7f71d1a5a79022b715ae0' - '7ae8e22cef30e57de02ca623b0673f76' '76bf83fe34c5b40533abc5dc940576a6') build() { @@ -37,19 +29,6 @@ build() { # 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 - # - modified to avoid pulling in disabling of firmware loading - patch -Np1 <"$srcdir"/0001-rules-move-builtin-calls-before-the-permissions-sect.patch - - # upstream commit 6c142648aaced56ab681fcc97a71b06d588122a9 - patch -Np1 <"$srcdir"/0001-Fix-vacuum-logic-error.patch - ./configure \ --enable-static \ --libexecdir=/usr/lib \ @@ -60,14 +39,15 @@ build() { --disable-audit \ --disable-ima \ --with-sysvinit-path= \ - --with-sysvrcnd-path= + --with-sysvrcnd-path= \ + --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware" make } -check() { - make -C "$pkgname-$pkgver" check -} +#check() { +# make -C "$pkgname-$pkgver" check +#} package_systemd() { pkgdesc="system and service manager" -- cgit v1.2.3-54-g00ecf