Hello community, here is the log from the commit of package fail2ban for openSUSE:Factory checked in at 2020-01-10 17:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fail2ban (Old) and /work/SRC/openSUSE:Factory/.fail2ban.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fail2ban" Fri Jan 10 17:50:16 2020 rev:57 rq:762815 version:0.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/fail2ban/fail2ban.changes 2019-08-13 13:23:16.249386705 +0200 +++ /work/SRC/openSUSE:Factory/.fail2ban.new.6675/fail2ban.changes 2020-01-10 17:50:34.914123884 +0100 @@ -1,0 +2,9 @@ +Thu Jan 9 14:06:14 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Switch to use python3 (upstream supported): + + BuildRequire python3-tools instead of python-devel (for the + 2to3 tool). + + Drop the python-gamin dependency. + + Replace all python-FOO deps for their python3-FOO counterpart. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fail2ban.spec ++++++ --- /var/tmp/diff_new_pack.ianfNy/_old 2020-01-10 17:50:36.166123660 +0100 +++ /var/tmp/diff_new_pack.ianfNy/_new 2020-01-10 17:50:36.170123660 +0100 @@ -1,7 +1,7 @@ # # spec file for package fail2ban # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,23 +53,23 @@ Patch300: fail2ban-opensuse-service-sfw.patch BuildRequires: fdupes BuildRequires: logrotate -BuildRequires: python-devel +BuildRequires: python3-tools # timezone package is required to run the tests BuildRequires: timezone Requires: cron Requires: ed Requires: iptables Requires: logrotate -Requires: python >= 2.6 +Requires: python3 >= 3.2 Requires: whois %if 0%{?suse_version} != 1110 BuildArch: noarch %endif %if 0%{?suse_version} >= 1230 # systemd -BuildRequires: python-systemd +BuildRequires: python3-systemd BuildRequires: pkgconfig(systemd) -Requires: python-systemd +Requires: python3-systemd Requires: systemd > 204 %{?systemd_requires} %else @@ -78,11 +78,8 @@ Requires: syslog %endif %if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1010 && 0%{?suse_version} != 1110 && 0%{?suse_version} != 1315 -BuildRequires: python-pyinotify >= 0.8.3 -Requires: python-pyinotify >= 0.8.3 -%endif -%if 0%{?suse_version} >= 1220 -Requires: python-gamin >= 0.0.21 +BuildRequires: python3-pyinotify >= 0.8.3 +Requires: python3-pyinotify >= 0.8.3 %endif %description @@ -129,9 +126,6 @@ # Use openSUSE paths sed -i -e 's/^before = paths-.*/before = paths-opensuse.conf/' config/jail.conf -# Remove shebang -sed -i -e '/^#!\/usr\/bin\/python$/d' fail2ban/client/fail2banregex.py - %patch100 %patch101 -p1 %if 0%{?suse_version} < 1310 @@ -159,11 +153,12 @@ %build export CFLAGS="%{optflags}" -python setup.py build +./fail2ban-2to3 +python3 setup.py build gzip man/*.{1,5} %install -python setup.py install \ +python3 setup.py install \ --root=%{buildroot} \ --prefix=%{_prefix} @@ -224,7 +219,7 @@ rm -r %{buildroot}%{_docdir}/%{name} # remove duplicates -%fdupes -s %{buildroot}%{python_sitelib} +%fdupes -s %{buildroot}%{python3_sitelib} %check #stat /dev/log @@ -315,9 +310,9 @@ %{_bindir}/%{name}-client %{_bindir}/%{name}-python %{_bindir}/%{name}-regex -%{python_sitelib}/%{name} -%exclude %{python_sitelib}/%{name}/tests -%{python_sitelib}/%{name}-* +%{python3_sitelib}/%{name} +%exclude %{python3_sitelib}/%{name}/tests +%{python3_sitelib}/%{name}-* %{_fillupdir}/sysconfig.%{name} %{_mandir}/man1/* %{_mandir}/man5/* @@ -326,7 +321,7 @@ # do not include tests as they are executed during the build process %exclude %{_bindir}/%{name}-testcases -%exclude %{python_sitelib}/%{name}/tests +%exclude %{python3_sitelib}/%{name}/tests %if !0%{?suse_version} > 1500 %if 0%{?_unitdir:1} ++++++ fail2ban-0.10.4-env-script-interpreter.patch ++++++ --- /var/tmp/diff_new_pack.ianfNy/_old 2020-01-10 17:50:36.194123655 +0100 +++ /var/tmp/diff_new_pack.ianfNy/_new 2020-01-10 17:50:36.194123655 +0100 @@ -3,7 +3,7 @@ +++ fail2ban-0.10.4/config/filter.d/ignorecommands/apache-fakegooglebot 2019-08-12 10:46:05.067842214 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env fail2ban-python -+#!/usr/bin/python ++#!/usr/bin/fail2ban-python # Inspired by https://isc.sans.edu/forums/diary/When+Google+isnt+Google/15968/ # # Written in Python to reuse built-in Python batteries and not depend on
