Permalink
Browse files

Merge remote-tracking branch 'eagleas/master'

Conflicts:
	VERSION
	clamav.gemspec
	ext/clamav/clamav.c
	rakefile
  • Loading branch information...
2 parents c2cbab9 + 4c77842 commit 265de62ca4ecc9aee3634082be9870326204279f @warp committed Jun 18, 2011
Showing with 279 additions and 133 deletions.
  1. +26 −0 ChangeLog
  2. +36 −22 README.rdoc
  3. +4 −0 TODO
  4. +1 −1 VERSION
  5. +11 −8 clamav.gemspec
  6. +111 −55 ext/clamav/clamav.c
  7. +40 −17 ext/clamav/const.h
  8. +1 −1 rakefile
  9. +49 −29 spec/unit/clamav_spec.rb
View
@@ -1,5 +1,31 @@
ChangeLog
+Tue May 18 15:30:00 MSK 2010
+----------------------------
+ V 0.4.1
+ * Raise error when scanfile() before loaddb()
+
+Fri Apr 23 19:31:00 MSK 2010
+----------------------------
+ V 0.4.0
+ * Clamav-0.96 compatible now
+ * Changes: ClamAV is a singleton (Use ClamAV.instance instead ClamAV.new)
+ You should call ClamAV#loaddb([options]) after first call ClamAV.instance
+ + ClamAV#version get Clamav engine version string
+ + ClamaAV#countsigs get loaded signatures count with options
+
+Thu Feb 25 20:01:00 MSK 2010
+----------------------------
+ V 0.3.2
+ * Fix to compile on ruby-1.9
+
+Wed Nov 11 20:33:00 MSK 2009
+----------------------------
+ V 0.3.1
+ * Fix to work on 64-bit systems
+ * Update to ClamAV-0.95.3
+ * Using Jeweler
+
Tue Apr 07 20:57:00 MSK 2009
----------------------------
V 0.3.0
View
@@ -8,33 +8,25 @@ $ sudo gem install clamav
== REQUIREMENTS:
-clamav >= 0.95, libclamav6, libclamav-dev
+clamav >= 0.95.3, libclamav6, libclamav-dev
+clamav >= 0.96 is recommended
== SYNOPSIS:
-== ClamAV.new([options[, db_options]])
+ *Changes*: Now ClamAV is a singleton. Use ClamAV.instance instead ClamAV.new.
+ You should call ClamAV#loaddb([options]) after first call ClamAV.instance.
+ Next run ClamAV#loaddb with another options will recreate/recompile clamav engine/database.
+
+== ClamAV.instance
return:
ClamAV instance
-Options:
-
-* CL_SCAN_STDOPT (default) equal CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF
-* CL_SCAN_RAW
-* CL_SCAN_BLOCKENCRYPTED
-* CL_SCAN_BLOCKBROKEN
-* CL_SCAN_MAILURL
-* CL_SCAN_PHISHING_BLOCKSSL
-* CL_SCAN_PHISHING_BLOCKCLOAK
-* CL_SCAN_STRUCTURED
-* CL_SCAN_STRUCTURED_SSN_NORMAL
-* CL_SCAN_STRUCTURED_SSN_STRIPPED
-* CL_SCAN_PARTIAL_MESSAGE
-* CL_SCAN_HEURISTIC_PRECEDENCE
+== ClamAV#loaddb([db_options])
DB options:
-* CL_DB_STDOPT (default) equal CL_DB_PHISHING | CL_DB_PHISHING_URLS
+* CL_DB_STDOPT (default) equal CL_DB_PHISHING | CL_DB_PHISHING_URLS | CL_DB_BYTECODE
* CL_DB_PUA
* CL_DB_CVDNOTMP
* CL_DB_PUA_MODE
@@ -44,24 +36,35 @@ DB options:
See ClamAV documentation and sources for details.
-
== ClamAV#scanfile(filename[, options])
options default CL_SCAN_STDOPT
-
+
+Options:
+
+* CL_SCAN_STDOPT (default) equal CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF
+* CL_SCAN_RAW
+* CL_SCAN_BLOCKENCRYPTED
+* CL_SCAN_BLOCKBROKEN
+* CL_SCAN_PHISHING_BLOCKSSL
+* CL_SCAN_PHISHING_BLOCKCLOAK
+* CL_SCAN_STRUCTURED
+* CL_SCAN_STRUCTURED_SSN_NORMAL
+* CL_SCAN_STRUCTURED_SSN_STRIPPED
+* CL_SCAN_PARTIAL_MESSAGE
+* CL_SCAN_HEURISTIC_PRECEDENCE
+
return:
virusname or ClamAV returncode(Fixnum)
-
== ClamAV#reload()
- reload virus db if changed
+ reload virus database if changed
return:
1 - reload successful
0 - reload unnecessary
-
== ClamAV#setlimit(param, value)
== ClamAV#getlimit(param)
@@ -96,6 +99,17 @@ See ClamAV documentation and sources for details.
== ClamaAV#signo()
get loaded signatures count
+== ClamaAV#countsigs([options])
+ get loaded signatures count (since 0.96 engine version)
+
+Options:
+* CL_COUNTSIGS_ALL (default)
+* CL_COUNTSIGS_OFFICIAL
+* CL_COUNTSIGS_UNOFFICIAL
+
+
+== ClamaAV#version()
+ get Clamav engine version string
== LICENSE:
View
4 TODO
@@ -0,0 +1,4 @@
+TODO
+
+* Switch to FFI
+
View
@@ -1 +1 @@
-0.3.1
+0.4.1
View
@@ -1,26 +1,28 @@
# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = %q{clamav}
- s.version = "0.3.1"
+ s.version = "0.4.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Alexander Oryol"]
- s.date = %q{2009-10-16}
+ s.date = %q{2010-05-18}
s.description = %q{ClamAV Ruby bindings}
s.email = %q{eagle.alex@gmail.com}
s.extensions = ["ext/clamav/extconf.rb"]
s.extra_rdoc_files = [
"ChangeLog",
- "README.rdoc"
+ "README.rdoc",
+ "TODO"
]
s.files = [
".gitignore",
"ChangeLog",
"README.rdoc",
+ "TODO",
"VERSION",
"clamav.gemspec",
"ext/clamav/clamav.c",
@@ -52,11 +54,11 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{clamav}
- s.rubygems_version = %q{1.3.5}
+ s.rubygems_version = %q{1.3.6}
s.summary = %q{ClamAV Ruby bindings}
s.test_files = [
- "spec/spec_helper.rb",
- "spec/unit/clamav_spec.rb"
+ "spec/unit/clamav_spec.rb",
+ "spec/spec_helper.rb"
]
if s.respond_to? :specification_version then
@@ -69,3 +71,4 @@ Gem::Specification.new do |s|
else
end
end
+
Oops, something went wrong.

0 comments on commit 265de62

Please sign in to comment.