summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch')
-rw-r--r--dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch b/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch
new file mode 100644
index 000000000000..7d21833757b2
--- /dev/null
+++ b/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch
@@ -0,0 +1,49 @@
+From ba3ef1af81b494248db230b4f7fdcc155fe256d5 Mon Sep 17 00:00:00 2001
+From: Jonathan Claudius <jclaudius@trustwave.com>
+Date: Sat, 5 Apr 2014 22:15:00 -0400
+Subject: [PATCH] Fix encoding issues in specs for Ruby 2.x
+
+---
+ spec/structfu_spec.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/structfu_spec.rb b/spec/structfu_spec.rb
+index c48c856..84b7e22 100644
+--- a/spec/structfu_spec.rb
++++ b/spec/structfu_spec.rb
+@@ -78,7 +78,7 @@ class StructClass
+ @int.to_s.should == "\x02"
+ @int.read(254)
+ @int.to_i.should == 254
+- @int.to_s.should == "\xfe"
++ @int.to_s.should == "\xfe".force_encoding("binary")
+ end
+
+ end
+@@ -98,7 +98,7 @@ class StructClass
+ end
+
+ it "should print a two character packed string" do
+- @int.to_s.should == "\x00\x0b"
++ @int.to_s.should == "\x00\x0b".force_encoding("binary")
+ end
+
+ it "should have a value of 11" do
+@@ -113,7 +113,7 @@ class StructClass
+ @int.to_s.should == "\x00\x02"
+ @int.read(254)
+ @int.to_i.should == 254
+- @int.to_s.should == "\x00\xfe"
++ @int.to_s.should == "\x00\xfe".force_encoding("binary")
+ end
+
+ it "should be able to set endianness" do
+@@ -198,7 +198,7 @@ class StructClass
+ @int.to_s.should == "\x00\x00\x00\x02"
+ @int.read(254)
+ @int.to_i.should == 254
+- @int.to_s.should == "\x00\x00\x00\xfe"
++ @int.to_s.should == "\x00\x00\x00\xfe".force_encoding("binary")
+ end
+
+ it "should be able to set endianness" do