Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fail2ban for openSUSE:Factory checked in at 2025-06-23 14:56:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fail2ban (Old) and /work/SRC/openSUSE:Factory/.fail2ban.new.7067 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fail2ban" Mon Jun 23 14:56:09 2025 rev:74 rq:1286316 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/fail2ban/fail2ban.changes 2025-06-06 22:45:35.167093048 +0200 +++ /work/SRC/openSUSE:Factory/.fail2ban.new.7067/fail2ban.changes 2025-06-23 14:56:42.360408782 +0200 @@ -1,0 +2,29 @@ +Mon Jun 16 22:37:03 UTC 2025 - Jan Engelhardt <[email protected]> + +- spec: + * Drop noarch due to /usr/bin/fail2ban-python ELF + * noarch for monitoring subpackage + +------------------------------------------------------------------- +Fri Jun 13 12:31:06 UTC 2025 - Nathan Cutler <[email protected]> + +- Add setup-py-install-dir.patch: + * fix unit file population broken by switch to %pyproject_wheel + +------------------------------------------------------------------- +Wed Jun 11 13:04:39 UTC 2025 - Nathan Cutler <[email protected]> + +- spec: + * simplify manual installation of files under /etc and /usr from + the wheel + +------------------------------------------------------------------- +Tue Jun 10 13:23:16 UTC 2025 - Nathan Cutler <[email protected]> + +- spec: + * Use pyproject macros to build and install (including + implementing manual install for files under /etc and /usr from + the wheel) + * some BuildRequires cleanup + +------------------------------------------------------------------- New: ---- setup-py-install-dir.patch ----------(New B)---------- New: - Add setup-py-install-dir.patch: * fix unit file population broken by switch to %pyproject_wheel ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fail2ban.spec ++++++ --- /var/tmp/diff_new_pack.WSrKWL/_old 2025-06-23 14:56:43.316448763 +0200 +++ /var/tmp/diff_new_pack.WSrKWL/_new 2025-06-23 14:56:43.316448763 +0200 @@ -16,6 +16,8 @@ # +%define pythons python3 + %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create} #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} @@ -44,11 +46,17 @@ Patch301: harden_fail2ban.service.patch # PATCH-FIX-OPENSUSE fail2ban-fix-openssh98.patch [email protected] -- support openssh9.8 bsc#1230101 Patch302: fail2ban-fix-openssh98.patch +# PATCH-FIX-OPENSUSE setup-py-install-dir.patch [email protected] -- fix unit file population broken by switch to pyproject_wheel macro +Patch303: setup-py-install-dir.patch +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pyinotify >= 0.8.3} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module systemd} +BuildRequires: %{python_module tools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: logrotate BuildRequires: python-rpm-macros -BuildRequires: python3-setuptools -BuildRequires: python3-tools # timezone package is required to run the tests BuildRequires: timezone Requires: cron @@ -58,13 +66,10 @@ Requires: python3 >= 3.5 Requires: python3-setuptools Requires: whois -BuildArch: noarch -BuildRequires: python3-systemd BuildRequires: pkgconfig(systemd) Requires: python3-systemd Requires: systemd > 204 %{?systemd_requires} -BuildRequires: python3-pyinotify >= 0.8.3 Requires: python3-pyinotify >= 0.8.3 %if 0%{?suse_version} < 1600 Obsoletes: SuSEfirewall2-%{name} @@ -81,6 +86,7 @@ %package -n monitoring-plugins-%{name} Summary: Check fail2ban server and how many IPs are currently banned Group: System/Monitoring +BuildArch: noarch %if 0%{?suse_version} BuildRequires: nagios-rpm-macros %else @@ -110,6 +116,7 @@ %patch -P 201 -p1 %patch -P 301 -p1 %patch -P 302 -p1 +%patch -P 303 -p1 rm config/paths-arch.conf \ config/paths-debian.conf \ @@ -122,13 +129,13 @@ %build export CFLAGS="%{optflags}" -python3 setup.py build +export SERVICE_BINDIR="/usr/bin" +%pyproject_wheel gzip man/*.{1,5} %install -python3 setup.py install \ - --root=%{buildroot} \ - --prefix=%{_prefix} +%pyproject_install +%python_expand %fdupes %{buildroot}%{python3_sitelib} install -d -m 755 %{buildroot}%{_mandir}/man{1,5} install -p -m 644 man/fail2ban-*.1.gz %{buildroot}%{_mandir}/man1 @@ -150,6 +157,13 @@ ln -sf service %{buildroot}%{_sbindir}/rc%{name} +install -d -m 755 %{buildroot}%{_sysconfdir} +mv %{buildroot}%{python3_sitelib}%{_sysconfdir}/%{name} %{buildroot}%{_sysconfdir} +rm -rv %{buildroot}%{_sysconfdir}/%{name}/action.d/__pycache__/ +install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/fail2ban.d +install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}/jail.d +install -d -m 755 %{buildroot}%{_docdir} +mv -v %{buildroot}%{python3_sitelib}%{_docdir}/%{name} %{buildroot}%{_docdir} echo "# Do all your modifications to the jail's configuration in jail.local!" > %{buildroot}%{_sysconfdir}/%{name}/jail.local install -d -m 0755 %{buildroot}%{_localstatedir}/lib/%{name}/ @@ -166,13 +180,6 @@ %endif install -D -m 755 files/nagios/check_fail2ban %{buildroot}%{nagios_plugindir}/check_%{name} -# install docs using the macro -rm -r %{buildroot}%{_docdir}/%{name} - -%python3_fix_shebang -# remove duplicates -%fdupes -s %{buildroot}%{python3_sitelib} - %check # tests require python-pyinotify to be installed, so don't run them on older versions %if 0%{?suse_version} >= 1500 @@ -187,8 +194,6 @@ %post %fillup_only %tmpfiles_create %{_tmpfilesdir}/%{name}.conf -# The next line is not workin in Leap 42.1, so keep the old way -#%%tmpfiles_create %%{_tmpfilesdir}/%%{name}.conf %service_add_post %{name}.service %preun @@ -233,7 +238,7 @@ %{_mandir}/man1/* %{_mandir}/man5/* %license COPYING -%doc README.md TODO ChangeLog doc/*.txt +%doc README.md TODO ChangeLog doc/*.txt DEVELOP FILTERS # do not include tests as they are executed during the build process %exclude %{_bindir}/%{name}-testcases ++++++ setup-py-install-dir.patch ++++++ diff -rub fail2ban-1.1.0/setup.py fail2ban-1.1.0-patched/setup.py --- fail2ban-1.1.0/setup.py 2024-04-25 23:08:13.000000000 +0200 +++ fail2ban-1.1.0-patched/setup.py 2025-06-13 14:21:56.504000000 +0200 @@ -84,7 +84,7 @@ def update_scripts(self, dry_run=False): buildroot = os.path.dirname(self.build_dir) - install_dir = self.install_dir + install_dir = os.environ.get("SERVICE_BINDIR", self.install_dir) try: # remove root-base from install scripts path: root = self.distribution.command_options['install']['root'][1]
