Эх сурвалжийг харах

updated 8 packages

device-mapper-multipath-0.8.2-1

dmraid-1.0.0.rc16-4

jansson-2.12-2

libbsd-0.10.0-1

libedit-3.1-4.20191231

libnsl2-1.2.0-2

libxcrypt-4.4.15-1

sgpio-1.2.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12356 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 5 жил өмнө
parent
commit
2b928d774f

+ 161 - 51
d/device-mapper-multipath/device-mapper-multipath-vl.spec

@@ -1,31 +1,49 @@
 Summary: Tools to manage multipath devices using device-mapper
 Summary: Tools to manage multipath devices using device-mapper
 Summary(ja): Device-mapper を使用してマルチパスデバイスを管理するためのツール集
 Summary(ja): Device-mapper を使用してマルチパスデバイスを管理するためのツール集
 Name: device-mapper-multipath
 Name: device-mapper-multipath
-Version: 0.4.9
-Release: 5%{?_dist_release}
-License: GPLv2+
+Version: 0.8.2
+Release: 1%{?_dist_release}
 Group: System Environment/Base
 Group: System Environment/Base
+License: GPLv2+
 URL: http://christophe.varoqui.free.fr/
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-%{version}.tar.bz2
+# The source for this package was pulled from upstream's git repo.  Use the
+# following command to generate the tarball
+# curl "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=refs/tags/0.8.2;sf=tgz" -o multipath-tools-0.8.2.tgz
+Source0: multipath-tools-%{version}.tgz
 Source1: multipath.conf
 Source1: multipath.conf
-
-# patch that should go upstream
-Patch1: 0001-for-upstream-add-tpg_pref-prioritizer.patch
-
-# RH patches
-Patch1007: 0007-RH-do-not-remove.patch
-Patch1008: 0008-RH-Make-build-system-RH-Fedora-friendly.patch
-Patch1009: 0009-RH-multipathd-blacklist-all-by-default.patch
-Patch1010: 0010-RH-multipath-rules-udev-changes.patch
-Patch1014: 0014-RH-add-hp_tur-checker.patch
-Patch1017: 0017-RHBZ-554592-man-page-note.patch
-Patch1018: 0018-RHBZ-554596-SUN-6540-config.patch
-Patch1019: 0019-RHBZ-554598-fix-multipath-locking.patch
-Patch1020: 0020-RHBZ-554605-fix-manual-failover.patch
-Patch1021: 0021-RHBZ-548874-add-find-multipaths-2.patch
-Patch1022: 0022-RHBZ-557845-RHEL5-style-partitions-2.patch
-Patch1023: 0023-RHBZ-557810-emc-invista-config.patch
-Patch1024: 0024-RHBZ-565933-checker-timeout-2.patch
+Source2: multipathd.init
+
+Patch0001: 0001-libmultipath-make-vector_foreach_slot_backwards-work.patch
+Patch0002: 0002-libmultipath-add-marginal-paths-and-groups-infrastru.patch
+Patch0003: 0003-tests-add-path-grouping-policy-unit-tests.patch
+Patch0004: 0004-libmultipath-add-wrapper-function-around-pgpolicyfn.patch
+Patch0005: 0005-tests-update-pgpolicy-tests-to-work-with-group_paths.patch
+Patch0006: 0006-libmultipath-fix-double-free-in-pgpolicyfn-error-pat.patch
+Patch0007: 0007-libmultipath-consolidate-group_by_-functions.patch
+Patch0008: 0008-libmultipath-make-pgpolicyfn-take-a-paths-vector.patch
+Patch0009: 0009-libmultipath-make-group_paths-handle-marginal-paths.patch
+Patch0010: 0010-tests-add-tests-for-grouping-marginal-paths.patch
+Patch0011: 0011-libmultipath-add-marginal_pathgroups-config-option.patch
+Patch0012: 0012-libmutipath-deprecate-delay_-_checks.patch
+Patch0013: 0013-multipathd-use-marginal_pathgroups.patch
+Patch0014: 0014-multipath-update-man-pages.patch
+Patch0015: 0015-multipath.conf-add-enable_foreign-parameter.patch
+Patch0016: 0016-multipath.conf.5-document-foreign-library-support.patch
+Patch0017: 0017-mpathpersist-remove-broken-unused-code.patch
+Patch0018: 0018-libmultipath-EMC-PowerMax-NVMe-device-config.patch
+Patch0019: 0019-mpathpersist-fix-leaks.patch
+Patch0020: 0020-libmultipath-fix-mpcontext-initialization.patch
+Patch0021: 0021-RH-fixup-udev-rules-for-redhat.patch
+Patch0022: 0022-RH-Remove-the-property-blacklist-exception-builtin.patch
+Patch0023: 0023-RH-don-t-start-without-a-config-file.patch
+Patch0024: 0024-RH-use-rpm-optflags-if-present.patch
+Patch0025: 0025-RH-add-mpathconf.patch
+Patch0026: 0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+Patch0027: 0027-RH-warn-on-invalid-regex-instead-of-failing.patch
+Patch0028: 0028-RH-reset-default-find_mutipaths-value-to-off.patch
+Patch0029: 0029-RH-Fix-nvme-compilation-warning.patch
+Patch0030: 0030-RH-attempt-to-get-ANA-info-via-sysfs-first.patch
+Patch0031: 0031-multipath-fix-issues-found-by-compiling-with-gcc-10.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
 Requires(post): chkconfig
