diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-29 10:04:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-29 10:04:55 +0100 |
commit | 20325cfc3bd40d48d3c7034afaac4f5193d9c704 (patch) | |
tree | b8e6ff7fc02271595e20f956b32cef56c41dafca /app-antivirus | |
parent | 14a6858a7d8bc085420a1430b3a3f67885019f27 (diff) |
gentoo auto-resync : 29:08:2023 - 10:04:54
Diffstat (limited to 'app-antivirus')
-rw-r--r-- | app-antivirus/Manifest.gz | bin | 880 -> 882 bytes | |||
-rw-r--r-- | app-antivirus/clamav/Manifest | 1 | ||||
-rw-r--r-- | app-antivirus/clamav/files/clamav-1.0.1-select-python.patch | 44 |
3 files changed, 0 insertions, 45 deletions
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz Binary files differindex 17788ee073a1..3ccd040e3c6c 100644 --- a/app-antivirus/Manifest.gz +++ b/app-antivirus/Manifest.gz diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 04dadcbf7d93..d262563a3358 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -3,7 +3,6 @@ AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d7 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306 AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672 AUX clamav-0.103.8-c-std.patch 8067 BLAKE2B a947309c705ed7812e907ababf8533485bf21a5a823aefbf942369e5c0297a46c4c03ebdb0b1c2b7569aa356ac802c3ef7a2b00f87eebbeefa6725a96e17113b SHA512 5b40b1307e8f6cf15bb5aff94ffd709d00e6d5e98ae6a0c31502968d3009b6f0cad9652fc5425525992cd25924f94c64022d8c8e1fb6dcf3f7724d458c53c376 -AUX clamav-1.0.1-select-python.patch 1648 BLAKE2B d43eef80ad607a6cba9cc9f5fe01e1372e5a59b8e9ff55132bc931c021a8ed959fe9170ee93012f726c3d53223aaac745fa35ef69c06d049513f274b25bcf3e5 SHA512 525d471aba58796a92cc3304d2efc37644b0358f1c51fa26619e70c4e4f30e82af1935313491aad39aa24cf6af15f4c606f2914fc0eb8f254f88d503980121cd AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3 AUX clamav-milter.initd 1164 BLAKE2B 190dee3476f8763dc2498e2099e6afa83c36642298618ad959940771e73c07456e30e6319d649291c82fec49e3712e500a65b167fe91b12bd2758f79f040e1c3 SHA512 d21c60e7d3ee5eee65da18831eed905858a1c7ab4ec02de1c16fa36179d9c1cf517eca8402b872f3d995fa1d59a9b2e79994655ca4570370b40dc810af5e0a3d AUX clamav-milter.logrotate-r1 1103 BLAKE2B b506a07f6ebdf697f87060424368ce4e4085564c3fa8e8cc4780ba786f2f543ae51a6e0f9d04db9ea9eb5554c1e395592453235db5abcc243fd2523cb44adec2 SHA512 890744086dcd8d6f7eba0f49df0941c643c6d730ea27a660ecaaab50c51c931489fa25079ad1aa9e307f919ac98a4e5d6b2e952cc46dcea8322b3253c6ba07b1 diff --git a/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch b/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch deleted file mode 100644 index 70bedc029399..000000000000 --- a/app-antivirus/clamav/files/clamav-1.0.1-select-python.patch +++ /dev/null @@ -1,44 +0,0 @@ -This patch enables us to tell CMake to find a particular python -impl on a multi-impl system. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,20 +223,26 @@ if(ENABLE_TESTS) - find_package(Libcheck REQUIRED) - - # Used to generate the test files and for the application feature test framework -- find_package(Python3 REQUIRED) -+ # In distros that support multiple implementations of python it is helpful to specify the impl to use -+ if(DEFINED PYTHON_FIND_VERSION) -+ find_package(Python3 EXACT ${PYTHON_FIND_VERSION} REQUIRED) -+ else() -+ find_package(Python3 REQUIRED) -+ # Not requesting a specific python impl; try using pytest from the PATH -+ execute_process( -+ COMMAND pytest --version -+ RESULT_VARIABLE PYTEST_EXIT_CODE -+ ERROR_QUIET OUTPUT_QUIET -+ ) - -- # First try using pytest from the PATH -- execute_process( -- COMMAND pytest --version -- RESULT_VARIABLE PYTEST_EXIT_CODE -- ERROR_QUIET OUTPUT_QUIET -- ) -+ if(${PYTEST_EXIT_CODE} EQUAL 0) -+ # pytest found in the path. -+ set(PythonTest_COMMAND "pytest;-v") -+ endif() -+ endif() - -- if(${PYTEST_EXIT_CODE} EQUAL 0) -- # pytest found in the path. -- set(PythonTest_COMMAND "pytest;-v") -- else() -- # Not in the path, try using: python3 -m pytest -+ if("${PythonTest_COMMAND}" STREQUAL "") -+ # Not in the path or specified a python impl; try using: python3 -m pytest - execute_process( - COMMAND ${Python3_EXECUTABLE} -m pytest --version - RESULT_VARIABLE PYTEST_MODULE_EXIT_CODE |