git-svn: trunk@4260
Tomasz Kojm authored on 2008/10/15 19:10:30... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Wed Oct 15 12:30:57 CEST 2008 (tk) |
|
2 |
+---------------------------------- |
|
3 |
+ * freshclam: drop --submit-stats; please use SubmitDetectionStats instead |
|
4 |
+ (bb#1235) |
|
5 |
+ |
|
1 | 6 |
Tue Oct 14 23:46:45 CEST 2008 (acab) |
2 | 7 |
------------------------------------ |
3 | 8 |
* docs/man/clamscan.1.in: drop reference to non-exsistent option --max-space |
... | ... |
@@ -67,9 +67,6 @@ Execute COMMAND when freshclam reports outdated version. In the command string % |
67 | 67 |
.TP |
68 | 68 |
\fB\-\-list\-mirrors\fR |
69 | 69 |
Print mirror details from mirrors.dat (cache file for the mirror manager). |
70 |
-.TP |
|
71 |
-\fB\-\-submit\-stats[=/path/to/clamd.conf]\fR |
|
72 |
-Upload detection statistics to the ClamAV Project (see freshclam.conf(5):SubmitDetectionStats for more details). No database update will be performed. This option only works in the interactive mode. |
|
73 | 70 |
.SH "EXAMPLES" |
74 | 71 |
.LP |
75 | 72 |
.TP |
... | ... |
@@ -144,7 +144,6 @@ static void help(void) |
144 | 144 |
mprintf(" --on-error-execute=COMMAND execute COMMAND if errors occured\n"); |
145 | 145 |
mprintf(" --on-outdated-execute=COMMAND execute COMMAND when software is outdated\n"); |
146 | 146 |
mprintf(" --list-mirrors print mirrors from mirrors.dat\n"); |
147 |
- mprintf(" --submit-stats[=/path/clamd.conf] only submit detection statistics\n"); |
|
148 | 147 |
|
149 | 148 |
mprintf("\n"); |
150 | 149 |
} |
... | ... |
@@ -234,7 +233,7 @@ int main(int argc, char **argv) |
234 | 234 |
{"on-error-execute", 1, 0, 0}, |
235 | 235 |
{"on-outdated-execute", 1, 0, 0}, |
236 | 236 |
{"list-mirrors", 0, 0, 0}, |
237 |
- {"submit-stats", 2, 0, 0}, |
|
237 |
+ /* {"submit-stats", 2, 0, 0}, */ |
|
238 | 238 |
{0, 0, 0, 0} |
239 | 239 |
}; |
240 | 240 |
|
... | ... |
@@ -581,6 +580,7 @@ int main(int argc, char **argv) |
581 | 581 |
} |
582 | 582 |
|
583 | 583 |
} else { |
584 |
+ /* |
|
584 | 585 |
if(opt_check(opt, "submit-stats")) { |
585 | 586 |
cfgfile = opt_arg(opt, "submit-stats"); |
586 | 587 |
if(!cfgfile) |
... | ... |
@@ -592,6 +592,12 @@ int main(int argc, char **argv) |
592 | 592 |
if((cpt = cfgopt(copt, "SubmitDetectionStats"))->enabled) |
593 | 593 |
submitstats(cpt->strarg, copt); |
594 | 594 |
} |
595 |
+ */ |
|
596 |
+ ret = download(copt, opt, newdir, cfgfile); |
|
597 |
+ |
|
598 |
+ if((cpt = cfgopt(copt, "SubmitDetectionStats"))->enabled) |
|
599 |
+ submitstats(cpt->strarg, copt); |
|
600 |
+ |
|
595 | 601 |
} |
596 | 602 |
|
597 | 603 |
if(ret > 1) { |