util-linux-2.37.1-1

u/util-linux/util-linux-vl.spec

@@ -22,7 +22,7 @@
 Summary: A collection of basic system utilities
 Summary(ja): 基本システムユーティリティー集
 Name: util-linux
-Version: 2.36.2
+Version: 2.37.1
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system,admin-tools
 Distribution: Vine Linux
@@ -53,13 +53,16 @@ Source10: uuidd.init
 ###
 # 151635 - makeing /var/log/lastlog
 Patch0: login-lastlog-create.patch
-# https://github.com/karelzak/util-linux/commit/57898c3a7ee8fc5933cddd4526bb3980bef85a02
-# The workaround is unnecessary on Fedora with kernel >= 5.8.
-Patch1: libmount-remove-read-mountinfo-workaround.patch
 # Add `/run/motd.d` to the hardcoded MOTD_FILE
 # https://github.com/coreos/console-login-helper-messages/issues/60
 Patch2: login-default-motd-file.patch
 
+### Upstream patches (remove ./autogen.sh call from build section  when remove
+###                   these patches)
+###
+# https://github.com/karelzak/util-linux/commit/1c9143d0c1f979c3daf10e1c37b5b1e916c22a1c
+Patch3: CVE-2021-37600.patch
+
 ### Paths
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -667,36 +670,16 @@ touch /etc/mtab
 /bin/chmod 0644 /etc/mtab
 %endif
 
-
 %preun
 if [ "$1" = 0 ]; then
 	%{_syssbindir}/update-alternatives --remove pager %{_sysbindir}/more
 fi
 exit 0
 
-
 %post -n libblkid
-/sbin/ldconfig
 [ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || :
 [ -e /etc/blkid.tab.old ] && mv /etc/blkid.tab.old /etc/blkid/blkid.tab.old || :
 
-%postun -n libblkid -p /sbin/ldconfig
-
-%post -n libuuid -p /sbin/ldconfig
-%postun -n libuuid -p /sbin/ldconfig
-
-%post -n libmount -p /sbin/ldconfig
-%postun -n libmount -p /sbin/ldconfig
-
-%post -n compat32-libuuid -p /sbin/ldconfig
-%postun -n compat32-libuuid -p /sbin/ldconfig
-
-%post -n compat32-libblkid -p /sbin/ldconfig
-%postun -n compat32-libblkid -p /sbin/ldconfig
-
-%post -n compat32-libmount -p /sbin/ldconfig
-%postun -n compat32-libmount -p /sbin/ldconfig
-
 %pre -n uuidd
 getent group uuidd >/dev/null || groupadd -r uuidd
 getent passwd uuidd >/dev/null || \
@@ -855,6 +838,7 @@ fi
 %{_bindir}/setterm
 #%{_bindir}/tailf
 %{_bindir}/ul
+%{_bindir}/uclampset
 %{_bindir}/unshare
 %{_bindir}/utmpdump
 %{_bindir}/uuidgen
@@ -922,6 +906,7 @@ fi
 %{_mandir}/man1/su.1*
 #%{_mandir}/man1/tailf.1*
 %{_mandir}/man1/taskset.1*
+%{_mandir}/man1/uclampset.1*
 %{_mandir}/man1/ul.1*
 %{_mandir}/man1/unshare.1*
 %{_mandir}/man1/utmpdump.1*
@@ -986,9 +971,7 @@ fi
 %ifnarch s390 s390x
 /sbin/clock
 /sbin/hwclock
-%{_sbindir}/fdformat
 %{_sbindir}/hwclock
-%{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/hwclock.8*
 %endif
 
@@ -1003,7 +986,6 @@ fi
 %{_bindir}/sunhostid
 %endif
 
-
 %if %{with bashcomp}
 %files -n bash-completion-util-linux
 %defattr(-,root,root)
@@ -1022,7 +1004,6 @@ fi
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 %dir %attr(2775, uuidd, uuidd) /var/run/uuidd
 
-
 %files -n libfdisk
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
@@ -1035,7 +1016,6 @@ fi
 %{_includedir}/libfdisk
 %{_libdir}/pkgconfig/fdisk.pc
 
-
 %files -n libsmartcols
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
@@ -1048,7 +1028,6 @@ fi
 %{_includedir}/libsmartcols
 %{_libdir}/pkgconfig/smartcols.pc
 
-
 %files -n libmount
 %defattr(-,root,root)
 %doc libmount/COPYING
@@ -1062,7 +1041,6 @@ fi
 %{_includedir}/libmount
 %{_libdir}/pkgconfig/mount.pc
 
-
 %files -n libblkid
 %defattr(-,root,root)
 %dir /etc/blkid
@@ -1076,7 +1054,6 @@ fi
 %{_mandir}/man3/libblkid.3*
 %{_libdir}/pkgconfig/blkid.pc
 
-
 %files -n libuuid
 %defattr(-,root,root)
 /%{_lib}/libuuid.so.*
@@ -1133,7 +1110,13 @@ fi
 %{_libdir}/pkgconfig/mount.pc
 %endif
 
+
 %changelog
+* Tue Aug 10 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.37.1-1
+- new upstream release.
+- dropped Patch1.
+- imported Patch3 from upstream to fix CVE-2021-37600.
+
 * Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.36.2-1
 - updated to 2.36.2.
 - dropped Patch1-1000: fixed in upstream.