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-27 23:01:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fail2ban (Old)
 and      /work/SRC/openSUSE:Factory/.fail2ban.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fail2ban"

Fri Jun 27 23:01:33 2025 rev:75 rq:1288744 version:1.1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/fail2ban/fail2ban.changes        2025-06-23 
14:56:42.360408782 +0200
+++ /work/SRC/openSUSE:Factory/.fail2ban.new.7067/fail2ban.changes      
2025-06-27 23:08:28.147052810 +0200
@@ -1,0 +2,13 @@
+Thu Jun 19 19:00:38 UTC 2025 - ch...@computersalat.de
+
+- fix build
+  * service file install
+- some rpmlint fixes
+- Add fail2ban_service.patch
+- rebase patches
+  * fail2ban-0.10.4-env-script-interpreter.patch
+  * fail2ban-fix-openssh98.patch
+  * fail2ban-opensuse-locations.patch
+  * harden_fail2ban.service.patch
+
+-------------------------------------------------------------------

New:
----
  fail2ban_service.patch

----------(New B)----------
  New:- some rpmlint fixes
- Add fail2ban_service.patch
- rebase patches
----------(New E)----------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fail2ban.spec ++++++
--- /var/tmp/diff_new_pack.eYYcdh/_old  2025-06-27 23:08:29.047090165 +0200
+++ /var/tmp/diff_new_pack.eYYcdh/_new  2025-06-27 23:08:29.051090332 +0200
@@ -42,6 +42,8 @@
 Patch100:       %{name}-opensuse-locations.patch
 # PATCH-FIX-OPENSUSE fail2ban-0.10.4-env-script-interpreter.patch 
jweberho...@weberhofer.at -- use exact path to define interpretor
 Patch201:       %{name}-0.10.4-env-script-interpreter.patch
+# PATCH-FEATURE-OPENSUSE fail2ban_service.patch ch...@computersalat.de -- Add 
[Service] EnvironmentFile
+Patch300:       %{name}_service.patch
 # PATCH-FEATURE-OPENSUSE harden_fail2ban.service.patch jseg...@suse.com -- 
Added hardening to systemd service(s) bsc#1181400
 Patch301:       harden_fail2ban.service.patch
 # PATCH-FIX-OPENSUSE fail2ban-fix-openssh98.patch meiss...@suse.com -- support 
openssh9.8 bsc#1230101
@@ -72,8 +74,8 @@
 %{?systemd_requires}
 Requires:       python3-pyinotify >= 0.8.3
 %if 0%{?suse_version} < 1600
-Obsoletes:      SuSEfirewall2-%{name}
-Provides:       SuSEfirewall2-%{name}
+Provides:       SuSEfirewall2-%{name} = %{version}
+Obsoletes:      SuSEfirewall2-%{name} < %{version}
 %endif
 
 %description
@@ -114,6 +116,7 @@
 
 %patch -P 100 -p1
 %patch -P 201 -p1
+%patch -P 300 -p1
 %patch -P 301 -p1
 %patch -P 302 -p1
 %patch -P 303 -p1
@@ -129,7 +132,7 @@
 
 %build
 export CFLAGS="%{optflags}"