@@ -37,6 +55,9 @@ BuildRequires: device-mapper-devel
 #BuildRequires: libselinux-devel, libsepol-devel
 #BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: readline-devel, ncurses-devel
 BuildRequires: libaio-devel
 BuildRequires: libaio-devel
+BuildRequires: userspace-rcu-devel
+BuildRequires: libudev-devel
+BuildRequires: json-c-devel
 
 
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -50,6 +71,28 @@ The tools are :
 * multipathd :  Detects when paths fail and execs multipath to update things.
 * multipathd :  Detects when paths fail and execs multipath to update things.
 
 
 
 
+%package libs
+Summary: The %{name} modules and shared library
+# only libmpathcmd is LGPLv2+
+License: GPLv2 and LGPLv2+
+
+%description libs
+The %{name}-libs provides the path checker
+and prioritizer modules. It also contains the libmpathpersist and
+libmpathcmd shared libraries, as well as multipath's internal library,
+libmultipath.
+
+
+%package devel
+Summary: Development libraries and headers for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+This package contains the files need to develop applications that use
+device-mapper-multipath's lbmpathpersist and libmpathcmd libraries.
+
+
 %package -n kpartx
 %package -n kpartx
 Summary: Partition device manager for device-mapper devices
 Summary: Partition device manager for device-mapper devices
 Summary(ja): Device-mapper デバイス用のパーティションデバイスマネージャー
 Summary(ja): Device-mapper デバイス用のパーティションデバイスマネージャー
@@ -60,47 +103,61 @@ Provides: kpartx = %{version}-%{release}
 kpartx manages partition creation and removal for device-mapper devices.
 kpartx manages partition creation and removal for device-mapper devices.
 
 
 
 
+%package -n libdmmp
+Summary: device-mapper-multipath C API library
+License: GPLv3+
+Requires: json-c
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+
+%description -n libdmmp
+This package contains the shared library for the device-mapper-multipath
+C API library.
+
+%package -n libdmmp-devel
+Summary: device-mapper-multipath C API library headers
+Requires: pkgconfig
+Requires: libdmmp = %{version}-%{release}
+
+%description -n libdmmp-devel
+This package contains the files needed to develop applications that use
+device-mapper-multipath's libdmmp C API library
+
+
 %prep
 %prep
-%setup -q -c
-%patch1 -p1
-%patch1007 -p1
-%patch1008 -p1
-%patch1009 -p1
-%patch1010 -p1
-%patch1014 -p1
-%patch1017 -p1
-%patch1018 -p1
-%patch1019 -p1
-%patch1020 -p1
-%patch1021 -p1
-%patch1022 -p1
-%patch1023 -p1
-%patch1024 -p1
+%setup -q -n multipath-tools-0.8.2
+%autopatch -p1
 
 
 
 
 %build
 %build
