diff options
author | Nicolas Iooss | 2017-02-04 09:44:41 +0100 |
---|---|---|
committer | Nicolas Iooss | 2017-02-04 09:44:41 +0100 |
commit | d32d22e63f671db121d83481016ba746b9404c2d (patch) | |
tree | 4dd79e7096962c34044601a22629e825d6331571 | |
parent | 5d798e0dca45854034f49d6202f480e3e47d7a8f (diff) | |
download | aur-d32d22e63f671db121d83481016ba746b9404c2d.tar.gz |
util-linux-selinux 2.29.1-1 update
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | 0001-chrt-default-to-SCHED_RR-policy.patch | 39 | ||||
-rw-r--r-- | 0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch | 79 | ||||
-rw-r--r-- | 0001-sfdisk-cleanup-dump-error-messages.patch | 44 | ||||
-rw-r--r-- | 0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch | 70 | ||||
-rw-r--r-- | PKGBUILD | 23 |
6 files changed, 14 insertions, 267 deletions
@@ -1,7 +1,7 @@ pkgbase = util-linux-selinux pkgdesc = SELinux aware miscellaneous system utilities for Linux - pkgver = 2.29 - pkgrel = 2 + pkgver = 2.29.1 + pkgrel = 1 url = https://www.kernel.org/pub/linux/utils/util-linux/ arch = i686 arch = x86_64 @@ -12,27 +12,19 @@ pkgbase = util-linux-selinux makedepends = libselinux options = strip options = debug - source = https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-2.29.tar.xz - source = https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-2.29.tar.sign + source = https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-2.29.1.tar.xz + source = https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-2.29.1.tar.sign source = pam-login source = pam-common source = pam-su - source = 0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch - source = 0001-sfdisk-cleanup-dump-error-messages.patch source = 0001-sfdisk-support-empty-label-use-case.patch - source = 0001-chrt-default-to-SCHED_RR-policy.patch - source = 0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284 - md5sums = 07b6845f48a421ad5844aa9d58edb837 + md5sums = 0cbb6d16ab9c5736e5649ef1264bee6e md5sums = SKIP md5sums = 4368b3f98abd8a32662e094c54e7f9b1 md5sums = a31374fef2cba0ca34dfc7078e2969e4 md5sums = fa85e5cce5d723275b14365ba71a8aad - md5sums = 3fce7192ce1b3d97fdffd0226ed63a90 - md5sums = 2f3c061865360170cacda948035fd02d md5sums = 6d2e3915124938577f0ff18ef701c87f - md5sums = 168c1cb2cfe7d4eddfc6e3f3b19d3ced - md5sums = 68c2076a9a09564ba0c9776540a175fa pkgname = util-linux-selinux depends = pam-selinux @@ -41,11 +33,11 @@ pkgname = util-linux-selinux depends = libsystemd-selinux depends = libutil-linux-selinux optdepends = python: python bindings to libmount - provides = util-linux-ng=2.29 + provides = util-linux-ng=2.29.1 provides = eject provides = zramctl - provides = util-linux=2.29-2 - provides = selinux-util-linux=2.29-2 + provides = util-linux=2.29.1-1 + provides = selinux-util-linux=2.29.1-1 conflicts = util-linux-ng conflicts = eject conflicts = zramctl @@ -65,6 +57,6 @@ pkgname = libutil-linux-selinux provides = libmount.so provides = libsmartcols.so provides = libuuid.so - provides = libutil-linux=2.29-2 + provides = libutil-linux=2.29.1-1 conflicts = libutil-linux diff --git a/0001-chrt-default-to-SCHED_RR-policy.patch b/0001-chrt-default-to-SCHED_RR-policy.patch deleted file mode 100644 index c4421495503f..000000000000 --- a/0001-chrt-default-to-SCHED_RR-policy.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c7adc2f204f19167f781fa2ee739e0ca386fc4f5 Mon Sep 17 00:00:00 2001 -From: Andreas Henriksson <andreas@fatal.se> -Date: Fri, 2 Dec 2016 15:10:18 +0100 -Subject: [PATCH] chrt: default to SCHED_RR policy - -This fixes a regression introduced in: - -commit 7a4ea5664edba98bff28adec3a9c3cfb5763a495 -"chrt: add control struct" - -Previously (and as documented in the manpage) the default policy -was SCHED_RR. Now it's implicitly SCHED_OTHER (0) as the value -is not initialized explicitly anymore. - -Test-command: chrt 90 echo hello - -Reported-by: Patrick Pelissier <patrick.pelissier@gmail.com> -Addresses: http://bugs.debian.org/846572 -Signed-off-by: Andreas Henriksson <andreas@fatal.se> ---- - schedutils/chrt.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/schedutils/chrt.c b/schedutils/chrt.c -index a861d9f..73d1ffa 100644 ---- a/schedutils/chrt.c -+++ b/schedutils/chrt.c -@@ -409,7 +409,7 @@ static void set_sched(struct chrt_ctl *ctl) - - int main(int argc, char **argv) - { -- struct chrt_ctl _ctl = { .pid = -1 }, *ctl = &_ctl; -+ struct chrt_ctl _ctl = { .pid = -1, .policy = SCHED_RR }, *ctl = &_ctl; - int c; - - static const struct option longopts[] = { --- -2.10.2 - diff --git a/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch b/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch deleted file mode 100644 index b13f189b135f..000000000000 --- a/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3fcbd7978980dc1a29c626b701333e27599e506d Mon Sep 17 00:00:00 2001 -From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> -Date: Wed, 23 Nov 2016 14:13:34 +0900 -Subject: [PATCH] lsns: Fix parser for /proc/<pid>/stat which is including - space in comm - -For example, child process of spamd has - - 32031 (spamd child) S 32026 32026 32026 0 -1 4210752 338 0 0 0 ... - -fscanf("%d %*s %c %d*[^\n]") in read_process() can't parse above as we -expected, because %s only skips non-whitespace. I.e. it parses like -following, - - 32031 (spamd child) S 32026 32026 32026 0 -1 4210752 338 0 0 0 ... - +---+ +----+ + - %d %*s %c - -and returns 2 (pid=32031, state=c). - -This fixes it by skipping task->comm part manually. - -Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> ---- - sys-utils/lsns.c | 30 ++++++++++++++++++++++++++---- - 1 file changed, 26 insertions(+), 4 deletions(-) - -diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c -index e4fd208..809737c 100644 ---- a/sys-utils/lsns.c -+++ b/sys-utils/lsns.c -@@ -217,6 +217,30 @@ static int get_ns_ino(int dir, const char *nsname, ino_t *ino) - return 0; - } - -+static int parse_proc_stat(FILE *fp, pid_t *pid, char *state, pid_t *ppid) -+{ -+ char *line = NULL, *p; -+ size_t len = 0; -+ int rc; -+ -+ if (getline(&line, &len, fp) < 0) { -+ rc = -errno; -+ goto error; -+ } -+ -+ p = strrchr(line, ')'); -+ if (p == NULL || -+ sscanf(line, "%d (", pid) != 1 || -+ sscanf(p, ") %c %d*[^\n]", state, ppid) != 2) { -+ rc = -EINVAL; -+ goto error; -+ } -+ rc = 0; -+ -+error: -+ free(line); -+ return rc; -+} - - static int read_process(struct lsns *ls, pid_t pid) - { -@@ -255,11 +279,9 @@ static int read_process(struct lsns *ls, pid_t pid) - rc = -errno; - goto done; - } -- rc = fscanf(f, "%d %*s %c %d*[^\n]", &p->pid, &p->state, &p->ppid); -- if (rc != 3) { -- rc = rc < 0 ? -errno : -EINVAL; -+ rc = parse_proc_stat(f, &p->pid, &p->state, &p->ppid); -+ if (rc < 0) - goto done; -- } - rc = 0; - - for (i = 0; i < ARRAY_SIZE(p->ns_ids); i++) { --- -2.10.2 - diff --git a/0001-sfdisk-cleanup-dump-error-messages.patch b/0001-sfdisk-cleanup-dump-error-messages.patch deleted file mode 100644 index 918138c4fb28..000000000000 --- a/0001-sfdisk-cleanup-dump-error-messages.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c49b765a6e9031642e2bb846e93dddc6827e4b28 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 30 Nov 2016 10:53:56 +0100 -Subject: [PATCH] sfdisk: cleanup --dump error messages - -old: - # truncate -s 1G empty && ./sfdisk --dump empty - sfdisk: failed to dump partition table: Success - -new: - # truncate -s 1G empty && ./sfdisk --dump empty - sfdisk: empty: does not contain a recognized partition table. - -Addresses: https://github.com/karelzak/util-linux/issues/375 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - disk-utils/sfdisk.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c -index 0f69d65..10307ad 100644 ---- a/disk-utils/sfdisk.c -+++ b/disk-utils/sfdisk.c -@@ -950,13 +950,16 @@ static int command_dump(struct sfdisk *sf, int argc, char **argv) - if (rc) - err(EXIT_FAILURE, _("cannot open %s"), devname); - -+ if (!fdisk_has_label(sf->cxt)) -+ errx(EXIT_FAILURE, _("%s: does not contain a recognized partition table"), devname); -+ - dp = fdisk_new_script(sf->cxt); - if (!dp) - err(EXIT_FAILURE, _("failed to allocate dump struct")); - - rc = fdisk_script_read_context(dp, NULL); - if (rc) -- err(EXIT_FAILURE, _("failed to dump partition table")); -+ errx(EXIT_FAILURE, _("%s: failed to dump partition table"), devname); - - if (sf->json) - fdisk_script_enable_json(dp, 1); --- -2.10.2 - diff --git a/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch b/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch deleted file mode 100644 index 4b088bb6f3f6..000000000000 --- a/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch +++ /dev/null @@ -1,70 +0,0 @@ -From fed304837f60b626f6198663990e76e506f89063 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 29 Nov 2016 15:58:18 +0100 -Subject: [PATCH] sfdisk: don't be silent when list non-existing device - -Addresses: https://github.com/karelzak/util-linux/issues/376 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - disk-utils/sfdisk.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c -index 52f2a6d..0f69d65 100644 ---- a/disk-utils/sfdisk.c -+++ b/disk-utils/sfdisk.c -@@ -560,6 +560,7 @@ static int write_changes(struct sfdisk *sf) - */ - static int command_list_partitions(struct sfdisk *sf, int argc, char **argv) - { -+ int fail = 0; - fdisk_enable_listonly(sf->cxt, 1); - - if (argc) { -@@ -568,13 +569,14 @@ static int command_list_partitions(struct sfdisk *sf, int argc, char **argv) - for (i = 0; i < argc; i++) { - if (ct) - fputs("\n\n", stdout); -- if (print_device_pt(sf->cxt, argv[i], 0, sf->verify) == 0) -- ct++; -+ if (print_device_pt(sf->cxt, argv[i], 1, sf->verify) != 0) -+ fail++; -+ ct++; - } - } else - print_all_devices_pt(sf->cxt, sf->verify); - -- return 0; -+ return fail; - } - - /* -@@ -582,6 +584,7 @@ static int command_list_partitions(struct sfdisk *sf, int argc, char **argv) - */ - static int command_list_freespace(struct sfdisk *sf, int argc, char **argv) - { -+ int fail = 0; - fdisk_enable_listonly(sf->cxt, 1); - - if (argc) { -@@ -590,13 +593,14 @@ static int command_list_freespace(struct sfdisk *sf, int argc, char **argv) - for (i = 0; i < argc; i++) { - if (ct) - fputs("\n\n", stdout); -- if (print_device_freespace(sf->cxt, argv[i], 0) == 0) -- ct++; -+ if (print_device_freespace(sf->cxt, argv[i], 1) != 0) -+ fail++; -+ ct++; - } - } else - print_all_devices_freespace(sf->cxt); - -- return 0; -+ return fail; - } - - /* --- -2.10.2 - @@ -9,8 +9,8 @@ pkgbase=util-linux-selinux pkgname=(util-linux-selinux libutil-linux-selinux) _pkgmajor=2.29 -pkgver=${_pkgmajor} -pkgrel=2 +pkgver=${_pkgmajor}.1 +pkgrel=1 pkgdesc="SELinux aware miscellaneous system utilities for Linux" url="https://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -26,30 +26,18 @@ options=('strip' 'debug') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${pkgbase/-selinux}-$pkgver.tar."{xz,sign} pam-{login,common,su} - '0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch' - '0001-sfdisk-cleanup-dump-error-messages.patch' - '0001-sfdisk-support-empty-label-use-case.patch' - '0001-chrt-default-to-SCHED_RR-policy.patch' - '0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch') -md5sums=('07b6845f48a421ad5844aa9d58edb837' + '0001-sfdisk-support-empty-label-use-case.patch') +md5sums=('0cbb6d16ab9c5736e5649ef1264bee6e' 'SKIP' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' 'fa85e5cce5d723275b14365ba71a8aad' - '3fce7192ce1b3d97fdffd0226ed63a90' - '2f3c061865360170cacda948035fd02d' - '6d2e3915124938577f0ff18ef701c87f' - '168c1cb2cfe7d4eddfc6e3f3b19d3ced' - '68c2076a9a09564ba0c9776540a175fa') + '6d2e3915124938577f0ff18ef701c87f') prepare() { cd "${pkgbase/-selinux}-$pkgver" - patch -Np1 <../0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch - patch -Np1 <../0001-sfdisk-cleanup-dump-error-messages.patch patch -Np1 <../0001-sfdisk-support-empty-label-use-case.patch - patch -Np1 <../0001-chrt-default-to-SCHED_RR-policy.patch - patch -Np1 <../0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch } build() { @@ -66,7 +54,6 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ - --disable-tailf \ --with-selinux \ --with-python=3 |