-export SERVICE_BINDIR="/usr/bin"
+export SERVICE_BINDIR="%{_bindir}"
 %pyproject_wheel
 gzip man/*.{1,5}
 
@@ -138,8 +141,8 @@
 %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
-install -p -m 644 man/jail.conf.5.gz %{buildroot}%{_mandir}/man5
+install -m 644 man/fail2ban-*.1.gz %{buildroot}%{_mandir}/man1
+install -m 644 man/jail.conf.5.gz %{buildroot}%{_mandir}/man5
 
 install -d -m 755 %{buildroot}%{_initddir}
 install -d -m 755 %{buildroot}%{_sbindir}
@@ -149,13 +152,12 @@
 touch %{buildroot}/run/%{name}
 
 # systemd
-install -d -m 755 %{buildroot}%{_unitdir}
-cp -av build/fail2ban.service "%{buildroot}/%{_unitdir}/%{name}.service"
-
-install -d -m 755 %{buildroot}%{_tmpfilesdir}
-install -p -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-
-ln -sf service %{buildroot}%{_sbindir}/rc%{name}
+if [[ ! -f build/fail2ban.service ]]; then
+  sed -e "s|@BINDIR@|%{_bindir}|g" files/fail2ban.service.in > 
build/fail2ban.service
+fi
+install -D -m 644 build/fail2ban.service 
"%{buildroot}/%{_unitdir}/%{name}.service"
+install -D -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
 install -d -m 755 %{buildroot}%{_sysconfdir}
 mv %{buildroot}%{python3_sitelib}%{_sysconfdir}/%{name} 
%{buildroot}%{_sysconfdir}
@@ -168,11 +170,9 @@
 
 install -d -m 0755 %{buildroot}%{_localstatedir}/lib/%{name}/
 
-install -d -m 755 %{buildroot}%{_fillupdir}
-install -p -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
+install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
-install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
-install -p -m 644 %{SOURCE3}  %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -D -m 644 %{SOURCE3}  %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 %if 0%{?suse_version} < 1600
 perl -i -lpe 's{(After|PartOf)=(.*)}{$1=$2 SuSEfirewall2.service}' \

++++++ fail2ban-0.10.4-env-script-interpreter.patch ++++++
--- /var/tmp/diff_new_pack.eYYcdh/_old  2025-06-27 23:08:29.091091991 +0200
+++ /var/tmp/diff_new_pack.eYYcdh/_new  2025-06-27 23:08:29.095092157 +0200
@@ -1,6 +1,7 @@
-diff -ur 
fail2ban-0.10.4-orig/config/filter.d/ignorecommands/apache-fakegooglebot 
fail2ban-0.10.4/config/filter.d/ignorecommands/apache-fakegooglebot
---- fail2ban-0.10.4-orig/config/filter.d/ignorecommands/apache-fakegooglebot   
2018-10-04 11:26:22.000000000 +0200
-+++ fail2ban-0.10.4/config/filter.d/ignorecommands/apache-fakegooglebot        
2019-08-12 10:46:05.067842214 +0200
+Index: fail2ban-1.1.0/config/filter.d/ignorecommands/apache-fakegooglebot
+===================================================================
+--- fail2ban-1.1.0.orig/config/filter.d/ignorecommands/apache-fakegooglebot
++++ fail2ban-1.1.0/config/filter.d/ignorecommands/apache-fakegooglebot
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env fail2ban-python
 +#!/usr/bin/fail2ban-python


++++++ fail2ban-fix-openssh98.patch ++++++
--- /var/tmp/diff_new_pack.eYYcdh/_old  2025-06-27 23:08:29.115092987 +0200
+++ /var/tmp/diff_new_pack.eYYcdh/_new  2025-06-27 23:08:29.119093153 +0200
@@ -1,7 +1,7 @@
-Index: fail2ban-1.0.2/config/filter.d/sshd.conf
+Index: fail2ban-1.1.0/config/filter.d/sshd.conf
 ===================================================================
---- fail2ban-1.0.2.orig/config/filter.d/sshd.conf
-+++ fail2ban-1.0.2/config/filter.d/sshd.conf
+--- fail2ban-1.1.0.orig/config/filter.d/sshd.conf
++++ fail2ban-1.1.0/config/filter.d/sshd.conf
 @@ -16,7 +16,7 @@ before = common.conf
  
  [DEFAULT]

++++++ fail2ban-opensuse-locations.patch ++++++
--- /var/tmp/diff_new_pack.eYYcdh/_old  2025-06-27 23:08:29.135093818 +0200
+++ /var/tmp/diff_new_pack.eYYcdh/_new  2025-06-27 23:08:29.143094149 +0200
@@ -1,8 +1,8 @@
-Index: fail2ban-1.0.1/config/jail.conf
+Index: fail2ban-1.1.0/config/jail.conf
 ===================================================================
---- fail2ban-1.0.1.orig/config/jail.conf
-+++ fail2ban-1.0.1/config/jail.conf
-@@ -731,7 +731,7 @@ backend = %(syslog_backend)s
+--- fail2ban-1.1.0.orig/config/jail.conf
++++ fail2ban-1.1.0/config/jail.conf
+@@ -735,7 +735,7 @@ backend = %(syslog_backend)s
  # filter   = named-refused
  # port     = domain,953
  # protocol = udp
@@ -11,7 +11,7 @@
  
  # IMPORTANT: see filter.d/named-refused for instructions to enable logging
  # This jail blocks TCP traffic for DNS requests.
-@@ -739,7 +739,7 @@ backend = %(syslog_backend)s
+@@ -743,7 +743,7 @@ backend = %(syslog_backend)s
  [named-refused]
  
  port     = domain,953
@@ -20,10 +20,10 @@
  
  
  [nsd]
-Index: fail2ban-1.0.1/config/paths-common.conf
+Index: fail2ban-1.1.0/config/paths-common.conf
 ===================================================================
---- fail2ban-1.0.1.orig/config/paths-common.conf
-+++ fail2ban-1.0.1/config/paths-common.conf
+--- fail2ban-1.1.0.orig/config/paths-common.conf
++++ fail2ban-1.1.0/config/paths-common.conf
 @@ -90,4 +90,4 @@ solidpop3d_log = %(syslog_local0)s
  mysql_log = %(syslog_daemon)s
  mysql_backend = %(default_backend)s


++++++ fail2ban_service.patch ++++++
Index: fail2ban-1.1.0/files/fail2ban.service.in
===================================================================
--- fail2ban-1.1.0.orig/files/fail2ban.service.in
+++ fail2ban-1.1.0/files/fail2ban.service.in
@@ -6,9 +6,10 @@ PartOf=iptables.service firewalld.servic
 
 [Service]
 Type=simple
+EnvironmentFile=-/etc/sysconfig/fail2ban
 Environment="PYTHONNOUSERSITE=1"
 ExecStartPre=/bin/mkdir -p /run/fail2ban
-ExecStart=@BINDIR@/fail2ban-server -xf start
+ExecStart=@BINDIR@/fail2ban-server -xf $FAIL2BAN_OPTIONS start
 # if should be logged in systemd journal, use following line or set logtarget 
to sysout in fail2ban.local
 # ExecStart=@BINDIR@/fail2ban-server -xf --logtarget=sysout start
 ExecStop=@BINDIR@/fail2ban-client stop

++++++ harden_fail2ban.service.patch ++++++
--- /var/tmp/diff_new_pack.eYYcdh/_old  2025-06-27 23:08:29.211096972 +0200
+++ /var/tmp/diff_new_pack.eYYcdh/_new  2025-06-27 23:08:29.215097138 +0200
@@ -23,6 +23,6 @@
 +RestrictRealtime=true
 +# end of automatic additions 
  Type=simple
+ EnvironmentFile=-/etc/sysconfig/fail2ban
  Environment="PYTHONNOUSERSITE=1"
- ExecStartPre=/bin/mkdir -p /run/fail2ban
 

Reply via email to