mirror of
https://git.yoctoproject.org/meta-security
synced 2026-01-11 15:00:34 +00:00
clamav: fix branch name and update
They dropped the dev branch for rel. Update to tip. Refresh patches Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -8,10 +8,10 @@ DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2 json-c li
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=2;endline=3;md5=f7029fbbc5898b273d5902896f7bbe17"
|
||||
|
||||
# May 15th
|
||||
SRCREV = "fe96de86bb90c489aa509ee9135f776b7a2a7eb4"
|
||||
# July 27th
|
||||
SRCREV = "c389dfa4c3af92b006ada4f7595bbc3e6df3f356"
|
||||
|
||||
SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=dev/0.104 \
|
||||
SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.104 \
|
||||
file://clamd.conf \
|
||||
file://freshclam.conf \
|
||||
file://volatiles.03_clamav \
|
||||
|
||||
@@ -12,9 +12,9 @@ Index: git/clamd/CMakeLists.txt
|
||||
===================================================================
|
||||
--- git.orig/clamd/CMakeLists.txt
|
||||
+++ git/clamd/CMakeLists.txt
|
||||
@@ -54,4 +54,10 @@ if(SYSTEMD_FOUND)
|
||||
@@ -60,4 +60,10 @@ if(SYSTEMD_FOUND)
|
||||
install(
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.service
|
||||
FILES ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.socket
|
||||
DESTINATION ${SYSTEMD_UNIT_DIR})
|
||||
+ configure_file(
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/clamav-daemon.socket.in
|
||||
|
||||
@@ -7,7 +7,7 @@ Index: git/CMakeLists.txt
|
||||
===================================================================
|
||||
--- git.orig/CMakeLists.txt
|
||||
+++ git/CMakeLists.txt
|
||||
@@ -374,8 +373,6 @@ check_include_file("stdlib.h"
|
||||
@@ -443,8 +443,6 @@ check_include_file("stdlib.h"
|
||||
check_include_file("string.h" HAVE_STRING_H)
|
||||
check_include_file("strings.h" HAVE_STRINGS_H)
|
||||
check_include_file("sys/cdefs.h" HAVE_SYS_CDEFS_H)
|
||||
@@ -16,7 +16,7 @@ Index: git/CMakeLists.txt
|
||||
check_include_file("sys/mman.h" HAVE_SYS_MMAN_H)
|
||||
check_include_file("sys/param.h" HAVE_SYS_PARAM_H)
|
||||
check_include_file("sys/queue.h" HAVE_SYS_QUEUE_H)
|
||||
@@ -410,8 +407,6 @@ endif()
|
||||
@@ -479,8 +477,6 @@ endif()
|
||||
|
||||
# int-types variants
|
||||
check_include_file("inttypes.h" HAVE_INTTYPES_H)
|
||||
@@ -25,7 +25,7 @@ Index: git/CMakeLists.txt
|
||||
check_include_file("stdint.h" HAVE_STDINT_H)
|
||||
|
||||
# this hack required to silence warnings on systems with inttypes.h
|
||||
@@ -539,17 +528,11 @@ check_type_size("time_t" SIZEOF_TIME_T)
|
||||
@@ -608,17 +604,11 @@ check_type_size("time_t" SIZEOF_TIME_T)
|
||||
# Checks for library functions.
|
||||
include(CheckSymbolExists)
|
||||
check_symbol_exists(_Exit "stdlib.h" HAVE__EXIT)
|
||||
@@ -44,7 +44,7 @@ Index: git/CMakeLists.txt
|
||||
check_symbol_exists(timegm "time.h" HAVE_TIMEGM)
|
||||
check_symbol_exists(vsnprintf "stdio.h" HAVE_VSNPRINTF)
|
||||
|
||||
@@ -563,10 +546,9 @@ else()
|
||||
@@ -632,10 +622,9 @@ else()
|
||||
check_symbol_exists(fseeko "stdio.h" HAVE_FSEEKO)
|
||||
check_symbol_exists(getaddrinfo "netdb.h" HAVE_GETADDRINFO)
|
||||
check_symbol_exists(getpagesize "unistd.h" HAVE_GETPAGESIZE)
|
||||
|
||||
@@ -22,7 +22,7 @@ Index: git/CMakeLists.txt
|
||||
if(C_LINUX)
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
# Set _GNU_SOURCE for O_LARGEFILE, O_CLOEXEC, O_DIRECTORY, O_NOFOLLOW, etc flags on older systems
|
||||
@@ -512,14 +506,8 @@ include(TestInline)
|
||||
@@ -581,14 +575,8 @@ include(TestInline)
|
||||
include(CheckFileOffsetBits)
|
||||
# Determine how to pack structs on this platform.
|
||||
include(CheckStructPacking)
|
||||
|
||||
Reference in New Issue
Block a user