updated 2 packages

fail2ban-1.1.0-1

iputils-20240905-1

f/fail2ban/fail2ban-vl.spec

@@ -5,7 +5,7 @@
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
-Version: 1.0.2
+Version: 1.1.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
@@ -20,8 +20,6 @@ Source1: fail2ban-logrotate
 # https://bugzilla.redhat.com/show_bug.cgi?id=1379141
 # https://bugzilla.redhat.com/show_bug.cgi?id=1573185
 Patch0: fail2ban-partof.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=2034205
-Patch1: fail2ban-python311.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -186,6 +184,9 @@ fi
 
 
 %changelog
+* Mon Sep 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
+- new upstream release.
+
 * Thu Nov 10 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-1
 - new upstream release.
 

i/iputils/iputils-vl.spec

@@ -1,10 +1,8 @@
-%bcond_with systemd
-
 Summary: Network monitoring tools including ping.
 Summary(ja): ping 等のネットワークモニタツール集
 Name: iputils
-Version: 20210202
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Version: 20240905
+Release: 1%{?_dist_release}
 Group: network
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -15,10 +13,6 @@ License: BSD and GPLv2+
 URL: https://github.com/iputils/iputils
 Source0: https://github.com/iputils/iputils/archive/%{version}.tar.gz#/%{name}-s%{version}.tar.gz
 Source1: ifenslave.tar.gz
-Source3: rdisc.initd
-Source5: rdisc.sysconfig
-Source6: ninfod.initd
-Source7: ninfod.sysconfig
 
 Source10: bsd.txt
 Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
@@ -29,21 +23,13 @@ Patch1: iputils-ifenslave.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-utils perl-SGMLSpm
-BuildRequires: glibc-kernheaders >= 2.4-8.19
+BuildRequires: kernel-headers
 BuildRequires: libidn2-devel
 BuildRequires: openssl-devel
 BuildRequires: libcap-devel
 BuildRequires: libxslt
 BuildRequires: docbook5-style-xsl
 BuildRequires: meson
-%if %{with systemd}
-%{?systemd_requires}
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
-%endif
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -71,107 +57,49 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie"
 %endif
 export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
-%meson \
-%if %{with systemd}
-	-Dsystemdunitdir="%{_unitdir}" \
-	-DINSTALL_SYSTEMD_UNITS=true \
-%endif
-	%{nil}
+%meson
 %meson_build
-%ninja_build -C %{_target_platform} iputils-gmo
+%ninja_build -C %{_vpath_builddir} iputils-gmo
 
-gcc -Wall $RPM_OPT_FLAGS $CFLAGS $LDFLAGS ifenslave.c -o ifenslave
+gcc $RPM_OPT_FLAGS $CFLAGS $RPM_LD_FLAGS $LDFLAGS ifenslave.c -o ifenslave
 
 
 %install
-rm -rf %{buildroot}
+%meson_install
 
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/{bin,sbin}
-mkdir -p $buildroot%{_sysconfdir}/sysconfig
-
-pushd %{_target_platform}
-install -c clockdiff		%{buildroot}%{_sbindir}/
-install -cp arping		%{buildroot}/sbin/
-ln -s /sbin/arping		%{buildroot}%{_sbindir}/arping
-install -cp ping/ping		%{buildroot}/bin/
-install -cp ../ifenslave		%{buildroot}/sbin/
-install -cp rdisc		%{buildroot}/sbin/
-install -cp tracepath		%{buildroot}/bin/
-install -cp ninfod/ninfod	%{buildroot}/sbin/
+mkdir -p %{buildroot}%{_mandir}/man8
+
+mv -f %{buildroot}%{_bindir}/{ping,tracepath} %{buildroot}/bin/
+mv -f %{buildroot}%{_bindir}/arping %{buildroot}/sbin/
+mv -f %{buildroot}%{_bindir}/clockdiff %{buildroot}%{_sbindir}
 
+ln -s /sbin/arping %{buildroot}%{_sbindir}/arping
 ln -sf /bin/ping %{buildroot}%{_sbindir}
 ln -sf /bin/ping %{buildroot}%{_sbindir}/ping6
 ln -sf /bin/tracepath %{buildroot}%{_sbindir}
 ln -sf /bin/tracepath %{buildroot}%{_sbindir}/tracepath6
