From 2c9b8fbe41c04a94054b0540b54fcf2de0b79166 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Mar 2024 07:01:01 +0000 Subject: gentoo auto-resync : 23:03:2024 - 07:01:01 --- app-antivirus/clamav/Manifest | 1 - .../clamav/files/clamav-0.103.8-c-std.patch | 204 --------------------- 2 files changed, 205 deletions(-) delete mode 100644 app-antivirus/clamav/files/clamav-0.103.8-c-std.patch (limited to 'app-antivirus/clamav') diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 349e3adb1c6f..973160826f63 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -2,7 +2,6 @@ AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942 AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19 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-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-0.103.8-c-std.patch b/app-antivirus/clamav/files/clamav-0.103.8-c-std.patch deleted file mode 100644 index 91556a1ae422..000000000000 --- a/app-antivirus/clamav/files/clamav-0.103.8-c-std.patch +++ /dev/null @@ -1,204 +0,0 @@ -From b9e2714d5b42ad9a0742746996b989400c794adb Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky -Date: Fri, 4 Nov 2022 19:31:15 -0400 -Subject: [PATCH 1/2] clamonacc/c-thread-pool/thpool.c: define _GNU_SOURCE for - syscall(). - -On Linux, thpool.c uses syscall() from unistd.h, but that function is -not defined without _GNU_SOURCE: - - c-thread-pool/thpool.c: In function 'jobqueue_pull': - c-thread-pool/thpool.c:474:105: error: implicit declaration of function - 'syscall' [-Werror=implicit-function-declaration] - -In general that's not great, because it hinders some compiler diagnostics, -but it will also cause problems down the road if (for example) clang-16 -decides to enable -Werror=implicit-function-declaration by default. - -This commit changes the _POSIX_C_SOURCE definition at the top of -thpool.c to _GNU_SOURCE, as in the syscall(2) man page. ---- - clamonacc/c-thread-pool/thpool.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clamonacc/c-thread-pool/thpool.c b/clamonacc/c-thread-pool/thpool.c -index 46572da5f4..27c5103ff1 100644 ---- a/clamonacc/c-thread-pool/thpool.c -+++ b/clamonacc/c-thread-pool/thpool.c -@@ -8,7 +8,7 @@ - * - ********************************/ - --#define _POSIX_C_SOURCE 200809L -+#define _GNU_SOURCE - #include - #include - #include - -From 7e3425ab701141064d179c45af2251f61af4ccc7 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky -Date: Fri, 4 Nov 2022 20:08:30 -0400 -Subject: [PATCH 2/2] */*: fix invalid prototypes. - -Prototypes (or the declarations themselves, if there is no -corresponding prototype) for functions that take no arguments are -required by the C standard to specify (void) as their argument list; -for example, - - regex_pcre.h:79:1: error: function declaration isn't a prototype - [-Werror=strict-prototypes] - 79 | cl_error_t cli_pcre_init_internal(); - -Future versions of clang may become strict about this, and there's no -harm in conforming to the standard right now, so we fix all such -instances in this commit. ---- - clamonacc/clamonacc.c | 2 +- - clamonacc/client/socket.h | 2 +- - clamonacc/inotif/hash.c | 2 +- - clamonacc/inotif/inotif.c | 2 +- - clamonacc/scan/onas_queue.c | 6 +++--- - libclamav/matcher-pcre.h | 6 +++--- - libclamav/regex_pcre.h | 2 +- - m4/reorganization/compiler_checks.m4 | 2 +- - shared/misc.h | 2 +- - 9 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/clamonacc/clamonacc.c b/clamonacc/clamonacc.c -index ba986ef06c..c020897908 100644 ---- a/clamonacc/clamonacc.c -+++ b/clamonacc/clamonacc.c -@@ -61,7 +61,7 @@ - pthread_t ddd_pid = 0; - pthread_t scan_queue_pid = 0; - --static void onas_handle_signals(); -+static void onas_handle_signals(void); - static int startup_checks(struct onas_context *ctx); - static struct onas_context *g_ctx = NULL; - -diff --git a/clamonacc/client/socket.h b/clamonacc/client/socket.h -index 915f9086ca..ea84fb4c41 100644 ---- a/clamonacc/client/socket.h -+++ b/clamonacc/client/socket.h -@@ -31,4 +31,4 @@ struct onas_sock_t { - }; - - cl_error_t onas_set_sock_only_once(struct onas_context *ctx); --int onas_get_sockd(); -+int onas_get_sockd(void); -diff --git a/clamonacc/inotif/hash.c b/clamonacc/inotif/hash.c -index e4b3f1f983..2bbc4cdbb4 100644 ---- a/clamonacc/inotif/hash.c -+++ b/clamonacc/inotif/hash.c -@@ -58,7 +58,7 @@ - - #if defined(HAVE_SYS_FANOTIFY_H) - --static struct onas_bucket *onas_bucket_init(); -+static struct onas_bucket *onas_bucket_init(void); - static void onas_free_bucket(struct onas_bucket *bckt); - static int onas_bucket_insert(struct onas_bucket *bckt, struct onas_element *elem); - static int onas_bucket_remove(struct onas_bucket *bckt, struct onas_element *elem); -diff --git a/clamonacc/inotif/inotif.c b/clamonacc/inotif/inotif.c -index 7799ae4889..b8680e9856 100644 ---- a/clamonacc/inotif/inotif.c -+++ b/clamonacc/inotif/inotif.c -@@ -66,7 +66,7 @@ - - static int onas_ddd_init_ht(uint32_t ht_size); - static int onas_ddd_init_wdlt(uint64_t nwatches); --static int onas_ddd_grow_wdlt(); -+static int onas_ddd_grow_wdlt(void); - - static int onas_ddd_watch(const char *pathname, int fan_fd, uint64_t fan_mask, int in_fd, uint64_t in_mask); - static int onas_ddd_watch_hierarchy(const char *pathname, size_t len, int fd, uint64_t mask, uint32_t type); -diff --git a/clamonacc/scan/onas_queue.c b/clamonacc/scan/onas_queue.c -index d279df7415..6fa7df6e96 100644 ---- a/clamonacc/scan/onas_queue.c -+++ b/clamonacc/scan/onas_queue.c -@@ -82,7 +82,7 @@ static cl_error_t onas_new_event_queue_node(struct onas_event_queue_node **node) - return CL_SUCCESS; - } - --static void *onas_init_event_queue() -+static void *onas_init_event_queue(void) - { - - if (CL_EMEM == onas_new_event_queue_node(&g_onas_event_queue_head)) { -@@ -122,7 +122,7 @@ static void onas_destroy_event_queue_node(struct onas_event_queue_node *node) - return; - } - --static void onas_destroy_event_queue() -+static void onas_destroy_event_queue(void) - { - - if (NULL == g_onas_event_queue_head) { -@@ -200,7 +200,7 @@ void *onas_scan_queue_th(void *arg) - pthread_cleanup_pop(1); - } - --static int onas_queue_is_b_empty() -+static int onas_queue_is_b_empty(void) - { - - if (g_onas_event_queue.head->next == g_onas_event_queue.tail) { -diff --git a/libclamav/matcher-pcre.h b/libclamav/matcher-pcre.h -index 5ffc88fb26..b0bd51852b 100644 ---- a/libclamav/matcher-pcre.h -+++ b/libclamav/matcher-pcre.h -@@ -68,11 +68,11 @@ struct cli_pcre_meta { - }; - - /* PCRE PERFORMANCE DECLARATIONS */ --void cli_pcre_perf_print(); --void cli_pcre_perf_events_destroy(); -+void cli_pcre_perf_print(void); -+void cli_pcre_perf_events_destroy(void); - - /* PCRE MATCHER DECLARATIONS */ --int cli_pcre_init(); -+int cli_pcre_init(void); - cl_error_t cli_pcre_addpatt(struct cli_matcher *root, const char *virname, const char *trigger, const char *pattern, const char *cflags, const char *offset, const uint32_t *lsigid, unsigned int options); - cl_error_t cli_pcre_build(struct cli_matcher *root, long long unsigned match_limit, long long unsigned recmatch_limit, const struct cli_dconf *dconf); - cl_error_t cli_pcre_recaloff(struct cli_matcher *root, struct cli_pcre_off *data, struct cli_target_info *info, cli_ctx *ctx); -diff --git a/libclamav/regex_pcre.h b/libclamav/regex_pcre.h -index d1f4127984..52653431d4 100644 ---- a/libclamav/regex_pcre.h -+++ b/libclamav/regex_pcre.h -@@ -76,7 +76,7 @@ struct cli_pcre_results { - }; - #endif - --cl_error_t cli_pcre_init_internal(); -+cl_error_t cli_pcre_init_internal(void); - cl_error_t cli_pcre_addoptions(struct cli_pcre_data *pd, const char **opt, int errout); - cl_error_t cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override); - int cli_pcre_match(struct cli_pcre_data *pd, const unsigned char *buffer, size_t buflen, size_t override_offset, int options, struct cli_pcre_results *results); -diff --git a/m4/reorganization/compiler_checks.m4 b/m4/reorganization/compiler_checks.m4 -index f7984f4cb2..80c81e1d30 100644 ---- a/m4/reorganization/compiler_checks.m4 -+++ b/m4/reorganization/compiler_checks.m4 -@@ -121,7 +121,7 @@ extern void abort(void); - ((bb_size) > 0 && (sb_size) > 0 && (size_t)(sb_size) <= (size_t)(bb_size) \ - && (sb) >= (bb) && ((sb) + (sb_size)) <= ((bb) + (bb_size)) && ((sb) + (sb_size)) > (bb) && (sb) < ((bb) + (bb_size))) - --int crashtest() -+int crashtest(void) - { - unsigned int backsize, dcur; - int dval=0x12000, unp_offset; -diff --git a/shared/misc.h b/shared/misc.h -index 436c73117b..63fdea0f50 100644 ---- a/shared/misc.h -+++ b/shared/misc.h -@@ -72,7 +72,7 @@ int daemonize(void); - /*closes stdin, stdout, stderr. This is called by daemonize, but not - * daemonize_all_return. Users of daemonize_all_return should call this - * when initialization is complete.*/ --int close_std_descriptors(); -+int close_std_descriptors(void); - - /*Returns the return value of fork. All processes return */ - int daemonize_all_return(void); -- cgit v1.2.3