New upstream release

.hgignore

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

debian/changelog

@@ -0,0 +1,61 @@
+linux-netlink-ruby (0.14-1+squeeze1) oldstable; urgency=low
+
+  * New upstream release.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 14 Nov 2013 11:59:05 +0000
+
+linux-netlink-ruby (0.13-1+squeeze1) oldstable; urgency=low
+
+  * New upstream release.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 13 Nov 2013 16:15:43 +0000
+
+linux-netlink-ruby (0.12-1+squeeze1) oldstable; urgency=low
+
+  * New upstream release.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Thu, 12 Sep 2013 14:28:10 +0100
+
+linux-netlink-ruby (0.11-1+squeeze1) oldstable; urgency=low
+
+  * New upstream version.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Fri, 05 Jul 2013 13:52:09 +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,39 @@
+Source: linux-netlink-ruby
+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
+Standards-Version: 3.8.0
+
+Package: liblinux-netlink-ruby
+Architecture: all
+Depends: liblinux-netlink-ruby1.8 | liblinux-netlink-ruby1.9.1, ${misc:Depends}
+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.
+

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/liblinux-netlink-ruby1.8.examples

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

debian/liblinux-netlink-ruby1.9.1.examples

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

debian/rules

@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+#
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+
+makebuilddir::
+	rake lib/linux/c_struct_sizeof_size_t.rb
+
+clean::
+	rake clean

lib/linux/netlink/nlsocket.rb

@@ -25,7 +25,7 @@ module Netlink
     # Check the sockaddr on a received message. Raises an error if the AF
     # is not AF_NETLINK or the PID is not 0 (this is important for security)
     def self.check_sockaddr(str)
-      af, _, pid, _ = str.unpack(SOCKADDR_PACK)
+      af, pad, pid, groups = str.unpack(SOCKADDR_PACK)
       raise "Bad AF #{af}!" if af != Socket::AF_NETLINK
       raise "Bad PID #{pid}!" if pid != 0
     end
@@ -135,8 +135,8 @@ module Netlink
     # (Compare: rtnl_talk in lib/libnetlink.c, with answer=NULL)
     def cmd(type, msg, flags=NLM_F_REQUEST, resp_type=NLMSG_ERROR, timeout=@timeout, sockaddr=SOCKADDR_DEFAULT)
       send_request(type, msg, flags|NLM_F_ACK, sockaddr)
-      receive_responses(true, timeout) do |rtype,rmsg|
+      receive_responses(true, timeout) do |type,msg|
-        return rmsg if rtype == resp_type
+        return msg if type == resp_type
         false
       end
     end
@@ -144,7 +144,7 @@ module Netlink
     # Discard all waiting messages
     def drain
       while select([@socket], nil, nil, 0)
-        mesg, _, _, _ = @socket.recvmsg
+        mesg, sender, rflags, controls = @socket.recvmsg
         raise EOFError unless mesg
       end
     end
@@ -209,7 +209,7 @@ module Netlink
     # kernel closes the socket.
     def recvmsg(timeout=@timeout)
       if select([@socket], nil, nil, timeout)
-        mesg, sender, _, _ = @socket.recvmsg
+        mesg, sender, rflags, controls = @socket.recvmsg
         raise EOFError unless mesg
         sender = sender.to_sockaddr if sender.respond_to? :to_sockaddr
         NLSocket.check_sockaddr(sender)