1. clamav-devel
  2. Commit 56426d2870b0765d0433146c6ba4fefe3c0b0246
Browse code

clamonacc - fix distcheck, patch by Micah

Mickey Sola authored on 2019/07/26 01:21:07
Showing 18 changed files
clamonacc/Makefile.am
History View file @ 56426d2
... ... 
@@ -20,9 +20,6 @@
20 20
21 21 
 bin_PROGRAMS = clamonacc
22 22
23 
-clamonacc_CPPFLAGS="-g"
24 
-clamonacc_CFLAGS="-g"
25 
-
26 23 
 clamonacc_SOURCES = \
27 24 
     $(top_srcdir)/shared/output.c \
28 25 
     $(top_srcdir)/shared/output.h \
... ... 
@@ -35,6 +32,7 @@ clamonacc_SOURCES = \
35 35 
     $(top_srcdir)/shared/actions.c \
36 36 
     $(top_srcdir)/shared/actions.h \
37 37 
     clamonacc.c \
38 
+    clamonacc.h \
38 39 
     ./client/client.c \
39 40 
     ./client/client.h \
40 41 
     ./client/protocol.c \
... ... 
@@ -66,7 +64,7 @@ AM_CFLAGS=@WERR_CFLAGS@
66 66
67 67 
 DEFS = @DEFS@ -DCL_NOLIBCLAMAV
68 68 
 LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@
69 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamd -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
69 
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamonacc -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
70 70
71 71 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamonacc$(EXEEXT)
72 72 
 CLEANFILES=*.gcda *.gcno
clamonacc/clamonacc.c
History View file @ 56426d2
... ... 
@@ -40,18 +40,18 @@
40 40 
 #include <fcntl.h>
41 41 
 #endif
42 42
43 
-#include "../libclamav/clamav.h"
44 
-#include "../libclamav/others.h"
45 
-#include "../shared/output.h"
46 
-#include "../shared/misc.h"
47 
-#include "../shared/optparser.h"
48 
-#include "../shared/actions.h"
49 
-
50 
-#include "./clamonacc.h"
51 
-#include "./client/client.h"
52 
-#include "./fanotif/fanotif.h"
53 
-#include "./inotif/inotif.h"
54 
-#include "./scan/queue.h"
43 
+#include "libclamav/clamav.h"
44 
+#include "libclamav/others.h"
45 
+#include "shared/output.h"
46 
+#include "shared/misc.h"
47 
+#include "shared/optparser.h"
48 
+#include "shared/actions.h"
49 
+
50 
+#include "clamonacc.h"
51 
+#include "client/client.h"
52 
+#include "fanotif/fanotif.h"
53 
+#include "inotif/inotif.h"
54 
+#include "scan/queue.h"
55 55
56 56
57 57 
 pthread_t ddd_pid = 0;
clamonacc/clamonacc.h
History View file @ 56426d2
... ... 
@@ -22,7 +22,7 @@
22 22 
 #ifndef __ONAS_CLAMONACC_H
23 23 
 #define __ONAS_CLAMONACC_H
24 24
25 
-#include "../libclamav/clamav.h"
25 
+#include "libclamav/clamav.h"
26 26
27 27 
 #ifndef ONAS_DEBUG
28 28 
 #define ONAS_DEBUG
clamonacc/client/client.c
History View file @ 56426d2
... ... 
@@ -52,18 +52,18 @@
52 52 
 #include <sys/uio.h>
53 53 
 #endif
54 54
55 
-#include "../../libclamav/clamav.h"
56 
-#include "../../shared/optparser.h"
57 
-#include "../../shared/output.h"
58 
-#include "../../shared/misc.h"
59 
-#include "../../shared/actions.h"
60 
-
61 
-#include "../../libclamav/str.h"
62 
-#include "../../libclamav/others.h"
63 
-
64 
-#include "./communication.h"
65 
-#include "./client.h"
66 
-#include "./protocol.h"
55 
+#include "libclamav/clamav.h"
56 
+#include "shared/optparser.h"
57 
+#include "shared/output.h"
58 
+#include "shared/misc.h"
59 
+#include "shared/actions.h"
60 
+
61 
+#include "libclamav/str.h"
62 
+#include "libclamav/others.h"
63 
+
64 
+#include "communication.h"
65 
+#include "client.h"
66 
+#include "protocol.h"
67 67
68 68 
 #include "../clamonacc.h"
69 69
clamonacc/client/client.h
History View file @ 56426d2
... ... 
@@ -24,7 +24,7 @@
24 24
25 25 
 #include <curl/curl.h>
26 26
27 
-#include "../../shared/optparser.h"
27 
+#include "shared/optparser.h"
28 28 
 #include "../clamonacc.h"
