Compare commits

..

30 Commits

Author SHA1 Message Date
Patrick J Cherry
7fa4149ade New stretch release 2015-11-10 13:40:10 +00:00
Patrick J Cherry
9e6ce9d913 Merged in another test fix 2015-04-02 11:53:48 +01:00
Patrick J Cherry
06d78d4168 Scaled back the massive allocation of IPs from 11 /24s to 4.
Otherwise I get

Error: test_massively_parallel_IP_address_addition(TestAddr::TestWithNetlinkRouteSocket)
  Errno::EMFILE: Too many open files - socket(2)
  lib/linux/netlink/nlsocket.rb:61:in `initialize'
  lib/linux/netlink/nlsocket.rb:61:in `new'
  lib/linux/netlink/nlsocket.rb:61:in `initialize'
  lib/linux/netlink/route.rb:21:in `initialize'
  test/t_route.rb:54:in `new'
  test/t_route.rb:54:in `block (4 levels) in <class:TestAddr>'
2015-04-02 11:52:56 +01:00
Patrick J Cherry
a97bbe0d7c Merged in new tests 2015-04-02 11:47:17 +01:00
Patrick J Cherry
2ceb0fbf6d Make sure link exists before proceeding with test 2015-04-02 11:44:40 +01:00
Patrick J Cherry
d771a2be9c New tests 2015-04-01 23:12:30 +01:00
Patrick J Cherry
51b8bbcd8a Fixed new massive IP test thing to work with ruby1.8 and also non-root users 2015-04-01 23:05:41 +01:00
Patrick J Cherry
118903d9d5 Added tag 0.17-1+jessie1 for changeset 149ff4e2efb4 2015-04-01 22:52:30 +01:00
Patrick J Cherry
0ed037fc9d New jessie release 2015-04-01 22:52:10 +01:00
Patrick J Cherry
4b17ea4714 new branch 2015-04-01 17:40:19 +01:00
Patrick J Cherry
05e54f22e8 Added tag 0.16-1+wheezy1 for changeset c0eb6a0f135a 2014-08-26 16:34:27 +01:00
Patrick J Cherry
f2f99ce8e4 New upstream release. 2014-08-26 16:34:20 +01:00
Patrick J Cherry
8d47c623c4 Added tag 0.15-1+wheezy1 for changeset 73cc3d95f810 2014-01-21 10:01:59 +00:00
Patrick J Cherry
827ca74740 New upstream release 2014-01-21 10:01:42 +00:00
Patrick J Cherry
75a6eaca70 Added tag 0.14-1+wheezy1 for changeset babbc25e15f5 2013-11-14 13:38:35 +00:00
Patrick J Cherry
427fa40ef4 New upstream release 2013-11-14 13:37:57 +00:00
Patrick J Cherry
7ad9816fc3 Added tag 0.13-1+wheezy1 for changeset 6681f37480ff 2013-11-13 16:17:36 +00:00
Patrick J Cherry
4e4d0e02b6 New upstream release 2013-11-13 16:16:57 +00:00
Patrick J Cherry
a4afa867a1 Added tag 0.12-1+wheezy1 for changeset 5a2086dbce00 2013-09-12 14:27:19 +01:00
Patrick J Cherry
72ce94ef59 Merge, new upstream release 2013-09-12 14:27:08 +01:00
Patrick J Cherry
ee38239429 merge 2013-07-16 16:50:24 +01:00
Patrick J Cherry
33fe733d3f merge 2013-07-16 16:47:11 +01:00
Patrick J Cherry
181d3cd30a Foo 2013-07-16 16:28:40 +01:00
Patrick J Cherry
4ed52c07dd Added tag 0.11-1+wheezy2 for changeset 123ea9ee6130 2013-07-05 14:25:40 +01:00
Patrick J Cherry
ffe52106cd merged heads 2013-07-05 14:25:08 +01:00
Patrick J Cherry
10f11d9bc1 Updated package name to match ruby-packaging standards.
Added patch to remove rubygems requirements.
2013-07-05 14:23:49 +01:00
Patrick J Cherry
4cba09d819 Added patches to remove rubygems requirements. 2013-07-05 14:17:24 +01:00
Patrick J Cherry
9e1b28a8b1 Added tag 0.11-1+wheezy1 for changeset 5db0aa45b5e2 2013-07-05 13:58:14 +01:00
Patrick J Cherry
08050fbec7 Updated packaging for wheezy. 2013-07-05 13:58:07 +01:00
Patrick J Cherry
7eb0b073ec Added wheezy branch 2013-07-05 13:54:39 +01:00
11 changed files with 99 additions and 53 deletions

