updated 3 packages

dmraid-1.0.0.rc16-5

dracut-059-1

lvm2-2.03.21-1

d/dmraid/dmraid-vl.spec

@@ -1,19 +1,21 @@
-%{!?_unitdir:%global _unitdir /lib/systemd/system}
+%bcond_with systemd
+
+%if ! %{with systemd}
+%{!?_unitdir:%global _unitdir /usr/lib/systemd/system}
+%endif
 %global _systemdscriptdir %(dirname %{_unitdir})
 
 Summary: Device-mapper RAID tool and library.
 Summary(ja): Device-mapper RAID ツールおよびライブラリ
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 4%{?_dist_release}
-Group: System Environment/Base
-
+Release: 5%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
 License: GPL
 URL: http://people.redhat.com/heinzm/sw/dmraid
-
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 Source1: dmraid-activation
 Source2: dmraid-activation.service
@@ -38,35 +40,38 @@ Patch15: dmraid-fix-errors-and-warnings-triggered-by-CFLAGS.patch
 Patch16: dmraid-fix-destdir.patch
 Patch17: dmraid-fix-missing-destdir.patch
 Patch18: dmraid-fix-so-flags.patch
+Patch19: dmraid-use-modern-run-lock-dir.patch
+Patch20: dmraid-c99.patch
 
 Patch100: dmraid-1.0.0.rc16-libudev.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: device-mapper-devel >= 1.02.22
 BuildRequires: device-mapper-event-devel
-BuildRequires: device-mapper-static
-BuildRequires: eudev-libudev-static
-BuildRequires: glibc-static
+%if %{with systemd}
+BuildRequires: systemd-devel
+%else
+BuildRequires: eudev-libudev-devel
+%endif
 Requires: device-mapper >= 1.02.22
-Requires(postun): ldconfig
-Requires(post): ldconfig
-
 
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
 properties for ATARAID on Linux >= 2.4 using device-mapper.
 
+
 %package -n dmraid-devel
 Summary: Development libraries and headers for dmraid.
-Group: Development/Libraries
+Group: programming
 
 %description -n dmraid-devel
 dmraid-devel provides a library interface for RAID device discovery,
 RAID set activation and display of properties for ATARAID volumes.
 
+
 %package -n dmraid-events
 Summary: dmevent_tool (Device-mapper event tool) and DSO
-Group: System Environment/Base
+Group: system
 Requires: dmraid = %{version}-%{release}, sgpio
 Requires: device-mapper-event
 
@@ -75,9 +80,10 @@ Provides a dmeventd DSO and the dmevent_tool to register devices with it
 for device monitoring.  All active RAID sets should be manually registered
 with dmevent_tool.
 
+
 %package -n dmraid-events-logwatch
 Summary: dmraid logwatch-based email reporting
-Group: System Environment/Base
+Group: system
 Requires: dmraid-events = %{version}-%{release}, logwatch, /etc/cron.d
 
 %description -n dmraid-events-logwatch
@@ -86,9 +92,17 @@ Device failure reporting has to be activated manually by activating the
 /etc/cron.d/dmeventd-logwatch entry and by calling the dmevent_tool
 (see manual page for examples) for any active RAID sets.
 
+
+%debug_package
+
+
 %prep
 %setup -q -n dmraid/%{version}
-%autopatch -p1
+%autopatch -p1 -M 18
+%if %{with systemd}
+%patch19 -p1
+%endif
+%autopatch -p1 -m 20
 
 
 %build
@@ -123,18 +137,20 @@ install -m 755 lib/libdmraid.so \
 install -m 755 lib/libdmraid-events-isw.so \
         %{buildroot}%{_libdir}/libdmraid-events-isw.so.%{version}
 (cd %{buildroot}/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so.1)
-		 
+
 # Install logwatch config file and script for dmeventd
 install -m 644 logwatch/dmeventd.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/dmeventd.conf
 install -m 755 logwatch/dmeventd %{buildroot}%{_sysconfdir}/logwatch/scripts/services/dmeventd
 install -m 644 logwatch/dmeventd_cronjob.txt %{buildroot}%{_sysconfdir}/cron.d/dmeventd-logwatch
 install -m 0700 /dev/null %{buildroot}/var/cache/logwatch/dmeventd/syslogpattern.txt
 
