开源软件构建与测试

_service:extract_file:util-linux.spec Deleted

@@ -1,550 +0,0 @@
-%define compldir %{_datadir}/bash-completion/completions/
-%global upstream_major 2.36
-
-Name:           util-linux
-Version:        2.37.2
-Release:        2
-Summary:        A random collection of Linux utilities
-License:        GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
-URL:            https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
-Source0:        https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/%{name}-%{version}.tar.xz
-Source1:        util-linux-login.pamd
-Source2:        util-linux-remote.pamd
-Source3:        util-linux-chsh-chfn.pamd
-Source4:        util-linux-60-raw.rules
-Source5:        adjtime
-Source6:        util-linux-su.pamd
-Source7:        util-linux-su-l.pamd
-Source8:        util-linux-runuser.pamd
-Source9:        util-linux-runuser-l.pamd
-
-BuildRequires:  audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel
-BuildRequires:  libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc
-
-Requires(post): coreutils
-Requires:       pam >= 1.1.3-7, /etc/pam.d/system-auth audit-libs >= 1.0.6
-Requires:       libblkid = %{version}-%{release} libmount = %{version}-%{release} libsmartcols = %{version}-%{release}
-Requires:       libfdisk = %{version}-%{release} libuuid = %{version}-%{release} 
-
-Conflicts:      initscripts < 9.79-4 bash-completion < 1:2.1-1 coreutils < 8.20 sysvinit-tools < 2.88-14
-Conflicts:      e2fsprogs < 1.41.8-5 filesystem < 3
-
-Provides:       eject = 2.1.6 rfkill = 0.5
-Provides:       util-linux-ng = %{version}-%{release} hardlink = 1:1.3-9
-Provides:       /bin/dmesg /bin/kill /bin/more /bin/mount /bin/umount /sbin/blkid
-Provides:       /sbin/blockdev /sbin/findfs /sbin/fsck /sbin/nologin
-Obsoletes:      eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9
-
-
-%description
-The util-linux package contains a random collection of files that
-implements some low-level basic linux utilities.
-
-%package -n libfdisk
-Summary: Library for fdisk-like programs.
-License: LGPLv2+
-
-%description -n libfdisk
-This package contains the library for fdisk-like programs.
-
-%package -n libsmartcols
-Summary: Library for column based text sort engine.
-License: LGPLv2+
-
-%description -n libsmartcols
-This package contains the library for column based text sort engine.
-
-%package -n libmount
-Summary: Library for device mounting
-License: LGPLv2+
-Requires: libblkid = %{version}-%{release}
-Requires: libuuid = %{version}-%{release}
-Conflicts: filesystem < 3
-
-%description -n libmount
-This package is the library for device mounting.
-
-%package -n libblkid
-Summary: Library for block device id.
-License: LGPLv2+
-Requires: libuuid = %{version}-%{release}
-Conflicts: filesystem < 3
-Requires(post): coreutils
-
-%description -n libblkid
-This package is le library for block device id.
-
-%package -n uuidd
-Summary:  UUID generation daemon
-Requires: libuuid = %{version}-%{release}
-License: GPLv2
-Requires: systemd
-Requires(pre): shadow
-Requires(post): systemd-units
-Requires(preun): systemd-units
-
-%description -n uuidd
-The uuidd daemon is used by the UUID library to generate universally
-unique identifiers (UUIDs), especially time-based UUIDs, in a secure
-and guaranteed-unique fashion, even in the face of large numbers of
-threads running on different CPUs trying to grab UUIDs.
-
-%package -n libuuid
-Summary: Universally unique ID library
-License: BSD
-Conflicts: filesystem < 3
-
-%description -n libuuid
-This package is the universally unique ID library.
-
-%package user
-Summary: libuser based util-linux utilities
-License: GPLv2
-Requires: util-linux = %{version}-%{release}
-
-%description user
-chfn and chsh utilities with dependence on libuser
-
-%package -n python3-libmount
-Summary:        Python Package for the libmount library pack
-Requires:       libmount = %{version}-%{release}
-License:        LGPLv2+
-
-%description -n python3-libmount
-This package provides python support for users to use the libmount library
-to work with mount tables and mount filesystems.
-
-%package devel
-Summary:        Development package for ${name}
-License:        LGPLv2+ and BSD
-Requires:       %{name} = %{version}-%{release} pkgconfig
-Provides:       libfdisk-devel libsmartcols-devel libmount-devel libblkid-devel libuuid-devel
-Obsoletes:      libfdisk-devel libsmartcols-devel libmount-devel libblkid-devel libuuid-devel
-
-%description devel
-This package contains some library and other necessary files for the
-development of %{name}.
-
-%package help
-Summary:        Help package for ${name}
-BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
-Obsoletes:      hardlink-help <= 1:1.3-9
-Provides:       hardlink-help = 1:1.3-9
-
-%description help
-This package contains some doc and man help files for %{name}.
-
-%prep
-%autosetup -n %{name}-%{version} -p1
-
-%build
-%define _build_arg0__ CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS" SUID_CFLAGS="-fpie"
-%define _build_arg1__ SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" DAEMON_CFLAGS="$SUID_CFLAGS" DAEMON_LDFLAGS="$SUID_LDFLAGS"
-
-unset LINGUAS || :
-%configure \
-  --with-systemdsystemunitdir=%{_unitdir} \
-  --disable-silent-rules \
-  --disable-bfs \
-  --disable-pg \
-  --enable-chfn-chsh \
-  --enable-usrdir-path \
-  --enable-write \
-  --enable-raw \
-  --enable-hardlink \
-  --with-python=3 \
-  --with-systemd \
-  --with-udev \
-  --with-selinux \
-  --with-audit \
-  --with-utempter \
-  --disable-makeinstall-chown
-
-%make_build %{_build_arg0__} %{_build_arg1__}
-
-%check
-export TS_OPT_misc_setarch_known_fail="yes"
-make check
-
-%install
-%make_install
-
-install -d %{buildroot}%{_sysconfdir}/pam.d
-install -d %{buildroot}{/run/uuidd,/var/lib/libuuid,/var/log}
-
-mv %{buildroot}%{_sbindir}/raw %{buildroot}%{_bindir}/raw
-install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/login
-install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/remote
-install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/chsh
-install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/chfn
-install -Dm644 %{SOURCE4} %{buildroot}%{_prefix}/lib/udev/rules.d/60-raw.rules
-install -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
-install -m644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/su
-install -m644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/su-l
-install -m644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/runuser
-install -m644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-
-ln -sf hwclock %{buildroot}%{_sbindir}/clock
-ln -sf ../proc/self/mounts %{buildroot}/etc/mtab
-
-touch %{buildroot}/var/log/lastlog
-chmod 0644 %{buildroot}/var/log/lastlog
-
-echo ".so man8/raw.8" > %{buildroot}%{_mandir}/man8/rawdevices.8
-echo ".so man8/hwclock.8" > %{buildroot}%{_mandir}/man8/clock.8
-
-%find_lang %name
-
-find  %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \

_service:tar_scm:util-linux.spec Added

@@ -0,0 +1,675 @@
+%define compldir %{_datadir}/bash-completion/completions/
+%global upstream_major 2.37
+
+Name:           util-linux
+Version:        2.37.2
+Release:        13
+Summary:        A random collection of Linux utilities
+License:        GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+URL:            https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
+Source0:        https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/%{name}-%{version}.tar.xz
+Source1:        util-linux-login.pamd
+Source2:        util-linux-remote.pamd
+Source3:        util-linux-chsh-chfn.pamd
+Source4:        util-linux-60-raw.rules
+Source5:        adjtime
+Source6:        util-linux-su.pamd
+Source7:        util-linux-su-l.pamd
+Source8:        util-linux-runuser.pamd
+Source9:        util-linux-runuser-l.pamd
+
+Patch6000:      2.36-login-lastlog-create.patch
+Patch6001:      backport-CVE-2021-3995.patch
+Patch6002:      backport-CVE-2021-3996.patch
+Patch6003:      realloc-buffer-when-header-size-changed.patch
+Patch6004:      fix-size-use-for-stdin.patch
+Patch6005:      segmentation-fault-on-invalid-unicode-input-passed-to-s-option.patch
+Patch6006:      backport-fix-by-ignoring-EINVAL-on-remount-of-proc.patch
+Patch6007:      backport-su-bash-completion-offer-usernames-rather-than-files.patch
+Patch6008:      backport-Fix-memory-leaks-in-the-chcpu.patch
+Patch6009:      backport-logger-fix-prio-prefix-doesn-t-use-priority-default.patch
+Patch6010:      backport-vipw-flush-stdout-before-getting-answer.patch
+Patch6011:      backport-login-Restore-tty-size-after-calling-vhangup.patch
+Patch6012:      backport-Forward-value-of-sector_size-instead-of-its-address.patch
+Patch6013:      backport-libfdisk-dereference-of-possibly-NULL-gcc-analyzer.patch
+Patch6014:      backport-libfdisk-check-calloc-return-gcc-analyzer.patch
+Patch6015:      backport-mcookie-fix-infinite-loop-when-use-f.patch
+Patch6016:      backport-sfdisk-write-empty-label-also-when-only-ignored-part.patch
+Patch6017:      backport-fstat-dir-itself.patch
+Patch6018:      backport-libblkid-src-topology-dm-close-redundant-write-file-.patch
+Patch6019:      backport-libblkid-topology-init-variables-for-DM.patch
+Patch6020:      backport-sfdisk-fix-typo-in-move-data-when-check-partition-size.patch
+Patch6021:      backport-losetup-fix-memory-leak-asan.patch
+Patch6022:      backport-partx-remove-memory-leak-to-make-scanners-happy-coverity-scan.patch
+Patch6023:      backport-lib-path-make-ul_path_read_buffer-more-robust-coverity-scan.patch
+Patch6024:      backport-libmount-fix-possible-memory-leak-in-mnt_optstr_fix_secontext-coverity-scan.patch
+Patch6025:      backport-libblkid-probe-fix-size-and-offset-overflows-fuzzing.patch
+Patch6026:      backport-lslogins-improve-prefixes-interpretation.patch
+Patch6027:      backport-lsns-fix-the-memory-leak.patch
+Patch6028:      backport-libblkid-check-fsync-return-code.patch
+Patch6029:      backport-libblkid-mac-make-sure-block-size-is-large-enough-fuzzing.patch
+Patch6030:      backport-libblkid-bsd-fix-buffer-pointer-use-fuzzing.patch
+Patch6031:      backport-libblkid-hfs-fix-label-use-fuzzing.patch
+Patch6032:      backport-Maybe-there-is-a-little-mistake-in-do_taskset-functi.patch
+Patch6033:      backport-lsblk-fix-endless-loop-if-device-specified-more-than-once.patch
+Patch6034:      backport-libblkid-avoid-buffer-overflow-in-ocfs-superblock-parsing.patch
+Patch6035:      backport-fsck-Processes-may-kill-other-processes.patch
+Patch6036:      backport-fdisk-fix-output-option-parsing.patch
+Patch6037:      backport-libblkid-exfat-fix-divide-by-zero-coverity-scan.patch
+Patch6038:      backport-llib-pty-session-split-PTY-and-signalfd-setup.patch
+Patch6039:      backport-script-fix-use-of-utempter.patch
+Patch6040:      backport-logger-always-update-header-when-read-from-stdin.patch
+
+Patch9000:      Add-check-to-resolve-uname26-version-test-failed.patch
+Patch9001:      SKIPPED-no-root-permissions-test.patch
+%ifarch sw_64
+Patch9002:      util-linux-Add-sw64-architecture.patch
+%endif
+
+BuildRequires:  audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel
+BuildRequires:  libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc
+
+Requires(post): coreutils
+Requires:       pam >= 1.1.3-7, /etc/pam.d/system-auth audit-libs >= 1.0.6
+Requires:       libblkid = %{version}-%{release} libmount = %{version}-%{release} libsmartcols = %{version}-%{release}
+Requires:       libfdisk = %{version}-%{release} libuuid = %{version}-%{release} 
+
+Conflicts:      initscripts < 9.79-4 bash-completion < 1:2.1-1 coreutils < 8.20 sysvinit-tools < 2.88-14
+Conflicts:      e2fsprogs < 1.41.8-5 filesystem < 3
+
+Provides:       eject = 2.1.6 rfkill = 0.5
+Provides:       util-linux-ng = %{version}-%{release} hardlink = 1:1.3-9
+Provides:       /bin/dmesg /bin/kill /bin/more /bin/mount /bin/umount /sbin/blkid
+Provides:       /sbin/blockdev /sbin/findfs /sbin/fsck /sbin/nologin
+Obsoletes:      eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9
+
+%description
+The util-linux package contains a random collection of files that
+implements some low-level basic linux utilities.
+
+%package -n libfdisk
+Summary: Library for fdisk-like programs.
+License: LGPLv2+
+
+%description -n libfdisk
+This package contains the library for fdisk-like programs.
+
+%package -n libsmartcols
+Summary: Library for column based text sort engine.
+License: LGPLv2+
+
+%description -n libsmartcols
+This package contains the library for column based text sort engine.
+
+%package -n libmount
+Summary: Library for device mounting
+License: LGPLv2+
+Requires: libblkid = %{version}-%{release}
+Requires: libuuid = %{version}-%{release}
+Conflicts: filesystem < 3
+
+%description -n libmount
+This package is the library for device mounting.
+
+%package -n libblkid
+Summary: Library for block device id.
+License: LGPLv2+
+Requires: libuuid = %{version}-%{release}
+Conflicts: filesystem < 3
+Requires(post): coreutils
+
+%description -n libblkid
+This package is le library for block device id.
+
+%package -n uuidd
+Summary:  UUID generation daemon
+Requires: libuuid = %{version}-%{release}
+License: GPLv2
+Requires: systemd
+Requires(pre): shadow
+Requires(post): systemd-units
+Requires(preun): systemd-units
+
+%description -n uuidd
+The uuidd daemon is used by the UUID library to generate universally
+unique identifiers (UUIDs), especially time-based UUIDs, in a secure
+and guaranteed-unique fashion, even in the face of large numbers of
+threads running on different CPUs trying to grab UUIDs.
+
+%package -n libuuid
+Summary: Universally unique ID library
+License: BSD
+Conflicts: filesystem < 3
+
+%description -n libuuid
+This package is the universally unique ID library.
+
+%package user
+Summary: libuser based util-linux utilities
+License: GPLv2
+Requires: util-linux = %{version}-%{release}
+
+%description user
+chfn and chsh utilities with dependence on libuser
+
+%package -n python3-libmount
+Summary:        Python Package for the libmount library pack
+Requires:       libmount = %{version}-%{release}
+License:        LGPLv2+
+
+%description -n python3-libmount
+This package provides python support for users to use the libmount library
+to work with mount tables and mount filesystems.
+
+%package devel
+Summary:        Development package for ${name}
+License:        LGPLv2+ and BSD
+Requires:       %{name} = %{version}-%{release} pkgconfig
+Provides:       libfdisk-devel libsmartcols-devel libmount-devel libblkid-devel libuuid-devel
+Obsoletes:      libfdisk-devel libsmartcols-devel libmount-devel libblkid-devel libuuid-devel
+
+%description devel
+This package contains some library and other necessary files for the
+development of %{name}.
+
+%package help
+Summary:        Help package for ${name}
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Obsoletes:      hardlink-help <= 1:1.3-9
+Provides:       hardlink-help = 1:1.3-9
+
+%description help
+This package contains some doc and man help files for %{name}.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+%define _build_arg0__ CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS" SUID_CFLAGS="-fpie"
+%define _build_arg1__ SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" DAEMON_CFLAGS="$SUID_CFLAGS" DAEMON_LDFLAGS="$SUID_LDFLAGS"
+
+unset LINGUAS || :
+%configure \
+  --with-systemdsystemunitdir=%{_unitdir} \
+  --disable-silent-rules \
+  --disable-bfs \
+  --disable-pg \
+  --enable-chfn-chsh \
+  --enable-usrdir-path \

