Date: Wednesday, May 20, 2020 @ 19:30:36 Author: eworm Revision: 387037
upgpkg: util-linux 2.35.2-1 new upstream release Modified: util-linux/trunk/PKGBUILD Deleted: util-linux/trunk/0001-stable.patch -------------------+ 0001-stable.patch | 164 ---------------------------------------------------- PKGBUILD | 14 ---- 2 files changed, 3 insertions(+), 175 deletions(-) Deleted: 0001-stable.patch =================================================================== --- 0001-stable.patch 2020-05-20 19:29:50 UTC (rev 387036) +++ 0001-stable.patch 2020-05-20 19:30:36 UTC (rev 387037) @@ -1,164 +0,0 @@ -From 00e53f17c8462cb34ece08cc10db60a7da29a305 Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -Date: Tue, 4 Feb 2020 15:11:19 +0100 -Subject: [PATCH 1/2] libfdisk: (script) accept sector-size, ignore unknown - headers - -- add sector-size between supported headers (already in --dump output) - -- report unknown headers by -ENOTSUP - -- ignore ENOTSUP in sfdisk (but print warning) and in fdisk_script_read_file() - -Addresses: https://github.com/karelzak/util-linux/issues/949 -Signed-off-by: Karel Zak <[email protected]> ---- - disk-utils/sfdisk.c | 6 +++++- - libfdisk/src/script.c | 49 +++++++++++++++++++++++-------------------- - 2 files changed, 31 insertions(+), 24 deletions(-) - -diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c -index bb6e1c6df..c0bea7046 100644 ---- a/disk-utils/sfdisk.c -+++ b/disk-utils/sfdisk.c -@@ -1782,7 +1782,11 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) - } - - rc = fdisk_script_read_line(dp, stdin, buf, sizeof(buf)); -- if (rc < 0) { -+ if (rc == -ENOTSUP) { -+ buf[sizeof(buf) - 1] = '\0'; -+ fdisk_warnx(sf->cxt, _("Unknown script header '%s' -- ignore."), buf); -+ continue; -+ } else if (rc < 0) { - DBG(PARSE, ul_debug("script parsing failed, trying sfdisk specific commands")); - buf[sizeof(buf) - 1] = '\0'; - rc = loop_control_commands(sf, dp, buf); -diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c -index a21771b6a..d3e67fa9c 100644 ---- a/libfdisk/src/script.c -+++ b/libfdisk/src/script.c -@@ -805,8 +805,12 @@ static inline int is_header_line(const char *s) - /* parses "<name>: value", note modifies @s*/ - static int parse_line_header(struct fdisk_script *dp, char *s) - { -- int rc = -EINVAL; -+ size_t i; - char *name, *value; -+ static const char *supported[] = { -+ "label", "unit", "label-id", "device", "grain", -+ "first-lba", "last-lba", "table-length", "sector-size" -+ }; - - DBG(SCRIPT, ul_debugobj(dp, " parse header '%s'", s)); - -@@ -816,7 +820,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s) - name = s; - value = strchr(s, ':'); - if (!value) -- goto done; -+ return -EINVAL; - *value = '\0'; - value++; - -@@ -825,32 +829,30 @@ static int parse_line_header(struct fdisk_script *dp, char *s) - ltrim_whitespace((unsigned char *) value); - rtrim_whitespace((unsigned char *) value); - -+ if (!*name || !*value) -+ return -EINVAL; -+ -+ /* check header name */ -+ for (i = 0; i < ARRAY_SIZE(supported); i++) { -+ if (strcmp(name, supported[i]) == 0) -+ break; -+ } -+ if (i == ARRAY_SIZE(supported)) -+ return -ENOTSUP; -+ -+ /* header specific actions */ - if (strcmp(name, "label") == 0) { - if (dp->cxt && !fdisk_get_label(dp->cxt, value)) -- goto done; /* unknown label name */ -+ return -EINVAL; /* unknown label name */ - dp->force_label = 1; -+ - } else if (strcmp(name, "unit") == 0) { - if (strcmp(value, "sectors") != 0) -- goto done; /* only "sectors" supported */ -- } else if (strcmp(name, "label-id") == 0 -- || strcmp(name, "device") == 0 -- || strcmp(name, "grain") == 0 -- || strcmp(name, "first-lba") == 0 -- || strcmp(name, "last-lba") == 0 -- || strcmp(name, "table-length") == 0) { -- ; /* whatever is possible */ -- } else -- goto done; /* unknown header */ -+ return -EINVAL; /* only "sectors" supported */ - -- if (*name && *value) -- rc = fdisk_script_set_header(dp, name, value); --done: -- if (rc) -- DBG(SCRIPT, ul_debugobj(dp, "header parse error: " -- "[rc=%d, name='%s', value='%s']", -- rc, name, value)); -- return rc; -+ } - -+ return fdisk_script_set_header(dp, name, value); - } - - /* returns zero terminated string with next token and @str is updated */ -@@ -1363,7 +1365,8 @@ int fdisk_script_set_fgets(struct fdisk_script *dp, - * - * Reads next line into dump. - * -- * Returns: 0 on success, <0 on error, 1 when nothing to read. -+ * Returns: 0 on success, <0 on error, 1 when nothing to read. For unknown headers -+ * returns -ENOTSUP, it's usually safe to ignore this error. - */ - int fdisk_script_read_line(struct fdisk_script *dp, FILE *f, char *buf, size_t bufsz) - { -@@ -1428,7 +1431,7 @@ int fdisk_script_read_file(struct fdisk_script *dp, FILE *f) - - while (!feof(f)) { - rc = fdisk_script_read_line(dp, f, buf, sizeof(buf)); -- if (rc) -+ if (rc && rc != -ENOTSUP) - break; - } - - -From 61b384b36105fe682ddf16b9379f446d935603bc Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -Date: Tue, 4 Feb 2020 16:17:42 +0100 -Subject: [PATCH 2/2] fstrim: do not use Protect setting in systemd service - -The ProtectHome= and ProtectSystem= settings mounts all stuff for the service in read-only mode. - -The fstrim ioctl operates on read-only mountpoint file descriptor, but -on some read-only filesystem the operation can fail, so since -2d22ac64e4 we check for read-only volumes and skip it. - -References: Upstream: http://github.com/karelzak/util-linux/commit/2d22ac64e4d6e6732640f38b7232b5bcdc84a877 -Addresses: https://github.com/karelzak/util-linux/issues/948 -Signed-off-by: Karel Zak <[email protected]> ---- - sys-utils/fstrim.service.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/sys-utils/fstrim.service.in b/sys-utils/fstrim.service.in -index a8b631730..b58728ef4 100644 ---- a/sys-utils/fstrim.service.in -+++ b/sys-utils/fstrim.service.in -@@ -6,8 +6,6 @@ ConditionVirtualization=!container - [Service] - Type=oneshot - ExecStart=@sbindir@/fstrim --fstab --verbose --quiet --ProtectSystem=strict --ProtectHome=read-only - PrivateDevices=no - PrivateNetwork=yes - PrivateUsers=no Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-20 19:29:50 UTC (rev 387036) +++ PKGBUILD 2020-05-20 19:30:36 UTC (rev 387037) @@ -5,8 +5,8 @@ pkgbase=util-linux pkgname=(util-linux libutil-linux) _pkgmajor=2.35 -pkgver=${_pkgmajor}.1 -pkgrel=2 +pkgver=${_pkgmajor}.2 +pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url='https://github.com/karelzak/util-linux' arch=('x86_64') @@ -15,15 +15,13 @@ options=('strip') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign} - '0001-stable.patch' pam-{login,common,runuser,su} 'util-linux.sysusers' '60-rfkill.rules' 'rfkill-unblock_.service' 'rfkill-block_.service') -sha256sums=('d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9' +sha256sums=('21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a' 'SKIP' - '6a09a002150a4a393bb4c051efafc15b3b531829f4599b4fc5230c412db45311' '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935' @@ -33,12 +31,6 @@ '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376' 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36') -prepare() { - cd "$pkgbase-$pkgver" - - patch -Np1 < ../0001-stable.patch -} - build() { cd "$pkgbase-$pkgver"
