From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 11 Dec 2021 09:47:53 +0000 (+0100)
Subject: - update x32 patch, rel 3
X-Git-Tag: auto/th/clamav-0.104.1-3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=01e85c7c4ffd324a4218341de225a8a50242885a;p=packages%2Fclamav.git

- update x32 patch, rel 3
---

diff --git a/clamav.spec b/clamav.spec
index 57762a0..03b4f2c 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -21,7 +21,7 @@ Summary:	An anti-virus utility for Unix
 Summary(pl.UTF-8):	Narzędzie antywirusowe dla Uniksów
 Name:		clamav
 Version:	0.104.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Daemons
 #Source0Download: http://www.clamav.net/download
diff --git a/x32.patch b/x32.patch
index 74c216e..5864749 100644
--- a/x32.patch
+++ b/x32.patch
@@ -12,3 +12,34 @@
                     tv1.tv_sec * 1000000 + tv1.tv_usec, pc);
      }
      if (stop == CL_EBYTECODE) {
+--- clamav-0.104.1/libclamav/bignum_fast.h.orig	2021-11-02 20:09:25.000000000 +0100
++++ clamav-0.104.1/libclamav/bignum_fast.h	2021-12-11 10:43:55.832213985 +0100
+@@ -102,7 +102,7 @@
+ #endif
+ 
+ /* autodetect x86-64 and make sure we are using 64-bit digits with x86-64 asm */
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && !defined(__ILP32__)
+ #if defined(TFM_X86) || defined(TFM_SSE2) || defined(TFM_ARM)
+ #error x86-64 detected, x86-32/SSE2/ARM optimizations are not valid!
+ #endif
+@@ -117,7 +117,7 @@
+ #endif
+ 
+ /* try to detect x86-32 */
+-#if defined(__i386__) && !defined(TFM_SSE2)
++#if (defined(__i386__) || defined(__ILP32__)) && !defined(TFM_SSE2)
+ #if defined(TFM_X86_64) || defined(TFM_ARM)
+ #error x86-32 detected, x86-64/ARM optimizations are not valid!
+ #endif
+--- clamav-0.104.1/libclamav/tomsfastmath/mont/fp_montgomery_reduce.c.orig	2021-12-11 10:41:02.011008906 +0100
++++ clamav-0.104.1/libclamav/tomsfastmath/mont/fp_montgomery_reduce.c	2021-12-11 10:41:23.713556450 +0100
+@@ -42,7 +42,7 @@
+ : "%eax", "cc")
+ 
+ /******************************************************************/
+-#elif defined(TFM_X86_64)
++#elif defined(TFM_X86_64) && !defined(__ILP32__)
+ /* x86-64 code */
+ 
+ #define MONT_START