summaryrefslogtreecommitdiff
path: root/source/a/util-linux
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-02 23:26:53 +0000
committerEric Hameleers <alien@slackware.com>2019-01-03 08:59:43 +0100
commitb66dbcf50c5c89b5d222a9da91ffa5e6b9592891 (patch)
tree02597da8f955c6cf683eecedc163fba45998bb5b /source/a/util-linux
parenteec4d4261607e9d68560089406d11eec060421e9 (diff)
downloadcurrent-b66dbcf50c5c89b5d222a9da91ffa5e6b9592891.tar.gz
Wed Jan 2 23:26:53 UTC 201920190102232653
a/tar-1.31-x86_64-1.txz: Upgraded. a/util-linux-2.33-x86_64-2.txz: Rebuilt. fdisk: Don't include /dev/ram* devices in 'fdisk -l' output. ap/soma-3.2.1-noarch-1.txz: Upgraded. d/ccache-3.5.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_23-x86_64-1.txz: Upgraded. xap/gnuplot-5.2.6-x86_64-1.txz: Upgraded. xap/rdesktop-1.8.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/util-linux')
-rwxr-xr-xsource/a/util-linux/util-linux.SlackBuild6
-rw-r--r--source/a/util-linux/util-linux.do.not.list.ram.devices.diff13
2 files changed, 18 insertions, 1 deletions
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 95bbb1ff..5bda2e60 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=util-linux
VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
ADJTIMEXVERS=1.29
SETSERIALVERS=2.17
@@ -87,6 +87,10 @@ find . \
# 83 back to "Linux swap":
zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1
+# Revert to the behavior of earlier versions of fdisk which did not list the
+# /dev/ram* devices in 'fdisk -l' output:
+zcat $CWD/util-linux.do.not.list.ram.devices.diff.gz | patch -p1 --verbose || exit 1
+
# This just call the configure script with $1 either being 2 for python2
# or 3 for python3.
#
diff --git a/source/a/util-linux/util-linux.do.not.list.ram.devices.diff b/source/a/util-linux/util-linux.do.not.list.ram.devices.diff
new file mode 100644
index 00000000..33a74307
--- /dev/null
+++ b/source/a/util-linux/util-linux.do.not.list.ram.devices.diff
@@ -0,0 +1,13 @@
+--- ./disk-utils/fdisk-list.c.orig 2018-09-20 07:38:55.845404951 -0500
++++ ./disk-utils/fdisk-list.c 2019-01-02 15:53:21.256868721 -0600
+@@ -337,6 +337,10 @@
+ if (devno <= 0)
+ continue;
+
++ /* Don't list /dev/ram* devices */
++ if (strstr(line, "ram") && devno >= 256)
++ continue;
++
+ if (sysfs_devno_is_dm_private(devno, NULL) ||
+ sysfs_devno_is_wholedisk(devno) <= 0)
+ continue;