_service:tar_scm:2.36-login-lastlog-create.patch Added

_service:tar_scm:Add-check-to-resolve-uname26-version-test-failed.patch Added

@@ -0,0 +1,34 @@
+From 72466ac801928c205604b99fe01f830809bda930 Mon Sep 17 00:00:00 2001
+From: Liquor <lirui130@huawei.com>
+Date: Thu, 17 Dec 2020 15:04:56 +0800
+Subject: PATCH Add check to resolve uname26-version test failed
+
+The uname command is modified in packages uname-build-checks,
+but the uname26-version test case needs to use the uname -r query
+result.As a result,the test fails.
+So we add a judgment to check whether uname-build-checks is installed.
+---
+ tests/ts/misc/setarch | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/ts/misc/setarch b/tests/ts/misc/setarch
+index 7c99cca..25d02c1 100755
+--- a/tests/ts/misc/setarch
++++ b/tests/ts/misc/setarch
+@@ -77,7 +77,12 @@ ts_finalize_subtest "$finmsg"
+ # conditional subtest
+ if  "$uname26_seems_supported" = "yes" ; then
+ ts_init_subtest uname26-version
+-	tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r)
++	rpm -qa | grep -q "uname-build-checks"
++	if  $? -eq 0 ; then
++		tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname.bin -r)
++	else
++		tmp=$($TS_CMD_SETARCH $ARCH --uname-2.6 uname -r)
++	fi
+ 	if echo "$tmp" | grep -q "^2\.6\."; then
+ 		echo "kernel version changed to 2.6" >> $TS_OUTPUT
+ 	else
+-- 
+2.27.0
+

_service:tar_scm:SKIPPED-no-root-permissions-test.patch Added

_service:tar_scm:backport-CVE-2021-3995.patch Added