View File

@@ -1,6 +1,7 @@
^debian/liblinux-netlink-ruby(1.8|1.9.1)?$
^debian/ruby-linux-netlink$
~$
^.config-liblinux-netlink-ruby
^.pc/
^debian/files$
^debian/.*\.substvars$
^debian/.*\.debhelper.log$

46
debian/changelog vendored
View File

@@ -1,44 +1,58 @@
linux-netlink-ruby (0.17-1+squeeze1) oldstable; urgency=medium
ruby-linux-netlink (0.17-1+stretch1) testing; urgency=medium
* New upstream release
* Repackaged for stretch.
-- Patrick J Cherry <patrick@bytemark.co.uk> Wed, 01 Apr 2015 22:48:55 +0100
-- Patrick J Cherry <patrick@bytemark.co.uk> Tue, 10 Nov 2015 13:39:37 +0000
linux-netlink-ruby (0.16-1+squeeze1) oldstable; urgency=low
ruby-linux-netlink (0.16-1+jessie1) testing; urgency=medium
* Repackaged for jessie
-- Patrick J Cherry <patrick@bytemark.co.uk> Wed, 01 Apr 2015 17:39:44 +0100
ruby-linux-netlink (0.16-1+wheezy1) stable; urgency=medium
* New upstream release.
-- Patrick J Cherry <patch@dynamo> Tue, 26 Aug 2014 16:32:44 +0100
-- Patrick J Cherry <patch@dynamo> Tue, 26 Aug 2014 16:33:48 +0100
linux-netlink-ruby (0.15-1+squeeze1) oldstable; urgency=low
ruby-linux-netlink (0.15-1+wheezy1) stable; urgency=low
* New upstream release.
-- Patrick J Cherry <patrick@bytemark.co.uk> Tue, 21 Jan 2014 10:02:54 +0000
-- Patrick J Cherry <patrick@bytemark.co.uk> Tue, 21 Jan 2014 10:01:20 +0000
linux-netlink-ruby (0.14-1+squeeze1) oldstable; urgency=low
ruby-linux-netlink (0.14-1+wheezy1) stable; urgency=low
* New upstream release.
-- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 14 Nov 2013 11:59:05 +0000
-- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 14 Nov 2013 13:37:28 +0000
linux-netlink-ruby (0.13-1+squeeze1) oldstable; urgency=low
ruby-linux-netlink (0.13-1+wheezy1) stable; urgency=low
* New upstream release.
-- Patrick J Cherry <patrick@bytemark.co.uk> Wed, 13 Nov 2013 16:15:43 +0000
-- Patrick J Cherry <patrick@bytemark.co.uk> Wed, 13 Nov 2013 16:16:36 +0000
linux-netlink-ruby (0.12-1+squeeze1) oldstable; urgency=low
ruby-linux-netlink (0.12-1+wheezy1) stable; urgency=low
* New upstream release.
-- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 12 Sep 2013 14:28:10 +0100
-- Patrick J Cherry <patrick@bytemark.co.uk> Thu, 12 Sep 2013 14:26:41 +0100
linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
* New upstream version.
* Switch to dpkg-source 3.0 (quilt) format.
* Added patch to remove rubygems requires.
* Renamed source package to fit in with the new guidelines.
-- Patrick J Cherry <patrick@bytemark.co.uk> Fri, 05 Jul 2013 13:52:09 +0100
-- Patrick J Cherry <patrick@bytemark.co.uk> Fri, 05 Jul 2013 14:16:30 +0100
linux-netlink-ruby (0.11-1+wheezy1) stable; urgency=low
* New upstream version, repackaged for wheezy.
-- Patrick J Cherry <patrick@bytemark.co.uk> Fri, 05 Jul 2013 14:16:05 +0100
linux-netlink-ruby (0.10-6) stable; urgency=low

37
debian/control vendored
View File