+%if %{with systemd}
 # Install systemd unit
 mkdir -p %{buildroot}%{_unitdir}
 install -p -m 755 %{SOURCE1} %{buildroot}%{_systemdscriptdir}/dmraid-activation
 install -p -m 444 %{SOURCE2} %{buildroot}%{_unitdir}/dmraid-activation.service
 sed -i -e 's|@systemdscriptdir@|%{_systemdscriptdir}|' %{buildroot}%{_unitdir}/dmraid-activation.service
+%endif
 
 # remove static libs
 rm -f %{buildroot}/%{_libdir}/libdmraid.a
@@ -142,9 +158,18 @@ rm -f %{buildroot}/%{_libdir}/libdmraid.a
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
- 
-%postun -p /sbin/ldconfig
+
+%if %{with systemd}
+%post
+%systemd_post dmraid-activation.service
+
+%preun
+%systemd_preun dmraid-activation.service
+
+%postun
+%systemd_postun dmraid-activation.service
+%endif
+
 
 %files
 %defattr(-,root,root)
@@ -154,12 +179,13 @@ rm -rf %{buildroot}
 /sbin/*
 %{_libdir}/libdmraid.so*
 %{_libdir}/libdmraid-events-isw.so*
-%ghost /var/lock/dmraid
-
-%dir %{_systemdscriptdir}
-%dir %{_unitdir}
+%if %{with systemd}
 %{_systemdscriptdir}/dmraid-activation
 %{_unitdir}/dmraid-activation.service
+%ghost /run/lock/dmraid
+%else
+%ghost /var/lock/dmraid
+%endif
 
 %files -n dmraid-devel
 %defattr(-,root,root)
@@ -182,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun May 14 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.0.rc16-5
+- imported Patch19 and 20 from rawhide.
+
 * Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.0.rc16-4
 - imported Patch14-18 from rawhide.
  

d/dracut/dracut-vl.spec

@@ -15,7 +15,7 @@
 
 Name: dracut
 Summary: Initramfs generator using udev
-Version: 053
+Version: 059
 Release: %{dist_free_release}%{?_dist_release}%{?with_systemd:.systemd}
 Group: system,admin-tools
 Vendor: Project Vine
@@ -27,7 +27,8 @@ License: GPLv2+ and LGPLv2+
 URL: https://dracut.wiki.kernel.org/
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%%{version};sf=tgz
-Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
+#Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
+Source0: https://github.com/dracutdevs/dracut/archive/refs/tags/%{version}.tar.gz#/dracut-%{version}.tar.gz
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source2000: vine.conf
 Source2001: vine-module-setup.sh
@@ -307,7 +308,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,0755)
 %if %{with doc}
-%doc README* AUTHORS dracut.html dracut.png dracut.svg
+%doc README* AUTHORS dracut.html
 %endif
 %{!?_licensedir:%global license %%doc}
 %license COPYING lgpl-2.1.txt
@@ -317,7 +318,6 @@ rm -rf -- $RPM_BUILD_ROOT
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/dracut
 %{_datadir}/bash-completion/completions/lsinitrd
-%{_bindir}/mkinitrd
 %{_bindir}/lsinitrd
 %dir %{dracutlibdir}
 %dir %{dracutlibdir}/modules.d
@@ -328,6 +328,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/dracut-logger.sh
 %{dracutlibdir}/dracut-initramfs-restore
 %{dracutlibdir}/dracut-install
+%{dracutlibdir}/dracut-util
 %{dracutlibdir}/skipcpio
 %config(noreplace) %{_sysconfdir}/dracut.conf
 %{dracutlibdir}/dracut.conf.d/01-dist.conf
@@ -339,7 +340,6 @@ rm -rf -- $RPM_BUILD_ROOT
 %if %{with doc}
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man8/*service.8*
-%{_mandir}/man8/mkinitrd.8*
 %{_mandir}/man1/lsinitrd.1*
 %{_mandir}/man7/dracut.kernel.7*
 %{_mandir}/man7/dracut.cmdline.7*
@@ -350,14 +350,31 @@ rm -rf -- $RPM_BUILD_ROOT
 
 %{dracutlibdir}/modules.d/00bash
 %{dracutlibdir}/modules.d/00systemd
+%{dracutlibdir}/modules.d/00systemd-network-management
 %{dracutlibdir}/modules.d/00warpclock
+%{dracutlibdir}/modules.d/01systemd-ac-power
 %{dracutlibdir}/modules.d/01systemd-ask-password
 %{dracutlibdir}/modules.d/01systemd-coredump
+%{dracutlibdir}/modules.d/01systemd-hostnamed
 %{dracutlibdir}/modules.d/01systemd-initrd
+%{dracutlibdir}/modules.d/01systemd-integritysetup
+%{dracutlibdir}/modules.d/01systemd-journald
+%{dracutlibdir}/modules.d/01systemd-ldconfig
 %{dracutlibdir}/modules.d/01systemd-modules-load
+%{dracutlibdir}/modules.d/01systemd-pcrphase
+%{dracutlibdir}/modules.d/01systemd-portabled
+%{dracutlibdir}/modules.d/01systemd-pstore
 %{dracutlibdir}/modules.d/01systemd-repart
+%{dracutlibdir}/modules.d/01systemd-resolved
+%{dracutlibdir}/modules.d/01systemd-rfkill
+%{dracutlibdir}/modules.d/01systemd-sysext
 %{dracutlibdir}/modules.d/01systemd-sysctl
 %{dracutlibdir}/modules.d/01systemd-sysusers
+%{dracutlibdir}/modules.d/01systemd-timedated
+%{dracutlibdir}/modules.d/01systemd-timesyncd
+%{dracutlibdir}/modules.d/01systemd-tmpfiles
+%{dracutlibdir}/modules.d/01systemd-udevd
+%{dracutlibdir}/modules.d/01systemd-veritysetup
 %{dracutlibdir}/modules.d/03modsign
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
@@ -372,10 +389,15 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/50drm
 %{dracutlibdir}/modules.d/50plymouth
+%{dracutlibdir}/modules.d/62bluetooth
 # vine
 %{dracutlibdir}/modules.d/70ehci_first
 
 %{dracutlibdir}/modules.d/80lvmmerge
+%{dracutlibdir}/modules.d/80lvmthinpool-monitor
+%{dracutlibdir}/modules.d/80test
+%{dracutlibdir}/modules.d/80test-makeroot
+%{dracutlibdir}/modules.d/80test-root
 %{dracutlibdir}/modules.d/90btrfs
 %{dracutlibdir}/modules.d/90crypt
 %{dracutlibdir}/modules.d/90dm
@@ -386,10 +408,16 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90multipath
 %{dracutlibdir}/modules.d/90nvdimm
-%{dracutlibdir}/modules.d/90qemu
+%{dracutlibdir}/modules.d/90overlayfs
 %{dracutlibdir}/modules.d/90ppcmac
+%{dracutlibdir}/modules.d/90qemu
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
+	
+%{dracutlibdir}/modules.d/91fido2
+%{dracutlibdir}/modules.d/91pcsc
+%{dracutlibdir}/modules.d/91pkcs11
+%{dracutlibdir}/modules.d/91tpm2-tss
 %{dracutlibdir}/modules.d/95debug
 %{dracutlibdir}/modules.d/95fstab-sys
 %{dracutlibdir}/modules.d/95lunmask
@@ -399,6 +427,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/95terminfo
 %{dracutlibdir}/modules.d/95udev-rules
 %{dracutlibdir}/modules.d/95virtfs
+%{dracutlibdir}/modules.d/95virtiofs
 %ifarch s390 s390x
 %{dracutlibdir}/modules.d/80cms
 %{dracutlibdir}/modules.d/81cio_ignore
@@ -444,6 +473,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %dir %{_sharedstatedir}/initramfs
 %if %{defined _unitdir}
 %{_unitdir}/dracut-shutdown.service
+%{_unitdir}/dracut-shutdown-onfailure.service
 %{_unitdir}/sysinit.target.wants/dracut-shutdown.service
 %{_unitdir}/dracut-cmdline.service
 %{_unitdir}/dracut-initqueue.service
@@ -464,7 +494,8 @@ rm -rf -- $RPM_BUILD_ROOT
 
 %files network
 %defattr(-,root,root,0755)
-%{dracutlibdir}/modules.d/02systemd-networkd
+%{dracutlibdir}/modules.d/01systemd-networkd
+%{dracutlibdir}/modules.d/35connman
 %{dracutlibdir}/modules.d/35network-legacy
 %{dracutlibdir}/modules.d/35network-manager
 %{dracutlibdir}/modules.d/35network-wicked
@@ -506,6 +537,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/99img-lib
 %{dracutlibdir}/modules.d/90dmsquash-live
+%{dracutlibdir}/modules.d/90dmsquash-live-autooverlay
 %{dracutlibdir}/modules.d/90dmsquash-live-ntfs
 %{dracutlibdir}/modules.d/90livenet
 
@@ -532,6 +564,9 @@ rm -rf -- $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 14 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 059-1
+- new upstream release.
+
 * Tue Apr 06 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 053-1
 - new upstream release.
 - added O:mkinitrd, nash.

l/lvm2/lvm2-vl.spec

@@ -5,9 +5,9 @@
 Summary: Userland logical volume management tools
 Summary(ja): 論理ボリューム管理ツール
 Name: lvm2
-Version: 2.03.16
+Version: 2.03.21
 %global lvm_version %{version}
-%define device_mapper_version 1.02.185
+%define device_mapper_version 1.02.195
 # Do not reset Release to 1 unless both lvm2 and device-mapper 
 # versions are increased together.
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -18,14 +18,7 @@ Packager: daisuke
 
 License: GPLv2
 URL: http://sourceware.org/lvm2/
-Source0: LVM2.%{version}.tgz
-Patch1: 0001-devices-file-move-clean-up-after-command-is-run.patch
-Patch2: 0002-devices-file-fail-if-devicesfile-filename-doesn-t-ex.patch
-Patch3: 0003-filter-mpath-handle-other-wwid-types-in-blacklist.patch
-Patch4: 0004-filter-mpath-get-wwids-from-sysfs-vpd_pg83.patch
-Patch5: 0005-pvdisplay-restore-reportformat-option.patch
-Patch6: 0006-exit-with-error-when-devicesfile-name-doesn-t-exist.patch
-Patch7: 0007-make-generate.patch
+Source0: https://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libaio-devel
@@ -45,8 +38,8 @@ BuildRequires: systemd-units
 %else
 BuildRequires: libudev-devel
 %endif
-Conflicts: lvm
-Obsoletes: lvm
+Conflicts: lvm < 2
+Obsoletes: lvm < 2
 
 %define _exec_prefix /usr
 
@@ -200,13 +193,6 @@ the device-mapper event library.
 
 %prep
 %setup -q -n LVM2.%{lvm_version}
-%patch1 -p1 -b .backup1
-%patch2 -p1 -b .backup2
-%patch3 -p1 -b .backup3
-%patch4 -p1 -b .backup4
-%patch5 -p1 -b .backup5
-%patch6 -p1 -b .backup6
-%patch7 -p1 -b .backup7
 
 
 %build
@@ -397,6 +383,7 @@ fi
 %{_sbindir}/vgs
 %{_sbindir}/vgscan
 %{_sbindir}/vgsplit
+%attr(755, -, -) /usr/libexec/lvresize_fs_helper
 %{_mandir}/man5/lvm.conf.5.gz
 %{_mandir}/man7/lvmautoactivation.7.gz
 %{_mandir}/man7/lvmcache.7.gz
@@ -526,8 +513,6 @@ fi
 %{_mandir}/man8/blkdeactivate.8.gz
 %{_mandir}/man8/dmsetup.8.gz
 %{_mandir}/man8/dmstats.8.gz
-%dir %{_udevbasedir}
-%dir %{_udevdir}
 %{_udevdir}/10-dm.rules
 %{_udevdir}/13-dm-disk.rules
 %{_udevdir}/95-dm-notify.rules
@@ -564,6 +549,9 @@ fi
 /usr%{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Sun May 14 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.03.21-1
+- new upstream release.
+
 * Sat Nov 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.03.16-1
 - new upstream release.