-
-mkdir -p %{buildroot}%{_mandir}/man8
-install -cp doc/clockdiff.8	%{buildroot}%{_mandir}/man8/
-install -cp doc/arping.8	%{buildroot}%{_mandir}/man8/
-install -cp doc/ping.8		%{buildroot}%{_mandir}/man8/
-install -cp doc/rdisc.8		%{buildroot}%{_mandir}/man8/
-install -cp doc/tracepath.8	%{buildroot}%{_mandir}/man8/
-install -cp doc/ninfod.8	%{buildroot}%{_mandir}/man8/
-install -cp ../ifenslave.8		%{buildroot}%{_mandir}/man8/
 ln -s ping.8.gz %{buildroot}%{_mandir}/man8/ping6.8.gz
 ln -s tracepath.8.gz %{buildroot}%{_mandir}/man8/tracepath6.8.gz
 
-install -dp %{buildroot}%{_datadir}/locale/ja/LC_MESSAGES
-install -m 644 po/ja.gmo %{buildroot}%{_datadir}/locale/ja/LC_MESSAGES/iputils.mo
-popd
-
-find %{buildroot}%{_mandir} -type f | xargs chmod 644
-
-%if %{with systemd}
-install -Dpm644 %{_target_platform}/rdisc.service %{buildroot}%{_unitdir}/rdisc.service
-install -Dpm644 %{_target_platform}/ninfod/ninfod.service %{buildroot}%{_unitdir}/ninfod.service
-sed -i -e 's|%{_sbindir}/|/sbin/|' %{buildroot}%{_unitdir}/*
-%else
-install -dp %{buildroot}%{_sysconfdir}/rc.d/init.d
-install -m 755 -p %{SOURCE3} %{buildroot}%{_sysconfdir}/rc.d/init.d/rdisc
-install -m 755 -p %{SOURCE6} %{buildroot}%{_sysconfdir}/rc.d/init.d/ninfod
-%endif
-
-install -Dpm644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/rdisc
-install -Dpm644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/ninfod
+install -cp ifenslave		%{buildroot}/sbin/
+install -cp ifenslave.8		%{buildroot}%{_mandir}/man8/
 
 %find_lang %{name}
 
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-
 %post
-%if %{with systemd}
-%systemd_post rdisc.service ninfod.service
-%else
-/sbin/chkconfig --add rdisc
-/sbin/chkconfig --add ninfod
-%endif
-
-%preun
-%if %{with systemd}
-%systemd_preun rdisc.service ninfod.service
-%else
-if [ $1 = 0 -o -x /bin/systemctl ]; then
-   service rdisc stop >/dev/null 2>&1
-   service ninfod stop >/dev/null 2>&1
-   /sbin/chkconfig --del rdisc
-   /sbin/chkconfig --del ninfod
-fi 
-%endif
-
-%postun
-%if %{with systemd}
-%systemd_postun_with_restart rdisc.service ninfod.service
-%else
-if [ "$1" -ge "1" ]; then
-    service rdisc condrestart >/dev/null 2>&1 || :
-    service ninfod condrestart >/dev/null 2>&1 || :
+if [ -x /usr/bin/systemctl ]; then
+  /usr/bin/systemctl disable rdisc.service ninfod.service >/dev/null 2>&1 ||:
+else
+  /sbin/service rdisc stop >/dev/null 2>&1
+  /sbin/service ninfod stop >/dev/null 2>&1
+  /sbin/chkconfig --del rdisc
+  /sbin/chkconfig --del ninfod
 fi
-%endif
+exit 0
 
 
 %files -f %{name}.lang
@@ -180,27 +108,21 @@ fi
 %doc README.*
 %{_sbindir}/clockdiff
 /sbin/arping
-%{_sbindir}/arping
 %attr(4755,root,root)	/bin/ping
 /sbin/ifenslave
-/sbin/rdisc
 /bin/tracepath
-/sbin/ninfod
+%{_sbindir}/arping
 %{_sbindir}/ping
 %{_sbindir}/ping6
 %{_sbindir}/tracepath
 %{_sbindir}/tracepath6
 %{_mandir}/man8/*
-%if %{with systemd}
-%{_unitdir}/*
-%else
-%{_sysconfdir}/rc.d/init.d/rdisc
-%{_sysconfdir}/rc.d/init.d/ninfod
-%endif
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/rdisc
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
+
 
 %changelog
+* Mon Sep 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20240905-1
+- updated to 20240905.
+
 * Tue Feb 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20210202-1
 - updated to 20210202.
 - dropped Patch2: fixed in upstream.