-make LIB=%{_lib}
+make %{?_smp_mflags} LIB=%{_lib} SYSTEMDPATH=/lib
+
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make install \
 make install \
-  DESTDIR=$RPM_BUILD_ROOT \
+  DESTDIR=%{buildroot} \
   bindir=%{_syssbindir} \
   bindir=%{_syssbindir} \
   syslibdir=/%{_lib} \
   syslibdir=/%{_lib} \
+  usrlibdir=%{_libdir} \
   libdir=/%{_lib}/multipath \
   libdir=/%{_lib}/multipath \
-  rcdir=%{_initrddir}
+  rcdir=%{_initdir} \
+  unitdir=%{_unitdir} \
+  pkgconfdir=%{_libdir}/pkgconfig \
+  SYSTEMDPATH=/lib
 
 
 install -d %{buildroot}/etc/multipath
 install -d %{buildroot}/etc/multipath
 install -m644 %{SOURCE1} %{buildroot}/etc/multipath.conf
 install -m644 %{SOURCE1} %{buildroot}/etc/multipath.conf
 
 
-install -m755 multipathd/multipathd.init.redhat %{buildroot}%{_initrddir}/multipathd
+install -d %{buildroot}%{_initdir}
+install -m755 %{SOURCE2} %{buildroot}%{_initdir}/multipathd
+
 
 
 %clean
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 
 
 %post
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add multipathd
 /sbin/chkconfig --add multipathd
 if [ "$1" -gt "1" -a ! -e /etc/multipath/bindings -a \
 if [ "$1" -gt "1" -a ! -e /etc/multipath/bindings -a \
     -f /var/lib/multipath/bindings ]; then
     -f /var/lib/multipath/bindings ]; then
@@ -116,38 +173,91 @@ fi
 
 
 
 
 %postun
 %postun
-/sbin/ldconfig
 if [ "$1" -ge "1" ]; then
 if [ "$1" -ge "1" ]; then
         /sbin/service multipathd condrestart >/dev/null 2>&1 || :
         /sbin/service multipathd condrestart >/dev/null 2>&1 || :
 fi
 fi
 
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%post -n libdmmp -p /sbin/ldconfig
+%postun -n libdmmp -p /sbin/ldconfig
+
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHOR COPYING README* FAQ
-%doc multipath.conf.annotated multipath.conf.defaults 
-%doc multipath.conf.synthetic
+%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0
+%doc README*
+%config /lib/udev/rules.d/62-multipath.rules
+%config /lib/udev/rules.d/11-dm-mpath.rules
 %{_syssbindir}/multipath
 %{_syssbindir}/multipath
 %{_syssbindir}/multipathd
 %{_syssbindir}/multipathd
 %{_syssbindir}/mpathconf
 %{_syssbindir}/mpathconf
-%config /lib/udev/rules.d/40-multipath.rules
+%{_syssbindir}/mpathpersist
+%{_mandir}/man5/multipath.conf.5.gz
 %{_mandir}/man8/multipath.8.gz
 %{_mandir}/man8/multipath.8.gz
 %{_mandir}/man8/multipathd.8.gz
 %{_mandir}/man8/multipathd.8.gz
-%{_mandir}/man5/multipath.conf.5.gz
+%{_mandir}/man8/mpathconf.8.gz
+%{_mandir}/man8/mpathpersist.8.gz
 %config /etc/rc.d/init.d/multipathd
 %config /etc/rc.d/init.d/multipathd
 %config(noreplace) /etc/multipath.conf
 %config(noreplace) /etc/multipath.conf
 %dir /etc/multipath
 %dir /etc/multipath