@@ -1,39 +1,18 @@
Source: linux-netlink-ruby
Source: ruby-linux-netlink
Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
Section: ruby
Priority: optional
Build-Depends: debhelper (>= 7), cdbs, ruby1.8, ruby1.9.1, ruby-pkg-tools, rake
Build-Depends: debhelper (>= 7), gem2deb, rake, ruby-ffi
Standards-Version: 3.8.0
XS-Ruby-Versions: all
Package: liblinux-netlink-ruby
Architecture: all
Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
Package: ruby-linux-netlink
Architecture: any
Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
XB-Ruby-Versions: ${ruby:Versions}
Description: Netlink socket library for Ruby
This library provides an API for using a Linux Netlink socket, for doing
things like manipulating IP interfaces and routes programmatically, and
capturing packets from ULOG.
.
This is the metapackage for all versions of Ruby.
Package: liblinux-netlink-ruby1.8
Architecture: any
Depends: ruby1.8 (>= 1.8.7), libffi-ruby1.8, ${misc:Depends}
Description: Netlink socket library for Ruby 1.8
This library provides an API for using a Linux Netlink socket, for doing
things like manipulating IP interfaces and routes programmatically, and
capturing packets from ULOG.
.
This is the version for Ruby 1.8.7.
Package: liblinux-netlink-ruby1.9.1
Architecture: any
Depends: ruby1.9.1, libffi-ruby1.9.1, ${misc:Depends}
Description: Netlink socket library for Ruby 1.9.1
This library provides an API for using a Linux Netlink socket, for doing
things like manipulating IP interfaces and routes programmatically, and
capturing packets from ULOG.
.
This is the version for Ruby 1.9.1.

View File

@@ -1 +0,0 @@
examples/*

View File

@@ -0,0 +1,32 @@
Removed "require rubygems" from everywhere.
--- a/lib/linux/iptables.rb
+++ b/lib/linux/iptables.rb
@@ -1,11 +1,6 @@
require 'socket'
require 'linux/constants'
-
-begin
- require 'ffi'
-rescue LoadError
- require('rubygems') ? retry : raise
-end
+require 'ffi'
# Good things about FFI::Struct:
--- a/lib/linux/sendmsg.rb
+++ b/lib/linux/sendmsg.rb
@@ -1,12 +1,7 @@
# Patchup to add Socket#sendmsg and Socket#recvmsg for ruby 1.8
if BasicSocket.instance_methods.grep(/^sendmsg$/).empty?
- begin
- require 'ffi'
- rescue LoadError
- require('rubygems') ? retry : raise
- end
-
+ require 'ffi'
class BasicSocket
module FFIExt

1
debian/patches/series vendored Normal file
View File

@@ -0,0 +1 @@
remove-rubygems-requirements

2
debian/ruby-test-files.yaml vendored Normal file
View File

@@ -0,0 +1,2 @@
---
- test/t_route.rb

20
debian/rules vendored
View File

@@ -1,11 +1,23 @@
#!/usr/bin/make -f
#
# export DH_VERBOSE=1
#
# Uncomment to ignore all test failures (but the tests will run anyway)
# export DH_RUBY_IGNORE_TESTS=all
#
# Uncomment to ignore some test failures (but the tests will run anyway).
# Valid values:
# export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
#
# If you need to specify the .gemspec (eg there is more than one)
# export DH_RUBY_GEMSPEC=gem.gemspec
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
%:
dh $@ --buildsystem=ruby --with ruby
makebuilddir::
override_dh_auto_build-arch:
rake lib/linux/c_struct_sizeof_size_t.rb
clean::
override_dh_auto_clean:
rake clean

1
debian/source/format vendored Normal file
View File

@@ -0,0 +1 @@
3.0 (quilt)

View File

@@ -42,8 +42,12 @@ class TestAddr < Test::Unit::TestCase
test "massively parallel IP address addition" do
@ifname = create_test_interface
return if @ifname.nil?
link = @ip.link.list.find{|x| x.ifname == @ifname}
return if link.nil?
ips = (10..20).map {|y| (1..254).map {|z| "10.100.#{y}.#{z}" } }.flatten.compact
ips = (10..13).map {|y| (1..254).map {|z| "10.100.#{y}.#{z}" } }.flatten.compact
threads = ips.map {|ip|
Thread.new {
@@ -55,7 +59,8 @@ class TestAddr < Test::Unit::TestCase
}
}
threads.map(&:join)
threads.map{|t| t.join }
created = @ip.addr.list(:index => @ifname, :family => Socket::AF_INET).
map {|ifaddr| ifaddr.address.to_s }