@@ -0,0 +1,138 @@
+From f3db9bd609494099f0c1b95231c5dfe383346929 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 24 Nov 2021 13:53:25 +0100
+Subject: PATCH libmount: fix UID check for FUSE umount CVE-2021-3995
+
+Improper UID check allows an unprivileged user to unmount FUSE
+filesystems of users with similar UID.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+Reference:https://github.com/util-linux/util-linux/commit/f3db9bd609494099f0c1b95231c5dfe383346929
+Conflict:NA
+---
+ include/strutils.h            |  2 +-
+ libmount/src/context_umount.c | 13 +++--------
+ libmount/src/mountP.h         |  1 +
+ libmount/src/optstr.c         | 42 +++++++++++++++++++++++++++++++++++
+ 4 files changed, 47 insertions(+), 11 deletions(-)
+
+diff --git a/include/strutils.h b/include/strutils.h
+index 4b3182f..50e493a 100644
+--- a/include/strutils.h
++++ b/include/strutils.h
+@@ -88,8 +88,8 @@ static inline char *mem2strcpy(char *dest, const void *src, size_t n, size_t nma
+ 	if (n + 1 > nmax)
+ 		n = nmax - 1;
+ 
++	memset(dest, '\0', nmax);
+ 	memcpy(dest, src, n);
+-	destnmax-1 = '\0';
+ 	return dest;
+ }
+ 
+diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
+index 94f824b..0d77fff 100644
+--- a/libmount/src/context_umount.c
++++ b/libmount/src/context_umount.c
+@@ -393,10 +393,7 @@ static int is_fuse_usermount(struct libmnt_context *cxt, int *errsv)
+ 	struct libmnt_ns *ns_old;
+ 	const char *type = mnt_fs_get_fstype(cxt->fs);
+ 	const char *optstr;
+-	char *user_id = NULL;
+-	size_t sz;
+-	uid_t uid;
+-	char uidstrsizeof(stringify_value(ULONG_MAX));
++	uid_t uid, entry_uid;
+ 
+ 	*errsv = 0;
+ 
+@@ -414,10 +411,7 @@ static int is_fuse_usermount(struct libmnt_context *cxt, int *errsv)
+ 	if (!optstr)
+ 		return 0;
+ 
+-	if (mnt_optstr_get_option(optstr, "user_id", &user_id, &sz) != 0)
+-		return 0;
+-
+-	if (sz == 0 || user_id == NULL)
++	if (mnt_optstr_get_uid(optstr, "user_id", &entry_uid) != 0)
+ 		return 0;
+ 
+ 	/* get current user */
+@@ -434,8 +428,7 @@ static int is_fuse_usermount(struct libmnt_context *cxt, int *errsv)
+ 		return 0;
+ 	}
+ 
+-	snprintf(uidstr, sizeof(uidstr), "%lu", (unsigned long) uid);
+-	return strncmp(user_id, uidstr, sz) == 0;
++	return uid == entry_uid;
+ }
+ 
+ /*
+diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
+index d8ba0ab..4a2ddb3 100644
+--- a/libmount/src/mountP.h
++++ b/libmount/src/mountP.h
+@@ -401,6 +401,7 @@ extern const struct libmnt_optmap *mnt_optmap_get_entry(
+ 			     const struct libmnt_optmap **mapent);
+ 
+ /* optstr.c */
++extern int mnt_optstr_get_uid(const char *optstr, const char *name, uid_t *uid);
+ extern int mnt_optstr_remove_option_at(char **optstr, char *begin, char *end);
+ extern int mnt_optstr_fix_gid(char **optstr, char *value, size_t valsz, char **next);
+ extern int mnt_optstr_fix_uid(char **optstr, char *value, size_t valsz, char **next);
+diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
+index eea952b..8a92c32 100644
+--- a/libmount/src/optstr.c
++++ b/libmount/src/optstr.c
+@@ -1090,6 +1090,48 @@ int mnt_optstr_fix_user(char **optstr)
+ 	return rc;
+ }
+ 
++/*
++ * Converts value from @optstr addressed by @name to uid.
++ *
++ * Returns: 0 on success, 1 if not found, <0 on error
++ */
++int mnt_optstr_get_uid(const char *optstr, const char *name, uid_t *uid)
++{
++	char *value = NULL;
++	size_t valsz = 0;
++	char bufsizeof(stringify_value(UINT64_MAX));
++	int rc;
++	uint64_t num;
++
++	assert(optstr);
++	assert(name);
++	assert(uid);
++
++	rc = mnt_optstr_get_option(optstr, name, &value, &valsz);
++	if (rc != 0)
++		goto fail;
++
++	if (valsz > sizeof(buf) - 1) {
++		rc = -ERANGE;
++		goto fail;
++	}
++	mem2strcpy(buf, value, valsz, sizeof(buf));
++
++	rc = ul_strtou64(buf, &num, 10);
++	if (rc != 0)
++		goto fail;
++	if (num > ULONG_MAX || (uid_t) num != num) {
++		rc = -ERANGE;
++		goto fail;
++	}
++	*uid = (uid_t) num;
++
++	return 0;
++fail:
++	DBG(UTILS, ul_debug("failed to convert '%s'= to number rc=%d", name, rc));
++	return rc;
++}
++
+ /**
+  * mnt_match_options:
+  * @optstr: options string
+-- 
+2.27.0
+

_service:tar_scm:backport-CVE-2021-3996.patch Added

@@ -0,0 +1,226 @@
+From 018a10907fa9885093f6d87401556932c2d8bd2b Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 4 Jan 2022 10:54:20 +0100
+Subject: PATCH libmount: fix (deleted) suffix issue CVE-2021-3996
+
+This issue is related to parsing the /proc/self/mountinfo file allows an
+unprivileged user to unmount other user's filesystems that are either
+world-writable themselves or mounted in a world-writable directory.
+
+The support for "(deleted)" is no more necessary as the Linux kernel does
+not use it in /proc/self/mountinfo and /proc/self/mount files anymore.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+Reference:https://github.com/util-linux/util-linux/commit/018a10907fa9885093f6d87401556932c2d8bd2b
+Conflict:NA
+---
+ libmount/src/tab_parse.c                            |  5 -----
+ tests/expected/findmnt/filter-options               |  1 -
+ tests/expected/findmnt/filter-options-nameval-neg   |  3 +--
+ tests/expected/findmnt/filter-types-neg             |  1 -
+ tests/expected/findmnt/outputs-default              |  3 +--
+ tests/expected/findmnt/outputs-force-tree           |  3 +--
+ tests/expected/findmnt/outputs-kernel               |  3 +--
+ tests/expected/libmount/tabdiff-mount               |  1 -
+ tests/expected/libmount/tabdiff-move                |  1 -
+ tests/expected/libmount/tabdiff-remount             |  1 -
+ tests/expected/libmount/tabdiff-umount              |  1 -
+ tests/expected/libmount/tabfiles-parse-mountinfo    | 11 -----------
+ tests/expected/libmount/tabfiles-py-parse-mountinfo | 11 -----------
+ tests/ts/findmnt/files/mountinfo                    |  1 -
+ tests/ts/findmnt/files/mountinfo-nonroot            |  1 -
+ tests/ts/libmount/files/mountinfo                   |  1 -
+ 16 files changed, 4 insertions(+), 44 deletions(-)
+
+diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
+index 3a2cc0d..eec9758 100644
+--- a/libmount/src/tab_parse.c
++++ b/libmount/src/tab_parse.c
+@@ -225,11 +225,6 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, const char *s)
+ 		goto fail;
+ 	}
+ 
+-	/* remove "\040(deleted)" suffix */
+-	p = (char *) endswith(fs->target, PATH_DELETED_SUFFIX);
+-	if (p && *p)
+-		*p = '\0';
+-
+ 	s = skip_separator(s);
+ 
+ 	/* (6) vfs options (fs-independent) */
+diff --git a/tests/expected/findmnt/filter-options b/tests/expected/findmnt/filter-options
+index 2606bce..97b0ead 100644
+--- a/tests/expected/findmnt/filter-options
++++ b/tests/expected/findmnt/filter-options
+@@ -28,5 +28,4 @@ TARGET                       SOURCE           FSTYPE                OPTIONS
+ /home/kzak/.gvfs             gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
+ /var/lib/nfs/rpc_pipefs      sunrpc           rpc_pipefs            rw,relatime
+ /mnt/sounds                  //foo.home/bar/  cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+-/mnt/foo                     /fooooo          bar                   rw,relatime
+ rc=0
+diff --git a/tests/expected/findmnt/filter-options-nameval-neg b/tests/expected/findmnt/filter-options-nameval-neg
+index 5471d65..f0467ef 100644
+--- a/tests/expected/findmnt/filter-options-nameval-neg
++++ b/tests/expected/findmnt/filter-options-nameval-neg
+@@ -29,6 +29,5 @@ TARGET                         SOURCE                FSTYPE                OPTIO
+ |-/home/kzak                   /dev/mapper/kzak-home ext4                  rw,noatime,barrier=1,data=ordered
+ | `-/home/kzak/.gvfs           gvfs-fuse-daemon      fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
+ |-/var/lib/nfs/rpc_pipefs      sunrpc                rpc_pipefs            rw,relatime
+-|-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+-`-/mnt/foo                     /fooooo               bar                   rw,relatime
++`-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+ rc=0
+diff --git a/tests/expected/findmnt/filter-types-neg b/tests/expected/findmnt/filter-types-neg
+index 2606bce..97b0ead 100644
+--- a/tests/expected/findmnt/filter-types-neg
++++ b/tests/expected/findmnt/filter-types-neg
+@@ -28,5 +28,4 @@ TARGET                       SOURCE           FSTYPE                OPTIONS
+ /home/kzak/.gvfs             gvfs-fuse-daemon fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
+ /var/lib/nfs/rpc_pipefs      sunrpc           rpc_pipefs            rw,relatime
+ /mnt/sounds                  //foo.home/bar/  cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+-/mnt/foo                     /fooooo          bar                   rw,relatime
+ rc=0
+diff --git a/tests/expected/findmnt/outputs-default b/tests/expected/findmnt/outputs-default
+index 5949579..0159935 100644
+--- a/tests/expected/findmnt/outputs-default
++++ b/tests/expected/findmnt/outputs-default
+@@ -30,6 +30,5 @@ TARGET                         SOURCE                FSTYPE                OPTIO
+ |-/home/kzak                   /dev/mapper/kzak-home ext4                  rw,noatime,barrier=1,data=ordered
+ | `-/home/kzak/.gvfs           gvfs-fuse-daemon      fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
+ |-/var/lib/nfs/rpc_pipefs      sunrpc                rpc_pipefs            rw,relatime
+-|-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+-`-/mnt/foo                     /fooooo               bar                   rw,relatime
++`-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+ rc=0
+diff --git a/tests/expected/findmnt/outputs-force-tree b/tests/expected/findmnt/outputs-force-tree
+index 5949579..0159935 100644
+--- a/tests/expected/findmnt/outputs-force-tree
++++ b/tests/expected/findmnt/outputs-force-tree
+@@ -30,6 +30,5 @@ TARGET                         SOURCE                FSTYPE                OPTIO
+ |-/home/kzak                   /dev/mapper/kzak-home ext4                  rw,noatime,barrier=1,data=ordered
+ | `-/home/kzak/.gvfs           gvfs-fuse-daemon      fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
+ |-/var/lib/nfs/rpc_pipefs      sunrpc                rpc_pipefs            rw,relatime
+-|-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+-`-/mnt/foo                     /fooooo               bar                   rw,relatime
++`-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+ rc=0
+diff --git a/tests/expected/findmnt/outputs-kernel b/tests/expected/findmnt/outputs-kernel
+index 5949579..0159935 100644
+--- a/tests/expected/findmnt/outputs-kernel
++++ b/tests/expected/findmnt/outputs-kernel
+@@ -30,6 +30,5 @@ TARGET                         SOURCE                FSTYPE                OPTIO
+ |-/home/kzak                   /dev/mapper/kzak-home ext4                  rw,noatime,barrier=1,data=ordered
+ | `-/home/kzak/.gvfs           gvfs-fuse-daemon      fuse.gvfs-fuse-daemon rw,nosuid,nodev,relatime,user_id=500,group_id=500
+ |-/var/lib/nfs/rpc_pipefs      sunrpc                rpc_pipefs            rw,relatime
+-|-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+-`-/mnt/foo                     /fooooo               bar                   rw,relatime
++`-/mnt/sounds                  //foo.home/bar/       cifs                  rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+ rc=0
+diff --git a/tests/expected/libmount/tabdiff-mount b/tests/expected/libmount/tabdiff-mount
+index 420aeac..3c18f8d 100644
+--- a/tests/expected/libmount/tabdiff-mount
++++ b/tests/expected/libmount/tabdiff-mount
+@@ -1,3 +1,2 @@
+ /dev/mapper/kzak-home on /home/kzak: MOUNTED
+-/fooooo on /mnt/foo: MOUNTED
+ tmpfs on /mnt/test/foo
bar: MOUNTED
+diff --git a/tests/expected/libmount/tabdiff-move b/tests/expected/libmount/tabdiff-move
+index 24f9bc7..95820d9 100644
+--- a/tests/expected/libmount/tabdiff-move
++++ b/tests/expected/libmount/tabdiff-move
+@@ -1,3 +1,2 @@
+ //foo.home/bar/ on /mnt/music: MOVED to /mnt/music
+-/fooooo on /mnt/foo: UMOUNTED
+ tmpfs on /mnt/test/foo
bar: UMOUNTED
+diff --git a/tests/expected/libmount/tabdiff-remount b/tests/expected/libmount/tabdiff-remount
+index 82ebeab..876bfd9 100644
+--- a/tests/expected/libmount/tabdiff-remount
++++ b/tests/expected/libmount/tabdiff-remount
+@@ -1,4 +1,3 @@
+ /dev/mapper/kzak-home on /home/kzak: REMOUNTED from 'rw,noatime,barrier=1,data=ordered' to 'ro,noatime,barrier=1,data=ordered'
+ //foo.home/bar/ on /mnt/sounds: REMOUNTED from 'rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344' to 'ro,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344'
+-/fooooo on /mnt/foo: UMOUNTED
+ tmpfs on /mnt/test/foo
bar: UMOUNTED
+diff --git a/tests/expected/libmount/tabdiff-umount b/tests/expected/libmount/tabdiff-umount
+index a3e0fe4..c7be725 100644
+--- a/tests/expected/libmount/tabdiff-umount
++++ b/tests/expected/libmount/tabdiff-umount
+@@ -1,3 +1,2 @@
+ /dev/mapper/kzak-home on /home/kzak: UMOUNTED
+-/fooooo on /mnt/foo: UMOUNTED
+ tmpfs on /mnt/test/foo
bar: UMOUNTED
+diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo
+index 47eb770..d5ba524 100644
+--- a/tests/expected/libmount/tabfiles-parse-mountinfo
++++ b/tests/expected/libmount/tabfiles-parse-mountinfo
+@@ -351,17 +351,6 @@ id:     47
+ parent: 20
+ devno:  0:38
+ ------ fs:
+-source: /fooooo
+-target: /mnt/foo
+-fstype: bar
+-optstr: rw,relatime
+-VFS-optstr: rw,relatime
+-FS-opstr: rw
+-root:   /
+-id:     48
+-parent: 20
+-devno:  0:39
+------- fs:
+ source: tmpfs
+ target: /mnt/test/foo
bar
+ fstype: tmpfs
+diff --git a/tests/expected/libmount/tabfiles-py-parse-mountinfo b/tests/expected/libmount/tabfiles-py-parse-mountinfo
+index 47eb770..d5ba524 100644
+--- a/tests/expected/libmount/tabfiles-py-parse-mountinfo
++++ b/tests/expected/libmount/tabfiles-py-parse-mountinfo
+@@ -351,17 +351,6 @@ id:     47
+ parent: 20
+ devno:  0:38
+ ------ fs:
+-source: /fooooo
+-target: /mnt/foo
+-fstype: bar
+-optstr: rw,relatime
+-VFS-optstr: rw,relatime
+-FS-opstr: rw
+-root:   /
+-id:     48
+-parent: 20
+-devno:  0:39
+------- fs:
+ source: tmpfs
+ target: /mnt/test/foo
bar
+ fstype: tmpfs
+diff --git a/tests/ts/findmnt/files/mountinfo b/tests/ts/findmnt/files/mountinfo
+index 475ea1a..ff1e664 100644
+--- a/tests/ts/findmnt/files/mountinfo
++++ b/tests/ts/findmnt/files/mountinfo

_service:tar_scm:backport-Fix-memory-leaks-in-the-chcpu.patch Added

_service:tar_scm:backport-Forward-value-of-sector_size-instead-of-its-address.patch Added

_service:tar_scm:backport-Maybe-there-is-a-little-mistake-in-do_taskset-functi.patch Added

_service:tar_scm:backport-fdisk-fix-output-option-parsing.patch Added

@@ -0,0 +1,28 @@
+From 55ef593842d94d657c8209042491c7590ea3bdf0 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 24 Oct 2022 09:57:07 +0200
+Subject: PATCH fdisk: fix --output option parsing
+
+Fixes: https://github.com/util-linux/util-linux/issues/1859
+Addresses: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1022249
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ disk-utils/fdisk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
+index 2bd2ef41b..79b904f25 100644
+--- a/disk-utils/fdisk.c
++++ b/disk-utils/fdisk.c
+@@ -928,7 +928,7 @@ int main(int argc, char **argv)
+ 		{ "type",           required_argument, NULL, 't' },
+ 		{ "units",          optional_argument, NULL, 'u' },
+ 		{ "version",        no_argument,       NULL, 'V' },
+-		{ "output",         no_argument,       NULL, 'o' },
++		{ "output",         required_argument, NULL, 'o' },
+ 		{ "protect-boot",   no_argument,       NULL, 'B' },
+ 		{ "wipe",           required_argument, NULL, 'w' },
+ 		{ "wipe-partitions",required_argument, NULL, 'W' },
+-- 
+2.27.0
+

_service:tar_scm:backport-fix-by-ignoring-EINVAL-on-remount-of-proc.patch Added

