diff --git a/clamav-curl.patch b/clamav-curl.patch deleted file mode 100644 index 6f9fe74..0000000 --- a/clamav-curl.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up clamav-0.102.2/clamonacc/client/communication.c.curl clamav-0.102.2/clamonacc/client/communication.c ---- clamav-0.102.2/clamonacc/client/communication.c.curl 2020-02-04 07:59:26.000000000 -0700 -+++ clamav-0.102.2/clamonacc/client/communication.c 2020-04-29 21:44:45.073020203 -0600 -@@ -42,12 +42,12 @@ - - #include "communication.h" - --static int onas_socket_wait(curl_socket_t sockfd, int32_t b_recv, uint64_t timeout_ms); -+static int onas_socket_wait(long sockfd, int32_t b_recv, uint64_t timeout_ms); - - /** - * Function from curl example code, Copyright (C) 1998 - 2018, Daniel Stenberg, see COPYING.curl for license details - */ --static int onas_socket_wait(curl_socket_t sockfd, int32_t b_recv, uint64_t timeout_ms) -+static int onas_socket_wait(long sockfd, int32_t b_recv, uint64_t timeout_ms) - { - struct timeval tv; - fd_set infd, outfd, errfd; -@@ -79,9 +79,9 @@ int onas_sendln(CURL *curl, const void * - { - size_t sent = 0; - CURLcode curlcode; -- curl_socket_t sockfd; -+ long sockfd; - -- curlcode = curl_easy_getinfo(curl, CURLINFO_ACTIVESOCKET, &sockfd); -+ curlcode = curl_easy_getinfo(curl, CURLINFO_LASTSOCKET, &sockfd); - - if (CURLE_OK != curlcode) { - logg("!ClamCom: could not get curl active socket info %s\n", curl_easy_strerror(curlcode)); -@@ -137,9 +137,9 @@ int onas_recvln(struct RCVLN *rcv_data, - { - char *eol; - int ret = 0; -- curl_socket_t sockfd; -+ long sockfd; - -- rcv_data->curlcode = curl_easy_getinfo(rcv_data->curl, CURLINFO_ACTIVESOCKET, &sockfd); -+ rcv_data->curlcode = curl_easy_getinfo(rcv_data->curl, CURLINFO_LASTSOCKET, &sockfd); - - if (CURLE_OK != rcv_data->curlcode) { - logg("!ClamCom: could not get curl active socket info %s\n", curl_easy_strerror(rcv_data->curlcode)); -diff -up clamav-0.102.2/m4/reorganization/libs/curl.m4.curl clamav-0.102.2/m4/reorganization/libs/curl.m4 ---- clamav-0.102.2/m4/reorganization/libs/curl.m4.curl 2020-02-04 07:59:26.000000000 -0700 -+++ clamav-0.102.2/m4/reorganization/libs/curl.m4 2020-04-29 21:36:15.043808045 -0600 -@@ -62,8 +62,8 @@ if test "X$have_curl" = "Xyes"; then - dnl end of section - - AM_COND_IF([BUILD_CLAMONACC], -- dnl if version greater than (7.45) -- [if test $curl_version -ge 470272 ; then -+ dnl if version greater than (7.29) -+ [if test $curl_version -ge 466176 ; then - $enable_clamonacc="yes" - else - AC_MSG_ERROR([m4_normalize([ diff --git a/clamav.spec b/clamav.spec index 57d7626..f9d919b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -88,8 +88,6 @@ Patch0: clamav-stats-deprecation.patch Patch1: clamav-default_confs.patch # Fix pkg-config flags for static linking, multilib Patch2: clamav-0.99-private.patch -# Patch to use EL7 libcurl -Patch3: clamav-curl.patch # Fix ck_assert_msg() call # https://github.com/Cisco-Talos/clamav-devel/pull/138 Patch4: clamav-check.patch @@ -259,8 +257,6 @@ This package contains files which are needed to run the clamav-milter. %endif %patch1 -p1 -b .default_confs %patch2 -p1 -b .private -# Patch to use older libcurl -%{?el7:%patch3 -p1 -b .curl} %patch4 -p1 -b .check %patch5 -p1 -b .clamonacc-service