Accepting request 1252432 from security

OBS-URL: https://build.opensuse.org/request/show/1252432
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sshguard?expand=0&rev=19

sshguard-gcc15.patch

@@ -0,0 +1,44 @@
+--- sshguard-2.4.3/src/blocker/blocker.c	2025-02-28 16:18:03.254281287 +0100
++++ sshguard-2.4.3/src/blocker/blocker.c	2025-02-28 16:12:18.456651762 +0100
+@@ -61,7 +61,7 @@ list_t limbo;
+ list_t offenders;
+ 
+ /* handler for termination-related signals */
+-static void sigfin_handler();
++static void sigfin_handler(int sig);
+ /* called at exit(): flush blocked addresses and finalize subsystems */
+ static void finishup(void);
+ 
+--- sshguard-2.4.3/src/blocker/blocklist.c	2025-02-28 16:18:03.254020175 +0100
++++ sshguard-2.4.3/src/blocker/blocklist.c	2025-02-28 16:13:53.568248681 +0100
+@@ -74,7 +74,7 @@ static void unblock_expired() {
+     pthread_testcancel();
+ }
+ 
+-static void *unblock_loop() {
++static void *unblock_loop(void *unused) {
+     while (1) {
+         /* wait some time, at most opts.pardon_threshold/3 + 1 sec */
+         sleep(1 + ((unsigned int)rand() % (1 + opts.pardon_threshold / 2)));
+--- sshguard-2.4.3/src/blocker/sshguard_whitelist.c	2025-02-28 16:18:03.254395547 +0100
++++ sshguard-2.4.3/src/blocker/sshguard_whitelist.c	2025-02-28 16:16:32.670247184 +0100
+@@ -76,7 +76,7 @@ static int match_ip6(const struct in6_ad
+     return 1;
+ }
+ 
+-static size_t whitelist_meter() { return sizeof(addrblock_t); }
++static size_t whitelist_meter(const void *unused) { return sizeof(addrblock_t); }
+ 
+ static int whitelist_compare(const void *a, const void *b) {
+     int ret;
+--- sshguard-2.4.3/src/parser/attack_parser.y	2025-02-28 16:18:03.252700675 +0100
++++ sshguard-2.4.3/src/parser/attack_parser.y	2025-02-28 16:17:47.406716234 +0100
+@@ -27,7 +27,7 @@
+ #define DEFAULT_ATTACKS_DANGEROUSNESS           10
+ 
+  /* stuff exported by the scanner */
+-extern void scanner_init();
++extern void scanner_init(char *str);
+ extern void scanner_fin();
+ extern int yylex();
+ 

sshguard.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 28 15:29:45 UTC 2025 - pgajdos@suse.com
+
+- added patches
+  fix build with gcc15
+  + sshguard-gcc15.patch
+
 -------------------------------------------------------------------
 Mon Oct  2 07:24:19 UTC 2023 - Andrea Manzini <andrea.manzini@suse.com>
 

sshguard.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sshguard
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,10 @@ Source4:        sshguard.whitelist
 # PATCH-FIX-UPSTREAM sshguard-gcc5.patch
 Patch0:         sshguard-gcc5.patch
 Patch1:         harden_sshguard.service.patch
+# build with gcc15 (https://bitbucket.org/sshguard/sshguard/issues/189/fail-with-gcc15)
+Patch2:         sshguard-gcc15.patch
 Requires:       openssh
+BuildRequires:  bison
 Requires(pre):  %fillup_prereq
 
 %description