From 62a032df771e406a5ce664f86521e09e61c44a72 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Fri, 23 Jul 2021 10:49:29 +0200
Subject: [PATCH] RHEL-9.0: 2.37.1-1: upgrade, remove raw(1) and PCRE2
 dependence

Resolves: #1984900 #1971989 #1938894 #1984771
---
 .gitignore              |  1 +
 sources                 |  2 +-
 util-linux-60-raw.rules |  8 --------
 util-linux.spec         | 29 +++++++----------------------
 4 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 util-linux-60-raw.rules

diff --git a/.gitignore b/.gitignore
index 5cd3454..44f8862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@
 /util-linux-2.36.1.tar.xz
 /util-linux-2.36.2.tar.xz
 /util-linux-2.37.tar.xz
+/util-linux-2.37.1.tar.xz
diff --git a/sources b/sources
index 249ef34..95cb972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (util-linux-2.37.tar.xz) = 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
+SHA512 (util-linux-2.37.1.tar.xz) = ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555
diff --git a/util-linux-60-raw.rules b/util-linux-60-raw.rules
deleted file mode 100644
index abbf79d..0000000
--- a/util-linux-60-raw.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Enter raw device bindings here.
-#
-# An example would be:
-#   ACTION=="add", KERNEL=="sda", RUN+="/usr/bin/raw /dev/raw/raw1 %N"
-# to bind /dev/raw/raw1 to /dev/sda, or
-#   ACTION=="add", ENV{MAJOR}=="8", ENV{MINOR}=="1", RUN+="/usr/bin/raw /dev/raw/raw2 %M %m"
-# to bind /dev/raw/raw2 to the device with major 8, minor 1.
diff --git a/util-linux.spec b/util-linux.spec
index c76158d..3ffc511 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,7 +1,7 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux
-Version: 2.37
+Version: 2.37.1
 Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -31,7 +31,6 @@ BuildRequires: systemd
 Buildrequires: libuser-devel
 BuildRequires: libcap-ng-devel
 BuildRequires: %{pypkg}-devel
-BuildRequires: pcre2-devel
 BuildRequires: gcc
 BuildRequires: autoconf
 BuildRequires: automake
@@ -52,7 +51,6 @@ Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
-Source4: util-linux-60-raw.rules
 Source5: adjtime
 Source12: util-linux-su.pamd
 Source13: util-linux-su-l.pamd
@@ -305,7 +303,7 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
 	--enable-chfn-chsh \
 	--enable-usrdir-path \
 	--enable-write \
-	--enable-raw \
+	--disable-raw \
 	--enable-hardlink \
 	--enable-fdformat \
 	--enable-asciidoc \
@@ -344,19 +342,6 @@ chmod 0644 ${RPM_BUILD_ROOT}/var/log/lastlog
 # install util-linux
 %make_install
 
-# raw
-echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
-{
-	# see RH bugzilla #216664
-	mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/udev/rules.d
-	pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/udev/rules.d
-	install -m 644 %{SOURCE4} ./60-raw.rules
-	popd
-}
-
-# sbin -> bin
-mv ${RPM_BUILD_ROOT}%{_sbindir}/raw ${RPM_BUILD_ROOT}%{_bindir}/raw
-
 # And a dirs uuidd needs that the makefiles don't create
 install -d ${RPM_BUILD_ROOT}/run/uuidd
 install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
@@ -517,7 +502,6 @@ fi
 %config(noreplace)	%{_sysconfdir}/pam.d/su-l
 %config(noreplace)	%{_sysconfdir}/pam.d/runuser
 %config(noreplace)	%{_sysconfdir}/pam.d/runuser-l
-%config(noreplace)	%{_prefix}/lib/udev/rules.d/60-raw.rules
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime
 
@@ -558,7 +542,6 @@ fi
 %{_bindir}/mesg
 %{_bindir}/namei
 %{_bindir}/prlimit
-%{_bindir}/raw
 %{_bindir}/rename
 %{_bindir}/rev
 %{_bindir}/script
@@ -642,8 +625,6 @@ fi
 %{_mandir}/man8/mkfs.minix.8*
 %{_mandir}/man8/nologin.8*
 %{_mandir}/man8/pivot_root.8*
-%{_mandir}/man8/raw.8*
-%{_mandir}/man8/rawdevices.8*
 %{_mandir}/man8/readprofile.8*
 %{_mandir}/man8/resizepart.8*
 %{_mandir}/man8/rfkill.8*
@@ -726,7 +707,6 @@ fi
 %{compldir}/namei
 %{compldir}/pivot_root
 %{compldir}/prlimit
-%{compldir}/raw
 %{compldir}/readprofile
 %{compldir}/rename
 %{compldir}/resizepart
@@ -809,6 +789,7 @@ fi
 %{compldir}/findmnt
 %{compldir}/flock
 %{compldir}/fsck
+%{compldir}/hardlink
 %{compldir}/ionice
 %{compldir}/ipcmk
 %{compldir}/ipcrm
@@ -963,6 +944,10 @@ fi
 %{_libdir}/python*/site-packages/libmount/
 
 %changelog
+* Fri Jul 23 2021 Karel Zak <kzak@redhat.com> - 2.37.1-1
+- upgrade to v2.37.1 (fix #1984900, #1971989, and #1938894)
+- fix #1984771 - disable raw
+
 * Tue Jun  8 2021 Karel Zak <kzak@redhat.com> - 2.37-1
 - upgrade to v2.37
 - introduce util-linux-core subpackage