yara 1.4.4 → 1.5.0

data/History.txt

@@ -1,3 +1,6 @@
+== 1.5.0 /2011-04-18
+  * Version 1.5.0 supports yara 1.5 - it is not backward compatible
+
 == 1.4.3 / 2011-04-11
   * Support optional namespaces when calling compile_file or compile_string
   * Better yardoc tags

data/README.rdoc

@@ -34,15 +34,19 @@ http://code.google.com/p/yara-project/
   end
 
 == Versioning
-The current version of libyara at the time of writing is 1.4.0. Bindings
+The current version of libyara at the time of writing is 1.5.0. Bindings
 have been written against this API and may not work with earlier versions
 of the libyara library.
 
 The major and minor version numbers of the ruby library are intended
 to be in step with the C api version.
 
+Note that yara-ruby began existence as of yara 1.4 so binding versions
+go back this far. The yara 1.4 binding in ruby to use is the most recent
+1.4.X gem, and so on.
+
 == Requirements
-* libyara 1.4 must be installed - http://code.google.com/p/yara-project/
+* libyara 1.5 must be installed - http://code.google.com/p/yara-project/
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.5.0

data/ext/yara_native/Match.c

@@ -95,7 +95,7 @@ MatchString_NEW(int offset, char *ident, char *buf, size_t buflen) {
 }
 
 int 
-Match_NEW_from_rule(RULE *rule, unsigned char *buffer, VALUE *match) {
+Match_NEW_from_rule(RULE *rule, VALUE *match) {
   match_info *mi;
   VALUE rb_mi = Qnil;
 
@@ -114,7 +114,7 @@ Match_NEW_from_rule(RULE *rule, unsigned char *buffer, VALUE *match) {
   rb_mi = Data_Wrap_Struct(class_Match, 0, free, mi);
 
   mi->rule      = rb_iv_set(rb_mi, "@rule", rb_obj_freeze(rb_str_new2(rule->identifier)));
-  mi->namespace = rb_iv_set(rb_mi, "@namespace", rb_obj_freeze(rb_str_new2(rule->namespace->name)));
+  mi->namespace = rb_iv_set(rb_mi, "@namespace", rb_obj_freeze(rb_str_new2(rule->ns->name)));
   mi->tags      = rb_iv_set(rb_mi, "@tags", rb_ary_new());
   mi->strings   = rb_iv_set(rb_mi, "@strings", rb_ary_new());
   mi->meta      = rb_iv_set(rb_mi, "@meta", rb_hash_new());
@@ -130,12 +130,12 @@ Match_NEW_from_rule(RULE *rule, unsigned char *buffer, VALUE *match) {
   string = rule->string_list_head;
   while(string) {
     if (string->flags & STRING_FLAGS_FOUND) {
-      m = string->matches;
+      m = string->matches_head;
       while (m) {
        rb_ary_push(mi->strings, 
            MatchString_NEW(m->offset, 
              string->identifier, 
-             buffer + m->offset, 
+             m->data, 
              m->length));
         m = m->next;
       }

data/ext/yara_native/Match.h

@@ -25,7 +25,7 @@
 #include <yara.h>
 
 extern int
-Match_NEW_from_rule(RULE * rule, unsigned char * buffer, VALUE * match);
+Match_NEW_from_rule(RULE * rule, VALUE * match);
 
 extern const char * SCAN_ERRORS[];
 

data/ext/yara_native/Rules.c

@@ -260,14 +260,14 @@ VALUE rules_set_namespace(VALUE self, VALUE rb_namespace) {
 
 /* an internal callback function used with scan_file and scan_string */
 static int 
-scan_callback(RULE *rule, unsigned char *buffer, unsigned int buffer_size, void *data) {
+scan_callback(RULE *rule, void *data) {
   int match_ret;
   VALUE match = Qnil;
   VALUE results = *((VALUE *) data);
 
   Check_Type(results, T_ARRAY);
 
-  match_ret = Match_NEW_from_rule(rule, buffer, &match);
+  match_ret = Match_NEW_from_rule(rule, &match);
   if(match_ret == 0 && !NIL_P(match))
     rb_ary_push(results,match);
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 4
-  version: 1.4.4
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Eric Monti
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -05:00
+date: 2011-04-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3417020004990498226
+      hash: -9224945978915744
       segments: 
       - 0
       version: "0"