29 29
30 30 
 enum {
clamonacc/client/communication.c
History View file @ 56426d2
... ... 
@@ -38,9 +38,9 @@
38 38 
 #include <sys/socket.h>
39 39 
 #endif
40 40
41 
-#include "../../shared/output.h"
41 
+#include "shared/output.h"
42 42
43 
-#include "./communication.h"
43 
+#include "communication.h"
44 44
45 45
46 46 
 static int onas_socket_wait(curl_socket_t sockfd, int32_t b_recv, uint64_t timeout_ms);
clamonacc/client/protocol.c
History View file @ 56426d2
... ... 
@@ -53,14 +53,14 @@
53 53 
 #include <netdb.h>
54 54 
 #endif
55 55
56 
-#include "../../libclamav/clamav.h"
57 
-#include "../../shared/actions.h"
58 
-#include "../../shared/output.h"
59 
-#include "../../shared/misc.h"
60 
-
61 
-#include "./communication.h"
62 
-#include "./protocol.h"
63 
-#include "./client.h"
56 
+#include "libclamav/clamav.h"
57 
+#include "shared/actions.h"
58 
+#include "shared/output.h"
59 
+#include "shared/misc.h"
60 
+
61 
+#include "communication.h"
62 
+#include "protocol.h"
63 
+#include "client.h"
64 64
65 65 
 static const char *scancmd[] = { "CONTSCAN", "MULTISCAN", "INSTREAM", "FILDES", "ALLMATCHSCAN" };
66 66
clamonacc/client/protocol.h
History View file @ 56426d2
... ... 
@@ -24,7 +24,7 @@
24 24
25 25 
 #include <curl/curl.h>
26 26
27 
-#include "../../shared/misc.h"
27 
+#include "shared/misc.h"
28 28 
 #include "../clamonacc.h"
29 29
30 30 
 int onas_dsresult(CURL *curl, int scantype, uint64_t maxstream, const char *filename, int fd, int64_t timeout, int *printok, int *errors, cl_error_t *ret_code);
clamonacc/fanotif/fanotif.c
History View file @ 56426d2
... ... 
@@ -36,16 +36,14 @@
36 36
37 37 
 #include <sys/fanotify.h>
38 38
39 
-#include "../../libclamav/clamav.h"
40 
-#include "../../libclamav/scanners.h"
39 
+#include "libclamav/clamav.h"
40 
+#include "libclamav/scanners.h"
41 41
42 
-#include "../../shared/optparser.h"
43 
-#include "../../shared/output.h"
42 
+#include "shared/optparser.h"
43 
+#include "shared/output.h"
44 44
45 
-#include "../misc/utils.h"
46 
-#include "../../clamd/server.h"
45 
+#include "clamd/server.h"
47 46
48 
-#include "./fanotif.h"
49 47 
 #include "../inotif/hash.h"
50 48 
 #include "../inotif/inotif.h"
51 49
... ... 
@@ -54,6 +52,10 @@
54 54 
 #include "../scan/thread.h"
55 55 
 #include "../scan/queue.h"
56 56
57 
+#include "../misc/utils.h"
58 
+
59 
+#include "fanotif.h"
60 
+
57 61 
 extern pthread_t ddd_pid;
58 62 
 extern pthread_t scan_queue_pid;
59 63 
 static int onas_fan_fd;
clamonacc/fanotif/fanotif.h
History View file @ 56426d2
... ... 
@@ -22,7 +22,7 @@
22 22 
 #define __ONAS_FAN_H
23 23
24 24 
 #include "../clamonacc.h"
25 
-#include "../../libclamav/clamav.h"
25 
+#include "libclamav/clamav.h"
26 26
27 27 
 //void *onas_fan_th(void *arg);
28 28 
 cl_error_t onas_setup_fanotif(struct onas_context **ctx);
clamonacc/inotif/hash.c
History View file @ 56426d2
... ... 
@@ -39,19 +39,20 @@
39 39 
 #endif
40 40
41 41 
 #include "../fanotif/fanotif.h"
42 
-#include "./hash.h"
43 
-#include "./inotif.h"
44 42
45 
-#include "../../libclamav/clamav.h"
46 
-#include "../../libclamav/scanners.h"
47 
-#include "../../libclamav/str.h"
43 
+#include "hash.h"
44 
+#include "inotif.h"
48 45
49 
-#include "../../shared/optparser.h"
50 
-#include "../../shared/output.h"
46 
+#include "libclamav/clamav.h"
47 
+#include "libclamav/scanners.h"
48 
+#include "libclamav/str.h"
51 49
52 
-#include "../../clamd/server.h"
53 
-#include "../../clamd/others.h"
54 
-#include "../../clamd/scanner.h"
50 
+#include "shared/optparser.h"
51 
+#include "shared/output.h"
52 
+
53 
+#include "clamd/server.h"
54 
+#include "clamd/others.h"
55 
+#include "clamd/scanner.h"
55 56 
 #include "../misc/priv_fts.h"
56 57
57 58
clamonacc/inotif/inotif.c
History View file @ 56426d2
... ... 
@@ -41,21 +41,23 @@
41 41 
 #endif
42 42
43 43 
 #include "../fanotif/fanotif.h"
44 
-#include "./hash.h"
45 
-#include "./inotif.h"
44 
+
45 
+#include "hash.h"
46 
+#include "inotif.h"
47 
+
46 48 
 #include "../scan/thread.h"
47 49 
 #include "../scan/queue.h"
48 50 
 #include "../misc/utils.h"
49 51
50 
-#include "../../libclamav/clamav.h"
51 
-#include "../../libclamav/scanners.h"
52 
+#include "libclamav/clamav.h"
53 
+#include "libclamav/scanners.h"
52 54
53 
-#include "../../shared/optparser.h"
54 
-#include "../../shared/output.h"
55 
+#include "shared/optparser.h"
56 
+#include "shared/output.h"
55 57
56 
-#include "../../clamd/server.h"
57 
-#include "../../clamd/others.h"
58 
-#include "../../clamd/scanner.h"
58 
+#include "clamd/server.h"
59 
+#include "clamd/others.h"
60 
+#include "clamd/scanner.h"
59 61
60 62
61 63 
 #if defined(FANOTIFY)
clamonacc/inotif/inotif.h
History View file @ 56426d2
... ... 
@@ -24,8 +24,8 @@
24 24
25 25 
 #if defined(FANOTIFY)
26 26
27 
-#include "../../shared/optparser.h"
28 
-#include "../../libclamav/clamav.h"
27 
+#include "shared/optparser.h"
28 
+#include "libclamav/clamav.h"
29 29
30 30 
 /*
31 31 
  * Extra options for onas_scan_th().
clamonacc/misc/utils.c
History View file @ 56426d2
... ... 
@@ -30,12 +30,12 @@
30 30 
 #include <errno.h>
31 31 
 #include <pthread.h>
32 32 
 #include <pwd.h>
33 
-#include "../../libclamav/clamav.h"
34 
-#include "../../shared/optparser.h"
35 
-#include "../../shared/output.h"
33 
+#include "libclamav/clamav.h"
34 
+#include "shared/optparser.h"
35 
+#include "shared/output.h"
36 36
37 
-#include "./utils.h"
38 
-#include "../../clamd/scanner.h"
37 
+#include "utils.h"
38 
+#include "clamd/scanner.h"
39 39 
 #include "../clamonacc.h"
40 40 
 #include "../client/client.h"
41 41 
 #include "../scan/queue.h"
clamonacc/misc/utils.h
History View file @ 56426d2
... ... 
@@ -21,8 +21,8 @@
21 21 
 #ifndef __CLAMD_ONAS_OTHERS_H
22 22 
 #define __CLAMD_ONAS_OTHERS_H
23 23
24 
-#include "../../shared/optparser.h"
25 
-#include "../../libclamav/clamav.h"
24 
+#include "shared/optparser.h"
25 
+#include "libclamav/clamav.h"
26 26 
 #include "../clamonacc.h"
27 27
28 28 
 typedef enum {
clamonacc/scan/queue.c
History View file @ 56426d2
... ... 
@@ -34,15 +34,15 @@
34 34
35 35 
 #include "../misc/utils.h"
36 36
37 
-#include "../../libclamav/clamav.h"
37 
+#include "libclamav/clamav.h"
38 38
39 
-#include "../../shared/optparser.h"
40 
-#include "../../shared/output.h"
39 
+#include "shared/optparser.h"
40 
+#include "shared/output.h"
41 41
42 42 
 #include "../c-thread-pool/thpool.h"
43 43
44 
-#include "./thread.h"
45 
-#include "./queue.h"
44 
+#include "thread.h"
45 
+#include "queue.h"
46 46
47 47 
 static void onas_scan_queue_exit(void * arg);
48 48 
 static int onas_consume_event(threadpool thpool);
clamonacc/scan/thread.c
History View file @ 56426d2
... ... 
@@ -35,14 +35,14 @@
35 35 
 #include <sys/fanotify.h>
36 36 
 #endif
37 37
38 
-#include "../../shared/optparser.h"
39 
-#include "../../shared/output.h"
38 
+#include "shared/optparser.h"
39 
+#include "shared/output.h"
40 40
41 
-#include "../../libclamav/others.h"
41 
+#include "libclamav/others.h"
42 42 
 #include "../misc/priv_fts.h"
43 43 
 #include "../misc/utils.h"
44 44 
 #include "../client/client.h"
45 
-#include "./thread.h"
45 
+#include "thread.h"
46 46
47 47 
 static pthread_mutex_t onas_scan_lock = PTHREAD_MUTEX_INITIALIZER;
48 48
clamonacc/scan/thread.h
History View file @ 56426d2
... ... 
@@ -25,8 +25,8 @@
25 25 
 #if defined(FANOTIFY)
26 26 
 #include <sys/fanotify.h>
27 27 
 #endif
28 
-#include "../../shared/optparser.h"
29 
-#include "../../libclamav/clamav.h"
28 
+#include "shared/optparser.h"
29 
+#include "libclamav/clamav.h"
30 30
31 31 
 #define ONAS_SCTH_B_DIR         0x01
32 32 
 #define ONAS_SCTH_B_FILE        0x02