- fix building with gcc 10+, rel 5

diff --git a/apache-mod_clamav.spec b/apache-mod_clamav.spec
index 22aa25644088b9cf30e22f16ddc0af23d200c307..a1986a5b0bc31c520bb0da0db18f21c07ab57db5 100644 (file)
--- a/apache-mod_clamav.spec
+++ b/apache-mod_clamav.spec
@@ -4,13 +4,14 @@ Summary:      An Apache virus scanning filter
 Summary(pl.UTF-8):     Filtr skanera antywirusowego dla Apache'a
 Name:          apache-mod_%{mod_name}
 Version:       0.23
-Release:       4
+Release:       5
 License:       GPL v2
 Group:         Networking/Daemons/HTTP
 Source0:       http://software.othello.ch/mod_clamav/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: 32c7b285dfdff5d13371b92ebe73b352
 Source1:       %{name}.conf
 Patch0:                %{name}-clamav.patch
+Patch1:                gcc10.patch
 URL:           http://software.othello.ch/mod_clamav/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0
@@ -43,6 +44,7 @@ skanera antywirusowego Clamav.
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644 (file)
index 0000000..c50aeda
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,11 @@
+--- mod_clamav-0.23/mod_clamav.h~      2009-04-11 01:37:29.000000000 +0200
++++ mod_clamav-0.23/mod_clamav.h       2021-10-20 22:57:08.055181300 +0200
+@@ -98,7 +98,7 @@
+ #define MOD_CLAMAV_INFECTED_STATUS    "INFECTED"
+ #define MOD_CLAMAV_FAILED_STATUS      "failed"
+ 
+-module AP_MODULE_DECLARE_DATA clamav_module;
++extern module AP_MODULE_DECLARE_DATA clamav_module;
+ 
+ /* the clamav statistics context */
+ #define       VIRUS_LIST_LENGTH       10