merged heads

Added patch to remove rubygems requirements.

.hgignore

@@ -1,3 +1,7 @@
+^debian/ruby-linux-netlink$
 ~$
 ^.config-liblinux-netlink-ruby
-^debian/$
+^.pc/
+^debian/files$
+^debian/.*\.substvars$
+^debian/.*\.debhelper.log$

debian/changelog

@@ -0,0 +1,51 @@
+ruby-linux-netlink (0.11-1+wheezy2) stable; urgency=low
+
+  * 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 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
+
+  * Add ip rule support
+
+ -- Nick Thomas <nick@bytemark.co.uk>  Thu,  5 Jul 2012 15:19:42 +0100
+
+linux-netlink-ruby (0.10-5) stable; urgency=low
+
+  * Updated rattr constants to work with linux 3.2.
+  * Updated link handler to have new rattrs. 
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Mon, 11 Jun 2012 10:53:37 +0100
+
+linux-netlink-ruby (0.10-4) unstable; urgency=low
+
+  * Removed dependency on gcc, in favour of having arch-dependent packages
+    which rely on build-time ascertation of sizeof size_t.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 24 Jan 2012 15:56:46 +0000
+
+linux-netlink-ruby (0.10-3) unstable; urgency=low
+
+  * Updated version number to cover the previous changes.
+
+ -- Steve Kemp <steve@bytemark.co.uk>  Thu, 12 Jan 2012 12:00:21 +0000
+
+linux-netlink-ruby (0.10-2) unstable; urgency=low
+
+  * Added NlSocket.open and scope handling.
+
+ -- Matthew Bloch <matthew@bytemark.co.uk>  Wed, 18 May 2011 15:27:00 +0100
+
+linux-netlink-ruby (0.10-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 May 2011 17:17:45 +0100

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,18 @@
+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), gem2deb, rake, ruby-ffi
+Standards-Version: 3.8.0
+XS-Ruby-Versions: all 
+
+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.

debian/copyright

@@ -0,0 +1,20 @@
+Ruby Netlink
+============
+
+Copyright (c) 2011 Bytemark Computer Consulting Ltd
+
+Licence:
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in ‘/usr/share/common-licenses/GPL’ or in the dpkg
+source as the file ‘COPYING’

debian/patches/remove-rubygems-requirements

@@ -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

debian/patches/series

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

debian/ruby-linux-netlink.examples

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

debian/ruby-test-files.yaml

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

debian/rules

@@ -0,0 +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
+
+%:
+	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_build-arch:
+	rake lib/linux/c_struct_sizeof_size_t.rb
+
+override_dh_auto_clean:
+	rake clean
+

debian/source/format

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

lib/linux/constants.rb

@@ -238,9 +238,6 @@ module Linux
   IFLA_NET_NS_FD  = 28
   IFLA_EXT_MASK   = 29 
   IFLA_PROMISCUITY = 30
-  IFLA_NUM_TX_QUEUES    = 31
-  IFLA_NUM_RX_QUEUES    = 32
-  IFLA_CARRIER          = 33
 
   IFLA_INFO_UNSPEC	= 0
   IFLA_INFO_KIND	= 1	# "vlan", "gre" etc

lib/linux/netlink/route/link_handler.rb

@@ -65,9 +65,6 @@ module Netlink
     rtattr :net_ns_fd, IFLA_NET_NS_FD
     rtattr :ext_mask, IFLA_EXT_MASK   
     rtattr :promiscuity, IFLA_PROMISCUITY
-    rtattr :num_tx_queues, IFLA_NUM_TX_QUEUES
-    rtattr :num_rx_queues, IFLA_NUM_RX_QUEUES
-    rtattr :carrier, IFLA_CARRIER
  
     # Return the best stats available (64bit or 32bit)
     def stats

netlinkrb.gemspec

@@ -5,9 +5,9 @@ $:.unshift lib unless $:.include? lib
 
 Gem::Specification.new do |s|
   s.name = "netlinkrb"
-  s.version = "0.12"
+  s.version = "0.11"
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Brian Candler", "Matthew Bloch", "Patrick Cherry", "Alex Young"]
+  s.authors = ["Brian Candler", "Patrick Cherry", "Alex Young"]
   s.email = ["matthew@bytemark.co.uk"]
   s.summary = "Interface to Linux' Netlink API"
   s.description = "Ruby native interface to the Netlink API which avoids shelling out to command-line tools as much as possible."

test/t_route.rb

@@ -16,12 +16,11 @@ class TestAddr < Test::Unit::TestCase
   context "With netlink route socket" do
     setup do
       @ip = $ip
-      @ifname = nil
     end
 
     teardown do
       begin
-        delete_test_interface(@ifname)
+        delete_test_interface
       rescue KeyError, IndexError
         # Do nothing
       end
@@ -39,11 +38,13 @@ class TestAddr < Test::Unit::TestCase
             :kind => "dummy"
           )
         )
-      rescue Errno::EOPNOTSUPP
-        # Ugh, fall back to eth0
-        ifname = "eth0"
       rescue Errno::EPERM => err
-        do_skip err.to_s
+        if self.respond_to?(:skip)
+          skip err.to_s
+        else
+          puts "Skipping #{self.method_name} -- #{err.to_s}"
+          return nil
+        end
       end
 
       return ifname
