summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarrat2020-06-12 17:47:21 +0200
committerNarrat2020-06-12 17:48:07 +0200
commitb2b1b30ee15f0d9e17a64eeb5d631eb02cb41842 (patch)
tree744a42afbac980979877b678dcf103a259ec3e98
parent733b8a0b2bfbecc8a0a4997d4e5d5d45d75c074b (diff)
downloadaur-b2b1b30ee15f0d9e17a64eeb5d631eb02cb41842.tar.gz
util-linux-aes: update to 2.35.2 to follow 3.7q release
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--0001-lsblk-force-to-print-PKNAME-for-partition.patch31
-rwxr-xr-xPKGBUILD24
-rw-r--r--util-linux-2.35.2.diff (renamed from util-linux-2.34.diff)202
4 files changed, 118 insertions, 157 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 682e40f16337..c7bab17b6666 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = util-linux-aes
pkgdesc = Miscellaneous system utilities for Linux, with loop-AES support
- pkgver = 2.34
- pkgrel = 8
+ pkgver = 2.35.2
+ pkgrel = 1
url = https://github.com/karelzak/util-linux
install = util-linux-aes.install
arch = x86_64
@@ -10,11 +10,10 @@ pkgbase = util-linux-aes
makedepends = python
makedepends = libcap-ng
options = strip
- source = https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz
- source = https://www.kernel.org/pub/linux/utils/util-linux/v2.34/util-linux-2.34.tar.sign
- source = util-linux-2.34.diff
+ source = https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz
+ source = https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.sign
+ source = util-linux-2.35.2.diff
source = util-linux-aes.modules
- source = 0001-lsblk-force-to-print-PKNAME-for-partition.patch
source = pam-login
source = pam-common
source = pam-runuser
@@ -24,11 +23,10 @@ pkgbase = util-linux-aes
source = rfkill-unblock_.service
source = rfkill-block_.service
validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
- sha256sums = 743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5
+ sha256sums = 21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
sha256sums = SKIP
- sha256sums = b03fcfb72bc2f08e0051ac8af47b67fa7c71c7a95a45480650b8c3a5a11fbe08
+ sha256sums = b500e906f0675318647a1af5696866822794d1fd535a6adf1b3f0f17e4ce56f7
sha256sums = 560ca858961eb997a216ce6b419d900e84688591abf4584ef30c9323ba06fffd
- sha256sums = cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9
sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92
sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20
sha256sums = 95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935
@@ -49,7 +47,7 @@ pkgname = util-linux-aes
optdepends = words: default dictionary for look
provides = rfkill
provides = util-linux
- conflicts = eject
+ conflicts = rfkill
conflicts = util-linux
replaces = rfkill
backup = etc/pam.d/chfn
diff --git a/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/0001-lsblk-force-to-print-PKNAME-for-partition.patch
deleted file mode 100644
index 3fc342b3732a..000000000000
--- a/0001-lsblk-force-to-print-PKNAME-for-partition.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-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 <kzak@redhat.com>
-Signed-off-by: Christian Hesse <mail@eworm.de>
----
- 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;
diff --git a/PKGBUILD b/PKGBUILD
index 48952ee23f58..cf15987183a0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,9 @@
_basename=util-linux
pkgbase=util-linux-aes
pkgname=(util-linux-aes libutil-linux-aes)
-_pkgmajor=2.34
-pkgver=${_pkgmajor}
-pkgrel=8
+_pkgmajor=2.35
+pkgver=${_pkgmajor}.2
+pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux, with loop-AES support"
url='https://github.com/karelzak/util-linux'
#url="http://sourceforge.net/projects/loop-aes/"
@@ -21,19 +21,17 @@ options=('strip')
install=${pkgname}.install
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${_basename}-$pkgver.tar."{xz,sign}
- "${_basename}-${_pkgmajor}.diff"
+ "${_basename}-${pkgver}.diff"
"${pkgname}.modules"
- '0001-lsblk-force-to-print-PKNAME-for-partition.patch'
pam-{login,common,runuser,su}
'util-linux-aes.sysusers'
'60-rfkill.rules'
'rfkill-unblock_.service'
'rfkill-block_.service')
-sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
+sha256sums=('21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a'
'SKIP'
- 'b03fcfb72bc2f08e0051ac8af47b67fa7c71c7a95a45480650b8c3a5a11fbe08'
+ 'b500e906f0675318647a1af5696866822794d1fd535a6adf1b3f0f17e4ce56f7'
'560ca858961eb997a216ce6b419d900e84688591abf4584ef30c9323ba06fffd'
- 'cfadc020011f88c028dc50c4e6790f5bae385b881417d917a8706c6ff78613d9'
'993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
'95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935'
@@ -45,11 +43,8 @@ sha256sums=('743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5'
prepare() {
cd "$_basename-$pkgver"
-
- patch -Np1 < ../0001-lsblk-force-to-print-PKNAME-for-partition.patch
-
- msg "Patching with loop-AES"
- patch -Np1 -i "../${_basename}-${_pkgmajor}.diff"
+ patch -Np1 -i "../${_basename}-${pkgver}.diff"
+ autoreconf -i
}
build() {
@@ -75,7 +70,6 @@ build() {
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
- --enable-partx \
--disable-hardlink \
--with-python=3
@@ -83,7 +77,7 @@ build() {
}
package_util-linux-aes() {
- conflicts=('eject' "${_basename}")
+ conflicts=('rfkill' "${_basename}")
provides=('rfkill' "${_basename}")
replaces=('rfkill')
depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libcap-ng' 'libutil-linux-aes')
diff --git a/util-linux-2.34.diff b/util-linux-2.35.2.diff
index cd12beca6bb6..19a8db71e00c 100644
--- a/util-linux-2.34.diff
+++ b/util-linux-2.35.2.diff
@@ -19,20 +19,20 @@ to programs, like this:
make
-diff -urN util-linux-2.34/include/Makemodule.am util-linux-2.34-AES/include/Makemodule.am
---- util-linux-2.34/include/Makemodule.am 2018-06-04 10:57:02.790445905 +0300
-+++ util-linux-2.34-AES/include/Makemodule.am 2019-07-11 09:31:03.205081083 +0300
-@@ -43,6 +43,7 @@
+diff -urN util-linux-2.35.2/include/Makemodule.am util-linux-2.35.2-AES/include/Makemodule.am
+--- util-linux-2.35.2/include/Makemodule.am 2020-05-20 15:27:43.450013565 +0300
++++ util-linux-2.35.2-AES/include/Makemodule.am 2020-06-02 12:09:34.980739096 +0300
+@@ -46,6 +46,7 @@
include/procutils.h \
include/pt-bsd.h \
include/pt-mbr.h \
+ include/xgetpass.h \
include/pt-mbr-partnames.h \
+ include/pt-gpt-partnames.h \
include/pt-sgi.h \
- include/pt-sun.h \
-diff -urN util-linux-2.34/include/xgetpass.h util-linux-2.34-AES/include/xgetpass.h
---- util-linux-2.34/include/xgetpass.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/include/xgetpass.h 2019-07-11 09:31:03.205081083 +0300
+diff -urN util-linux-2.35.2/include/xgetpass.h util-linux-2.35.2-AES/include/xgetpass.h
+--- util-linux-2.35.2/include/xgetpass.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/include/xgetpass.h 2020-06-02 12:09:34.981739099 +0300
@@ -0,0 +1,6 @@
+#ifndef UTIL_LINUX_XGETPASS_H
+#define UTIL_LINUX_XGETPASS_H
@@ -40,10 +40,10 @@ diff -urN util-linux-2.34/include/xgetpass.h util-linux-2.34-AES/include/xgetpas
+extern char *xgetpass(int pfd, const char *prompt);
+
+#endif /* UTIL_LINUX_XGETPASS_H */
-diff -urN util-linux-2.34/lib/Makemodule.am util-linux-2.34-AES/lib/Makemodule.am
---- util-linux-2.34/lib/Makemodule.am 2019-02-22 12:17:43.704854212 +0200
-+++ util-linux-2.34-AES/lib/Makemodule.am 2019-07-11 09:31:03.206081088 +0300
-@@ -24,6 +24,7 @@
+diff -urN util-linux-2.35.2/lib/Makemodule.am util-linux-2.35.2-AES/lib/Makemodule.am
+--- util-linux-2.35.2/lib/Makemodule.am 2020-05-20 15:27:43.451013558 +0300
++++ util-linux-2.35.2-AES/lib/Makemodule.am 2020-06-02 12:09:34.981739099 +0300
+@@ -23,6 +23,7 @@
lib/strutils.c \
lib/timeutils.c \
lib/ttyutils.c \
@@ -51,9 +51,9 @@ diff -urN util-linux-2.34/lib/Makemodule.am util-linux-2.34-AES/lib/Makemodule.a
lib/exec_shell.c \
lib/strv.c \
lib/sha1.c \
-diff -urN util-linux-2.34/lib/xgetpass.c util-linux-2.34-AES/lib/xgetpass.c
---- util-linux-2.34/lib/xgetpass.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/lib/xgetpass.c 2019-07-11 09:31:03.206081088 +0300
+diff -urN util-linux-2.35.2/lib/xgetpass.c util-linux-2.35.2-AES/lib/xgetpass.c
+--- util-linux-2.35.2/lib/xgetpass.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/lib/xgetpass.c 2020-06-02 12:09:34.981739099 +0300
@@ -0,0 +1,64 @@
+/*
+ * A function to read the passphrase either from the terminal or from
@@ -119,9 +119,9 @@ diff -urN util-linux-2.34/lib/xgetpass.c util-linux-2.34-AES/lib/xgetpass.c
+ if(p) p[y] = 0;
+ return p;
+}
-diff -urN util-linux-2.34/libmount/src/Makemodule.am util-linux-2.34-AES/libmount/src/Makemodule.am
---- util-linux-2.34/libmount/src/Makemodule.am 2018-06-04 10:57:02.802445812 +0300
-+++ util-linux-2.34-AES/libmount/src/Makemodule.am 2019-07-11 09:31:03.206081088 +0300
+diff -urN util-linux-2.35.2/libmount/src/Makemodule.am util-linux-2.35.2-AES/libmount/src/Makemodule.am
+--- util-linux-2.35.2/libmount/src/Makemodule.am 2020-04-27 11:19:10.825721526 +0300
++++ util-linux-2.35.2-AES/libmount/src/Makemodule.am 2020-06-02 12:09:34.982739101 +0300
@@ -27,7 +27,10 @@
if LINUX
libmount_la_SOURCES += \
@@ -131,12 +131,12 @@ diff -urN util-linux-2.34/libmount/src/Makemodule.am util-linux-2.34-AES/libmoun
+ libmount/src/sha512.c \
+ libmount/src/rmd160.c \
+ libmount/src/aes.c \
+ libmount/src/context_veritydev.c \
libmount/src/context_mount.c \
libmount/src/context_umount.c \
- libmount/src/monitor.c
-diff -urN util-linux-2.34/libmount/src/aes.c util-linux-2.34-AES/libmount/src/aes.c
---- util-linux-2.34/libmount/src/aes.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/aes.c 2019-07-11 09:31:03.207081094 +0300
+diff -urN util-linux-2.35.2/libmount/src/aes.c util-linux-2.35.2-AES/libmount/src/aes.c
+--- util-linux-2.35.2/libmount/src/aes.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/aes.c 2020-06-02 12:09:34.983739103 +0300
@@ -0,0 +1,299 @@
+// I retain copyright in this code but I encourage its free use provided
+// that I don't carry any responsibility for the results. I am especially
@@ -437,9 +437,9 @@ diff -urN util-linux-2.34/libmount/src/aes.c util-linux-2.34-AES/libmount/src/ae
+
+ state_out(out_blk, b0);
+}
-diff -urN util-linux-2.34/libmount/src/aes.h util-linux-2.34-AES/libmount/src/aes.h
---- util-linux-2.34/libmount/src/aes.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/aes.h 2019-07-11 09:31:03.208081100 +0300
+diff -urN util-linux-2.35.2/libmount/src/aes.h util-linux-2.35.2-AES/libmount/src/aes.h
+--- util-linux-2.35.2/libmount/src/aes.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/aes.h 2020-06-02 12:09:34.983739103 +0300
@@ -0,0 +1,97 @@
+// I retain copyright in this code but I encourage its free use provided
+// that I don't carry any responsibility for the results. I am especially
@@ -538,18 +538,18 @@ diff -urN util-linux-2.34/libmount/src/aes.h util-linux-2.34-AES/libmount/src/ae
+// if their parameters have not changed.
+
+#endif // _AES_H
-diff -urN util-linux-2.34/libmount/src/context.c util-linux-2.34-AES/libmount/src/context.c
---- util-linux-2.34/libmount/src/context.c 2019-04-10 14:28:20.591837314 +0300
-+++ util-linux-2.34-AES/libmount/src/context.c 2019-07-11 09:31:03.209081105 +0300
-@@ -99,7 +99,6 @@
- mnt_unref_table(cxt->fstab);
- mnt_unref_cache(cxt->cache);
+diff -urN util-linux-2.35.2/libmount/src/context.c util-linux-2.35.2-AES/libmount/src/context.c
+--- util-linux-2.35.2/libmount/src/context.c 2020-05-20 15:27:43.461013497 +0300
++++ util-linux-2.35.2-AES/libmount/src/context.c 2020-06-02 12:09:34.984739106 +0300
+@@ -102,7 +102,6 @@
+ mnt_unref_fs(cxt->fs);
+ mnt_unref_fs(cxt->fs_template);
- mnt_context_clear_loopdev(cxt);
mnt_free_lock(cxt->lock);
mnt_free_update(cxt->update);
-@@ -142,6 +141,8 @@
+@@ -145,6 +144,8 @@
DBG(CXT, ul_debugobj(cxt, "<---- reset [status=%d] ---->",
mnt_context_get_status(cxt)));
@@ -558,9 +558,9 @@ diff -urN util-linux-2.34/libmount/src/context.c util-linux-2.34-AES/libmount/sr
fl = cxt->flags;
mnt_unref_fs(cxt->fs);
-diff -urN util-linux-2.34/libmount/src/context_loopdev1.c util-linux-2.34-AES/libmount/src/context_loopdev1.c
---- util-linux-2.34/libmount/src/context_loopdev1.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/context_loopdev1.c 2019-07-11 09:31:03.211081117 +0300
+diff -urN util-linux-2.35.2/libmount/src/context_loopdev1.c util-linux-2.35.2-AES/libmount/src/context_loopdev1.c
+--- util-linux-2.35.2/libmount/src/context_loopdev1.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/context_loopdev1.c 2020-06-02 12:09:34.985739108 +0300
@@ -0,0 +1,1525 @@
+/*
+ * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
@@ -2087,9 +2087,9 @@ diff -urN util-linux-2.34/libmount/src/context_loopdev1.c util-linux-2.34-AES/li
+ cxt->loopdev_fd = -1;
+ return 0;
+}
-diff -urN util-linux-2.34/libmount/src/context_umount.c util-linux-2.34-AES/libmount/src/context_umount.c
---- util-linux-2.34/libmount/src/context_umount.c 2019-05-15 18:24:08.255894236 +0300
-+++ util-linux-2.34-AES/libmount/src/context_umount.c 2019-07-11 09:31:03.212081123 +0300
+diff -urN util-linux-2.35.2/libmount/src/context_umount.c util-linux-2.35.2-AES/libmount/src/context_umount.c
+--- util-linux-2.35.2/libmount/src/context_umount.c 2020-05-20 15:27:43.462013491 +0300
++++ util-linux-2.35.2-AES/libmount/src/context_umount.c 2020-06-02 12:09:34.985739108 +0300
@@ -330,11 +330,12 @@
*/
static int is_associated_fs(const char *devname, struct libmnt_fs *fs)
@@ -2141,9 +2141,9 @@ diff -urN util-linux-2.34/libmount/src/context_umount.c util-linux-2.34-AES/libm
mnt_context_enable_loopdel(cxt, FALSE);
}
-diff -urN util-linux-2.34/libmount/src/optmap.c util-linux-2.34-AES/libmount/src/optmap.c
---- util-linux-2.34/libmount/src/optmap.c 2019-02-22 12:17:43.717854104 +0200
-+++ util-linux-2.34-AES/libmount/src/optmap.c 2019-07-11 09:31:03.212081123 +0300
+diff -urN util-linux-2.35.2/libmount/src/optmap.c util-linux-2.35.2-AES/libmount/src/optmap.c
+--- util-linux-2.35.2/libmount/src/optmap.c 2020-05-20 15:27:43.463013485 +0300
++++ util-linux-2.35.2-AES/libmount/src/optmap.c 2020-06-02 12:09:34.985739108 +0300
@@ -168,10 +168,19 @@
{ "x-", MNT_MS_XCOMMENT, MNT_NOHLPS | MNT_PREFIX }, /* persistent comments (utab) */
{ "X-", MNT_MS_XFSTABCOMM, MNT_NOHLPS | MNT_NOMTAB | MNT_PREFIX }, /* fstab only comments */
@@ -2166,9 +2166,9 @@ diff -urN util-linux-2.34/libmount/src/optmap.c util-linux-2.34-AES/libmount/src
{ "nofail", MNT_MS_NOFAIL, MNT_NOMTAB }, /* Do not fail if ENOENT on dev */
-diff -urN util-linux-2.34/libmount/src/rmd160.c util-linux-2.34-AES/libmount/src/rmd160.c
---- util-linux-2.34/libmount/src/rmd160.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/rmd160.c 2019-07-11 09:31:03.213081128 +0300
+diff -urN util-linux-2.35.2/libmount/src/rmd160.c util-linux-2.35.2-AES/libmount/src/rmd160.c
+--- util-linux-2.35.2/libmount/src/rmd160.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/rmd160.c 2020-06-02 12:09:34.986739110 +0300
@@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc.
@@ -2702,9 +2702,9 @@ diff -urN util-linux-2.34/libmount/src/rmd160.c util-linux-2.34-AES/libmount/src
+ rmd160_final( &hd );
+ memcpy( outbuf, hd.buf, 20 );
+}
-diff -urN util-linux-2.34/libmount/src/rmd160.h util-linux-2.34-AES/libmount/src/rmd160.h
---- util-linux-2.34/libmount/src/rmd160.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/rmd160.h 2019-07-11 09:31:03.213081128 +0300
+diff -urN util-linux-2.35.2/libmount/src/rmd160.h util-linux-2.35.2-AES/libmount/src/rmd160.h
+--- util-linux-2.35.2/libmount/src/rmd160.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/rmd160.h 2020-06-02 12:09:34.986739110 +0300
@@ -0,0 +1,9 @@
+#ifndef RMD160_H
+#define RMD160_H
@@ -2715,9 +2715,9 @@ diff -urN util-linux-2.34/libmount/src/rmd160.h util-linux-2.34-AES/libmount/src
+#endif /*RMD160_H*/
+
+
-diff -urN util-linux-2.34/libmount/src/sha512.c util-linux-2.34-AES/libmount/src/sha512.c
---- util-linux-2.34/libmount/src/sha512.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/sha512.c 2019-07-11 09:31:03.213081128 +0300
+diff -urN util-linux-2.35.2/libmount/src/sha512.c util-linux-2.35.2-AES/libmount/src/sha512.c
+--- util-linux-2.35.2/libmount/src/sha512.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/sha512.c 2020-06-02 12:09:34.986739110 +0300
@@ -0,0 +1,432 @@
+/*
+ * sha512.c
@@ -3151,9 +3151,9 @@ diff -urN util-linux-2.34/libmount/src/sha512.c util-linux-2.34-AES/libmount/src
+ memset(&ctx, 0, sizeof(ctx));
+}
+#endif
-diff -urN util-linux-2.34/libmount/src/sha512.h util-linux-2.34-AES/libmount/src/sha512.h
---- util-linux-2.34/libmount/src/sha512.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/libmount/src/sha512.h 2019-07-11 09:31:03.213081128 +0300
+diff -urN util-linux-2.35.2/libmount/src/sha512.h util-linux-2.35.2-AES/libmount/src/sha512.h
+--- util-linux-2.35.2/libmount/src/sha512.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/libmount/src/sha512.h 2020-06-02 12:09:34.986739110 +0300
@@ -0,0 +1,45 @@
+/*
+ * sha512.h
@@ -3200,9 +3200,9 @@ diff -urN util-linux-2.34/libmount/src/sha512.h util-linux-2.34-AES/libmount/src
+/* no sha384_write(), use sha512_write() */
+/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47] */
+extern void __loDev_sha384_hash_buffer(unsigned char *, int, unsigned char *, int);
-diff -urN util-linux-2.34/sys-utils/Makemodule.am util-linux-2.34-AES/sys-utils/Makemodule.am
---- util-linux-2.34/sys-utils/Makemodule.am 2019-04-10 14:28:20.658836607 +0300
-+++ util-linux-2.34-AES/sys-utils/Makemodule.am 2019-07-11 09:31:03.214081134 +0300
+diff -urN util-linux-2.35.2/sys-utils/Makemodule.am util-linux-2.35.2-AES/sys-utils/Makemodule.am
+--- util-linux-2.35.2/sys-utils/Makemodule.am 2020-05-20 15:27:43.547012965 +0300
++++ util-linux-2.35.2-AES/sys-utils/Makemodule.am 2020-06-02 12:09:34.986739110 +0300
@@ -231,7 +231,7 @@
if BUILD_LOSETUP
sbin_PROGRAMS += losetup
@@ -3229,9 +3229,9 @@ diff -urN util-linux-2.34/sys-utils/Makemodule.am util-linux-2.34-AES/sys-utils/
sys-utils/swapon-common.c \
sys-utils/swapon-common.h \
lib/swapprober.c \
-diff -urN util-linux-2.34/sys-utils/loop.c util-linux-2.34-AES/sys-utils/loop.c
---- util-linux-2.34/sys-utils/loop.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/sys-utils/loop.c 2019-07-11 09:31:03.214081134 +0300
+diff -urN util-linux-2.35.2/sys-utils/loop.c util-linux-2.35.2-AES/sys-utils/loop.c
+--- util-linux-2.35.2/sys-utils/loop.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/sys-utils/loop.c 2020-06-02 12:09:34.986739110 +0300
@@ -0,0 +1,221 @@
+/*
+ * loop.c
@@ -3454,9 +3454,9 @@ diff -urN util-linux-2.34/sys-utils/loop.c util-linux-2.34-AES/sys-utils/loop.c
+ loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
+ return(loop_set_status64_ioctl(fd, loopinfo));
+}
-diff -urN util-linux-2.34/sys-utils/loop.h util-linux-2.34-AES/sys-utils/loop.h
---- util-linux-2.34/sys-utils/loop.h 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/sys-utils/loop.h 2019-07-11 09:31:03.214081134 +0300
+diff -urN util-linux-2.35.2/sys-utils/loop.h util-linux-2.35.2-AES/sys-utils/loop.h
+--- util-linux-2.35.2/sys-utils/loop.h 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/sys-utils/loop.h 2020-06-02 12:09:34.986739110 +0300
@@ -0,0 +1,87 @@
+/*
+ * loop.h
@@ -3545,9 +3545,9 @@ diff -urN util-linux-2.34/sys-utils/loop.h util-linux-2.34-AES/sys-utils/loop.h
+extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
+
+#endif
-diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/losetup.8
---- util-linux-2.34/sys-utils/losetup.8 2019-04-24 13:42:25.234752668 +0300
-+++ util-linux-2.34-AES/sys-utils/losetup.8 2019-07-11 09:31:03.214081134 +0300
+diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/losetup.8
+--- util-linux-2.35.2/sys-utils/losetup.8 2020-05-20 15:27:43.551012941 +0300
++++ util-linux-2.35.2-AES/sys-utils/losetup.8 2020-06-02 12:09:34.987739112 +0300
@@ -1,210 +1,200 @@
-.TH LOSETUP 8 "November 2015" "util-linux" "System Administration"
+.TH LOSETUP 8 "2012-09-24" "Linux" "MAINTENANCE COMMANDS"
@@ -3561,10 +3561,10 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
-.B losetup
-[\fIloopdev\fP]
-.sp
--.B losetup -l
+-.B losetup \-l
-.RB [ \-a ]
-.sp
--.B losetup -j
+-.B losetup \-j
-.I file
-.RB [ \-o
-.IR offset ]
@@ -3636,8 +3636,8 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
-\fIloopdev\fP argument is given, the status of the corresponding loop
-device is shown. If no option is given, all loop devices are shown.
-.sp
--Note that the old output format (i.e., \fBlosetup -a\fR) with comma-delimited
--strings is deprecated in favour of the \fB--list\fR output format.
+-Note that the old output format (i.e., \fBlosetup \-a\fR) with comma-delimited
+-strings is deprecated in favour of the \fB\-\-list\fR output format.
-.sp
-It's possible to create more independent loop devices for the same backing
-file.
@@ -3658,7 +3658,7 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
-.BR \-a , " \-\-all"
-Show the status of all loop devices. Note that not all information is accessible
-for non-root users. See also \fB\-\-list\fR. The old output format (as printed
--without \fB--list)\fR is deprecated.
+-without \fB\-\-list)\fR is deprecated.
-.TP
-.BR \-d , " \-\-detach " \fIloopdev\fR...
-Detach the file or device associated with the specified loop device(s). Note
@@ -3847,7 +3847,7 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
Verbose mode.
-.TP
-.BR \-l , " \-\-list"
--If a loop device or the \fB-a\fR option is specified, print the default columns
+-If a loop device or the \fB\-a\fR option is specified, print the default columns
-for either the specified loop device or all loop devices; the default is to
-print info about all devices. See also \fB\-\-output\fP, \fB\-\-noheadings\fP,
-\fB\-\-raw\fP, and \fB\-\-json\fP.
@@ -3904,9 +3904,9 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
.nf
-.IP
-# dd if=/dev/zero of=~/file.img bs=1024k count=10
--# losetup --find --show ~/file.img
+-# losetup \-\-find \-\-show ~/file.img
-/dev/loop0
--# mkfs -t ext2 /dev/loop0
+-# mkfs \-t ext2 /dev/loop0
-# mount /dev/loop0 /mnt
+
+dd if=/dev/zero of=/file bs=1k count=500
@@ -3917,7 +3917,7 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
+mount -t ext2 /dev/loop0 /mnt
...
-# umount /dev/loop0
--# losetup --detach /dev/loop0
+-# losetup \-\-detach /dev/loop0
+umount /dev/loop0
+losetup -d /dev/loop0
.fi
@@ -3936,9 +3936,9 @@ diff -urN util-linux-2.34/sys-utils/losetup.8 util-linux-2.34-AES/sys-utils/lose
+Original version: Theodore Ts'o <tytso@athena.mit.edu>
+AES support: Jari Ruusu
+.fi
-diff -urN util-linux-2.34/sys-utils/losetup1.c util-linux-2.34-AES/sys-utils/losetup1.c
---- util-linux-2.34/sys-utils/losetup1.c 1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.34-AES/sys-utils/losetup1.c 2019-07-11 09:31:03.214081134 +0300
+diff -urN util-linux-2.35.2/sys-utils/losetup1.c util-linux-2.35.2-AES/sys-utils/losetup1.c
+--- util-linux-2.35.2/sys-utils/losetup1.c 1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.35.2-AES/sys-utils/losetup1.c 2020-06-02 12:09:34.987739112 +0300
@@ -0,0 +1,1281 @@
+/* Taken from Ted's losetup.c - Mitch <m.dsouza@mrc-apu.cam.ac.uk> */
+/* Added vfs mount options - aeb - 960223 */
@@ -5221,10 +5221,10 @@ diff -urN util-linux-2.34/sys-utils/losetup1.c util-linux-2.34-AES/sys-utils/los
+ }
+ return res;
+}
-diff -urN util-linux-2.34/sys-utils/mount.8 util-linux-2.34-AES/sys-utils/mount.8
---- util-linux-2.34/sys-utils/mount.8 2019-05-15 14:49:04.536813022 +0300
-+++ util-linux-2.34-AES/sys-utils/mount.8 2019-07-11 09:31:03.215081140 +0300
-@@ -729,6 +729,11 @@
+diff -urN util-linux-2.35.2/sys-utils/mount.8 util-linux-2.35.2-AES/sys-utils/mount.8
+--- util-linux-2.35.2/sys-utils/mount.8 2020-05-20 15:27:43.553012928 +0300
++++ util-linux-2.35.2-AES/sys-utils/mount.8 2020-06-02 12:09:34.988739115 +0300
+@@ -737,6 +737,11 @@
sections.
.RE
@@ -5236,7 +5236,7 @@ diff -urN util-linux-2.34/sys-utils/mount.8 util-linux-2.34-AES/sys-utils/mount.
.TP
.BR "\-\-options\-mode " \fImode
Controls how to combine options from fstab/mtab with options from command line.
-@@ -2387,13 +2392,19 @@
+@@ -2466,13 +2471,19 @@
.B "mount \-t ext4 /tmp/disk.img /mnt"
.sp
.RE
@@ -5258,9 +5258,9 @@ diff -urN util-linux-2.34/sys-utils/mount.8 util-linux-2.34-AES/sys-utils/mount.
Since Linux 2.6.25 auto-destruction of loop devices is supported,
meaning that any loop device allocated by
.B mount
-diff -urN util-linux-2.34/sys-utils/mount.c util-linux-2.34-AES/sys-utils/mount.c
---- util-linux-2.34/sys-utils/mount.c 2019-04-24 12:02:03.124448789 +0300
-+++ util-linux-2.34-AES/sys-utils/mount.c 2019-07-11 09:31:03.215081140 +0300
+diff -urN util-linux-2.35.2/sys-utils/mount.c util-linux-2.35.2-AES/sys-utils/mount.c
+--- util-linux-2.35.2/sys-utils/mount.c 2020-05-20 15:27:43.553012928 +0300
++++ util-linux-2.35.2-AES/sys-utils/mount.c 2020-06-02 12:09:34.988739115 +0300
@@ -36,6 +36,7 @@
#include "c.h"
#include "env.h"
@@ -5269,15 +5269,15 @@ diff -urN util-linux-2.34/sys-utils/mount.c util-linux-2.34-AES/sys-utils/mount.
#include "closestream.h"
#include "canonicalize.h"
-@@ -52,6 +53,7 @@
- * --options-source-force MNT_OMODE_FORCE
- */
+@@ -45,6 +46,7 @@
+ #define OPTUTILS_EXIT_CODE MNT_EX_USAGE
+ #include "optutils.h"
+static int passfd = -1;
static int mk_exit_code(struct libmnt_context *cxt, int rc);
- static void __attribute__((__noreturn__)) exit_non_root(const char *option)
-@@ -102,6 +104,32 @@
+ static void suid_drop(struct libmnt_context *cxt)
+@@ -96,6 +98,32 @@
return 1;
}
@@ -5310,7 +5310,7 @@ diff -urN util-linux-2.34/sys-utils/mount.c util-linux-2.34-AES/sys-utils/mount.
/*
* Replace control chars with '?' to be compatible with coreutils. For more
* robust solution use findmnt(1) where we use \x?? hex encoding.
-@@ -473,6 +501,7 @@
+@@ -468,6 +496,7 @@
fprintf(out, _(
" -o, --options <list> comma-separated list of mount options\n"
" -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
@@ -5338,7 +5338,7 @@ diff -urN util-linux-2.34/sys-utils/mount.c util-linux-2.34-AES/sys-utils/mount.
case 'L':
xasprintf(&srcbuf, "LABEL=\"%s\"", optarg);
mnt_context_disable_swapmatch(cxt, 1);
-@@ -884,6 +917,8 @@
+@@ -887,6 +920,8 @@
else if (types)
mnt_context_set_fstype(cxt, types);
@@ -5347,9 +5347,9 @@ diff -urN util-linux-2.34/sys-utils/mount.c util-linux-2.34-AES/sys-utils/mount.
if (all) {
/*
* A) Mount all
-diff -urN util-linux-2.34/sys-utils/swapoff.c util-linux-2.34-AES/sys-utils/swapoff.c
---- util-linux-2.34/sys-utils/swapoff.c 2019-04-24 12:02:03.126448778 +0300
-+++ util-linux-2.34-AES/sys-utils/swapoff.c 2019-07-11 09:31:03.215081140 +0300
+diff -urN util-linux-2.35.2/sys-utils/swapoff.c util-linux-2.35.2-AES/sys-utils/swapoff.c
+--- util-linux-2.35.2/sys-utils/swapoff.c 2020-02-27 11:26:34.709140285 +0200
++++ util-linux-2.35.2-AES/sys-utils/swapoff.c 2020-06-02 12:09:34.988739115 +0300
@@ -1,4 +1,9 @@
#include <stdio.h>
+#include <sys/types.h>
@@ -5447,9 +5447,9 @@ diff -urN util-linux-2.34/sys-utils/swapoff.c util-linux-2.34-AES/sys-utils/swap
}
mnt_free_iter(itr);
-diff -urN util-linux-2.34/sys-utils/swapon.8 util-linux-2.34-AES/sys-utils/swapon.8
---- util-linux-2.34/sys-utils/swapon.8 2019-04-10 14:28:20.660836586 +0300
-+++ util-linux-2.34-AES/sys-utils/swapon.8 2019-07-11 09:31:03.215081140 +0300
+diff -urN util-linux-2.35.2/sys-utils/swapon.8 util-linux-2.35.2-AES/sys-utils/swapon.8
+--- util-linux-2.35.2/sys-utils/swapon.8 2020-02-27 11:26:34.710140278 +0200
++++ util-linux-2.35.2-AES/sys-utils/swapon.8 2020-06-02 12:09:34.988739115 +0300
@@ -69,6 +69,22 @@
.I /proc/swaps
or
@@ -5473,9 +5473,9 @@ diff -urN util-linux-2.34/sys-utils/swapon.8 util-linux-2.34-AES/sys-utils/swapo
.SH OPTIONS
.TP
-diff -urN util-linux-2.34/sys-utils/swapon.c util-linux-2.34-AES/sys-utils/swapon.c
---- util-linux-2.34/sys-utils/swapon.c 2019-04-24 12:02:03.127448771 +0300
-+++ util-linux-2.34-AES/sys-utils/swapon.c 2019-07-11 09:31:03.215081140 +0300
+diff -urN util-linux-2.35.2/sys-utils/swapon.c util-linux-2.35.2-AES/sys-utils/swapon.c
+--- util-linux-2.35.2/sys-utils/swapon.c 2020-05-20 15:27:43.555012916 +0300
++++ util-linux-2.35.2-AES/sys-utils/swapon.c 2020-06-02 12:09:34.989739117 +0300
@@ -8,6 +8,8 @@
#include <unistd.h>
#include <sys/types.h>