New Upstream Release - ruby-pcaprub
Ready changes
Summary
Merged new upstream version: 0.13.1 (was: 0.12.4).
Resulting package
Built on 2022-03-08T06:15 (took 2m15s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases ruby-pcaprub-dbgsymapt install -t fresh-releases ruby-pcaprub
Lintian Result
Diff
diff --git a/.travis.yml b/.travis.yml
index 5813bd5..bc744de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,17 @@
language: ruby
before_install:
- sudo apt-get install libpcap-dev -qq
- - gem update bundler
before_script:
- travis_retry gem update bundler
rvm:
- - 1.8.7
- - 1.9.3
- - 2.0.0
- - 2.1
- - 2.2
- - 2.3.0
+ - 2.5
+ - 2.6
+ - 2.7
+ - 3.0
- ruby-head
+env:
+ rvmsudo_secure_path: 1
+cache: bundler
matrix:
allow_failures:
- rvm: ruby-head
diff --git a/Gemfile b/Gemfile
index bccd2f0..67c1356 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,33 +1,17 @@
source 'https://rubygems.org'
-# No more static spec file
-
-platforms :ruby_18 do
- gem 'rdoc'
-end
-
group :development, :test do
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
gem 'minitest', '~> 4.7.0'
gem 'shoulda-context', '~> 1.1.6'
-
- # test-unit moved to its own gem in ruby 2.2
- platforms :ruby_22, :ruby_23 do
- gem 'test-unit'
- end
-
- platforms :ruby_19, :ruby_20, :ruby_21, :ruby_22, :ruby_23 do
- gem 'coveralls', :require => false
- end
+ gem 'test-unit'
+ gem 'coveralls', :require => false
end
gem 'rake-compiler', '>= 0.6.0'
gem 'rubygems-tasks'
-if Bundler.current_ruby.ruby_18?
- gem 'rake', '< 10.6'
- gem 'git', '1.2.9'
-elsif Bundler.current_ruby.mri? || Bundler.current_ruby.mingw? || Bundler.current_ruby.x64_mingw?
+if Bundler.current_ruby.mri? || Bundler.current_ruby.mingw? || Bundler.current_ruby.x64_mingw?
gem 'rake', '>= 0.9.2'
gem 'git', '~> 1.3.0'
end
diff --git a/README.rdoc b/README.rdoc
index 00f8790..b3637fd 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -21,9 +21,7 @@ For packet processing capability look at ruby gems PCAPFU, PCAPLET, etc..
== Requirements
MRI POSIX Ruby (Native compilation) [Travis-CI Tested]
- Ruby 1.8.7 (EOL June 2014)
- Ruby 1.9.3
- ~> Ruby 2.x
+ ~> Ruby 2.4
libpcap - http://www.tcpdump.org
diff --git a/Rakefile b/Rakefile
index df6bef4..c602649 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,15 +9,16 @@ ENV['LANG'] = "en_US.UTF-8"
@gemspec = Gem::Specification.new do |spec|
- spec.name = "pcaprub"
- spec.version = PCAPRUB::Pcap.version
- spec.authors = ["shadowbq", "crondaemon", "jmcavinee", "unmarshal"]
- spec.email = "shadowbq@gmail.com"
- spec.description = "libpcap bindings for ruby with Ruby1.8, Ruby1.9, Ruby 2.x"
- spec.summary = "libpcap bindings for ruby"
- spec.homepage = "https://github.com/pcaprub/pcaprub"
- spec.requirements = "libpcap"
- spec.license = "LGPL-2.1"
+ spec.name = "pcaprub"
+ spec.version = PCAPRUB::Pcap.version
+ spec.authors = ["shadowbq", "crondaemon", "jmcavinee", "unmarshal"]
+ spec.email = "shadowbq@gmail.com"
+ spec.description = "libpcap bindings for Ruby 2.x"
+ spec.summary = "libpcap bindings for ruby"
+ spec.homepage = "https://github.com/pcaprub/pcaprub"
+ spec.requirements = "libpcap"
+ spec.license = "LGPL-2.1"
+ spec.required_ruby_version = '>= 2.0'
spec.files = [
".document",
@@ -114,6 +115,7 @@ Gem::Tasks.new
# Override standard release task
require 'git'
Rake::Task["release"].clear
+desc 'Release the gem (create tag, build, publish)'
task :release do
version = "#{PCAPRUB::VERSION::STRING}"
remote = 'origin'
diff --git a/debian/changelog b/debian/changelog
index b9c4a55..cac6a66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ruby-pcaprub (0.12.4-2) UNRELEASED; urgency=medium
+ruby-pcaprub (0.13.1-1) UNRELEASED; urgency=medium
[ Utkarsh Gupta ]
* Add salsa-ci.yml
@@ -14,8 +14,9 @@ ruby-pcaprub (0.12.4-2) UNRELEASED; urgency=medium
* Use canonical URL in Vcs-Git.
* Apply multi-arch hints.
+ ruby-pcaprub: Add Multi-Arch: same.
+ * New upstream release.
- -- Utkarsh Gupta <guptautkarsh2102@gmail.com> Tue, 13 Aug 2019 06:32:54 +0530
+ -- Utkarsh Gupta <guptautkarsh2102@gmail.com> Tue, 08 Mar 2022 06:13:41 -0000
ruby-pcaprub (0.12.4-1) unstable; urgency=medium
diff --git a/debian/patches/0001-Remove-bundler-dependency-from-tests.patch b/debian/patches/0001-Remove-bundler-dependency-from-tests.patch
index 91ecd3c..60ffd60 100644
--- a/debian/patches/0001-Remove-bundler-dependency-from-tests.patch
+++ b/debian/patches/0001-Remove-bundler-dependency-from-tests.patch
@@ -6,10 +6,10 @@ Subject: Remove bundler dependency from tests
test/test_helper.rb | 1 -
1 file changed, 1 deletion(-)
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index c1cbcd7..c07b10b 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
+Index: ruby-pcaprub/test/test_helper.rb
+===================================================================
+--- ruby-pcaprub.orig/test/test_helper.rb
++++ ruby-pcaprub/test/test_helper.rb
@@ -1,5 +1,4 @@
require 'rubygems'
-require 'bundler/setup'
diff --git a/ext/pcaprub_c/extconf.rb b/ext/pcaprub_c/extconf.rb
index 4fddd0f..fae6b4d 100644
--- a/ext/pcaprub_c/extconf.rb
+++ b/ext/pcaprub_c/extconf.rb
@@ -18,6 +18,10 @@ if /i386-mingw32/ =~ RUBY_PLATFORM || /x64-mingw32/ =~ RUBY_PLATFORM
pcap_includedir = with_config("pcap-includedir", pcap_dir + "/include")
pcap_libdir = with_config("pcap-libdir", pcap_dir + "/lib")
+ if /x64-mingw32/ =~ RUBY_PLATFORM
+ pcap_libdir += "/x64"
+ end
+
$CFLAGS = "-DWIN32 -I#{pcap_includedir}"
$CFLAGS += " -g" if with_config("debug")
$LDFLAGS = "-L#{pcap_libdir}"
@@ -33,6 +37,10 @@ elsif /i386-mswin32/ =~ RUBY_PLATFORM || /x64-mswin32/ =~ RUBY_PLATFORM
pcap_includedir = with_config("pcap-includedir", pcap_dir + "\\include")
pcap_libdir = with_config("pcap-libdir", pcap_dir + "\\lib")
+ if /x64-mingw32/ =~ RUBY_PLATFORM
+ pcap_libdir += "\\x64"
+ end
+
$CFLAGS = "-DWIN32 -I#{pcap_includedir}"
$CFLAGS += " -g" if with_config("debug")
$LDFLAGS = "/link /LIBPATH:#{pcap_libdir}"
diff --git a/ext/pcaprub_c/pcaprub.c b/ext/pcaprub_c/pcaprub.c
index 69f4616..4bb3637 100644
--- a/ext/pcaprub_c/pcaprub.c
+++ b/ext/pcaprub_c/pcaprub.c
@@ -61,6 +61,15 @@ typedef struct rbpacket {
u_char* pkt;
} rbpacket_t;
+/*
+* Return the pcap version
+*/
+static VALUE
+rbpcap_s_lib_version(VALUE self)
+{
+ return rb_str_new2(pcap_lib_version());
+}
+
/*
* Return the name of a network device on the system.
*
@@ -1295,6 +1304,7 @@ Init_pcaprub_c()
rb_define_module_function(rb_cPcap, "lookupdev", rbpcap_s_lookupdev, 0);
rb_define_module_function(rb_cPcap, "lookupnet", rbpcap_s_lookupnet, 1);
+ rb_define_module_function(rb_cPcap, "lib_version", rbpcap_s_lib_version, 0);
rb_define_const(rb_cPcap, "DLT_NULL", INT2NUM(DLT_NULL));
rb_define_const(rb_cPcap, "DLT_EN10MB", INT2NUM(DLT_EN10MB));
diff --git a/lib/pcaprub/ext.rb b/lib/pcaprub/ext.rb
index 94c9aa4..5813207 100644
--- a/lib/pcaprub/ext.rb
+++ b/lib/pcaprub/ext.rb
@@ -1,9 +1,5 @@
begin
- if RUBY_VERSION =~ /1.8/
- require '1.8/pcaprub_c'
- elsif RUBY_VERSION =~ /1.9/
- require '1.9/pcaprub_c'
- elsif RUBY_VERSION =~ /2.0/
+ if RUBY_VERSION =~ /2.0/
require '2.0/pcaprub_c'
elsif RUBY_VERSION =~ /2.1/
require '2.1/pcaprub_c'
diff --git a/lib/pcaprub/version.rb b/lib/pcaprub/version.rb
index ca4f0ae..98d7121 100644
--- a/lib/pcaprub/version.rb
+++ b/lib/pcaprub/version.rb
@@ -3,8 +3,8 @@ module PCAPRUB #:nodoc:
module VERSION #:nodoc:
MAJOR = 0
- MINOR = 12
- TINY = 4
+ MINOR = 13
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
diff --git a/pcaprub.gemspec b/pcaprub.gemspec
index 516ba0f..2780eff 100644
--- a/pcaprub.gemspec
+++ b/pcaprub.gemspec
@@ -2,48 +2,51 @@
# This file has been automatically generated by gem2tgz #
#########################################################
# -*- encoding: utf-8 -*-
+# stub: pcaprub 0.13.1 ruby lib
+# stub: ext/pcaprub_c/extconf.rb
Gem::Specification.new do |s|
- s.name = "pcaprub"
- s.version = "0.12.4"
+ s.name = "pcaprub".freeze
+ s.version = "0.13.1"
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["shadowbq", "crondaemon", "jmcavinee", "unmarshal"]
- s.date = "2016-04-18"
- s.description = "libpcap bindings for ruby with Ruby1.8, Ruby1.9, Ruby 2.x"
- s.email = "shadowbq@gmail.com"
- s.extensions = ["ext/pcaprub_c/extconf.rb"]
- s.extra_rdoc_files = ["FAQ.rdoc", "LICENSE", "README.rdoc", "USAGE.rdoc", "ext/pcaprub_c/pcaprub.c"]
- s.files = [".document", ".travis.yml", "FAQ.rdoc", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "USAGE.rdoc", "examples/dead_cap.rb", "examples/file_cap.rb", "examples/simple_cap.rb", "examples/telnet-raw.pcap", "ext/pcaprub_c/extconf.rb", "ext/pcaprub_c/pcaprub.c", "lib/pcaprub.rb", "lib/pcaprub/common.rb", "lib/pcaprub/ext.rb", "lib/pcaprub/version.rb", "test/test_helper.rb", "test/test_pcaprub_unit.rb"]
- s.homepage = "https://github.com/pcaprub/pcaprub"
- s.licenses = ["LGPL-2.1"]
- s.require_paths = ["lib"]
- s.requirements = ["libpcap"]
- s.rubygems_version = "1.8.23"
- s.summary = "libpcap bindings for ruby"
- s.test_files = ["test/test_helper.rb", "test/test_pcaprub_unit.rb"]
+ s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+ s.require_paths = ["lib".freeze]
+ s.authors = ["shadowbq".freeze, "crondaemon".freeze, "jmcavinee".freeze, "unmarshal".freeze]
+ s.date = "2021-10-11"
+ s.description = "libpcap bindings for Ruby 2.x".freeze
+ s.email = "shadowbq@gmail.com".freeze
+ s.extensions = ["ext/pcaprub_c/extconf.rb".freeze]
+ s.extra_rdoc_files = ["FAQ.rdoc".freeze, "LICENSE".freeze, "README.rdoc".freeze, "USAGE.rdoc".freeze, "ext/pcaprub_c/pcaprub.c".freeze]
+ s.files = [".document".freeze, ".travis.yml".freeze, "FAQ.rdoc".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.rdoc".freeze, "Rakefile".freeze, "USAGE.rdoc".freeze, "examples/dead_cap.rb".freeze, "examples/file_cap.rb".freeze, "examples/simple_cap.rb".freeze, "examples/telnet-raw.pcap".freeze, "ext/pcaprub_c/extconf.rb".freeze, "ext/pcaprub_c/pcaprub.c".freeze, "lib/pcaprub.rb".freeze, "lib/pcaprub/common.rb".freeze, "lib/pcaprub/ext.rb".freeze, "lib/pcaprub/version.rb".freeze, "test/test_helper.rb".freeze, "test/test_pcaprub_unit.rb".freeze]
+ s.homepage = "https://github.com/pcaprub/pcaprub".freeze
+ s.licenses = ["LGPL-2.1".freeze]
+ s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
+ s.requirements = ["libpcap".freeze]
+ s.rubygems_version = "2.7.6.2".freeze
+ s.summary = "libpcap bindings for ruby".freeze
+ s.test_files = ["test/test_helper.rb".freeze, "test/test_pcaprub_unit.rb".freeze]
if s.respond_to? :specification_version then
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_development_dependency(%q<bundler>, ["~> 1.3"])
- s.add_development_dependency(%q<minitest>, [">= 4.7.0", "~> 4.7"])
- s.add_development_dependency(%q<rake>, [">= 0.9.2", "~> 0.9"])
- s.add_development_dependency(%q<rake-compiler>, [">= 0.6.0", "~> 0.6"])
- s.add_development_dependency(%q<shoulda-context>, ["~> 1.1", "~> 1.1.6"])
+ s.add_development_dependency(%q<bundler>.freeze, ["~> 1.3"])
+ s.add_development_dependency(%q<minitest>.freeze, [">= 4.7.0", "~> 4.7"])
+ s.add_development_dependency(%q<rake>.freeze, [">= 0.9.2", "~> 0.9"])
+ s.add_development_dependency(%q<rake-compiler>.freeze, [">= 0.6.0", "~> 0.6"])
+ s.add_development_dependency(%q<shoulda-context>.freeze, ["~> 1.1", "~> 1.1.6"])
else
- s.add_dependency(%q<bundler>, ["~> 1.3"])
- s.add_dependency(%q<minitest>, [">= 4.7.0", "~> 4.7"])
- s.add_dependency(%q<rake>, [">= 0.9.2", "~> 0.9"])
- s.add_dependency(%q<rake-compiler>, [">= 0.6.0", "~> 0.6"])
- s.add_dependency(%q<shoulda-context>, ["~> 1.1", "~> 1.1.6"])
+ s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+ s.add_dependency(%q<minitest>.freeze, [">= 4.7.0", "~> 4.7"])
+ s.add_dependency(%q<rake>.freeze, [">= 0.9.2", "~> 0.9"])
+ s.add_dependency(%q<rake-compiler>.freeze, [">= 0.6.0", "~> 0.6"])
+ s.add_dependency(%q<shoulda-context>.freeze, ["~> 1.1", "~> 1.1.6"])
end
else
- s.add_dependency(%q<bundler>, ["~> 1.3"])
- s.add_dependency(%q<minitest>, [">= 4.7.0", "~> 4.7"])
- s.add_dependency(%q<rake>, [">= 0.9.2", "~> 0.9"])
- s.add_dependency(%q<rake-compiler>, [">= 0.6.0", "~> 0.6"])
- s.add_dependency(%q<shoulda-context>, ["~> 1.1", "~> 1.1.6"])
+ s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+ s.add_dependency(%q<minitest>.freeze, [">= 4.7.0", "~> 4.7"])
+ s.add_dependency(%q<rake>.freeze, [">= 0.9.2", "~> 0.9"])
+ s.add_dependency(%q<rake-compiler>.freeze, [">= 0.6.0", "~> 0.6"])
+ s.add_dependency(%q<shoulda-context>.freeze, ["~> 1.1", "~> 1.1.6"])
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c1cbcd7..4089622 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -8,9 +8,5 @@ require "minitest/autorun"
require 'test/unit'
require 'pcaprub'
-
-if RUBY_VERSION >= "1.9.2"
- require 'coveralls'
- Coveralls.wear!
-end
-
+require 'coveralls'
+Coveralls.wear!
diff --git a/test/test_pcaprub_unit.rb b/test/test_pcaprub_unit.rb
index 5e791cf..d43826c 100644
--- a/test/test_pcaprub_unit.rb
+++ b/test/test_pcaprub_unit.rb
@@ -13,19 +13,20 @@ require File.expand_path '../test_helper.rb', __FILE__
class Pcap::UnitTest < Test::Unit::TestCase
def test_version
assert_equal(String, Pcap.version.class)
- puts "Pcaprub version: #{Pcap.version}"
+ # puts "Pcaprub version: #{Pcap.version}"
end
def test_lookupdev
assert_equal(String, Pcap.lookupdev.class)
- puts "Pcaprub default device: #{Pcap.lookupdev}"
+ # puts "Pcaprub default device: #{Pcap.lookupdev}"
end
def test_lookupnet
dev = Pcap.lookupdev
assert_equal(Array, Pcap.lookupnet(dev).class)
net = Pcap.lookupnet(dev)
- puts "Pcaprub net (#{dev}): #{net[0]} #{[net[1]].pack("N").unpack("H*")[0]}"
+ assert net
+ # puts "Pcaprub net (#{dev}): #{net[0]} #{[net[1]].pack("N").unpack("H*")[0]}"
end
def test_pcap_new
@@ -70,7 +71,7 @@ class Pcap::UnitTest < Test::Unit::TestCase
d = Pcap.lookupdev
o = Pcap.open_live(d, 65535, true, 1)
r = o.datalink
- assert_equal(Fixnum, r.class)
+ assert_equal(Integer, r.class)
end
def test_pcap_snapshot
@@ -106,8 +107,8 @@ class Pcap::UnitTest < Test::Unit::TestCase
end
t.kill
- puts "Background thread ticked #{@c} times while capture was running"
- puts "Captured #{pkt_count} packets"
+ # puts "Background thread ticked #{@c} times while capture was running"
+ # puts "Captured #{pkt_count} packets"
assert(0 < @c, "Background thread failed to tick while capture was running");
true
end
@@ -160,4 +161,11 @@ class Pcap::UnitTest < Test::Unit::TestCase
o.compile("A non working filter")
end
end
+
+ def test_lib_version
+ v = Pcap.lib_version.split
+ assert_equal "libpcap", v[0]
+ assert_equal "version", v[1]
+ assert_equal 3, v[2].split('.').size
+ end
end
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/78/68ee369d05e6dcbb152e6b5221a9f323ed39e1.debug -rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/ruby/vendor_ruby/3.0.0/pcaprub_c.so -rw-r--r-- root/root /usr/share/rubygems-integration/3.0.0/specifications/pcaprub-0.13.1.gemspec
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/6f/366b76366d308f4ec741649ac093c1f1aec222.debug -rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/ruby/vendor_ruby/3.1.0/pcaprub_c.so -rw-r--r-- root/root /usr/share/rubygems-integration/3.1.0/specifications/pcaprub-0.12.4.gemspec
Control files of package ruby-pcaprub: lines which differ (wdiff format)
Depends: ruby | ruby-interpreter, (>= 1:3.0~0), libc6 (>= 2.4), libpcap0.8 (>= 1.0.0), libruby3.1 (>= 3.1.2), libruby libruby3.0 (>= 1:3.1~0), libruby 3.0.0~preview1), ruby (<< 1:3.2~) 1:3.1~)
Ruby-Versions: ruby3.0
Control files of package ruby-pcaprub-dbgsym: lines which differ (wdiff format)
Build-Ids: 6f366b76366d308f4ec741649ac093c1f1aec222 7868ee369d05e6dcbb152e6b5221a9f323ed39e1
Ruby-Versions: ruby3.0