-/%{_lib}/libmultipath.so*
+
+%files libs
+%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0
+%doc README
+/%{_lib}/libmultipath.so
+/%{_lib}/libmultipath.so.*
+/%{_lib}/libmpathpersist.so.*
+/%{_lib}/libmpathcmd.so.*
 %dir /%{_lib}/multipath
 %dir /%{_lib}/multipath
 /%{_lib}/multipath/*
 /%{_lib}/multipath/*
 
 
+%files devel
+%doc README
+/%{_lib}/libmpathpersist.so
+/%{_lib}/libmpathcmd.so
+%{_includedir}/mpath_cmd.h
+%{_includedir}/mpath_persist.h
+%{_mandir}/man3/mpath_persistent_reserve_in.3.gz
+%{_mandir}/man3/mpath_persistent_reserve_out.3.gz
+
 %files -n kpartx
 %files -n kpartx
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
+%license LICENSES/GPL-2.0 LICENSES/LGPL-2.0
+%doc README
 %{_syssbindir}/kpartx
 %{_syssbindir}/kpartx
+/lib/udev/kpartx_id
+%config /lib/udev/rules.d/11-dm-parts.rules
+%config /lib/udev/rules.d/66-kpartx.rules
+%config /lib/udev/rules.d/68-del-part-nodes.rules
 %{_mandir}/man8/kpartx.8.gz
 %{_mandir}/man8/kpartx.8.gz
 
 
+%files -n libdmmp
+%license LICENSES/GPL-3.0
+%doc README
+%{_libdir}/libdmmp.so.*
+
+%files -n libdmmp-devel
+%doc README
+%{_libdir}/libdmmp.so
+%dir %{_includedir}/libdmmp
+%{_includedir}/libdmmp/*
+%{_mandir}/man3/dmmp_*
+%{_mandir}/man3/libdmmp.h.3.gz
+%{_libdir}/pkgconfig/libdmmp.pc
+
 
 
 %changelog
 %changelog
+* Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.2-1
+- new upstream release.
+- replaced all patches with rawhide's.
+- added sub-packages.
+  - device-mapper-multipath-libs
+  - device-mapper-multipath-devel
+  - libdmmp
+  - libdmmp-devel
+
 * Sat Mar 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.4.9-5
 * Sat Mar 21 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.4.9-5
 - rebuilt with readline 6.3
 - rebuilt with readline 6.3
 - changed BuildRequires: libsysfs-devel instead of sysfsutils-devel
 - changed BuildRequires: libsysfs-devel instead of sysfsutils-devel

+ 62 - 50
d/dmraid/dmraid-vl.spec

@@ -1,13 +1,23 @@
+%{!?_unitdir:%global _unitdir /lib/systemd/system}
+%global _systemdscriptdir %(dirname %{_unitdir})
+
 Summary: Device-mapper RAID tool and library.
 Summary: Device-mapper RAID tool and library.
 Summary(ja): Device-mapper RAID ツールおよびライブラリ
 Summary(ja): Device-mapper RAID ツールおよびライブラリ
 Name: dmraid
 Name: dmraid
 Version: 1.0.0.rc16
 Version: 1.0.0.rc16
-Release: 3%{?_dist_release}
-License: GPL
+Release: 4%{?_dist_release}
 Group: System Environment/Base
 Group: System Environment/Base
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPL
 URL: http://people.redhat.com/heinzm/sw/dmraid
 URL: http://people.redhat.com/heinzm/sw/dmraid
 
 
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
+Source1: dmraid-activation
+Source2: dmraid-activation.service
+
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
 Patch1: ddf1_lsi_persistent_name.patch
 Patch1: ddf1_lsi_persistent_name.patch
 Patch2: pdc_raid10_failure.patch
 Patch2: pdc_raid10_failure.patch
@@ -17,11 +27,18 @@ Patch5: avoid_register.patch
 Patch6: move_pattern_file_to_var.patch
 Patch6: move_pattern_file_to_var.patch
 Patch7: libversion.patch
 Patch7: libversion.patch
 Patch8: libversion-display.patch
 Patch8: libversion-display.patch
+
 Patch9: bz635995-data_corruption_during_activation_volume_marked_for_rebuild.patch
 Patch9: bz635995-data_corruption_during_activation_volume_marked_for_rebuild.patch
 Patch11: bz626417_19-enabling_registration_degraded_volume.patch
 Patch11: bz626417_19-enabling_registration_degraded_volume.patch
 Patch12: bz626417_20-cleanup_some_compilation_warning.patch
 Patch12: bz626417_20-cleanup_some_compilation_warning.patch
 Patch13: bz626417_21-add_option_that_postpones_any_metadata_updates.patch
 Patch13: bz626417_21-add_option_that_postpones_any_metadata_updates.patch
 
 
+Patch14: dmraid-fix-build-to-honour-cflags-var.patch
+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
+
 Patch100: dmraid-1.0.0.rc16-libudev.patch
 Patch100: dmraid-1.0.0.rc16-libudev.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -34,8 +51,6 @@ Requires: device-mapper >= 1.02.22
 Requires(postun): ldconfig
 Requires(postun): ldconfig
 Requires(post): ldconfig
 Requires(post): ldconfig
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 %description
 %description
 DMRAID supports RAID device discovery, RAID set activation and display of
 DMRAID supports RAID device discovery, RAID set activation and display of
@@ -73,71 +88,59 @@ Device failure reporting has to be activated manually by activating the
 
 
 %prep
 %prep
 %setup -q -n dmraid/%{version}
 %setup -q -n dmraid/%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch100 -p1
+%autopatch -p1
+
 
 
 %build
 %build
 %configure \
 %configure \
-  --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin \
-  --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-  --includedir=${RPM_BUILD_ROOT}/%{_includedir} \
-  --disable-libselinux --enable-static_link
-make DESTDIR=$RPM_BUILD_ROOT
-mv tools/dmraid tools/dmraid.static
-make clean
-%configure \
-  --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin \
-  --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-  --includedir=${RPM_BUILD_ROOT}/%{_includedir} \
-  --disable-libselinux --disable-static_link
-make -C lib DESTDIR=$RPM_BUILD_ROOT libdmraid.so
+  --sbindir=/sbin \
+  --disable-libselinux --disable-static_link \
+  --enable-led --enable-intel_led
+# parallel make is broken, do not pass smp flags
+make
+
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
-install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,%{_sysconfdir}/cron.d/}
-install -m 755 -d $RPM_BUILD_ROOT{%{_sysconfdir}/logwatch/conf/services/,%{_sysconfdir}/logwatch/scripts/services/,/var/cache/logwatch/dmeventd}
-make DESTDIR=$RPM_BUILD_ROOT install
-install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
+rm -rf %{buildroot}
+install -m 755 -d %{buildroot}{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,%{_sysconfdir}/cron.d/}
+install -m 755 -d %{buildroot}{%{_sysconfdir}/logwatch/conf/services/,%{_sysconfdir}/logwatch/scripts/services/,/var/cache/logwatch/dmeventd}
+make DESTDIR=%{buildroot} install
+#install -m 755 tools/dmraid.static %{buildroot}/sbin/dmraid.static
+ln -s dmraid %{buildroot}/sbin/dmraid.static
 
 
 # Provide convenience link from dmevent_tool
 # Provide convenience link from dmevent_tool
-(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
-(cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
+(cd %{buildroot}/sbin ; ln -f dmevent_tool dm_dso_reg_tool)
+(cd %{buildroot}/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8)
 
 
 #
 #
-install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/
+install -m 644 include/dmraid/*.h %{buildroot}%{_includedir}/dmraid/
 
 
 # Install the libdmraid and libdmraid-events (for dmeventd) DSO
 # Install the libdmraid and libdmraid-events (for dmeventd) DSO
 # Create version symlink to libdmraid.so.1 we link against
 # Create version symlink to libdmraid.so.1 we link against
 install -m 755 lib/libdmraid.so \
 install -m 755 lib/libdmraid.so \
-        $RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
-(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so ; ln -sf libdmraid.so.%{version} libdmraid.so.1)
+        %{buildroot}%{_libdir}/libdmraid.so.%{version}
+(cd %{buildroot}/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so ; ln -sf libdmraid.so.%{version} libdmraid.so.1)
 install -m 755 lib/libdmraid-events-isw.so \
 install -m 755 lib/libdmraid-events-isw.so \
-        $RPM_BUILD_ROOT%{_libdir}/libdmraid-events-isw.so.%{version}
-(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so.1)
+        %{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 logwatch config file and script for dmeventd
-install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT%{_sysconfdir}/logwatch/conf/services/dmeventd.conf
-install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT%{_sysconfdir}/logwatch/scripts/services/dmeventd
-install -m 644 logwatch/dmeventd_cronjob.txt $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/dmeventd-logwatch
-install -m 0700 /dev/null $RPM_BUILD_ROOT/var/cache/logwatch/dmeventd/syslogpattern.txt
+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
+
+# 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
 
 
 # remove static libs
 # remove static libs
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
+rm -f %{buildroot}/%{_libdir}/libdmraid.a
 
 
 %clean
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
  
  
@@ -145,13 +148,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
+%license LICENSE LICENSE_GPL LICENSE_LGPL
+%doc CHANGELOG CREDITS KNOWN_BUGS README TODO doc/dmraid_design.txt
 %{_mandir}/man8/*
 %{_mandir}/man8/*
 /sbin/*
 /sbin/*
 %{_libdir}/libdmraid.so*
 %{_libdir}/libdmraid.so*
 %{_libdir}/libdmraid-events-isw.so*
 %{_libdir}/libdmraid-events-isw.so*
 %ghost /var/lock/dmraid
 %ghost /var/lock/dmraid
 
 
+%dir %{_systemdscriptdir}
+%dir %{_unitdir}
+%{_systemdscriptdir}/dmraid-activation
+%{_unitdir}/dmraid-activation.service
+
 %files -n dmraid-devel
 %files -n dmraid-devel
 %defattr(-,root,root)
 %defattr(-,root,root)
 %dir %{_includedir}/dmraid
 %dir %{_includedir}/dmraid
@@ -173,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.0.rc16-4
+- imported Patch14-18 from rawhide.
+ 
 * Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.0.rc16-3
 * Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.0.rc16-3
 - change BuildRequires: eudev-libudev-static instead of libudev-static
 - change BuildRequires: eudev-libudev-static instead of libudev-static
 
 

+ 6 - 2
j/jansson/jansson-vl.spec

@@ -1,6 +1,6 @@
 Name:		jansson
 Name:		jansson
 Version:	2.12
 Version:	2.12
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	C library for encoding, decoding and manipulating JSON data
 Summary:	C library for encoding, decoding and manipulating JSON data
 Summary(ja):	JSONデータをエンコード・デコード・操作するためのライブラリ
 Summary(ja):	JSONデータをエンコード・デコード・操作するためのライブラリ
 
 
@@ -52,7 +52,8 @@ rm -rf "$RPM_BUILD_ROOT"
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc LICENSE CHANGES
+%license LICENSE
+%doc CHANGES
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 
 
 %files devel
 %files devel
@@ -63,6 +64,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_includedir}/*
 %{_includedir}/*
 
 
 %changelog
 %changelog
+* Fri Mar 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.12-2
+- rebuilt with current environment.
+
 * Fri Nov 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.12-1
 * Fri Nov 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.12-1
 - new upstream release.
 - new upstream release.
 
 

+ 9 - 7
lib/libb/libbsd/libbsd-vl.spec

@@ -1,19 +1,17 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 Name:		libbsd
 Name:		libbsd
-Version:	0.8.7
+Version:	0.10.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 Summary:	Library providing BSD-compatible functions for portability
 Summary:	Library providing BSD-compatible functions for portability
-
-License:	BSD and ISC and Copyright only and Public Domain
 Group:		System Environment/Libraries
 Group:		System Environment/Libraries
-URL:		http://libbsd.freedesktop.org/
 
 
-Source0:	http://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
+License:	BSD and ISC and Copyright only and Public Domain
+URL:		https://libbsd.freedesktop.org/
+Source0:	https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz
 
 
 Vendor:			Project Vine
 Vendor:			Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
-Packager:		tomop
 
 
 %description
 %description
 libbsd provides useful functions commonly found on BSD systems, and
 libbsd provides useful functions commonly found on BSD systems, and
@@ -108,7 +106,8 @@ rm -rf %{buildroot}
 %endif
 %endif
 
 
 %files
 %files
-%doc COPYING README TODO ChangeLog
+%license COPYING
+%doc README TODO ChangeLog
 %{_libdir}/%{name}.so.*
 %{_libdir}/%{name}.so.*
 
 
 %files devel
 %files devel
@@ -142,6 +141,9 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.0-1
+- new upstream release.
+
 * Thu Feb 22 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.7-1
 * Thu Feb 22 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.7-1
 - new upstream release.
 - new upstream release.
 - added ctor-static subpackage.
 - added ctor-static subpackage.

+ 7 - 3
lib/libe/libedit/libedit-vl.spec

@@ -1,11 +1,11 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-%define snap 20170329
+%define snap 20191231
 
 
 Summary:	The NetBSD Editline library
 Summary:	The NetBSD Editline library
 Summary(ja):	NetBSD Editline ライブラリ
 Summary(ja):	NetBSD Editline ライブラリ
 Name:		libedit
 Name:		libedit
 Version:	3.1
 Version:	3.1
-Release:	3.%{snap}%{?_dist_release}
+Release:	4.%{snap}%{?_dist_release}
 License:	BSD
 License:	BSD
 Group:		System Environment/Libraries
 Group:		System Environment/Libraries
 URL:		http://thrysoee.dk/editline/
 URL:		http://thrysoee.dk/editline/
@@ -93,7 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING THANKS
+%license COPYING
+%doc ChangeLog THANKS
 %{_libdir}/%{name}.so.*
 %{_libdir}/%{name}.so.*
 %{_mandir}/man5/editrc.5*
 %{_mandir}/man5/editrc.5*
 %{_mandir}/man7/editline.7*
 %{_mandir}/man7/editline.7*
@@ -121,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Fri Mar 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1-4.20191231
+- updated to 3.1-20191231.
+
 * Fri Feb 02 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1-3.20170329
 * Fri Feb 02 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1-3.20170329
 - updated to 3.1-20170329.
 - updated to 3.1-20170329.
 
 

+ 5 - 4
lib/libn/libnsl2/libnsl2-vl.spec

@@ -1,16 +1,14 @@
 Name:         libnsl2
 Name:         libnsl2
 Version:      1.2.0
 Version:      1.2.0
-Release:      1%{?_dist_release}
+Release:      2%{?_dist_release}
 Summary:      Public client interface library for NIS(YP) and NIS+
 Summary:      Public client interface library for NIS(YP) and NIS+
+Group:        System Environment/Libraries
 
 
 Vendor:       Project Vine
 Vendor:       Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 License:      BSD and LGPLv2+
 License:      BSD and LGPLv2+
-Group:        System Environment/Libraries
 URL:          https://github.com/thkukuk/libnsl
 URL:          https://github.com/thkukuk/libnsl
-
-
 Source0:      https://github.com/thkukuk/libnsl/archive/v%{version}.tar.gz#/libnsl-%{version}.tar.gz
 Source0:      https://github.com/thkukuk/libnsl/archive/v%{version}.tar.gz#/libnsl-%{version}.tar.gz
 
 
 Patch1:       0001-Don-t-include-ltmain.sh-since-this-would-require-the.patch
 Patch1:       0001-Don-t-include-ltmain.sh-since-this-would-require-the.patch
@@ -69,6 +67,9 @@ rm %{buildroot}/%{_libdir}/libnsl.la
 %{_libdir}/pkgconfig/libnsl.pc
 %{_libdir}/pkgconfig/libnsl.pc
 
 
 %changelog
 %changelog
+* Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-2
+- rebuilt with current environment.
+
 * Fri Jan 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-1
 * Fri Jan 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 8 - 21
lib/libx/libxcrypt/libxcrypt-vl.spec

@@ -3,18 +3,10 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 # Build with new api?
 # Build with new api?
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 9
 %bcond_without new_api
 %bcond_without new_api
-%else
-%bcond_with    new_api
-%endif
 
 
 # Build the compat package?
 # Build the compat package?
-%if 0%{?fedora} >= 999 || 0%{?rhel} >= 99
-%bcond_with    compat_pkg
-%else
 %bcond_without compat_pkg
 %bcond_without compat_pkg
-%endif
 
 
 # Run memcheck?
 # Run memcheck?
 # Valgrind does not work well on %%{power64} arches.
 # Valgrind does not work well on %%{power64} arches.
@@ -61,15 +53,7 @@
 
 
 
 
 # Needed for the distribution README file.
 # Needed for the distribution README file.
-%if 0%{?fedora}
-%global distname .fedora
-%else
-%if 0%{?rhel}
-%global distname .rhel
-%else
-%global distname .distribution
-%endif
-%endif
+%global distname .vine
 
 
 # Needed for out-of-tree builds.
 # Needed for out-of-tree builds.
 %global _configure ../"configure"
 %global _configure ../"configure"
@@ -116,8 +100,8 @@ fi                                                             \
 %endif
 %endif
 
 
 Name:           libxcrypt
 Name:           libxcrypt
-Version:        4.4.2
-Release:        6%{?_dist_release}
+Version:        4.4.15
+Release:        1%{?_dist_release}
 Summary:        Extended crypt library for descrypt, md5crypt, bcrypt, and others
 Summary:        Extended crypt library for descrypt, md5crypt, bcrypt, and others
 
 
 Group:          System Environment/Libraries
 Group:          System Environment/Libraries
@@ -270,10 +254,10 @@ developing applications that use compat32-%{name}.
 
 
 %prep
 %prep
 %autosetup -p 1
 %autosetup -p 1
-./bootstrap
+./autogen.sh
 %if %{with new_api}
 %if %{with new_api}
 %{__cat} << EOF >> README%{distname}
 %{__cat} << EOF >> README%{distname}
-This version of the %{name} package ships the libcrypt.so2
+This version of the %{name} package ships the libcrypt.so.2
 library and does not provide the legacy API functions that have
 library and does not provide the legacy API functions that have
 been provided by glibc's libcrypt.so.1.  The removed functions
 been provided by glibc's libcrypt.so.1.  The removed functions
 by name are encrypt, encrypt_r, setkey, setkey_r, and fcrypt.
 by name are encrypt, encrypt_r, setkey, setkey_r, and fcrypt.
@@ -439,6 +423,9 @@ done
 
 
 
 
 %changelog
 %changelog
+* Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.4.15-1
+- new upstream release.
+
 * Sat Jan 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.4.2-6
 * Sat Jan 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.4.2-6
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 12 - 5
s/sgpio/sgpio-vl.spec

@@ -1,16 +1,19 @@
 Summary: SGPIO captive backplane tool
 Summary: SGPIO captive backplane tool
 Summary(ja): SGPIO バックプレーンツール
 Summary(ja): SGPIO バックプレーンツール
 Name: sgpio
 Name: sgpio
-Version: 1.2.0.10
+Version: 1.2.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-License: GPLv2+
 Group: System Environment/Base
 Group: System Environment/Base
-URL: http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing
-Source: sgpio-1.2-0.10-src.tar.gz
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPLv2+
+URL: http://www.sourceware.org/lvm2/wiki/DMRAID_Eventing
+Source: http://www.sourceware.org/lvm2/wiki/DMRAID_Eventing?action=AttachFile&do=get&target=sgpio-%{version}.tgz#/sgpio-%{version}.tgz
 # there is no official download link for the latest package
 # there is no official download link for the latest package
 #Source: http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing?action=AttachFile&do=get&target=sgpio-1.2.tgz
 #Source: http://sources.redhat.com/lvm2/wiki/DMRAID_Eventing?action=AttachFile&do=get&target=sgpio-1.2.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch0: sgpio-1.2-makefile.patch
 Patch0: sgpio-1.2-makefile.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: nkf
 BuildRequires: nkf
 
 
 %description
 %description
@@ -39,11 +42,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
 %defattr(-, root, root, -)
 %defattr(-, root, root, -)
+%license LICENSE_GPL
 %doc README
 %doc README
 /sbin/sgpio
 /sbin/sgpio
 %{_mandir}/man1/sgpio.*
 %{_mandir}/man1/sgpio.*
 
 
 %changelog
 %changelog
+* Sat Mar 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.1-1
+- new upstream release.
+
 * Wed Apr 06 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0.10-1
 * Wed Apr 06 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0.10-1
 - initial build for Vine Linux
 - initial build for Vine Linux