@@ -0,0 +1,40 @@
+From 1961dccea09176a401bc8fc5e1769ab426308314 Mon Sep 17 00:00:00 2001
+From: benaryorg <binary@benary.org>
+Date: Fri, 4 Jun 2021 12:34:52 +0000
+Subject: PATCH fix #648 by ignoring EINVAL on-remount of proc
+
+When using --mount-proc=/some/path then unshare fails if the path provided is not already mounted due to the mount(2) call to change the propagation of the mount.
+In such a case mount(2) returns EINVAL, which however is used for a variety of other errors.
+If this error is ignored mistakenly the effects however should be neglible since:
+
+1. the mount of proc afterwards happens regardless, errors of which are not ignored
+2. the propagation change of root uses MS_REC, which shold already change the propagation of all mounts recursively
+
+Furthermore /proc is not touched if --mount-proc specifies a different mount point.
+This should not cause too much unexpected behaviour due to point 2 from above in any case.
+Specifying --mount-proc with a different path also means that unshare(3) is not instructed to touch /proc, thus /proc not being touched should not be unexpected.
+As a side note, if unshare is called with /proc as an (implicit) parameter to --mount-proc then /proc is a stacked mount, meaning if /proc is unmounted it in the namespace the host /proc is visible again, thus not touching /proc with a different parameter does not constitute more information leakage than the alternative, quite contary it may even be the desired behaviour.
+
+Signed-off-by: benaryorg <binary@benary.org>
+---
+ sys-utils/unshare.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
+index e5627d3c64..820691ba35 100644
+--- a/sys-utils/unshare.c
++++ b/sys-utils/unshare.c
+@@ -650,8 +650,11 @@ int main(int argc, char *argv)
+ 		err(EXIT_FAILURE, _("cannot chdir to '%s'"), newdir);
+ 
+ 	if (procmnt) {
+-		if (!newroot && mount("none", procmnt, NULL, MS_PRIVATE|MS_REC, NULL) != 0)
+-			err(EXIT_FAILURE, _("cannot change %s filesystem propagation"), procmnt);
++		if (!newroot && mount("none", procmnt, NULL, MS_PRIVATE|MS_REC, NULL))
++			/* custom procmnt means that proc is very likely not mounted, causing EINVAL
++			   ignoring the error in this specific instance is safe */
++			if(errno != EINVAL)
++				err(EXIT_FAILURE, _("cannot change %s filesystem propagation"), procmnt);
+ 		if (mount("proc", procmnt, "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL) != 0)
+ 			err(EXIT_FAILURE, _("mount %s failed"), procmnt);
+ 	}

_service:tar_scm:backport-fsck-Processes-may-kill-other-processes.patch Added

@@ -0,0 +1,35 @@
+From 240f2ea95724a2045afebef703f9a7e62326b603 Mon Sep 17 00:00:00 2001
+From: zhanchengbin <zhanchengbin1@huawei.com>
+Date: Mon, 10 Oct 2022 17:23:24 +0800
+Subject: PATCH fsck: Processes may kill other processes.
+
+A error in disk-utils/fsck.c, if run the fsck -N command, processes
+don't execute, just show what would be done. However, the pid whose
+value is -1 is added to the instance_list list in the execute
+function,if the kill_all function is called later, kill(-1, signum)
+is executed, Signals are sent to all processes except the number one
+process and itself. Other processes will be killed if they use the
+default signal processing function.
+
+Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
+Reviewed-by: Lukas Czerner <lczerner@redhat.com>
+---
+ disk-utils/fsck.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
+index 505952c81..800d3ce08 100644
+--- a/disk-utils/fsck.c
++++ b/disk-utils/fsck.c
+@@ -730,6 +730,8 @@ static int kill_all(int signum)
+ 	for (inst = instance_list; inst; inst = inst->next) {
+ 		if (inst->flags & FLAG_DONE)
+ 			continue;
++		if (inst->pid <= 0)
++			continue;
+ 		kill(inst->pid, signum);
+ 		n++;
+ 	}
+-- 
+2.27.0
+

_service:tar_scm:backport-fstat-dir-itself.patch Added

_service:tar_scm:backport-lib-path-make-ul_path_read_buffer-more-robust-coverity-scan.patch Added

@@ -0,0 +1,42 @@
+From ea459dcf95d0bb04c816b71d2b85fbcd8cfc5ee4 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 17 Mar 2022 12:18:03 +0100
+Subject: PATCH lib/path: make ul_path_read_buffer() more robust coverity
+ scan
+
+Make sure we never call bufrc - 1 for rc=0.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ lib/path.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/lib/path.c b/lib/path.c
+index 8a2b882fe4..20a3ea15d2 100644
+--- a/lib/path.c
++++ b/lib/path.c
+@@ -672,14 +672,17 @@ int ul_path_readf_string(struct path_cxt *pc, char **str, const char *path, ...)
+ int ul_path_read_buffer(struct path_cxt *pc, char *buf, size_t bufsz, const char *path)
+ {
+ 	int rc = ul_path_read(pc, buf, bufsz - 1, path);
+-	if (rc < 0)
+-		return rc;
+ 
+-	/* Remove tailing newline (usual in sysfs) */
+-	if (rc > 0 && *(buf + rc - 1) == '\n')
+-		buf--rc = '\0';
+-	else
+-		bufrc - 1 = '\0';
++	if (rc == 0)
++		buf0 = '\0';
++
++	else if (rc > 0) {
++		/* Remove tailing newline (usual in sysfs) */
++		if (*(buf + rc - 1) == '\n')
++			buf--rc = '\0';
++		else
++			bufrc - 1 = '\0';
++	}
+ 
+ 	return rc;
+ }

_service:tar_scm:backport-libblkid-avoid-buffer-overflow-in-ocfs-superblock-parsing.patch Added

@@ -0,0 +1,39 @@
+From d7fa8ed63891b0058c5df8aa809e34de61008f51 Mon Sep 17 00:00:00 2001
+From: Milan Broz <gmazyland@gmail.com>
+Date: Sun, 9 Oct 2022 20:20:45 +0200
+Subject: PATCH libblkid: avoid buffer overflow in ocfs superblock parsing
+
+Label and mount values are checked only according to on-disk
+values and not checked against the real structure size.
+This can lead to reading of memory outside of superblock
+struct and subsequent crash.
+
+Reproducer found with OSS-Fuzz (issue 52270) running over
+cryptsetup project (blkid is used in header init).
+
+Signed-off-by: Milan Broz <gmazyland@gmail.com>
+---
+ libblkid/src/superblocks/ocfs.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libblkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c
+index 28df6ddfa4..e213d66b44 100644
+--- a/libblkid/src/superblocks/ocfs.c
++++ b/libblkid/src/superblocks/ocfs.c
+@@ -129,10 +129,12 @@ static int probe_ocfs(blkid_probe pr, const struct blkid_idmag *mag)
+ 		blkid_probe_set_value(pr, "SEC_TYPE",
+ 				(unsigned char *) "ntocfs", sizeof("ntocfs"));
+ 
+-	blkid_probe_set_label(pr, (unsigned char *) ovl.label,
+-				ocfslabellen(ovl));
+-	blkid_probe_set_value(pr, "MOUNT", (unsigned char *) ovh.mount,
+-				ocfsmountlen(ovh));
++	if (ocfslabellen(ovl) < sizeof(ovl.label))
++		blkid_probe_set_label(pr, (unsigned char *) ovl.label,
++					ocfslabellen(ovl));
++	if (ocfsmountlen(ovh) < sizeof(ovh.mount))
++		blkid_probe_set_value(pr, "MOUNT", (unsigned char *) ovh.mount,
++					ocfsmountlen(ovh));
+ 	blkid_probe_set_uuid(pr, ovl.vol_id);
+ 	blkid_probe_sprintf_version(pr, "%u.%u", maj, min);
+ 	return 0;

_service:tar_scm:backport-libblkid-bsd-fix-buffer-pointer-use-fuzzing.patch Added

_service:tar_scm:backport-libblkid-check-fsync-return-code.patch Added

@@ -0,0 +1,59 @@
+From 133a0d70f637b4f4e4337811e452153b04f2bdcf Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 19 Apr 2022 09:44:07 +0200
+Subject: PATCH libblkid: check fsync() return code
+
+Since 39f5af25982d8b0244000e92a9d0e0e6557d0e17 libblkid uses
+O_NONBLOCK. Now it's more obvious that check fsync() (and close())
+return value after write() is always a good idea ...
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2074486
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libblkid/src/probe.c | 3 ++-
+ misc-utils/wipefs.c  | 8 ++++++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
+index 80db524..3e8a7a0 100644
+--- a/libblkid/src/probe.c
++++ b/libblkid/src/probe.c
+@@ -1299,7 +1299,8 @@ int blkid_do_wipe(blkid_probe pr, int dryrun)
+ 		/* wipen on device */
+ 		if (write_all(fd, buf, len))
+ 			return -1;
+-		fsync(fd);
++		if (fsync(fd) != 0)
++				return -1;
+ 		pr->flags &= ~BLKID_FL_MODIF_BUFF;	/* be paranoid */
+ 
+ 		return blkid_probe_step_back(pr);
+diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
+index 78dc63e..f08a9ba 100644
+--- a/misc-utils/wipefs.c
++++ b/misc-utils/wipefs.c
+@@ -615,7 +615,9 @@ static int do_wipe(struct wipe_control *ctl)
+ 	if (need_force)
+ 		warnx(_("Use the --force option to force erase."));
+ 
+-	fsync(blkid_probe_get_fd(pr));
++	if (fsync(blkid_probe_get_fd(pr)) != 0)
++		err(EXIT_FAILURE, _("%s: cannot flush modified buffers"),
++				ctl->devname);
+ 
+ #ifdef BLKRRPART
+ 	if (reread && (mode & O_EXCL)) {
+@@ -635,7 +637,9 @@ static int do_wipe(struct wipe_control *ctl)
+ 	}
+ #endif
+ 
+-	close(blkid_probe_get_fd(pr));
++	if (close(blkid_probe_get_fd(pr)) != 0)
++		err(EXIT_FAILURE, _("%s: close device failed"), ctl->devname);
++
+ 	blkid_free_probe(pr);
+ 	free(backup);
+ 	return 0;
+-- 
+2.27.0
+

_service:tar_scm:backport-libblkid-exfat-fix-divide-by-zero-coverity-scan.patch Added

_service:tar_scm:backport-libblkid-hfs-fix-label-use-fuzzing.patch Added

_service:tar_scm:backport-libblkid-mac-make-sure-block-size-is-large-enough-fuzzing.patch Added

_service:tar_scm:backport-libblkid-probe-fix-size-and-offset-overflows-fuzzing.patch Added

@@ -0,0 +1,51 @@
+From 106de261469e1001243d5b81ed895762fb34b2ba Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 2 Jun 2022 16:02:54 +0200
+Subject: PATCH libblkid: (probe) fix size and offset overflows fuzzing
+
+Reported-by: Thibault Guittet <tguittet@redhat.com>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libblkid/src/probe.c | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
+index 06c25572be..fc638c9bbe 100644
+--- a/libblkid/src/probe.c
++++ b/libblkid/src/probe.c
+@@ -621,6 +621,11 @@ static int hide_buffer(blkid_probe pr, uint64_t off, uint64_t len)
+ 	struct list_head *p;
+ 	int ct = 0;
+ 
++	if (UINT64_MAX - len < off) {
++		DBG(BUFFER, ul_debug("\t  hide-buffer overflow (ignore)"));
++		return -EINVAL;
++	}
++
+ 	list_for_each(p, &pr->buffers) {
+ 		struct blkid_bufinfo *x =
+ 			list_entry(p, struct blkid_bufinfo, bufs);
+@@ -656,14 +661,20 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, uint64_t off, uint64_t len
+ 	DBG(BUFFER, ul_debug("\t>>>> off=%ju, real-off=%ju (probe <%ju..%ju>, len=%ju",
+ 				off, real_off, pr->off, pr->off + pr->size, len));
+ 	*/
+-
+ 	if (pr->size == 0) {
+ 		errno = EINVAL;
+ 		return NULL;
+ 	}
+ 
+-	if (len == 0 || (!S_ISCHR(pr->mode) && pr->off + pr->size < real_off + len)) {
+-		DBG(BUFFER, ul_debug("\t  ignore: request out of probing area"));
++	if (UINT64_MAX - len < off || UINT64_MAX - len < real_off) {
++		DBG(BUFFER, ul_debug("\t  read-buffer overflow (ignore)"));
++		return NULL;
++	}
++
++	if (len == 0
++	    || (!S_ISCHR(pr->mode) && (pr->size < off || pr->size < len))
++	    || (!S_ISCHR(pr->mode) && (pr->off + pr->size < real_off + len))) {
++		DBG(BUFFER, ul_debug("\t  read-buffer out of probing area (ignore)"));
+ 		errno = 0;
+ 		return NULL;
+ 	}

_service:tar_scm:backport-libblkid-src-topology-dm-close-redundant-write-file-.patch Added

@@ -0,0 +1,47 @@
+From 3f5dd5fa812120764312a2326285e88b2be82c2f Mon Sep 17 00:00:00 2001
+From: jiayi0118 <1398871225@qq.com>
+Date: Wed, 17 Aug 2022 22:25:27 +0800
+Subject: PATCH libblkid/src/topology/dm: close redundant write file
+ description for pipe before reading data.
+
+Reference:https://github.com/util-linux/util-linux/commit/1d5d50c277e459f4ccbb6e3db416dcb6eb2e2bc4
+Conflict:NA
+---
+ libblkid/src/topology/dm.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c
+index b210a805b..1a1cb8ac0 100644
+--- a/libblkid/src/topology/dm.c
++++ b/libblkid/src/topology/dm.c
+@@ -103,6 +103,10 @@ static int probe_dm_tp(blkid_probe pr,
+ 	if (!stream)
+ 		goto nothing;
+ 
++	if (dmpipe1 != -1) {
++		close(dmpipe1);
++	}
++
+ 	if (fscanf(stream, "%lld %lld striped %d %d ",
+ 			&offset, &size, &stripes, &stripesize) != 0)
+ 		goto nothing;
+@@ -111,7 +115,6 @@ static int probe_dm_tp(blkid_probe pr,
+ 	blkid_topology_set_optimal_io_size(pr, (stripes * stripesize) << 9);
+ 
+ 	fclose(stream);
+-	close(dmpipe1);
+ 	return 0;
+ 
+ nothing:
+@@ -119,8 +122,6 @@ nothing:
+ 		fclose(stream);
+ 	else if (dmpipe0 != -1)
+ 		close(dmpipe0);
+-	if (dmpipe1 != -1)
+-		close(dmpipe1);
+ 	return 1;
+ }
+ 
+-- 
+2.31.1
+

_service:tar_scm:backport-libblkid-topology-init-variables-for-DM.patch Added

@@ -0,0 +1,34 @@
+From 819210f37d66949f54fb2f830bc62cb3635a83d5 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 19 Aug 2022 11:40:27 +0200
+Subject: PATCH libblkid: (topology) init variables for DM
+
+Addresses: https://github.com/util-linux/util-linux/issues/1776
+Signed-off-by: Karel Zak <kzak@redhat.com>
+
+Reference:https://github.com/util-linux/util-linux/commit/819210f37d66949f54fb2f830bc62cb3635a83d5
+Conflict:NA
+---
+ libblkid/src/topology/dm.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c
+index 1a1cb8ac0..77146e2e2 100644
+--- a/libblkid/src/topology/dm.c
++++ b/libblkid/src/topology/dm.c
+@@ -34,10 +34,10 @@ static int probe_dm_tp(blkid_probe pr,
+ 		"/usr/sbin/dmsetup",
+ 		"/sbin/dmsetup"
+ 	};
+-	int dmpipe = { -1, -1 }, stripes, stripesize;
++	int dmpipe = { -1, -1 }, stripes = 0, stripesize = 0;
+ 	const char *cmd = NULL;
+ 	FILE *stream = NULL;
+-	long long  offset, size;
++	long long  offset = 0, size = 0;
+ 	size_t i;
+ 	dev_t devno = blkid_probe_get_devno(pr);
+ 
+-- 
+2.31.1
+

_service:tar_scm:backport-libfdisk-check-calloc-return-gcc-analyzer.patch Added

@@ -0,0 +1,43 @@
+From e31e28848e7e5887b0dd48f5bb5ce3c8055eee1e Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 18 Aug 2021 11:35:07 +0200
+Subject: PATCH libfdisk: check calloc() return gcc-analyzer
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libfdisk/src/ask.c  | 4 ++++
+ libfdisk/src/item.c | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
+index 31f95fb..274f6ba 100644
+--- a/libfdisk/src/ask.c
++++ b/libfdisk/src/ask.c
+@@ -36,6 +36,10 @@ int fdisk_set_ask(struct fdisk_context *cxt,
+ struct fdisk_ask *fdisk_new_ask(void)
+ {
+ 	struct fdisk_ask *ask = calloc(1, sizeof(struct fdisk_ask));
++
++	if (!ask)
++		return NULL;
++
+ 	DBG(ASK, ul_debugobj(ask, "alloc"));
+ 	ask->refcount = 1;
+ 	return ask;
+diff --git a/libfdisk/src/item.c b/libfdisk/src/item.c
+index 86fa0fb..671f9ad 100644
+--- a/libfdisk/src/item.c
++++ b/libfdisk/src/item.c
+@@ -40,6 +40,9 @@ struct fdisk_labelitem *fdisk_new_labelitem(void)
+ {
+ 	struct fdisk_labelitem *li = calloc(1, sizeof(*li));
+ 
++	if (!li)
++		return NULL;
++
+ 	li->refcount = 1;
+ 	DBG(ITEM, ul_debugobj(li, "alloc"));
+ 	return li;
+-- 
+1.8.3.1
+

_service:tar_scm:backport-libfdisk-dereference-of-possibly-NULL-gcc-analyzer.patch Added

_service:tar_scm:backport-libmount-fix-possible-memory-leak-in-mnt_optstr_fix_secontext-coverity-scan.patch Added

_service:tar_scm:backport-llib-pty-session-split-PTY-and-signalfd-setup.patch Added

@@ -0,0 +1,121 @@
+From 4681d88ba1034d488814bbbb6e7d06d17e33322d Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 16 Nov 2022 09:17:52 +0100
+Subject: PATCH llib/pty-session: split PTY and signalfd setup
+
+In some cases applications need to use PTY before signalfd is enabled.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/pty-session.h   |  1 +
+ lib/pty-session.c       | 29 +++++++++++++++++++++++++----
+ login-utils/su-common.c |  2 ++
+ term-utils/scriptlive.c |  2 ++
+ 4 files changed, 30 insertions(+), 4 deletions(-)
+
+diff --git a/include/pty-session.h b/include/pty-session.h
+index 09eff43..3242992 100644
+--- a/include/pty-session.h
++++ b/include/pty-session.h
+@@ -98,6 +98,7 @@ void ul_pty_set_child(struct ul_pty *pty, pid_t child);
+ struct ul_pty_callbacks *ul_pty_get_callbacks(struct ul_pty *pty);
+ int ul_pty_is_running(struct ul_pty *pty);
+ int ul_pty_setup(struct ul_pty *pty);
++int ul_pty_signals_setup(struct ul_pty *pty);
+ void ul_pty_cleanup(struct ul_pty *pty);
+ int ul_pty_chownmod_slave(struct ul_pty *pty, uid_t uid, gid_t gid, mode_t mode);
+ void ul_pty_init_slave(struct ul_pty *pty);
+diff --git a/lib/pty-session.c b/lib/pty-session.c
+index 6f038e1..d89dfbb 100644
+--- a/lib/pty-session.c
++++ b/lib/pty-session.c
+@@ -149,12 +149,12 @@ static void pty_signals_cleanup(struct ul_pty *pty)
+ int ul_pty_setup(struct ul_pty *pty)
+ {
+ 	struct termios attrs;
+-	sigset_t ourset;
+ 	int rc = 0;
+ 
+ 	assert(pty->sigfd == -1);
+ 
+-	/* save the current signals setting */
++	/* save the current signals setting (to make ul_pty_cleanup() usable,
++	 * otherwise see ul_pty_signals_setup() */
+ 	sigprocmask(0, NULL, &pty->orgsig);
+ 
+ 	if (pty->isterm) {
+@@ -198,6 +198,26 @@ int ul_pty_setup(struct ul_pty *pty)
+ 		tcsetattr(pty->slave, TCSANOW, &attrs);
+ 	}
+ 
++done:
++	if (rc)
++		ul_pty_cleanup(pty);
++
++	DBG(SETUP, ul_debugobj(pty, "pty setup done master=%d, slave=%d, rc=%d",
++				pty->master, pty->slave, rc));
++	return rc;
++}
++
++/* call me before fork() */
++int ul_pty_signals_setup(struct ul_pty *pty)
++{
++	sigset_t ourset;
++	int rc = 0;
++
++	assert(pty->sigfd == -1);
++
++	/* save the current signals setting */
++	sigprocmask(0, NULL, &pty->orgsig);
++
+ 	sigfillset(&ourset);
+ 	if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
+ 		rc = -errno;
+@@ -221,8 +241,7 @@ done:
+ 	if (rc)
+ 		ul_pty_cleanup(pty);
+ 
+-	DBG(SETUP, ul_debugobj(pty, "pty setup done master=%d, slave=%d, rc=%d",
+-				pty->master, pty->slave, rc));
++	DBG(SETUP, ul_debugobj(pty, "pty signals setup done rc=%d", rc));
+ 	return rc;
+ }
+ 
+@@ -692,6 +711,8 @@ int main(int argc, char *argv)
+ 
+ 	if (ul_pty_setup(pty))
+ 		err(EXIT_FAILURE, "failed to create pseudo-terminal");
++	if (ul_pty_signals_setup(pty))
++		err(EXIT_FAILURE, "failed to initialize signals handler");
+ 
+ 	fflush(stdout);			/* ??? */
+ 
+diff --git a/login-utils/su-common.c b/login-utils/su-common.c
+index afd0ea8..46dc116 100644
+--- a/login-utils/su-common.c
++++ b/login-utils/su-common.c
+@@ -536,6 +536,8 @@ static void create_watching_parent(struct su_context *su)
+ 		/* create pty */
+ 		if (ul_pty_setup(su->pty))
+ 			err(EXIT_FAILURE, _("failed to create pseudo-terminal"));
++		if (ul_pty_signals_setup(su->pty))
++			err(EXIT_FAILURE, _("failed to initialize signals handler"));
+ 	}
+ #endif
+ 	fflush(stdout);			/* ??? */
+diff --git a/term-utils/scriptlive.c b/term-utils/scriptlive.c
+index d81712d..3e68f3c 100644
+--- a/term-utils/scriptlive.c
++++ b/term-utils/scriptlive.c
+@@ -294,6 +294,8 @@ main(int argc, char *argv)
+ 
+ 	if (ul_pty_setup(ss.pty))
+ 		err(EXIT_FAILURE, _("failed to create pseudo-terminal"));
++	if (ul_pty_signals_setup(ss.pty))
++		err(EXIT_FAILURE, _("failed to initialize signals handler"));
+ 
+ 	fflush(stdout);			/* ??? */
+ 
+-- 
+2.27.0
+

_service:tar_scm:backport-logger-always-update-header-when-read-from-stdin.patch Added

@@ -0,0 +1,98 @@
+From 96ccdc00e1fcf1684f9734a189baf90e00ff0c9a Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 1 Nov 2022 10:30:06 +0100
+Subject: PATCH logger: always update header when read from stdin
+
+The current code updates the header only when the priority has been
+changed. It's incorrect because wanted is a valid header or each entry
+(don't forget that logger for stdin use-case is used in pipe to log
+long-time running processes).
+
+This patch also fixes the initial timestamp; it was originally generated
+on logger startup, it now generates the header on the first message.
+
+$ (sleep 2; date; sleep 2; date; sleep 2; date) | logger --stderr --no-act
+
+old:
+<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:16 AM CET 2022
+<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:18 AM CET 2022
+<13>Nov  1 10:42:14 kzak: Tue Nov  1 10:42:20 AM CET 2022
+
+new:
+<13>Nov  1 10:19:02 kzak: Tue Nov  1 10:19:02 AM CET 2022
+<13>Nov  1 10:19:04 kzak: Tue Nov  1 10:19:04 AM CET 2022
+<13>Nov  1 10:19:06 kzak: Tue Nov  1 10:19:06 AM CET 2022
+
+Fixes: https://github.com/util-linux/util-linux/issues/1866
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/logger.c | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/misc-utils/logger.c b/misc-utils/logger.c
+index a29b9e4..0f2a849 100644
+--- a/misc-utils/logger.c
++++ b/misc-utils/logger.c
+@@ -920,8 +920,6 @@ static void logger_open(struct logger_ctl *ctl)
+ 		ctl->tag = xgetlogin();
+ 	if (!ctl->tag)
+ 		ctl->tag = "<someone>";
+-
+-	generate_syslog_header(ctl);
+ }
+ 
+ /* re-open; usually after failed connection */
+@@ -971,10 +969,8 @@ static void logger_stdin(struct logger_ctl *ctl)
+ {
+ 	/* note: we re-generate the syslog header for each log message to
+ 	 * update header timestamps and to reflect possible priority changes.
+-	 * The initial header is generated by logger_open().
+ 	 */
+ 	int default_priority = ctl->pri;
+-	int last_pri = default_priority;
+ 	char *buf = xmalloc(ctl->max_message_size + 2 + 2);
+ 	int pri;
+ 	int c;
+@@ -1001,10 +997,6 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 			} else
+ 				ctl->pri = default_priority;
+ 
+-			if (ctl->pri != last_pri) {
+-				generate_syslog_header(ctl);
+-				last_pri = ctl->pri;
+-			}
+ 			if (c != EOF && c != '\n')
+ 				c = getchar();
+ 		}
+@@ -1015,8 +1007,10 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 		}
+ 		bufi = '\0';
+ 
+-		if (i > 0 || !ctl->skip_empty_lines)
++		if (i > 0 || !ctl->skip_empty_lines) {
++			generate_syslog_header(ctl);
+ 			write_output(ctl, buf);
++		}
+ 
+ 		if (c == '\n')	/* discard line terminator */
+ 			c = getchar();
+@@ -1291,12 +1285,14 @@ int main(int argc, char **argv)
+ 		abort();
+ 	}
+ 	logger_open(&ctl);
+-	if (0 < argc)
++	if (0 < argc) {
++		generate_syslog_header(&ctl);
+ 		logger_command_line(&ctl, argv);
+-	else
++	} else
+ 		/* Note. --file <arg> reopens stdin making the below
+ 		 * function to be used for file inputs. */
+ 		logger_stdin(&ctl);
++
+ 	logger_close(&ctl);
+ 	return EXIT_SUCCESS;
+ }
+-- 
+2.27.0
+

_service:tar_scm:backport-logger-fix-prio-prefix-doesn-t-use-priority-default.patch Added

@@ -0,0 +1,37 @@
+From dbe693413205ba2c3d06a42e85b47b1bd713bfee Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 16 Sep 2021 12:20:25 +0200
+Subject: PATCH logger: fix --prio-prefix doesn't use --priority default
+
+The commit b9ef27f have added priority check, but it introduced
+regression as the default priority (as specified by --priority) is
+ignored.
+
+This patch fixes this problem, but it also removes extra check for
+"kern facility", it's unnecessary and inconsistent with the rest of
+logger.
+
+Fixes: https://github.com/karelzak/util-linux/issues/1450
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/logger.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/misc-utils/logger.c b/misc-utils/logger.c
+index 5b122de..0e7ac8d 100644
+--- a/misc-utils/logger.c
++++ b/misc-utils/logger.c
+@@ -997,8 +997,8 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 			if (c == '>' && 0 <= pri && pri <= 191) {
+ 				/* valid RFC PRI values */
+ 				i = 0;
+-				if (pri < 8)	/* kern facility is forbidden */
+-					pri |= 8;
++				if ((pri & LOG_FACMASK) == 0)
++					pri |= (default_priority & LOG_FACMASK);
+ 				ctl->pri = pri;
+ 			} else
+ 				ctl->pri = default_priority;
+-- 
+1.8.3.1
+

_service:tar_scm:backport-login-Restore-tty-size-after-calling-vhangup.patch Added

@@ -0,0 +1,58 @@
+From 7ba741a50a04e8e72861e90132394996f2d82006 Mon Sep 17 00:00:00 2001
+From: Daan De Meyer <daan.j.demeyer@gmail.com>
+Date: Sat, 30 Oct 2021 15:56:14 +0100
+Subject: PATCH login: Restore tty size after calling vhangup()
+
+If login receives the tty to work on via stdin, stdout and stderr,
+login might end up closing the remaining open file descriptors to
+the tty just before it calls vhangup(). When the last open file
+descriptors to a tty are closed, it's configured size is reset to
+0x0. To avoid this from happening, save the size before closing
+the stdin, stdout and stderr file descriptors and reapply the size
+after the tty is re-opened.
+
+Fixes #1484
+---
+ login-utils/login.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/login-utils/login.c b/login-utils/login.c
+index 3657f04..c9f6d59 100644
+--- a/login-utils/login.c
++++ b/login-utils/login.c
+@@ -513,6 +513,7 @@ static void init_tty(struct login_context *cxt)
+ {
+ 	struct stat st;
+ 	struct termios tt, ttt;
++	struct winsize ws;
+ 
+ 	cxt->tty_mode = (mode_t) getlogindefs_num("TTYPERM", TTY_MODE);
+ 
+@@ -543,6 +544,12 @@ static void init_tty(struct login_context *cxt)
+ 	}
+ #endif
+ 
++	/* The TTY size might be reset to 0x0 by the kernel when we close the stdin/stdout/stderr file
++	 * descriptors so let's save the size now so we can reapply it later */
++	memset(&ws, 0, sizeof(struct winsize));
++	if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) < 0)
++		syslog(LOG_WARNING, _("TIOCGWINSZ ioctl failed: %m"));
++
+ 	tcgetattr(0, &tt);
+ 	ttt = tt;
+ 	ttt.c_cflag &= ~HUPCL;
+@@ -574,6 +581,11 @@ static void init_tty(struct login_context *cxt)
+ 
+ 	/* restore tty modes */
+ 	tcsetattr(0, TCSAFLUSH, &tt);
++
++	/* Restore tty size */
++	if (ws.ws_row > 0 || ws.ws_col > 0)
++		if (ioctl(STDIN_FILENO, TIOCSWINSZ, &ws) < 0)
++			syslog(LOG_WARNING, _("TIOCSWINSZ ioctl failed: %m"));
+ }
+ 
+ /*
+-- 
+1.8.3.1
+

_service:tar_scm:backport-losetup-fix-memory-leak-asan.patch Added

_service:tar_scm:backport-lsblk-fix-endless-loop-if-device-specified-more-than-once.patch Added

@@ -0,0 +1,41 @@
+From 9eb31ca7f7971101846bd3668be5d7807200fa2f Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 19 Sep 2022 14:23:25 +0200
+Subject: PATCH lsblk: fix endless loop if device specified more than once
+
+Fixes: https://github.com/util-linux/util-linux/issues/1814
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/lsblk-devtree.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/misc-utils/lsblk-devtree.c b/misc-utils/lsblk-devtree.c
+index ce9d3e84f7..6f9dc54b3c 100644
+--- a/misc-utils/lsblk-devtree.c
++++ b/misc-utils/lsblk-devtree.c
+@@ -282,8 +282,25 @@ void lsblk_unref_devtree(struct lsblk_devtree *tr)
+ 	}
+ }
+ 
++static int has_root(struct lsblk_devtree *tr, struct lsblk_device *dev)
++{
++	struct lsblk_iter itr;
++	struct lsblk_device *x = NULL;
++
++	lsblk_reset_iter(&itr, LSBLK_ITER_FORWARD);
++
++	while (lsblk_devtree_next_root(tr, &itr, &x) == 0) {
++		if (x == dev)
++			return 1;
++	}
++	return 0;
++}
++
+ int lsblk_devtree_add_root(struct lsblk_devtree *tr, struct lsblk_device *dev)
+ {
++	if (has_root(tr, dev))
++		return 0;
++
+ 	if (!lsblk_devtree_has_device(tr, dev))
+ 		lsblk_devtree_add_device(tr, dev);
+

_service:tar_scm:backport-lslogins-improve-prefixes-interpretation.patch Added

@@ -0,0 +1,88 @@
+From c51cba1e838ae7e36a843ec785543492bb8737cd Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 7 Jun 2022 09:11:56 +0200
+Subject: PATCH lslogins: improve prefixes interpretation
+
+It seems that for example 'passwd --lock' uses two exclamation marks
+in password  field. It seems better to assume arbitrary number of '!'
+and '*' prefixes.
+
+The patch also makes description of the PWD-EMPTY output field more
+explicit.
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2093166
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/lslogins.c | 33 ++++++++++++++++++++++++++-------
+ 1 file changed, 26 insertions(+), 7 deletions(-)
+
+diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
+index 4a1c62fe9d..3646883e0e 100644
+--- a/login-utils/lslogins.c
++++ b/login-utils/lslogins.c
+@@ -226,7 +226,7 @@ static const struct lslogins_coldesc coldescs =
+ {
+ 	COL_USER          = { "USER",		N_("user name"), N_("Username"), 0.1, SCOLS_FL_NOEXTREMES },
+ 	COL_UID           = { "UID",		N_("user ID"), "UID", 1, SCOLS_FL_RIGHT},
+-	COL_PWDEMPTY      = { "PWD-EMPTY",	N_("password not required"), N_("Password not required"), 1, SCOLS_FL_RIGHT },
++	COL_PWDEMPTY      = { "PWD-EMPTY",	N_("password not defined"), N_("Password not required (empty)"), 1, SCOLS_FL_RIGHT },
+ 	COL_PWDDENY       = { "PWD-DENY",	N_("login by password disabled"), N_("Login by password disabled"), 1, SCOLS_FL_RIGHT },
+ 	COL_PWDLOCK       = { "PWD-LOCK",	N_("password defined, but locked"), N_("Password is locked"), 1, SCOLS_FL_RIGHT },
+ 	COL_PWDMETHOD     = { "PWD-METHOD",   N_("password encryption method"), N_("Password encryption method"), 0.1 },
+@@ -823,23 +823,42 @@ static struct lslogins_user *get_user_info(struct lslogins_control *ctl, const c
+ 			break;
+ 		case COL_PWDEMPTY:
+ 			if (shadow) {
+-				if (!*shadow->sp_pwdp) /* '\0' */
++				const char *p = shadow->sp_pwdp;
++
++				while (p && (*p == '!' || *p == '*'))
++					p++;
++
++				if (!p || !*p)
+ 					user->pwd_empty = STATUS_TRUE;
+ 			} else
+ 				user->pwd_empty = STATUS_UNKNOWN;
+ 			break;
+ 		case COL_PWDDENY:
+ 			if (shadow) {
+-				if ((*shadow->sp_pwdp == '!' ||
+-				     *shadow->sp_pwdp == '*') &&
+-				    !valid_pwd(shadow->sp_pwdp + 1))
++				const char *p = shadow->sp_pwdp;
++
++				while (p && (*p == '!' || *p == '*'))
++					p++;
++
++				if (p && *p && p != shadow->sp_pwdp && !valid_pwd(p))
+ 					user->pwd_deny = STATUS_TRUE;
+ 			} else
+ 				user->pwd_deny = STATUS_UNKNOWN;
+ 			break;
+ 		case COL_PWDLOCK:
+ 			if (shadow) {
+-				if (*shadow->sp_pwdp == '!' && valid_pwd(shadow->sp_pwdp + 1))
++				const char *p = shadow->sp_pwdp;
++				int i = 0;
++
++				/* 'passwd --lock' uses two exclamation marks,
++				 * shadow(5) describes the lock as "field which
++				 * starts with an exclamation mark". Let's
++				 * support more '!' ...
++				 */
++				while (p && *p == '!')
++					p++, i++;
++
++				if (i != 0 && (!*p || valid_pwd(p)))
+ 					user->pwd_lock = STATUS_TRUE;
+ 			} else
+ 				user->pwd_lock = STATUS_UNKNOWN;
+@@ -848,7 +867,7 @@ static struct lslogins_user *get_user_info(struct lslogins_control *ctl, const c
+ 			if (shadow) {
+ 				const char *p = shadow->sp_pwdp;
+ 
+-				if (*p == '!' || *p == '*')
++				while (p && (*p == '!' || *p == '*'))
+ 					p++;
+ 				user->pwd_method = get_pwd_method(p, NULL, NULL);
+ 			} else

_service:tar_scm:backport-lsns-fix-the-memory-leak.patch Added

@@ -0,0 +1,100 @@
+From 395f3baed6df1eb736c872ecaa3aa2f05c5dc111 Mon Sep 17 00:00:00 2001
+From: lishengyu <lishengyu@uniontech.com>
+Date: Thu, 23 Jun 2022 14:02:49 +0800
+Subject: PATCH lsns: fix the memory leak.
+
+==28129== 96 bytes in 3 blocks are possibly lost in loss record 1 of 4
+==28129==    at 0x4837B65: calloc (vg_replace_malloc.c:752)
+==28129==    by 0x405C83: xcalloc (xalloc.h:60)
+==28129==    by 0x405C83: netnsid_cache_add (lsns.c:389)
+==28129==    by 0x405C83: get_netnsid (lsns.c:486)
+==28129==    by 0x405C83: read_process (lsns.c:549)
+==28129==    by 0x403FB4: read_processes (lsns.c:586)
+==28129==    by 0x403FB4: main (lsns.c:1417)
+==28129==
+==28129== 119,664 (384 direct, 119,280 indirect) bytes in 1 blocks are definitely lost in loss record 4 of 4
+==28129==    at 0x4837B65: calloc (vg_replace_malloc.c:752)
+==28129==    by 0x4055F5: xcalloc (xalloc.h:60)
+==28129==    by 0x4055F5: read_process (lsns.c:516)
+==28129==    by 0x403FB4: read_processes (lsns.c:586)
+==28129==    by 0x403FB4: main (lsns.c:1417)
+---
+ include/list.h   | 19 +++++++++++++++++++
+ sys-utils/lsns.c | 25 +++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/include/list.h b/include/list.h
+index 96c84e5..b6bbbdd 100644
+--- a/include/list.h
++++ b/include/list.h
+@@ -208,6 +208,25 @@ _INLINE_ void list_splice(struct list_head *list, struct list_head *head)
+ 	for (pos = (head)->next, pnext = pos->next; pos != (head); \
+ 	     pos = pnext, pnext = pos->next)
+ 
++/**
++ * list_free - remove all entries from list and call freefunc()
++ *             for each entry
++ * @head:       the head for your list
++ * @type:       the type of the struct this is embedded in.
++ * @member:     the name of the list_struct within the struct.
++ * @freefunc:   the list entry deallocator
++ */
++#define list_free(head, type, member, freefunc)				\
++	do {								\
++		struct list_head *__p, *__pnext;			\
++									\
++		list_for_each_safe (__p, __pnext, (head)) {		\
++			type *__elt = list_entry(__p, type, member);	\
++			list_del(__p);					\
++			freefunc(__elt);			\
++		}							\
++	} while (0)
++
+ _INLINE_ size_t list_count_entries(struct list_head *head)
+ {
+ 	struct list_head *pos;
+diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
+index 8e25ff1..baa80bd 100644
+--- a/sys-utils/lsns.c
++++ b/sys-utils/lsns.c
+@@ -953,6 +953,28 @@ static int show_namespace_processes(struct lsns *ls, struct lsns_namespace *ns)
+ 	return 0;
+ }
+ 
++static void free_lsns_process(struct lsns_process *lsns_p)
++{
++	free(lsns_p);
++}
++
++static void free_netnsid_caches(struct netnsid_cache *cache)
++{
++	free(cache);
++}
++
++static void free_lsns_namespace(struct lsns_namespace *lsns_n)
++{
++	free(lsns_n);
++}
++
++static void free_all(struct lsns *ls)
++{
++	list_free(&ls->processes, struct lsns_process, processes, free_lsns_process);
++	list_free(&netnsids_cache, struct netnsid_cache, netnsids, free_netnsid_caches);
++	list_free(&ls->namespaces, struct lsns_namespace, namespaces, free_lsns_namespace);
++}
++
+ static void __attribute__((__noreturn__)) usage(void)
+ {
+ 	FILE *out = stdout;
+@@ -1162,5 +1184,8 @@ int main(int argc, char *argv)
+ 	if (netlink_fd >= 0)
+ 		close(netlink_fd);
+ 	free_idcache(uid_cache);
++	
++	free_all(&ls);
++
+ 	return r == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+ }
+-- 
+2.27.0
+

_service:tar_scm:backport-mcookie-fix-infinite-loop-when-use-f.patch Added

_service:tar_scm:backport-partx-remove-memory-leak-to-make-scanners-happy-coverity-scan.patch Added

_service:tar_scm:backport-script-fix-use-of-utempter.patch Added

@@ -0,0 +1,43 @@
+From 6ed644fbf4869a7e042826900eff531cf6660cfb Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Wed, 16 Nov 2022 09:19:18 +0100
+Subject: PATCH script: fix use of utempter
+
+libutempter uses SIGCHLD, but script(1) pty implementation completely
+control all signals by signalfd and utempter does not work.
+
+The solution is to setup signalfd later (after libutempter use).
+
+Fixes: https://github.com/util-linux/util-linux/issues/1904
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ term-utils/script.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/term-utils/script.c b/term-utils/script.c
+index c918ecd6e..516a6cf93 100644
+--- a/term-utils/script.c
++++ b/term-utils/script.c
+@@ -947,13 +947,16 @@ int main(int argc, char **argv)
+ 		printf(_(".\n"));
+ 	}
+ 
+-#ifdef HAVE_LIBUTEMPTER
+-	utempter_add_record(ul_pty_get_childfd(ctl.pty), NULL);
+-#endif
+ 
+ 	if (ul_pty_setup(ctl.pty))
+ 		err(EXIT_FAILURE, _("failed to create pseudo-terminal"));
+ 
++#ifdef HAVE_LIBUTEMPTER
++	utempter_add_record(ul_pty_get_childfd(ctl.pty), NULL);
++#endif
++
++	if (ul_pty_signals_setup(ctl.pty))
++		err(EXIT_FAILURE, _("failed to initialize signals handler"));
+ 	fflush(stdout);
+ 
+ 	/*
+-- 
+2.27.0
+

_service:tar_scm:backport-sfdisk-fix-typo-in-move-data-when-check-partition-size.patch Added

@@ -0,0 +1,26 @@
+From b383155ac6a94f14f5c661d2e4a62c1eef5b6e27 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 8 Nov 2021 14:01:55 +0100
+Subject: PATCH sfdisk: fix typo in --move-data when check partition size
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ disk-utils/sfdisk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
+index b08c945..65256c8 100644
+--- a/disk-utils/sfdisk.c
++++ b/disk-utils/sfdisk.c
+@@ -418,7 +418,7 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
+ 		warnx(_("failed to get start of the old partition; ignoring --move-data"));
+ 	else if (fdisk_partition_get_start(pa) == fdisk_partition_get_start(orig_pa))
+ 		warnx(_("start of the partition has not been moved; ignoring --move-data"));
+-	else if (fdisk_partition_get_size(orig_pa) < fdisk_partition_get_size(pa))
++	else if (fdisk_partition_get_size(orig_pa) > fdisk_partition_get_size(pa))
+ 		warnx(_("new partition is smaller than original; ignoring --move-data"));
+ 	else
+ 		ok = 1;
+-- 
+2.27.0
+

_service:tar_scm:backport-sfdisk-write-empty-label-also-when-only-ignored-part.patch Added

@@ -0,0 +1,51 @@
+From 9e9ad25d690b284427f9a355475bcdddb17cf1e0 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 19 Aug 2021 12:10:02 +0200
+Subject: PATCH sfdisk: write empty label also when only ignored partition
+ specified
+
+sfdisk writes empty disk label only when "label:" header specified.
+Unfortunately, this feature is ignored when all specified partitions
+are ignored
+
+  echo -e "label: dos\n0,0,0\n" | sfdisk /dev/sdc
+
+Fixes: https://github.com/karelzak/util-linux/issues/1413
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ disk-utils/sfdisk.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
+index 526d090..b08c945 100644
+--- a/disk-utils/sfdisk.c
++++ b/disk-utils/sfdisk.c
+@@ -1714,7 +1714,7 @@ static void refresh_prompt_buffer(struct sfdisk *sf, const char *devname,
+  */
+ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
+ {
+-	int rc = 0, partno = sf->partno, created = 0, unused = 0;
++	int rc = 0, partno = sf->partno, created = 0, unused = 0, ignored = 0;
+ 	struct fdisk_script *dp;
+ 	struct fdisk_table *tb = NULL;
+ 	const char *devname = NULL, *label;
+@@ -1897,6 +1897,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
+ 			if (ignore_partition(pa)) {
+ 				fdisk_info(sf->cxt, _("Ignoring partition."));
+ 				next_partno++;
++				ignored++;
+ 				continue;
+ 			}
+ 			if (!created) {		/* create a new disklabel */
+@@ -1960,7 +1961,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
+ 	/* create empty disk label if label, but no partition specified */
+ 	if ((rc == SFDISK_DONE_EOF || rc == SFDISK_DONE_WRITE) && created == 0
+ 	    && fdisk_script_has_force_label(dp) == 1
+-	    && fdisk_table_get_nents(tb) == 0
++	    && fdisk_table_get_nents(tb) == (size_t) ignored
+ 	    && fdisk_script_get_header(dp, "label")) {
+ 
+ 		int xrc = fdisk_apply_script_headers(sf->cxt, dp);
+-- 
+1.8.3.1
+

_service:tar_scm:backport-su-bash-completion-offer-usernames-rather-than-files.patch Added

_service:tar_scm:backport-vipw-flush-stdout-before-getting-answer.patch Added

@@ -0,0 +1,35 @@
+From 56bacb552d017858751aac208987604f7c9387c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
+Date: Fri, 22 Oct 2021 14:28:50 -0300
+Subject: PATCH vipw: flush stdout before getting answer.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the question is displayed only after the user presses Return,
+and the program looks like it's hanging.
+
+This happens at least on musl libc.
+
+Reported by @loreb.
+
+Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
+---
+ login-utils/vipw.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/login-utils/vipw.c b/login-utils/vipw.c
+index f178c8f..bf76f51 100644
+--- a/login-utils/vipw.c
++++ b/login-utils/vipw.c
+@@ -353,6 +353,7 @@ int main(int argc, char *argv)
+ 		 * which means they can be translated. */
+ 		printf(_("Would you like to edit %s now y/n? "), orig_file);
+ 
++		fflush(stdout);
+ 		if (fgets(response, sizeof(response), stdin) &&
+ 		    rpmatch(response) == RPMATCH_YES)
+ 			edit_file(1);
+-- 
+1.8.3.1
+

_service:tar_scm:fix-size-use-for-stdin.patch Added

@@ -0,0 +1,61 @@
+From 58e4ee082bca100034791a4a74481f263bb30a25 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 21 Oct 2021 18:47:40 +0200
+Subject: PATCH logger: fix --size use for stdin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stdin version counts log header into the message size, but
+for example when it reads message from argv it counts only message
+itself.
+
+ $ logger --stderr  --size 3 "abcd"
+ <13>Oct 21 18:48:29 kzak: abc
+
+ $ echo "abcd" | logger --stderr  --size 3
+ logger: cannot allocate 18446744073709551597 bytes: Cannot allocate memory
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2011602
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/logger.c | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/misc-utils/logger.c b/misc-utils/logger.c
+index 25ff2b9308..50ae211056 100644
+--- a/misc-utils/logger.c
++++ b/misc-utils/logger.c
+@@ -976,9 +976,7 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 	 */
+ 	int default_priority = ctl->pri;
+ 	int last_pri = default_priority;
+-	size_t max_usrmsg_size = ctl->max_message_size - strlen(ctl->hdr);
+-	size_t allocated_usrmsg_size = max_usrmsg_size;
+-	char *buf = xmalloc(allocated_usrmsg_size + 2 + 2);
++	char *buf = xmalloc(ctl->max_message_size + 2 + 2);
+ 	int pri;
+ 	int c;
+ 	size_t i;
+@@ -1006,20 +1004,13 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 
+ 			if (ctl->pri != last_pri) {
+ 				generate_syslog_header(ctl);
+-				max_usrmsg_size = ctl->max_message_size - strlen(ctl->hdr);
+-
+-				if (max_usrmsg_size > allocated_usrmsg_size) {
+-					allocated_usrmsg_size = max_usrmsg_size;
+-					buf = xrealloc(buf, allocated_usrmsg_size + 2 + 2);
+-				}
+-
+ 				last_pri = ctl->pri;
+ 			}
+ 			if (c != EOF && c != '\n')
+ 				c = getchar();
+ 		}
+ 
+-		while (c != EOF && c != '\n' && i < max_usrmsg_size) {
++		while (c != EOF && c != '\n' && i < ctl->max_message_size) {
+ 			bufi++ = c;
+ 			c = getchar();
+ 		}

_service:tar_scm:realloc-buffer-when-header-size-changed.patch Added

@@ -0,0 +1,64 @@
+From b0a8b8cd9c34600dda7d0503aac2dc0af3012fdc Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 21 Oct 2021 16:00:01 +0200
+Subject: PATCH logger: realloc buffer when header size changed
+
+This is probably paranoid optimization, but when we generate a new
+header we need to be sure that buffer is not smaller than calculated
+maximal size of user's data.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/logger.c | 21 +++++++++++----------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/misc-utils/logger.c b/misc-utils/logger.c
+index 23da164cd6..4511ab1141 100644
+--- a/misc-utils/logger.c
++++ b/misc-utils/logger.c
+@@ -979,11 +979,11 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 	 * update header timestamps and to reflect possible priority changes.
+ 	 * The initial header is generated by logger_open().
+ 	 */
+-	int has_header = 1;
+ 	int default_priority = ctl->pri;
+ 	int last_pri = default_priority;
+ 	size_t max_usrmsg_size = ctl->max_message_size - strlen(ctl->hdr);
+-	char *const buf = xmalloc(max_usrmsg_size + 2 + 2);
++	size_t allocated_usrmsg_size = max_usrmsg_size;
++	char *buf = xmalloc(allocated_usrmsg_size + 2 + 2);
+ 	int pri;
+ 	int c;
+ 	size_t i;
+@@ -1010,9 +1010,14 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 				ctl->pri = default_priority;
+ 
+ 			if (ctl->pri != last_pri) {
+-				has_header = 0;
+-				max_usrmsg_size =
+-				    ctl->max_message_size - strlen(ctl->hdr);
++				generate_syslog_header(ctl);
++				max_usrmsg_size = ctl->max_message_size - strlen(ctl->hdr);
++
++				if (max_usrmsg_size > allocated_usrmsg_size) {
++					allocated_usrmsg_size = max_usrmsg_size;
++					buf = xrealloc(buf, allocated_usrmsg_size + 2 + 2);
++				}
++
+ 				last_pri = ctl->pri;
+ 			}
+ 			if (c != EOF && c != '\n')
+@@ -1025,12 +1030,8 @@ static void logger_stdin(struct logger_ctl *ctl)
+ 		}
+ 		bufi = '\0';
+ 
+-		if (i > 0 || !ctl->skip_empty_lines) {
+-			if (!has_header)
+-				generate_syslog_header(ctl);
++		if (i > 0 || !ctl->skip_empty_lines)
+ 			write_output(ctl, buf);
+-			has_header = 0;
+-		}
+ 
+ 		if (c == '\n')	/* discard line terminator */
+ 			c = getchar();

_service:tar_scm:segmentation-fault-on-invalid-unicode-input-passed-to-s-option.patch Added

_service:tar_scm:util-linux-Add-sw64-architecture.patch Added

@@ -0,0 +1,326 @@
+From f59cfb87a948b2fb9c18ab059b74b9141419643a Mon Sep 17 00:00:00 2001
+From: wzx <wuzx1226@qq.com>
+Date: Wed, 26 Oct 2022 09:53:14 +0800
+Subject: PATCH Add sw64 architecture
+
+Signed-off-by: wzx <wuzx1226@qq.com>
+---
+ configure                     |  2 ++
+ configure.ac                  |  2 ++
+ include/pt-bsd.h              |  4 ++--
+ libblkid/src/partitions/bsd.c |  1 +
+ libfdisk/src/bsd.c            | 16 ++++++++--------
+ sys-utils/hwclock-rtc.c       |  2 +-
+ sys-utils/hwclock.c           | 12 ++++++------
+ sys-utils/hwclock.h           |  6 +++---
+ sys-utils/lscpu-cputype.c     |  2 +-
+ sys-utils/setarch.c           |  4 ++++
+ tests/ts/fdisk/bsd            |  5 ++++-
+ 11 files changed, 34 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index 57b830a..48d3a36 100755
+--- a/configure
++++ b/configure
+@@ -36071,6 +36071,7 @@ else
+ 	    case $host_cpu in
+ 	      #(
+   alpha) syscall="442" ;;  #(
++  sw_64) syscall="442" ;;  #(
+   i*86) syscall="289" ;;  #(
+   ia64*) syscall="1274" ;;  #(
+   powerpc*) syscall="273" ;;  #(
+@@ -36175,6 +36176,7 @@ else
+ 	    case $host_cpu in
+ 	      #(
+   alpha) syscall="443" ;;  #(
++  sw_64) syscall="443" ;;  #(
+   i*86) syscall="290" ;;  #(
+   ia64*) syscall="1275" ;;  #(
+   powerpc*) syscall="274" ;;  #(
+diff --git a/configure.ac b/configure.ac
+index b12b48c..bf405da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2218,6 +2218,7 @@ UL_BUILD_INIT(ionice)
+ UL_REQUIRES_SYSCALL_CHECK(ionice,
+ 	UL_CHECK_SYSCALL(ioprio_set,
+ 	  alpha,	442,
++	  sw_64,	442,
+ 	  i*86,	289,
+ 	  ia64*,	1274,
+ 	  powerpc*,	273,
+@@ -2230,6 +2231,7 @@ UL_REQUIRES_SYSCALL_CHECK(ionice,
+ UL_REQUIRES_SYSCALL_CHECK(ionice,
+ 	UL_CHECK_SYSCALL(ioprio_get,
+ 	  alpha,	443,
++	  sw_64,	443,
+ 	  i*86,	290,
+ 	  ia64*,	1275,
+ 	  powerpc*,	274,
+diff --git a/include/pt-bsd.h b/include/pt-bsd.h
+index 9bf47a5..c524c44 100644
+--- a/include/pt-bsd.h
++++ b/include/pt-bsd.h
+@@ -10,7 +10,7 @@
+ 
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+-#if defined (__alpha__) || defined (__powerpc__) || \
++#if defined (__alpha__) || defined (__sw_64__) || defined (__powerpc__) || \
+     defined (__ia64__) || defined (__hppa__)
+ # define BSD_LABELSECTOR   0
+ # define BSD_LABELOFFSET   64
+@@ -137,7 +137,7 @@ struct bsd_disklabel {
+ #define BSD_FS_ADVFS	16		/* Digital Unix AdvFS */
+ 
+ /* this is annoying, but it's also the way it is :-( */
+-#ifdef __alpha__
++#if defined __alpha__ || defined __sw_64__
+ #define	BSD_FS_EXT2	8		/* ext2 file system */
+ #else
+ #define	BSD_FS_MSDOS	8		/* MS-DOS file system */
+diff --git a/libblkid/src/partitions/bsd.c b/libblkid/src/partitions/bsd.c
+index c745173..ad2bfda 100644
+--- a/libblkid/src/partitions/bsd.c
++++ b/libblkid/src/partitions/bsd.c
+@@ -166,6 +166,7 @@ nothing:
+  * ------------------------+-------------+------------
+  * alpha luna88k mac68k    |      0      |     64
+  * sparc(OpenBSD) vax      |             |
++ * sw_64                   |             |
+  * ------------------------+-------------+------------
+  * sparc64 sparc(NetBSD)   |      0      |    128
+  * ------------------------+-------------+------------
+diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
+index 313ae5a..875fa11 100644
+--- a/libfdisk/src/bsd.c
++++ b/libfdisk/src/bsd.c
+@@ -55,7 +55,7 @@ static struct fdisk_parttype bsd_fstypes = {
+ 	{BSD_FS_V71K,   "4.1BSD"},
+ 	{BSD_FS_V8,     "Eighth Edition"},
+ 	{BSD_FS_BSDFFS, "4.2BSD"},
+-#ifdef __alpha__
++#if defined __alpha__ || defined __sw_64__
+ 	{BSD_FS_EXT2,   "ext2"},
+ #else
+ 	{BSD_FS_MSDOS,  "MS-DOS"},
+@@ -80,7 +80,7 @@ struct fdisk_bsd_label {
+ 
+ 	struct dos_partition *dos_part;		/* parent */
+ 	struct bsd_disklabel bsd;		/* on disk label */
+-#if defined (__alpha__)
++#if defined (__alpha__) || defined (__sw_64__)
+ 	/* We access this through a u_int64_t * when checksumming */
+ 	char bsdbufferBSD_BBSIZE __attribute__((aligned(8)));
+ #else
+@@ -120,7 +120,7 @@ static struct fdisk_parttype *bsd_partition_parttype(
+ }
+ 
+ 
+-#if defined (__alpha__)
++#if defined (__alpha__) || defined (__sw_64__)
+ static void alpha_bootblock_checksum (char *boot)
+ {
+ 	uint64_t *dp = (uint64_t *) boot, sum = 0;
+@@ -606,7 +606,7 @@ int fdisk_bsd_edit_disklabel(struct fdisk_context *cxt)
+ 	struct bsd_disklabel *d = self_disklabel(cxt);
+ 	uintmax_t res;
+ 
+-#if defined (__alpha__) || defined (__ia64__)
++#if defined (__alpha__) || defined (__sw_64__) || defined (__ia64__)
+ 	if (fdisk_ask_number(cxt, DEFAULT_SECTOR_SIZE, d->d_secsize,
+ 			     UINT32_MAX, _("bytes/sector"), &res) == 0)
+ 		d->d_secsize = res;
+@@ -712,7 +712,7 @@ int fdisk_bsd_write_bootstrap(struct fdisk_context *cxt)
+ 	sector = 0;
+ 	if (l->dos_part)
+ 		sector = dos_partition_get_start(l->dos_part);
+-#if defined (__alpha__)
++#if defined (__alpha__) || defined (__sw_64__)
+ 	alpha_bootblock_checksum(l->bsdbuffer);
+ #endif
+ 	if (lseek(cxt->dev_fd, (off_t) sector * DEFAULT_SECTOR_SIZE, SEEK_SET) == -1) {
+@@ -769,7 +769,7 @@ static int bsd_initlabel (struct fdisk_context *cxt)
+ 	else
+ 		d -> d_type = BSD_DTYPE_ST506;
+ 
+-#if !defined (__alpha__)
++#if !defined (__alpha__) && !defined (__sw_64__)	
+ 	d -> d_flags = BSD_D_DOSPART;
+ #else
+ 	d -> d_flags = 0;
+@@ -893,7 +893,7 @@ static int bsd_write_disklabel(struct fdisk_context *cxt)
+ 	memmove(&l->bsdbufferBSD_LABELSECTOR * DEFAULT_SECTOR_SIZE
+ 			   + BSD_LABELOFFSET, d, sizeof(*d));
+ 
+-#if defined (__alpha__) && BSD_LABELSECTOR == 0
++#if (defined (__alpha__) || defined (__sw_64__)) && BSD_LABELSECTOR == 0
+ 	/* Write the checksum to the end of the first sector. */
+ 	alpha_bootblock_checksum(l->bsdbuffer);
+ #endif
+@@ -929,7 +929,7 @@ static int bsd_translate_fstype (int linux_type)
+ 	case 0x06: /* DOS 16-bit >=32M */
+ 	case 0xe1: /* DOS access       */
+ 	case 0xe3: /* DOS R/O          */
+-#if !defined (__alpha__)
++#if !defined (__alpha__) && !defined (__sw_64__)
+ 	case 0xf2: /* DOS secondary    */
+ 		return BSD_FS_MSDOS;
+ #endif
+diff --git a/sys-utils/hwclock-rtc.c b/sys-utils/hwclock-rtc.c
+index 07af9c8..885ca1e 100644
+--- a/sys-utils/hwclock-rtc.c
++++ b/sys-utils/hwclock-rtc.c
+@@ -390,7 +390,7 @@ struct clock_ops *probe_for_rtc_clock(const struct hwclock_control *ctl)
+ 	return &rtc_interface;
+ }
+ 
+-#ifdef __alpha__
++#if defined __alpha__ || defined __sw_64__
+ /*
+  * Get the Hardware Clock epoch setting from the kernel.
+  */
+diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
+index 3609814..37ec0d0 100644
+--- a/sys-utils/hwclock.c
++++ b/sys-utils/hwclock.c
+@@ -1129,7 +1129,7 @@ manipulate_clock(const struct hwclock_control *ctl, const time_t set_time,
+  * Get or set the kernel RTC driver's epoch on Alpha machines.
+  * ISA machines are hard coded for 1900.
+  */
+-#if defined(__linux__) && defined(__alpha__)
++#if defined(__linux__) && (defined(__alpha__) || defined(__sw_64__))
+ static void
+ manipulate_epoch(const struct hwclock_control *ctl)
+ {
+@@ -1172,7 +1172,7 @@ usage(void)
+ 	puts(_(" -w, --systohc        set the RTC from the system time"));
+ 	puts(_("     --systz          send timescale configurations to the kernel"));

_service Changed

_service:extract_file:adjtime Deleted

_service:extract_file:util-linux-2.37.2.tar.xz Deleted

_service:extract_file:util-linux-60-raw.rules Deleted

_service:extract_file:util-linux-chsh-chfn.pamd Deleted

_service:extract_file:util-linux-login.pamd Deleted

_service:extract_file:util-linux-remote.pamd Deleted

_service:extract_file:util-linux-runuser-l.pamd Deleted

_service:extract_file:util-linux-runuser.pamd Deleted

_service:extract_file:util-linux-su-l.pamd Deleted

_service:extract_file:util-linux-su.pamd Deleted

_service:extract_file:util-linux.yaml Deleted

_service:tar_scm:adjtime Added

_service:tar_scm:util-linux-1654758532.d93b40f.tar -> _service:tar_scm:util-linux-2.37.2.tar.xz Changed

_service:tar_scm:util-linux-60-raw.rules Added

_service:tar_scm:util-linux-chsh-chfn.pamd Added

_service:tar_scm:util-linux-login.pamd Added

_service:tar_scm:util-linux-remote.pamd Added

_service:tar_scm:util-linux-runuser-l.pamd Added

_service:tar_scm:util-linux-runuser.pamd Added

_service:tar_scm:util-linux-su-l.pamd Added

_service:tar_scm:util-linux-su.pamd Added

_service:tar_scm:util-linux.yaml Added

Changes of Revision 7