@@ -52,9 +53,6 @@ class TestAddr < Test::Unit::TestCase
     def set_interface_up(ifname)
         link = @ip.link.list.find{|l| l.ifname == ifname}
 
-      return if link.nil?
-      return unless link.linkinfo and "dummy" == link.linkinfo.kind
-
         #
         # Bring the link up
         #
@@ -73,7 +71,6 @@ class TestAddr < Test::Unit::TestCase
       link = @ip.link.list.find{|l| l.ifname == ifname}
 
       return if link.nil?
-      return unless link.linkinfo and "dummy" == link.linkinfo.kind
       return unless link.flags == (link.flags | Linux::IFF_UP | Linux::IFF_RUNNING)
 
       #
@@ -90,11 +87,7 @@ class TestAddr < Test::Unit::TestCase
       assert_equal(0, link.flags & Linux::IFF_RUNNING, "Link still has the IFF_RUNNING flag set") 
     end
 
-    def delete_test_interface(ifname) 
+    def delete_test_interface(ifname = "test_#{$$}")
-      unless @ip.link[ifname] and @ip.link[ifname].linkinfo and "dummy" == @ip.link[ifname].linkinfo.kind
-        return nil
-      end
-
       begin
         set_interface_down(ifname)
       ensure
@@ -102,27 +95,11 @@ class TestAddr < Test::Unit::TestCase
       end
     end
       
-    def do_skip(msg)
-      if self.respond_to?(:skip)
-        skip msg
-      else
-        puts "Skipping #{self.method_name} -- #{msg}"
-      end
-      return nil
-    end
-
     test "Add and remove dummy interface" do
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      link = @ip.link.list.find{|x| x.ifname == @ifname} 
+      delete_test_interface(ifname)
-      return if link.nil?
-
-      unless link.linkinfo and "dummy" == link.linkinfo.kind
-        return do_skip("Could not create dummy interface")
-      end
-
-      delete_test_interface(@ifname)
     end
     
     def addrlist(opt = {:index=>"lo"})
@@ -130,26 +107,23 @@ class TestAddr < Test::Unit::TestCase
     end
 
     def add_and_remove_addr(testaddr, pfx)
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      link = @ip.link.list.find{|x| x.ifname == @ifname} 
+      addrs1 = addrlist({:index => ifname})
-      return if link.nil?
-      
-      addrs1 = addrlist({:index => @ifname})
       assert !addrs1.include?(testaddr)
 
-      @ip.addr.add(:index=>@ifname, :local=>testaddr, :prefixlen=>pfx)
+      @ip.addr.add(:index=>ifname, :local=>testaddr, :prefixlen=>pfx)
       assert_raises(Errno::EEXIST) {
-        @ip.addr.add(:index=>@ifname, :local=>testaddr, :prefixlen=>pfx)
+        @ip.addr.add(:index=>ifname, :local=>testaddr, :prefixlen=>pfx)
       }
 
-      addrs2 = addrlist({:index => @ifname})
+      addrs2 = addrlist({:index => ifname})
       assert addrs2.include?(testaddr), "#{addrs2.inspect} doesn't include #{testaddr}"
       
-      @ip.addr.delete(:index=>@ifname, :local=>testaddr, :prefixlen=>pfx)
+      @ip.addr.delete(:index=>ifname, :local=>testaddr, :prefixlen=>pfx)
       
-      addrs3 = addrlist({:index => @ifname})
+      addrs3 = addrlist({:index => ifname})
       assert_equal addrs1, addrs3
     end
 
@@ -184,24 +158,22 @@ class TestAddr < Test::Unit::TestCase
     end
   
     test "Add and remove vlan" do
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      link = @ip.link.list.find{|x| x.ifname == @ifname}
+      vlans1 = vlanlist(ifname)
-      return if link.nil?
-
-      vlans1 = vlanlist(@ifname)
       assert !vlans1.include?(1234)
 
-      @ip.vlan.add(:link=>@ifname, :vlan_id=>1234)
+      @ip.vlan.add(:link=>ifname, :vlan_id=>1234)
 
-      vlans2 = vlanlist(@ifname)
+      vlans2 = vlanlist(ifname)
       assert vlans2.include?(1234)
 
-      @ip.vlan.delete(:link=>@ifname, :vlan_id=>1234)
+      @ip.vlan.delete(:link=>ifname, :vlan_id=>1234)
 
-      vlans3 = vlanlist(@ifname)
+      vlans3 = vlanlist(ifname)
       assert_equal vlans1, vlans3
+      @ip.link.delete(:index => ifname)
     end
 
     def routes
@@ -219,17 +191,13 @@ class TestAddr < Test::Unit::TestCase
     end
     
     def add_and_remove_route(info)
-      @ifname = create_test_interface
+      ifname = create_test_interface
-      return if @ifname.nil?
+      return if ifname.nil?
 
-      set_interface_up(@ifname) 
+      set_interface_up(ifname) 
 
-      info[:oif] = @ifname
+      info[:oif] = ifname
-
+      ifidx = @ip.link.list.find{|x| x.ifname == info[:oif]}.index
-      link = @ip.link.list.find{|x| x.ifname == info[:oif]}
-      return if link.nil?
-
-      ifidx = link.index
 
       assert_equal 0, routes.select { |x| x == [info[:dst], info[:dst_len], ifidx] }.size