|
 |
f9c00c3 |
diff -up clamav-0.102.2/clamonacc/client/communication.c.curl clamav-0.102.2/clamonacc/client/communication.c
|
|
|
f9c00c3 |
--- clamav-0.102.2/clamonacc/client/communication.c.curl 2020-02-04 07:59:26.000000000 -0700
|
|
|
f9c00c3 |
+++ clamav-0.102.2/clamonacc/client/communication.c 2020-04-29 21:44:45.073020203 -0600
|
|
|
f9c00c3 |
@@ -42,12 +42,12 @@
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
#include "communication.h"
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
-static int onas_socket_wait(curl_socket_t sockfd, int32_t b_recv, uint64_t timeout_ms);
|
|
|
f9c00c3 |
+static int onas_socket_wait(long sockfd, int32_t b_recv, uint64_t timeout_ms);
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
/**
|
|
|
f9c00c3 |
* Function from curl example code, Copyright (C) 1998 - 2018, Daniel Stenberg, see COPYING.curl for license details
|
|
|
f9c00c3 |
*/
|
|
|
f9c00c3 |
-static int onas_socket_wait(curl_socket_t sockfd, int32_t b_recv, uint64_t timeout_ms)
|
|
|
f9c00c3 |
+static int onas_socket_wait(long sockfd, int32_t b_recv, uint64_t timeout_ms)
|
|
|
f9c00c3 |
{
|
|
|
f9c00c3 |
struct timeval tv;
|
|
|
f9c00c3 |
fd_set infd, outfd, errfd;
|
|
|
f9c00c3 |
@@ -79,9 +79,9 @@ int onas_sendln(CURL *curl, const void *
|
|
|
f9c00c3 |
{
|
|
|
f9c00c3 |
size_t sent = 0;
|
|
|
f9c00c3 |
CURLcode curlcode;
|
|
|
f9c00c3 |
- curl_socket_t sockfd;
|
|
|
f9c00c3 |
+ long sockfd;
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
- curlcode = curl_easy_getinfo(curl, CURLINFO_ACTIVESOCKET, &sockfd);
|
|
|
f9c00c3 |
+ curlcode = curl_easy_getinfo(curl, CURLINFO_LASTSOCKET, &sockfd);
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
if (CURLE_OK != curlcode) {
|
|
|
f9c00c3 |
logg("!ClamCom: could not get curl active socket info %s\n", curl_easy_strerror(curlcode));
|
|
|
f9c00c3 |
@@ -137,9 +137,9 @@ int onas_recvln(struct RCVLN *rcv_data,
|
|
|
f9c00c3 |
{
|
|
|
f9c00c3 |
char *eol;
|
|
|
f9c00c3 |
int ret = 0;
|
|
|
f9c00c3 |
- curl_socket_t sockfd;
|
|
|
f9c00c3 |
+ long sockfd;
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
- rcv_data->curlcode = curl_easy_getinfo(rcv_data->curl, CURLINFO_ACTIVESOCKET, &sockfd);
|
|
|
f9c00c3 |
+ rcv_data->curlcode = curl_easy_getinfo(rcv_data->curl, CURLINFO_LASTSOCKET, &sockfd);
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
if (CURLE_OK != rcv_data->curlcode) {
|
|
|
f9c00c3 |
logg("!ClamCom: could not get curl active socket info %s\n", curl_easy_strerror(rcv_data->curlcode));
|
|
|
f9c00c3 |
diff -up clamav-0.102.2/m4/reorganization/libs/curl.m4.curl clamav-0.102.2/m4/reorganization/libs/curl.m4
|
|
|
f9c00c3 |
--- clamav-0.102.2/m4/reorganization/libs/curl.m4.curl 2020-02-04 07:59:26.000000000 -0700
|
|
|
f9c00c3 |
+++ clamav-0.102.2/m4/reorganization/libs/curl.m4 2020-04-29 21:36:15.043808045 -0600
|
|
|
f9c00c3 |
@@ -62,8 +62,8 @@ if test "X$have_curl" = "Xyes"; then
|
|
|
f9c00c3 |
dnl end of section
|
|
|
f9c00c3 |
|
|
|
f9c00c3 |
AM_COND_IF([BUILD_CLAMONACC],
|
|
|
f9c00c3 |
- dnl if version greater than (7.45)
|
|
|
f9c00c3 |
- [if test $curl_version -ge 470272 ; then
|
|
|
f9c00c3 |
+ dnl if version greater than (7.29)
|
|
|
f9c00c3 |
+ [if test $curl_version -ge 466176 ; then
|
|
|
f9c00c3 |
$enable_clamonacc="yes"
|
|
|
f9c00c3 |
else
|
|
|
f9c00c3 |
AC_MSG_ERROR([m4_normalize([
|