[arch-commits] Commit in util-linux/repos (11 files)

2020-04-13 Thread Christian Hesse via arch-commits 
Date: Monday, April 13, 2020 @ 21:29:13
  Author: eworm
Revision: 380301

archrelease: copy trunk to testing-x86_64

Added:
  util-linux/repos/testing-x86_64/
  util-linux/repos/testing-x86_64/0001-stable.patch
(from rev 380300, util-linux/trunk/0001-stable.patch)
  util-linux/repos/testing-x86_64/60-rfkill.rules
(from rev 380300, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/testing-x86_64/PKGBUILD
(from rev 380300, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
(from rev 380300, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
(from rev 380300, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-runuser
(from rev 380300, util-linux/trunk/pam-runuser)
  util-linux/repos/testing-x86_64/pam-su
(from rev 380300, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/rfkill-block_.service
(from rev 380300, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/testing-x86_64/rfkill-unblock_.service
(from rev 380300, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/testing-x86_64/util-linux.sysusers
(from rev 380300, util-linux/trunk/util-linux.sysusers)

-+
 0001-stable.patch   |  164 ++
 60-rfkill.rules |1 
 PKGBUILD|  132 +
 pam-common  |6 +
 pam-login   |7 +
 pam-runuser |4 +
 pam-su  |9 ++
 rfkill-block_.service   |   10 ++
 rfkill-unblock_.service |   10 ++
 util-linux.sysusers |2 
 10 files changed, 345 insertions(+)

Copied: util-linux/repos/testing-x86_64/0001-stable.patch (from rev 380300, 
util-linux/trunk/0001-stable.patch)
===
--- testing-x86_64/0001-stable.patch(rev 0)
+++ testing-x86_64/0001-stable.patch2020-04-13 21:29:13 UTC (rev 380301)
@@ -0,0 +1,164 @@
+From 00e53f17c8462cb34ece08cc10db60a7da29a305 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+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 
+---
+ 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 ": 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;
++
++  /*

[arch-commits] Commit in util-linux/repos (11 files)

2019-11-22 Thread Dave Reisner via arch-commits 
Date: Saturday, November 23, 2019 @ 00:38:05
  Author: dreisner
Revision: 369619

archrelease: copy trunk to testing-x86_64

Added:
  util-linux/repos/testing-x86_64/
  
util-linux/repos/testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(from rev 369618, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
  util-linux/repos/testing-x86_64/60-rfkill.rules
(from rev 369618, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/testing-x86_64/PKGBUILD
(from rev 369618, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
(from rev 369618, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
(from rev 369618, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-runuser
(from rev 369618, util-linux/trunk/pam-runuser)
  util-linux/repos/testing-x86_64/pam-su
(from rev 369618, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/rfkill-block_.service
(from rev 369618, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/testing-x86_64/rfkill-unblock_.service
(from rev 369618, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/testing-x86_64/util-linux.sysusers
(from rev 369618, util-linux/trunk/util-linux.sysusers)

--+
 0001-lsblk-force-to-print-PKNAME-for-partition.patch |   31 +++
 60-rfkill.rules  |1 
 PKGBUILD |  132 +
 pam-common   |6 
 pam-login|7 
 pam-runuser  |4 
 pam-su   |9 +
 rfkill-block_.service|   10 +
 rfkill-unblock_.service  |   10 +
 util-linux.sysusers  |2 
 10 files changed, 212 insertions(+)

Copied: 
util-linux/repos/testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
 (from rev 369618, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
===
--- testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
(rev 0)
+++ testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
2019-11-23 00:38:05 UTC (rev 369619)
@@ -0,0 +1,31 @@
+From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 27 Jun 2019 09:22:18 +0200
+Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition
+
+PKNAME (parent kernel device name) is based on printed tree according
+to parent -> child relationship. The tree is optional and not printed
+if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
+versions print the PKNAME also in this case.
+
+Addresses: https://github.com/karelzak/util-linux/issues/813
+Signed-off-by: Karel Zak 
+Signed-off-by: Christian Hesse 
+---
+ misc-utils/lsblk.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index e95af7af0..3ce6da730 100644
+--- a/misc-utils/lsblk.c
 b/misc-utils/lsblk.c
+@@ -1019,6 +1019,9 @@ static void device_to_scols(
+   DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
+   ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s 
---> is open!", dev->name));
+ 
++  if (!parent && dev->wholedisk)
++  parent = dev->wholedisk;
++
+   /* Do not print device more than one in --list mode */
+   if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
+   return;

Copied: util-linux/repos/testing-x86_64/60-rfkill.rules (from rev 369618, 
util-linux/trunk/60-rfkill.rules)
===
--- testing-x86_64/60-rfkill.rules  (rev 0)
+++ testing-x86_64/60-rfkill.rules  2019-11-23 00:38:05 UTC (rev 369619)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 369618, 
util-linux/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-11-23 00:38:05 UTC (rev 369619)
@@ -0,0 +1,132 @@
+# Maintainer: Tom Gundersen 
+# Maintainer: Dave Reisner 
+# Contributor: judd 
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=8
+pkgdesc="Miscellaneous system utilities for Linux"
+url='https://github.com/karelzak/util-linux'
+arch=('x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
+license=('GPL2')
+options=('strip')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak

[arch-commits] Commit in util-linux/repos (11 files)

2019-11-13 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, November 13, 2019 @ 17:38:56
  Author: foutrelis
Revision: 368378

archrelease: copy trunk to staging-x86_64

Added:
  util-linux/repos/staging-x86_64/
  
util-linux/repos/staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(from rev 368377, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
  util-linux/repos/staging-x86_64/60-rfkill.rules
(from rev 368377, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/staging-x86_64/PKGBUILD
(from rev 368377, util-linux/trunk/PKGBUILD)
  util-linux/repos/staging-x86_64/pam-common
(from rev 368377, util-linux/trunk/pam-common)
  util-linux/repos/staging-x86_64/pam-login
(from rev 368377, util-linux/trunk/pam-login)
  util-linux/repos/staging-x86_64/pam-runuser
(from rev 368377, util-linux/trunk/pam-runuser)
  util-linux/repos/staging-x86_64/pam-su
(from rev 368377, util-linux/trunk/pam-su)
  util-linux/repos/staging-x86_64/rfkill-block_.service
(from rev 368377, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/staging-x86_64/rfkill-unblock_.service
(from rev 368377, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/staging-x86_64/util-linux.sysusers
(from rev 368377, util-linux/trunk/util-linux.sysusers)

--+
 0001-lsblk-force-to-print-PKNAME-for-partition.patch |   31 
 60-rfkill.rules  |1 
 PKGBUILD |  130 +
 pam-common   |6 
 pam-login|7 
 pam-runuser  |4 
 pam-su   |9 +
 rfkill-block_.service|   10 +
 rfkill-unblock_.service  |   10 +
 util-linux.sysusers  |2 
 10 files changed, 210 insertions(+)

Copied: 
util-linux/repos/staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
 (from rev 368377, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
===
--- staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
(rev 0)
+++ staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
2019-11-13 17:38:56 UTC (rev 368378)
@@ -0,0 +1,31 @@
+From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 27 Jun 2019 09:22:18 +0200
+Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition
+
+PKNAME (parent kernel device name) is based on printed tree according
+to parent -> child relationship. The tree is optional and not printed
+if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
+versions print the PKNAME also in this case.
+
+Addresses: https://github.com/karelzak/util-linux/issues/813
+Signed-off-by: Karel Zak 
+Signed-off-by: Christian Hesse 
+---
+ misc-utils/lsblk.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index e95af7af0..3ce6da730 100644
+--- a/misc-utils/lsblk.c
 b/misc-utils/lsblk.c
+@@ -1019,6 +1019,9 @@ static void device_to_scols(
+   DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
+   ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s 
---> is open!", dev->name));
+ 
++  if (!parent && dev->wholedisk)
++  parent = dev->wholedisk;
++
+   /* Do not print device more than one in --list mode */
+   if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
+   return;

Copied: util-linux/repos/staging-x86_64/60-rfkill.rules (from rev 368377, 
util-linux/trunk/60-rfkill.rules)
===
--- staging-x86_64/60-rfkill.rules  (rev 0)
+++ staging-x86_64/60-rfkill.rules  2019-11-13 17:38:56 UTC (rev 368378)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

Copied: util-linux/repos/staging-x86_64/PKGBUILD (from rev 368377, 
util-linux/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-11-13 17:38:56 UTC (rev 368378)
@@ -0,0 +1,130 @@
+# Maintainer: Tom Gundersen 
+# Maintainer: Dave Reisner 
+# Contributor: judd 
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=7
+pkgdesc="Miscellaneous system utilities for Linux"
+url='https://github.com/karelzak/util-linux'
+arch=('x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
+license=('GPL2')
+options=('strip')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak

[arch-commits] Commit in util-linux/repos (11 files)

2019-10-25 Thread Evangelos Foutras via arch-commits 
Date: Friday, October 25, 2019 @ 13:50:05
  Author: foutrelis
Revision: 365549

archrelease: copy trunk to staging-x86_64

Added:
  util-linux/repos/staging-x86_64/
  
util-linux/repos/staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(from rev 365548, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
  util-linux/repos/staging-x86_64/60-rfkill.rules
(from rev 365548, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/staging-x86_64/PKGBUILD
(from rev 365548, util-linux/trunk/PKGBUILD)
  util-linux/repos/staging-x86_64/pam-common
(from rev 365548, util-linux/trunk/pam-common)
  util-linux/repos/staging-x86_64/pam-login
(from rev 365548, util-linux/trunk/pam-login)
  util-linux/repos/staging-x86_64/pam-runuser
(from rev 365548, util-linux/trunk/pam-runuser)
  util-linux/repos/staging-x86_64/pam-su
(from rev 365548, util-linux/trunk/pam-su)
  util-linux/repos/staging-x86_64/rfkill-block_.service
(from rev 365548, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/staging-x86_64/rfkill-unblock_.service
(from rev 365548, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/staging-x86_64/util-linux.sysusers
(from rev 365548, util-linux/trunk/util-linux.sysusers)

--+
 0001-lsblk-force-to-print-PKNAME-for-partition.patch |   31 
 60-rfkill.rules  |1 
 PKGBUILD |  130 +
 pam-common   |6 
 pam-login|7 
 pam-runuser  |4 
 pam-su   |9 +
 rfkill-block_.service|   10 +
 rfkill-unblock_.service  |   10 +
 util-linux.sysusers  |2 
 10 files changed, 210 insertions(+)

Copied: 
util-linux/repos/staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
 (from rev 365548, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
===
--- staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
(rev 0)
+++ staging-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,31 @@
+From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 27 Jun 2019 09:22:18 +0200
+Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition
+
+PKNAME (parent kernel device name) is based on printed tree according
+to parent -> child relationship. The tree is optional and not printed
+if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
+versions print the PKNAME also in this case.
+
+Addresses: https://github.com/karelzak/util-linux/issues/813
+Signed-off-by: Karel Zak 
+Signed-off-by: Christian Hesse 
+---
+ misc-utils/lsblk.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index e95af7af0..3ce6da730 100644
+--- a/misc-utils/lsblk.c
 b/misc-utils/lsblk.c
+@@ -1019,6 +1019,9 @@ static void device_to_scols(
+   DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
+   ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s 
---> is open!", dev->name));
+ 
++  if (!parent && dev->wholedisk)
++  parent = dev->wholedisk;
++
+   /* Do not print device more than one in --list mode */
+   if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
+   return;

Copied: util-linux/repos/staging-x86_64/60-rfkill.rules (from rev 365548, 
util-linux/trunk/60-rfkill.rules)
===
--- staging-x86_64/60-rfkill.rules  (rev 0)
+++ staging-x86_64/60-rfkill.rules  2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

Copied: util-linux/repos/staging-x86_64/PKGBUILD (from rev 365548, 
util-linux/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-25 13:50:05 UTC (rev 365549)
@@ -0,0 +1,130 @@
+# Maintainer: Tom Gundersen 
+# Maintainer: Dave Reisner 
+# Contributor: judd 
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=4
+pkgdesc="Miscellaneous system utilities for Linux"
+url='https://github.com/karelzak/util-linux'
+arch=('x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
+license=('GPL2')
+options=('strip' 'debug')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak

[arch-commits] Commit in util-linux/repos (11 files)

2019-06-27 Thread Christian Hesse via arch-commits 
Date: Thursday, June 27, 2019 @ 10:10:17
  Author: eworm
Revision: 356954

archrelease: copy trunk to testing-x86_64

Added:
  util-linux/repos/testing-x86_64/
  
util-linux/repos/testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
(from rev 356953, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
  util-linux/repos/testing-x86_64/60-rfkill.rules
(from rev 356953, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/testing-x86_64/PKGBUILD
(from rev 356953, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
(from rev 356953, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
(from rev 356953, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-runuser
(from rev 356953, util-linux/trunk/pam-runuser)
  util-linux/repos/testing-x86_64/pam-su
(from rev 356953, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/rfkill-block_.service
(from rev 356953, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/testing-x86_64/rfkill-unblock_.service
(from rev 356953, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/testing-x86_64/util-linux.sysusers
(from rev 356953, util-linux/trunk/util-linux.sysusers)

--+
 0001-lsblk-force-to-print-PKNAME-for-partition.patch |   31 
 60-rfkill.rules  |1 
 PKGBUILD |  131 +
 pam-common   |6 
 pam-login|7 
 pam-runuser  |4 
 pam-su   |9 +
 rfkill-block_.service|   10 +
 rfkill-unblock_.service  |   10 +
 util-linux.sysusers  |2 
 10 files changed, 211 insertions(+)

Copied: 
util-linux/repos/testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch
 (from rev 356953, 
util-linux/trunk/0001-lsblk-force-to-print-PKNAME-for-partition.patch)
===
--- testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
(rev 0)
+++ testing-x86_64/0001-lsblk-force-to-print-PKNAME-for-partition.patch 
2019-06-27 10:10:17 UTC (rev 356954)
@@ -0,0 +1,31 @@
+From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 27 Jun 2019 09:22:18 +0200
+Subject: [PATCH 1/1] lsblk: force to print PKNAME for partition
+
+PKNAME (parent kernel device name) is based on printed tree according
+to parent -> child relationship. The tree is optional and not printed
+if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
+versions print the PKNAME also in this case.
+
+Addresses: https://github.com/karelzak/util-linux/issues/813
+Signed-off-by: Karel Zak 
+Signed-off-by: Christian Hesse 
+---
+ misc-utils/lsblk.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index e95af7af0..3ce6da730 100644
+--- a/misc-utils/lsblk.c
 b/misc-utils/lsblk.c
+@@ -1019,6 +1019,9 @@ static void device_to_scols(
+   DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
+   ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s 
---> is open!", dev->name));
+ 
++  if (!parent && dev->wholedisk)
++  parent = dev->wholedisk;
++
+   /* Do not print device more than one in --list mode */
+   if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
+   return;

Copied: util-linux/repos/testing-x86_64/60-rfkill.rules (from rev 356953, 
util-linux/trunk/60-rfkill.rules)
===
--- testing-x86_64/60-rfkill.rules  (rev 0)
+++ testing-x86_64/60-rfkill.rules  2019-06-27 10:10:17 UTC (rev 356954)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 356953, 
util-linux/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-06-27 10:10:17 UTC (rev 356954)
@@ -0,0 +1,131 @@
+# Maintainer: Tom Gundersen 
+# Maintainer: Dave Reisner 
+# Contributor: judd 
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.34
+pkgver=${_pkgmajor}
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url='https://github.com/karelzak/util-linux'
+arch=('x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
+license=('GPL2')
+options=('strip' 'debug')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak

[arch-commits] Commit in util-linux/repos (11 files)

2019-01-05 Thread Dave Reisner via arch-commits 
Date: Saturday, January 5, 2019 @ 15:24:28
  Author: dreisner
Revision: 343009

archrelease: copy trunk to testing-x86_64

Added:
  util-linux/repos/testing-x86_64/
  
util-linux/repos/testing-x86_64/0001-agetty-fix-output-of-escaped-characters.patch
(from rev 343008, 
util-linux/trunk/0001-agetty-fix-output-of-escaped-characters.patch)
  util-linux/repos/testing-x86_64/60-rfkill.rules
(from rev 343008, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/testing-x86_64/PKGBUILD
(from rev 343008, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
(from rev 343008, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
(from rev 343008, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-runuser
(from rev 343008, util-linux/trunk/pam-runuser)
  util-linux/repos/testing-x86_64/pam-su
(from rev 343008, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/rfkill-block_.service
(from rev 343008, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/testing-x86_64/rfkill-unblock_.service
(from rev 343008, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/testing-x86_64/util-linux.sysusers
(from rev 343008, util-linux/trunk/util-linux.sysusers)

+
 0001-agetty-fix-output-of-escaped-characters.patch |   23 +++
 60-rfkill.rules|1 
 PKGBUILD   |  125 +++
 pam-common |6 
 pam-login  |7 +
 pam-runuser|4 
 pam-su |9 +
 rfkill-block_.service  |   10 +
 rfkill-unblock_.service|   10 +
 util-linux.sysusers|2 
 10 files changed, 197 insertions(+)

Copied: 
util-linux/repos/testing-x86_64/0001-agetty-fix-output-of-escaped-characters.patch
 (from rev 343008, 
util-linux/trunk/0001-agetty-fix-output-of-escaped-characters.patch)
===
--- testing-x86_64/0001-agetty-fix-output-of-escaped-characters.patch   
(rev 0)
+++ testing-x86_64/0001-agetty-fix-output-of-escaped-characters.patch   
2019-01-05 15:24:28 UTC (rev 343009)
@@ -0,0 +1,23 @@
+From ecf19dcb2d623f9c5847b6d3b3a4b85751323aee Mon Sep 17 00:00:00 2001
+From: Christian Hesse 
+Date: Wed, 7 Nov 2018 13:54:32 +0100
+Subject: [PATCH 1/1] agetty: fix output of escaped characters
+
+Signed-off-by: Christian Hesse 
+---
+ term-utils/agetty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index 05a269abb..b9f08728e 100644
+--- a/term-utils/agetty.c
 b/term-utils/agetty.c
+@@ -2755,7 +2755,7 @@ static void output_special_char(struct issue *ie,
+   break;
+   }
+   default:
+-  putchar(c);
++  putc(c, ie->output);
+   break;
+   }
+ }

Copied: util-linux/repos/testing-x86_64/60-rfkill.rules (from rev 343008, 
util-linux/trunk/60-rfkill.rules)
===
--- testing-x86_64/60-rfkill.rules  (rev 0)
+++ testing-x86_64/60-rfkill.rules  2019-01-05 15:24:28 UTC (rev 343009)
@@ -0,0 +1 @@
+KERNEL=="rfkill", GROUP="rfkill", MODE="0664"

Copied: util-linux/repos/testing-x86_64/PKGBUILD (from rev 343008, 
util-linux/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-01-05 15:24:28 UTC (rev 343009)
@@ -0,0 +1,125 @@
+# Maintainer: Tom Gundersen 
+# Maintainer: Dave Reisner 
+# Contributor: judd 
+
+pkgbase=util-linux
+pkgname=(util-linux libutil-linux)
+_pkgmajor=2.33
+pkgver=${_pkgmajor}
+pkgrel=3
+pkgdesc="Miscellaneous system utilities for Linux"
+url="https://www.kernel.org/pub/linux/utils/util-linux/;
+arch=('x86_64')
+makedepends=('systemd' 'python' 'libcap-ng')
+license=('GPL2')
+options=('strip' 'debug')
+validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
+source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign}
+'0001-agetty-fix-output-of-escaped-characters.patch'
+pam-{login,common,runuser,su}
+'util-linux.sysusers'
+'60-rfkill.rules'
+'rfkill-unblock_.service'
+'rfkill-block_.service')
+sha256sums=('f261b9d73c35bfeeea04d26941ac47ee1df937bd3b0583e748217c1ea423658a'
+'SKIP'
+'a20ab3b78eed0e143300476d059e55ab87720bc9fc66a4dcbbd5ae8c48f39bf4'
+'993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
+

[arch-commits] Commit in util-linux/repos (11 files)

2018-06-30 Thread Felix Yan via arch-commits 
Date: Saturday, June 30, 2018 @ 15:42:25
  Author: felixonmars
Revision: 327844

archrelease: copy trunk to staging-x86_64

Added:
  util-linux/repos/staging-x86_64/
  util-linux/repos/staging-x86_64/0001-fstrim-cleanup-uncludes.patch
(from rev 327843, util-linux/trunk/0001-fstrim-cleanup-uncludes.patch)
  
util-linux/repos/staging-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
(from rev 327843, 
util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch)
  util-linux/repos/staging-x86_64/60-rfkill.rules
(from rev 327843, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/staging-x86_64/PKGBUILD
(from rev 327843, util-linux/trunk/PKGBUILD)
  util-linux/repos/staging-x86_64/pam-common
(from rev 327843, util-linux/trunk/pam-common)
  util-linux/repos/staging-x86_64/pam-login
(from rev 327843, util-linux/trunk/pam-login)
  util-linux/repos/staging-x86_64/pam-su
(from rev 327843, util-linux/trunk/pam-su)
  util-linux/repos/staging-x86_64/rfkill-block_.service
(from rev 327843, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/staging-x86_64/rfkill-unblock_.service
(from rev 327843, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/staging-x86_64/util-linux.sysusers
(from rev 327843, util-linux/trunk/util-linux.sysusers)

---+
 0001-fstrim-cleanup-uncludes.patch|   41 
 0002-libmount_include_sys_mount_h_only_if_necessary.patch |   54 +
 60-rfkill.rules   |1 
 PKGBUILD  |  121 
 pam-common|6 
 pam-login |7 
 pam-su|9 
 rfkill-block_.service |   10 
 rfkill-unblock_.service   |   10 
 util-linux.sysusers   |2 
 10 files changed, 261 insertions(+)

Copied: util-linux/repos/staging-x86_64/0001-fstrim-cleanup-uncludes.patch 
(from rev 327843, util-linux/trunk/0001-fstrim-cleanup-uncludes.patch)
===
--- staging-x86_64/0001-fstrim-cleanup-uncludes.patch   
(rev 0)
+++ staging-x86_64/0001-fstrim-cleanup-uncludes.patch   2018-06-30 15:42:25 UTC 
(rev 327844)
@@ -0,0 +1,41 @@
+From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 22 Mar 2018 13:17:10 +0100
+Subject: fstrim: cleanup includes
+
+* HAVE_SYS_FS_H is incorrect (should be HAVE_LINUX_FS_H)
+
+* linux/fs.h cannot be included together with sys/mount.h as the both
+  files define MS_* constants. The libmount.h includes sys/mount.h now.
+
+Signed-off-by: Karel Zak 
+---
+ sys-utils/fstrim.c | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
+index ca8cf256d..53ac594c0 100644
+--- a/sys-utils/fstrim.c
 b/sys-utils/fstrim.c
+@@ -36,10 +36,6 @@
+ #include 
+ #include 
+ 
+-#ifdef HAVE_SYS_FS_H
+-# include 
+-#endif
+-
+ #include "nls.h"
+ #include "strutils.h"
+ #include "c.h"
+@@ -49,6 +45,10 @@
+ 
+ #include 
+ 
++
++/* We cannot include linux/fs.h due to MS_* constants collision with
++ * sys/mount.h (and libmount.h)
++ */
+ #ifndef FITRIM
+ struct fstrim_range {
+   uint64_t start;

Copied: 
util-linux/repos/staging-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
 (from rev 327843, 
util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch)
===
--- staging-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
(rev 0)
+++ staging-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
2018-06-30 15:42:25 UTC (rev 327844)
@@ -0,0 +1,54 @@
+From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 22 Mar 2018 14:05:17 +0100
+Subject: libmount: include sys/mount.h only if necessary
+
+Addresses: https://github.com/systemd/systemd/issues/8507
+Signed-off-by: Karel Zak 
+---
+ libmount/src/libmount.h.in | 9 -
+ sys-utils/fstrim.c | 4 +---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
+index 8f323fcbf..11fd759fa 100644
+--- a/libmount/src/libmount.h.in
 b/libmount/src/libmount.h.in
+@@ -28,7 +28,14 @@ extern "C" {
+ #include 
+ #include 
+ #include 
+-#include 
++
++/* Make sure libc MS_* definitions are used by default. Note that MS_* flags
++ * may be already defined by linux/fs.h or another file -- in this case we
++ * don't want to include sys/mount.h at all to avoid collisions.
++ */
++#ifndef MS_RDONLY
++# include 
++#endif

[arch-commits] Commit in util-linux/repos (11 files)

2018-04-10 Thread Christian Hesse via arch-commits 
Date: Tuesday, April 10, 2018 @ 13:45:40
  Author: eworm
Revision: 321468

archrelease: copy trunk to testing-x86_64

Added:
  util-linux/repos/testing-x86_64/
  util-linux/repos/testing-x86_64/0001-fstrim-cleanup-uncludes.patch
(from rev 321467, util-linux/trunk/0001-fstrim-cleanup-uncludes.patch)
  
util-linux/repos/testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
(from rev 321467, 
util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch)
  util-linux/repos/testing-x86_64/60-rfkill.rules
(from rev 321467, util-linux/trunk/60-rfkill.rules)
  util-linux/repos/testing-x86_64/PKGBUILD
(from rev 321467, util-linux/trunk/PKGBUILD)
  util-linux/repos/testing-x86_64/pam-common
(from rev 321467, util-linux/trunk/pam-common)
  util-linux/repos/testing-x86_64/pam-login
(from rev 321467, util-linux/trunk/pam-login)
  util-linux/repos/testing-x86_64/pam-su
(from rev 321467, util-linux/trunk/pam-su)
  util-linux/repos/testing-x86_64/rfkill-block_.service
(from rev 321467, util-linux/trunk/rfkill-block_.service)
  util-linux/repos/testing-x86_64/rfkill-unblock_.service
(from rev 321467, util-linux/trunk/rfkill-unblock_.service)
  util-linux/repos/testing-x86_64/util-linux.sysusers
(from rev 321467, util-linux/trunk/util-linux.sysusers)

---+
 0001-fstrim-cleanup-uncludes.patch|   41 
 0002-libmount_include_sys_mount_h_only_if_necessary.patch |   54 +
 60-rfkill.rules   |1 
 PKGBUILD  |  121 
 pam-common|6 
 pam-login |7 
 pam-su|9 
 rfkill-block_.service |   10 
 rfkill-unblock_.service   |   10 
 util-linux.sysusers   |2 
 10 files changed, 261 insertions(+)

Copied: util-linux/repos/testing-x86_64/0001-fstrim-cleanup-uncludes.patch 
(from rev 321467, util-linux/trunk/0001-fstrim-cleanup-uncludes.patch)
===
--- testing-x86_64/0001-fstrim-cleanup-uncludes.patch   
(rev 0)
+++ testing-x86_64/0001-fstrim-cleanup-uncludes.patch   2018-04-10 13:45:40 UTC 
(rev 321468)
@@ -0,0 +1,41 @@
+From 43abda66869e749044c6c4fd1d106d7df9484aca Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 22 Mar 2018 13:17:10 +0100
+Subject: fstrim: cleanup includes
+
+* HAVE_SYS_FS_H is incorrect (should be HAVE_LINUX_FS_H)
+
+* linux/fs.h cannot be included together with sys/mount.h as the both
+  files define MS_* constants. The libmount.h includes sys/mount.h now.
+
+Signed-off-by: Karel Zak 
+---
+ sys-utils/fstrim.c | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
+index ca8cf256d..53ac594c0 100644
+--- a/sys-utils/fstrim.c
 b/sys-utils/fstrim.c
+@@ -36,10 +36,6 @@
+ #include 
+ #include 
+ 
+-#ifdef HAVE_SYS_FS_H
+-# include 
+-#endif
+-
+ #include "nls.h"
+ #include "strutils.h"
+ #include "c.h"
+@@ -49,6 +45,10 @@
+ 
+ #include 
+ 
++
++/* We cannot include linux/fs.h due to MS_* constants collision with
++ * sys/mount.h (and libmount.h)
++ */
+ #ifndef FITRIM
+ struct fstrim_range {
+   uint64_t start;

Copied: 
util-linux/repos/testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
 (from rev 321467, 
util-linux/trunk/0002-libmount_include_sys_mount_h_only_if_necessary.patch)
===
--- testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
(rev 0)
+++ testing-x86_64/0002-libmount_include_sys_mount_h_only_if_necessary.patch
2018-04-10 13:45:40 UTC (rev 321468)
@@ -0,0 +1,54 @@
+From 061d1a51097c3c025ff46173f10aa135f9a610d4 Mon Sep 17 00:00:00 2001
+From: Karel Zak 
+Date: Thu, 22 Mar 2018 14:05:17 +0100
+Subject: libmount: include sys/mount.h only if necessary
+
+Addresses: https://github.com/systemd/systemd/issues/8507
+Signed-off-by: Karel Zak 
+---
+ libmount/src/libmount.h.in | 9 -
+ sys-utils/fstrim.c | 4 +---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
+index 8f323fcbf..11fd759fa 100644
+--- a/libmount/src/libmount.h.in
 b/libmount/src/libmount.h.in
+@@ -28,7 +28,14 @@ extern "C" {
+ #include 
+ #include 
+ #include 
+-#include 
++
++/* Make sure libc MS_* definitions are used by default. Note that MS_* flags
++ * may be already defined by linux/fs.h or another file -- in this case we
++ * don't want to include sys/mount.h at all to